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 /solenv/gbuild | |
| 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 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/UITest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index d08fe69aef55..ef8dcc65cee5 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -20,7 +20,7 @@ $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_Gallery_get_workdir,$(2))/* && \ RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \ $(call gb_Helper_print_on_error,\ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \ SAL_USE_VCLPLUGIN=svp \ )) \ $(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \ diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 9b0590e35d2a..c579a34ea6d5 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -52,7 +52,7 @@ else UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=1 \ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \ SAL_USE_VCLPLUGIN=svp \ )) \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \ diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index 03d30448ef7b..00579ebdb4e5 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -69,7 +69,7 @@ else PYTHONPATH="$(PYPATH)" \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=0 \ - $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \ SAL_USE_VCLPLUGIN=svp \ )) \ $(gb_UITest_COMMAND) \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 451897fc4765..00d9bc57921a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -42,7 +42,7 @@ MERGE_LIBRARY_LIST := \ sfx \ sofficeapp \ sot \ - $(if $(ENABLE_HEADLESS),,spl) \ + $(if $(DISABLE_GUI),,spl) \ svl \ svt \ svx \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b87f6fc569dd..a67780a2cef8 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -227,7 +227,7 @@ gb_GLOBALDEFS += -DDEBUG \ endif endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) gb_GLOBALDEFS += -DLIBO_HEADLESS \ endif |