diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-23 16:14:49 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-23 16:28:02 -0400 |
| commit | 81728bed9b82300875b156affa9aa55e5afa80e4 (patch) | |
| tree | 84236ad4eb2cd65cb576ca6fe59b30cc79db4d15 /Library_merged.mk | |
| parent | f380dd4a7c53184ffb4021a70172e4828cd1b214 (diff) | |
cleanup Library_merged
Change-Id: Iedd2a60ab6287ed661de7a88daf182cf2af4fe86
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 3684bd8d6d14..1e190b6fd14c 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -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 \ |