cleanup Library_merged

Change-Id: Iedd2a60ab6287ed661de7a88daf182cf2af4fe86
This commit is contained in:
Peter Foley 2013-03-23 16:14:49 -04:00
parent f380dd4a7c
commit 81728bed9b

View file

@ -75,15 +75,13 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_use_externals,merged,\
hunspell \
expat_utf8 \
mythes \
hyphen \
))
$(eval $(call gb_Library_use_static_libraries,merged,\
sax_shared \
ulingu \
))
$(eval $(call gb_Library_add_libs,merged,\
$(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
$(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \
))
endif
ifeq ($(ENABLE_GRAPHITE),TRUE)
@ -183,12 +181,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
))
endif
ifneq ($(ENABLE_LIBRSVG),NO)
$(eval $(call gb_Library_use_externals,merged,\
cairo \
))
endif
ifeq ($(ENABLE_TELEPATHY),TRUE)
$(eval $(call gb_Library_use_externals,merged,\
gtk \