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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/Executable_oosplash.mk | 2 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 4 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 365b58fdab5e..a14acd626b74 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\ endif -ifneq ($(ENABLE_HEADLESS),TRUE) +ifneq ($(DISABLE_GUI),TRUE) ifneq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,oosplash,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 288e26d47726..38e427d66173 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -123,7 +123,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/migration/migration \ )) -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_libs,sofficeapp,\ -lm $(DLOPEN_LIBS) \ -lpthread \ @@ -161,7 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/lokclipboard \ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ desktop/source/lib/lokinteractionhandler \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 086e51e6ea26..dfb9542a6401 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ $(if $(ENABLE_BREAKPAD), \ Library_crashreport \ ) \ - $(if $(ENABLE_HEADLESS),,Library_spl) \ + $(if $(DISABLE_GUI),,Library_spl) \ Package_branding \ $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \ UIConfig_deployment \ |