diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-08-26 17:22:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-27 08:47:49 +0200 |
| commit | 2b5812e0191d43bff939274d88e7ec3ce02ce6cd (patch) | |
| tree | f360e4740c06eb0d1fc33d3e087e578fcaf760e0 /postprocess | |
| parent | e6f4779de8fea16931967ce206439c5780d46125 (diff) | |
rename ENABLE_HEADLESS option to DISABLE_GUI
since it has nothing to do with the headless command line option, so
use the name it has in the configure.ac file
Change-Id: Ibf0615ed02695d6e48a797f5632e4f417c010c70
Reviewed-on: https://gerrit.libreoffice.org/59611
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/Module_postprocess.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 27cc0b940327..b02faf7b9310 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -34,7 +34,7 @@ endif # contain content from at least one of external/more_fonts/fc_local.snippet # (conditional on MORE_FONTS in BUILD_TYPE) and # extras/source/truetype/symbol/fc_local.snippet (unconditional): -ifneq ($(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)),) +ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,postprocess, \ CustomTarget_fontconfig \ Package_fontconfig \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b427e659439e..054af64345af 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -150,7 +150,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/win32/syssh \ vcl/vcl.windows \ ) \ - $(if $(ENABLE_HEADLESS), \ + $(if $(DISABLE_GUI), \ vcl/vcl.headless \ ) \ $(if $(filter ANDROID,$(OS)), \ @@ -298,7 +298,7 @@ $(eval $(call gb_Rdb_add_components,services,\ desktop/source/migration/services/migrationoo2 \ desktop/source/migration/services/migrationoo3 \ desktop/source/offacc/offacc \ - $(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \ + $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ extensions/source/abpilot/abp \ extensions/source/config/ldap/ldapbe2 \ $(if $(filter WNT,$(OS)),\ @@ -315,7 +315,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/unix/exec/syssh \ ) \ $(if $(filter-out MACOSX WNT,$(OS)), \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ shell/source/backends/desktopbe/desktopbe1 \ vcl/vcl.unx \ ) \ |