diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-11-06 18:08:16 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-11-06 18:59:44 +0200 |
commit | e10124b20efb8cb7caf0f02fc537147a6505aa1d (patch) | |
tree | 4b1590fccf7d083da11a2e7e5b197af34d30b8f4 /RepositoryExternal.mk | |
parent | Try to unbreak the Android build (diff) | |
download | core-e10124b20efb8cb7caf0f02fc537147a6505aa1d.tar.gz core-e10124b20efb8cb7caf0f02fc537147a6505aa1d.zip |
Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg
Now with librsvg no longer used, and liblangtag no longer using glib,
a bunch of bundled (in some configurations, always on some platforms)
3rd-party libraries are no longer needed.
Initial work by rene, continued by tml.
Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 194 |
1 files changed, 8 insertions, 186 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 716e1a7e2581..6d68b30e8941 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -593,42 +593,10 @@ endef endif # SYSTEM_LIBXSLT - -ifeq ($(SYSTEM_GLIB),YES) - -define gb_LinkTarget__use_glib -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(GLIB_CFLAGS) \ -) - -$(call gb_LinkTarget_add_libs,$(1),$(GLIB_LIBS)) - -endef - -else # !SYSTEM_GLIB - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - glib-2.0 \ - gmodule-2.0 \ -)) - define gb_LinkTarget__use_glib -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/glib-2.0 \ -) - -$(call gb_LinkTarget_use_libraries,$(1),\ - glib-2.0 \ - gmodule-2.0 \ -) - +$(error gb_LinkTarget__use_glib should not be called any more) endef -endif # SYSTEM_GLIB - - ifeq ($(ENABLE_LIBLANGTAG),YES) ifeq ($(SYSTEM_LIBLANGTAG),YES) @@ -654,12 +622,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ langtag \ ) -ifeq ($(OS),MACOSX) - -$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,libglib-2.0.0 libgmodule-2.0.0,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) - -endif - endef endif # SYSTEM_LIBLANGTAG @@ -1308,25 +1270,10 @@ endef else # ENABLE_GIO -ifeq ($(SYSTEM_GLIB),YES) - -gb_LinkTarget__use_gio := - -else # !SYSTEM_GLIB - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - gio-2.0 \ -)) - define gb_LinkTarget__use_gio -$(call gb_LinkTarget_use_libraries,$(1),\ - gio-2.0 \ -) - +$(error gb_LinkTarget__use_gio should not be used any more) endef -endif # SYSTEM_GLIB - endif # ENABLE_GIO define gb_LinkTarget__use_gtk @@ -1352,27 +1299,10 @@ endif endef -ifeq ($(SYSTEM_GLIB),YES) - define gb_LinkTarget__use_gthread -$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) - +$(error gb_LinkTarget__use_gthread should not be used any more) endef -else # !SYSTEM_GLIB - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - gthread-2.0 \ -)) - -define gb_LinkTarget__use_gthread -$(call gb_LinkTarget_use_libraries,$(1),\ - gthread-2.0 \ -) -endef - -endif # SYSTEM_GLIB - ifeq ($(ENABLE_CUPS),TRUE) define gb_LinkTarget__use_cups @@ -1458,108 +1388,22 @@ gb_LinkTarget__use_telepathy := endif # ENABLE_TELEPATHY -ifeq ($(SYSTEM_LIBCROCO),NO) - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - croco-0.6-3 \ -)) - define gb_LinkTarget__use_croco - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/libcroco-0.6 \ -) - -$(call gb_LinkTarget_use_libraries,$(1),\ - croco-0.6-3 \ -) - +$(error gb_LinkTarget__use_croco should not be used any more) endef -else # !SYSTEM_LIBCROCO - -gb_LinkTarget__use_croco := - -endif # SYSTEM_LIBCROCO - -ifeq ($(SYSTEM_PANGO),NO) - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - pango-1.0 \ - pangocairo-1.0 \ -)) - define gb_LinkTarget__use_pango - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/pango-1.0 \ -) - -$(call gb_LinkTarget_use_libraries,$(1),\ - pango-1.0 \ - pangocairo-1.0 \ -) - +$(error gb_LinkTarget__use_pango should not be used any more) endef -else # !SYSTEM_PANGO - -gb_LinkTarget__use_pango := - -endif # SYSTEM_PANGO - -ifeq ($(SYSTEM_LIBGSF),NO) - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - gsf-1 \ -)) - define gb_LinkTarget__use_gsf - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/libgsf-1 \ -) - -$(call gb_LinkTarget_use_libraries,$(1),\ - gsf-1 \ -) - +$(error gb_LinkTarget__use_gsf should not be used any more) endef -else # !SYSTEM_LIBGSF - -gb_LinkTarget__use_gsf := - -endif # SYSTEM_LIBGSF - -ifeq ($(SYSTEM_GDKPIXBUF),NO) - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - gdk_pixbuf-2.0 \ -)) - define gb_LinkTarget__use_pixbuf - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 \ -) - -$(call gb_LinkTarget_use_libraries,$(1),\ - gdk_pixbuf-2.0 \ -) - +$(error gb_LinkTarget__use_pixbuf should not be used any more) endef -else # !SYSTEM_GDKPIXBUF - -gb_LinkTarget__use_pixbuf := - -endif # SYSTEM_GDKPIXBUF - ifeq ($(SYSTEM_DB),YES) define gb_LinkTarget__use_berkeleydb @@ -1776,32 +1620,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ endif # SYSTEM_CLUCENE -ifeq ($(SYSTEM_GLIB),YES) define gb_LinkTarget__use_gobject -$(call gb_LinkTarget_add_libs,$(1),\ - $(GOBJECT_LIBS) \ -) - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(GOBJECT_CFLAGS) \ -) +$(error gb_LinkTarget__use_gobject should not be used any more) endef -else # !SYSTEM_GLIB - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - gobject-2.0 \ -)) - -define gb_LinkTarget__use_gobject -$(call gb_LinkTarget_use_libraries,$(1),\ - gobject-2.0 \ -) -endef - -endif # !SYSTEM_GLIB - ifeq ($(SYSTEM_HSQLDB),YES) define gb_LinkTarget__use_hsqldb |