diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-15 10:06:30 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-15 10:10:44 +0200 |
| commit | 645f327ec4009eddac512958bc022a8d668a762c (patch) | |
| tree | d3f0196f8c229d81f5a4032da08e1f710a526ff2 | |
| parent | 1e7bc069056518e216be7765796dff26ba06bb32 (diff) | |
libmerged: fix linking against cppunit again
Fix for: ./program/soffice.bin: error while loading shared libraries:
libcppunit-1.13.so.0: cannot open shared object file: No such file or
directory
Change-Id: Ib73010f69c7fcab0e5759df9e77e0848aa80579f
| -rw-r--r-- | Library_merged.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 044df38720db..43c64891ead8 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -46,7 +46,6 @@ $(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 \ @@ -58,14 +57,20 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ libxslt \ - libexslt \ $(if $(filter-out IOS,$(OS)),lpsolve) \ mythes \ nss3 \ - $(call gb_Helper_optional,PYUNO,python) \ zlib \ )) +ifeq (ALL,$(MERGELIBS)) +$(eval $(call gb_Library_use_externals,merged,\ + cppunit \ + libexslt \ + $(call gb_Helper_optional,PYUNO,python) \ +)) +endif + ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ graphite \ |