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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/CppunitTest_vcl_bitmap_test.mk | 2 | ||||
| -rw-r--r-- | vcl/Executable_icontest.mk | 2 | ||||
| -rw-r--r-- | vcl/Executable_vcldemo.mk | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 6 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk index 9d2a132d6454..bae00152c77d 100644 --- a/vcl/CppunitTest_vcl_bitmap_test.mk +++ b/vcl/CppunitTest_vcl_bitmap_test.mk @@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ boost_headers \ glm_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ epoxy \ )) diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 8c917b71cd0e..b162800e72fd 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_externals,icontest,\ boost_headers \ glm_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Executable_use_externals,icontest,\ epoxy \ )) diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index c06725c297cf..125a151dec99 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -20,7 +20,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\ glm_headers \ harfbuzz \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Executable_use_externals,vcldemo,\ epoxy \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 95c466d27f20..2f69f6550dae 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -29,7 +29,7 @@ else ifeq ($(OS),ANDROID) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android)) else ifeq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios)) -else ifeq ($(ENABLE_HEADLESS),TRUE) +else ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless)) else $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) @@ -122,7 +122,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ lcms2 \ mdds_headers \ )) -ifeq ($(ENABLE_HEADLESS),) +ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,vcl,\ epoxy \ )) @@ -613,7 +613,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 0fc88c18c26f..b8731614797a 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -28,11 +28,11 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ $(if $(ENABLE_MACOSX_SANDBOX),, \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ Executable_ui-previewer)) \ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ Executable_outdevgrind \ - $(if $(ENABLE_HEADLESS),, \ + $(if $(DISABLE_GUI),, \ Executable_vcldemo \ Executable_icontest \ Executable_visualbackendtest \ @@ -224,7 +224,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) endif -ifeq ($(ENABLE_HEADLESS),TRUE) +ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_timer \ )) |