diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-11-23 22:16:31 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-11-28 08:04:14 +0100 |
| commit | 8668e044b27ca70de2e5b47741d5ccb2d4418ac4 (patch) | |
| tree | e953559e937e5bbf6bd79917cdc89c52612bf2e2 | |
| parent | c6122fe6143ff1efa9f449d46a848cf3071ac67e (diff) | |
Add comphelper to libmerged
Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb
| -rw-r--r-- | Library_merged.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 2e482e8d91e5..49dcbb5c0c40 100644 --- 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 \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 6af790c80dda..d9a97a1d4859 100644 --- 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 \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 97953eed736a..c9275f4679ee 100644 --- 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) \ |