Add comphelper to libmerged

Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb

Add comphelper to libmerged
Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb
8668e044 · Matúš Kukan · c6122fe6 · 8668e044 · 8668e044 · 8668e044
Kaydet (Commit) 8668e044 authored Kas 23, 2015 tarafından Matúš Kukan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Library_merged.mk Library_merged.mk +0 -1

LinkTarget.mk solenv/gbuild/LinkTarget.mk +1 -0

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

No files found.
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 ))

 $(eval $(call gb_Library_use_libraries,merged,\
-	comphelper \
 	cppu \
 	cppuhelper \
 	i18nlangtag \

--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -818,6 +818,7 @@ endef

 # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS
 gb_BUILD_HELPER_LIBS := basegfx \
+	comphelper \
 	cppu \
 	cppuhelper \
 	reg \

--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \
 	$(if $(filter $(OS),ANDROID),,basebmp) \
 	basegfx \
 	canvastools \
+	comphelper \
 	configmgr \
 	cppcanvas \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \