summaryrefslogtreecommitdiffstats
path: root/solenv/gbuild/extensions
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-09-18 14:12:08 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-09-25 07:25:46 +0000
commitc29ea22b899f24dab3eecce9df8c70544f044e1b (patch)
tree83c000b95f9863a938facc96b75d7e65e7e2b127 /solenv/gbuild/extensions
parentAdd lok::Office::getFilterTypes() testcase (diff)
downloadcore-c29ea22b899f24dab3eecce9df8c70544f044e1b.tar.gz
core-c29ea22b899f24dab3eecce9df8c70544f044e1b.zip
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/gbuild/extensions')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk2
1 files changed, 1 insertions, 1 deletions
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 \