Kaydet (Commit) 2705fc72 authored tarafından Matúš Kukan's avatar Matúš Kukan

libmerged: remove some of unused externals and static libraries

Because cppunit was causing troubles. It's not in installation, to be
used at run-time, so we can't link against it.

Change-Id: I133feb0c3dab50bacbe96775a28dd1a61f09882e
üst caceb6fa
...@@ -44,23 +44,13 @@ $(eval $(call gb_Library_use_libraries,merged,\ ...@@ -44,23 +44,13 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
ifneq ($(OS),IOS)
$(eval $(call gb_Library_use_static_libraries,merged,\
writerperfect \
))
endif
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
boostdatetime \ boostdatetime \
$(if $(filter-out IOS,$(OS)),cdr) \
$(call gb_Helper_optional,DESKTOP,clucene) \ $(call gb_Helper_optional,DESKTOP,clucene) \
cmis \
cppunit \
cups \ cups \
curl \ curl \
expat \ expat \
hunspell \ hunspell \
hyphen \
icui18n \ icui18n \
icule \ icule \
icuuc \ icuuc \
...@@ -69,25 +59,11 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -69,25 +59,11 @@ $(eval $(call gb_Library_use_externals,merged,\
libxml2 \ libxml2 \
$(call gb_Helper_optional,DESKTOP,libxslt) \ $(call gb_Helper_optional,DESKTOP,libxslt) \
$(if $(filter-out IOS,$(OS)),lpsolve) \ $(if $(filter-out IOS,$(OS)),lpsolve) \
$(if $(filter-out IOS,$(OS)),mspub) \
$(if $(filter-out IOS,$(OS)),mwaw) \
mythes \ mythes \
nss3 \ nss3 \
openssl \
orcus \
$(call gb_Helper_optional,PYUNO,python) \
$(if $(filter-out IOS,$(OS)),wpd) \
$(if $(filter-out IOS,$(OS)),wpg) \
$(if $(filter-out IOS,$(OS)),wps) \
$(if $(filter-out IOS,$(OS)),visio) \
zlib \ zlib \
)) ))
$(eval $(call gb_Library_use_static_libraries,merged,\
sax_shared \
ulingu \
))
ifeq ($(ENABLE_GRAPHITE),TRUE) ifeq ($(ENABLE_GRAPHITE),TRUE)
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
graphite \ graphite \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment