diff options
author | Peter Foley <pefoley2@verizon.net> | 2013-04-15 18:49:08 -0400 |
---|---|---|
committer | Peter Foley <pefoley2@verizon.net> | 2013-04-15 19:00:53 -0400 |
commit | 99ff52443e3e91376c306c33d0540f6ff9c45c2c (patch) | |
tree | bb95fd93f7465dec8574b2ec867e00ba7bac89fa /Library_merged.mk | |
parent | bf9a7829354c8f5e7459629262f02d9f23ab19c1 (diff) |
add a bunch more libs to libmerged
Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
Diffstat (limited to 'Library_merged.mk')
-rw-r--r-- | Library_merged.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index a26878c59494..c540e59f7a71 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -71,9 +71,14 @@ $(eval $(call gb_Library_use_externals,merged,\ )) ifeq (ALL,$(MERGELIBS)) +$(eval $(call gb_Library_use_static_libraries,merged,\ + ulingu \ +)) $(eval $(call gb_Library_use_externals,merged,\ cppunit \ + hyphen \ libexslt \ + libexttextcat \ $(if $(filter-out ANDROID IOS,$(OS)),openldap) \ $(call gb_Helper_optional,PYUNO,python) \ )) |