diff options
| -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 \ |