From 99ff52443e3e91376c306c33d0540f6ff9c45c2c Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 15 Apr 2013 18:49:08 -0400 Subject: add a bunch more libs to libmerged Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682 --- Library_merged.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Library_merged.mk') 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) \ )) -- cgit