summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Library_merged.mk3
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
2 files changed, 4 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index e523814f6244..45119e9b7021 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -50,14 +50,17 @@ $(eval $(call gb_Library_use_static_libraries,merged,\
endif
$(eval $(call gb_Library_use_externals,merged,\
+ $(call gb_Helper_optional,DESKTOP,clucene) \
cppunit \
cups \
+ $(call gb_Helper_optional,DESKTOP,expat_utf8) \
icui18n \
icule \
icuuc \
jpeg \
lcms2 \
libxml2 \
+ $(call gb_Helper_optional,DESKTOP,libxslt) \
nss3 \
openssl \
orcus \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b419e1320abf..3efa62591f7b 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -57,6 +57,7 @@ gb_MERGEDLIBS := \
fwi \
fwk \
fwl \
+ $(call gb_Helper_optional,DESKTOP,helplinker) \
i18npool \
i18nutil \
lng \