diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-12 18:06:31 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-25 12:45:35 +0200 |
| commit | 4d7b9557052a31319b0583b46340fbc64de056c5 (patch) | |
| tree | bffb951b73fba8b8b8e935222e5a26cc5a7e1ada /Library_merged.mk | |
| parent | f92fcff04a6a88fd004e721294a4817249cabf26 (diff) | |
libmerged: add more libraries
Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index b7935444c249..1a5b6c39c917 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,19 +34,17 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nisolang1 \ - i18nutil \ jvmfwk \ sal \ salhelper \ - sax \ tl \ ucbhelper \ - utl \ xmlreader \ $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,merged,\ + icui18n \ icule \ icuuc \ jpeg \ @@ -118,6 +116,7 @@ $(eval $(call gb_Library_use_externals,merged,\ carbon \ cocoa \ corefoundation \ + coreservices \ quicktime \ )) endif @@ -164,4 +163,11 @@ $(eval $(call gb_Library_use_externals,merged,\ )) endif +ifeq ($(ENABLE_LIBLANGTAG),YES) +$(eval $(call gb_Library_use_externals,merged,\ + glib \ + liblangtag \ +)) +endif + # vim: set noet sw=4 ts=4: |