diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-18 14:12:08 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-25 07:25:46 +0000 |
| commit | c29ea22b899f24dab3eecce9df8c70544f044e1b (patch) | |
| tree | 83c000b95f9863a938facc96b75d7e65e7e2b127 /solenv | |
| parent | edb9ef41f29bf3477b8985ee409ce2d22214e63f (diff) | |
Replace GUIBASE with USING_X11
That's what it actually means. Also make it a boolean
Change-Id: I249e18351253b34b5dada28e2a9c6bc0c06b730c
Reviewed-on: https://gerrit.libreoffice.org/18688
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 11b47329d442..b64359861f34 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -172,7 +172,7 @@ endef define gb_CppunitTest__use_vcl $(call gb_CppunitTest_get_target,$(1)) : VCL := $(true) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstrapprotector) -ifeq ($(GUIBASE),unx) +ifeq ($(USING_X11),TRUE) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector) $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \ $(call gb_Library_get_target,vclplug_gen) \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index b9b8d75bb52d..97953eed736a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -20,7 +20,7 @@ MERGE_LIBRARY_LIST := \ deployment \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ - $(if $(filter unx,$(GUIBASE)),desktop_detector) \ + $(if $(USING_X11),desktop_detector) \ drawinglayer \ editeng \ filterconfig \ |