add helplinker to Library_merged

Change-Id: I33073859403edf11576fd88db6a68279f9055139

add helplinker to Library_merged
Change-Id: I33073859403edf11576fd88db6a68279f9055139
679ab714 · Peter Foley · 470c5fef · 679ab714 · 679ab714
Kaydet (Commit) 679ab714 authored Mar 27, 2013 tarafından Peter Foley
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Library_merged.mk Library_merged.mk +3 -0

pre_MergedLibsList.mk solenv/gbuild/extensions/pre_MergedLibsList.mk +1 -0

No files found.
--- 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 \

--- 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 \