diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-14 12:39:43 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 16:20:00 +0200 |
| commit | 888d96f6b48a60abdf9077854f9a5f883f1e84be (patch) | |
| tree | 1f33a75d3f2697169b969b980e877f3bc50ed559 | |
| parent | 8f3cce6f8de919e0cc53b028e49b5587cdece315 (diff) | |
Add svt and tk to libmerged
| -rw-r--r-- | Library_merged.mk | 5 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 2 | ||||
| -rw-r--r-- | android/qa/sc/Makefile | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 0b2268c67511..b994231ed36b 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -30,13 +30,13 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ cppuhelper \ i18nisolang1 \ i18npaper \ + i18nutil \ + jvmfwk \ sal \ salhelper \ sax \ sot \ svl \ - svt \ - tk \ tl \ ucbhelper \ utl \ @@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ + jpeg \ libxml2 \ zlib \ )) diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index b02ebd0ac548..67fdb7c6796b 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -150,9 +150,7 @@ copy-stuff: buildrcs stocservices.uno \ store \ svllo \ - svtlo \ test \ - tklo \ tllo \ ucb1 \ ucbhelper4gcc3 \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 054ba792a922..71d145b30401 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -95,10 +95,8 @@ copy-stuff: stocservices.uno \ store \ svllo \ - svtlo \ textinstream.uno \ test \ - tklo \ tllo \ ucb1 \ ucbhelper4gcc3 \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index cff4b1935190..a7dfc2209b7e 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -47,8 +47,10 @@ gb_MERGEDLIBS := \ sfx \ sofficeapp \ spl \ + svt \ svx \ svxcore \ + tk \ uui \ xo \ |