diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-10 13:32:44 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-15 14:22:08 +0200 |
| commit | 3df1af355d8aa133cd983f15b17c740a1e9a85f7 (patch) | |
| tree | e7ce889b8514036b036ccb116a059fb386fdb460 /Library_merged.mk | |
| parent | bridge_lib_name is $(gb_CPPU_ENV)_uno (diff) | |
| download | core-3df1af355d8aa133cd983f15b17c740a1e9a85f7.tar.gz core-3df1af355d8aa133cd983f15b17c740a1e9a85f7.zip | |
libmerged: add more libraries and cleanup
Change-Id: I68c6f4d4bae3ae495dd2033c95f47a34a4aba560
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 56 |
1 files changed, 7 insertions, 49 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 43c64891ead8..e7a407d2d949 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,18 +48,25 @@ $(eval $(call gb_Library_use_externals,merged,\ $(call gb_Helper_optional,DESKTOP,clucene) \ cups \ curl \ + dbus \ expat \ + gconf \ + gio \ + graphite \ + $(if $(ENABLE_GTK),gtk) \ hunspell \ icui18n \ icule \ icuuc \ jpeg \ lcms2 \ + liblangtag \ libxml2 \ libxslt \ $(if $(filter-out IOS,$(OS)),lpsolve) \ mythes \ nss3 \ + telepathy \ zlib \ )) @@ -71,12 +78,6 @@ $(eval $(call gb_Library_use_externals,merged,\ )) endif -ifeq ($(ENABLE_GRAPHITE),TRUE) -$(eval $(call gb_Library_use_externals,merged,\ - graphite \ -)) -endif - ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_use_externals,merged,\ fontconfig \ @@ -140,47 +141,4 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ )) endif -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_use_libraries,merged,\ - libotouch \ -)) - -$(eval $(call gb_Library_add_libs,merged,\ - -llog \ - -landroid \ - -llo-bootstrap \ -)) - -$(eval $(call gb_Library_use_externals,merged,\ - fontconfig \ - freetype \ -)) -endif - -ifeq ($(OS),IOS) -$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ - CoreFoundation \ - UIKit \ -)) -endif - -ifeq ($(ENABLE_TELEPATHY),TRUE) -$(eval $(call gb_Library_use_externals,merged,\ - gtk \ - telepathy \ -)) -endif - -ifeq ($(ENABLE_DBUS),TRUE) -$(eval $(call gb_Library_use_externals,merged,\ - dbus \ -)) -endif - -ifeq ($(ENABLE_LIBLANGTAG),YES) -$(eval $(call gb_Library_use_externals,merged,\ - liblangtag \ -)) -endif - # vim: set noet sw=4 ts=4: |