diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-11-23 22:23:12 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-11-28 08:04:14 +0100 |
| commit | c1c13e6e38b8c58b0def4f462fd0ea3a5b2697cd (patch) | |
| tree | a947c68af8031080f5fae4c7eb04be0df24753e9 | |
| parent | 8668e044b27ca70de2e5b47741d5ccb2d4418ac4 (diff) | |
Add i18nlangtag and ucbhelper to libmerged
Change-Id: I717d3289d63787cd8148d480783092868a60873b
| -rw-r--r-- | Library_merged.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 49dcbb5c0c40..8247e5aa28fb 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -18,13 +18,11 @@ $(eval $(call gb_Library_use_library_objects,merged,\ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ - i18nlangtag \ $(if $(ENABLE_JAVA), \ jvmaccess \ jvmfwk) \ sal \ salhelper \ - ucbhelper \ xmlreader \ $(gb_UWINAPI) \ )) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d9a97a1d4859..7f24a57f58ad 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -821,12 +821,14 @@ gb_BUILD_HELPER_LIBS := basegfx \ comphelper \ cppu \ cppuhelper \ + i18nlangtag \ reg \ sal \ salhelper \ sax \ store \ tl \ + ucbhelper \ unoidl \ xmlreader \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index c9275f4679ee..4ad27fb805ee 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -30,6 +30,7 @@ MERGE_LIBRARY_LIST := \ fwi \ fwk \ $(call gb_Helper_optional,DESKTOP,helplinker) \ + i18nlangtag \ i18npool \ i18nutil \ lng \ @@ -51,6 +52,7 @@ MERGE_LIBRARY_LIST := \ tl \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ + ucbhelper \ ucpexpand1 \ ucpfile1 \ unoxml \ |