diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 14:15:55 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 15:32:32 +0200 |
| commit | 2705fc72df2058332773b5cb04a6b4d207f5e39c (patch) | |
| tree | 69a810df0f36d172191f91f92f905a312ca87d77 /Library_merged.mk | |
| parent | caceb6fa3cf288e0a66bb547647b5d496e10f4ee (diff) | |
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
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 663a806d4314..7385553569df 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -44,23 +44,13 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -ifneq ($(OS),IOS) -$(eval $(call gb_Library_use_static_libraries,merged,\ - writerperfect \ -)) -endif - $(eval $(call gb_Library_use_externals,merged,\ boostdatetime \ - $(if $(filter-out IOS,$(OS)),cdr) \ $(call gb_Helper_optional,DESKTOP,clucene) \ - cmis \ - cppunit \ cups \ curl \ expat \ hunspell \ - hyphen \ icui18n \ icule \ icuuc \ @@ -69,25 +59,11 @@ $(eval $(call gb_Library_use_externals,merged,\ libxml2 \ $(call gb_Helper_optional,DESKTOP,libxslt) \ $(if $(filter-out IOS,$(OS)),lpsolve) \ - $(if $(filter-out IOS,$(OS)),mspub) \ - $(if $(filter-out IOS,$(OS)),mwaw) \ mythes \ 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 \ )) -$(eval $(call gb_Library_use_static_libraries,merged,\ - sax_shared \ - ulingu \ -)) - ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ graphite \ |