diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-15 13:49:08 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-16 10:14:07 +0100 |
| commit | bcf1df4c6a18b069d556490b58878274adce5fac (patch) | |
| tree | 818e1af15656f8b27cfd1a102b27148c1a791f67 /Library_merged.mk | |
| parent | 5aeacac8736c317844f4aac41956ec61fd813c1d (diff) | |
gbuild: Do not require gb_Library_use_externals for libmerged
Instead, automatically get the externals when parsing other makefiles.
This commit fixes the build and hopefully avoids problems in future
because people didn't know they had to add externals for libmerged too.
Similar should be done for other functions like add_libs...
Change-Id: I5aea4c43f4b6838092ada81c310ef1100f241108
(cherry picked from commit b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca)
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 533acb0a542b..02671f14c5cf 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -36,60 +36,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ )) endif -$(eval $(call gb_Library_use_externals,merged,\ - icu_headers \ - icui18n \ - icuuc \ - boost_headers \ - boostdatetime \ - $(call gb_Helper_optional,DESKTOP,clucene) \ - $(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \ - cups \ - curl \ - dbus \ - expat \ - gconf \ - gio \ - glew \ - graphite \ - $(if $(ENABLE_GTK),gtk) \ - harfbuzz \ - hunspell \ - jpeg \ - lcms2 \ - $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ - libeot \ - liblangtag \ - libxml2 \ - libxslt \ - mesa_headers \ - mythes \ - nss3 \ - $(call gb_Helper_optional,COLLADA2GLTF,opencollada_parser) \ - $(call gb_Helper_optional,COLLADA2GLTF,png) \ - telepathy \ - zlib \ -)) - ifeq (ALL,$(MERGELIBS)) $(eval $(call gb_Library_use_static_libraries,merged,\ ulingu \ )) -$(eval $(call gb_Library_use_externals,merged,\ - cppunit \ - hyphen \ - libexslt \ - libexttextcat \ - $(if $(filter-out ANDROID IOS,$(OS)),openldap) \ - $(call gb_Helper_optional,PYUNO,python) \ -)) endif ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_use_externals,merged,\ - fontconfig \ - freetype \ -)) $(eval $(call gb_Library_add_libs,merged,\ -lX11 \ -lXext \ |