From 54ad562ff57e5a7293ad017e6664bcfedaef09af Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 13 Apr 2013 09:22:11 -0400 Subject: fix mergelibs=all Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c --- Library_merged.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Library_merged.mk') diff --git a/Library_merged.mk b/Library_merged.mk index 59edec136213..2c4257afc121 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_externals,merged,\ boostdatetime \ $(call gb_Helper_optional,DESKTOP,clucene) \ + cppunit \ cups \ curl \ expat \ @@ -62,6 +63,7 @@ $(eval $(call gb_Library_use_externals,merged,\ $(if $(filter-out IOS,$(OS)),lpsolve) \ mythes \ nss3 \ + $(call gb_Helper_optional,PYUNO,python) \ zlib \ )) -- cgit