GNOME.org
 

[tracker/as-needed: 1/4] tracker-extract: Don't use program's link deps for extraction modules

commit d39f0fc647026cf74b3369bd09c8ef841e5e0c2e
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Feb 15 18:30:16 2011 +0100

    tracker-extract: Don't use program's link deps for extraction modules

 configure.ac                    |    5 ++
 src/tracker-extract/Makefile.am |  123 +++++++++++++++++++++++++--------------
 2 files changed, 85 insertions(+), 43 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5874bde..54fb8fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,6 +323,11 @@ TRACKER_EXTRACT_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED])
 
+# Check requirements for tracker-extract modules
+TRACKER_EXTRACT_MODULES_REQUIRED="glib-2.0     >= $GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_EXTRACT_MODULES, [$TRACKER_EXTRACT_MODULES_REQUIRED])
+
 # Check requirements for tracker-writeback
 TRACKER_WRITEBACK_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                             gio-unix-2.0 >= $GLIB_REQUIRED
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index ce9d84a..485d3ea 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -88,245 +88,284 @@ endif
 
 # ABW
 libextract_abw_la_SOURCES = tracker-extract-abw.c
+libextract_abw_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_abw_la_LDFLAGS = $(module_flags)
 libextract_abw_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 # MP3
 libextract_mp3_la_SOURCES = tracker-extract-mp3.c
+libextract_mp3_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_mp3_la_LDFLAGS = $(module_flags)
 libextract_mp3_la_LIBADD =  \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 if HAVE_ENCA
-libextract_mp3_la_CFLAGS = $(ENCA_CFLAGS)
+libextract_mp3_la_CFLAGS += $(ENCA_CFLAGS)
 libextract_mp3_la_LIBADD += $(ENCA_LIBS)
 endif
 
 # Vorbis (OGG)
 libextract_vorbis_la_SOURCES = tracker-extract-vorbis.c $(escape_sources)
+libextract_vorbis_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_vorbis_la_LDFLAGS = $(module_flags)
 libextract_vorbis_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBVORBIS_LIBS)
 
 # Flac
 libextract_flac_la_SOURCES = tracker-extract-flac.c $(escape_sources)
+libextract_flac_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_flac_la_LDFLAGS = $(module_flags)
 libextract_flac_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBFLAC_LIBS)
 
 # MPlayer
 libextract_mplayer_la_SOURCES = tracker-extract-mplayer.c
+libextract_mplayer_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_mplayer_la_LDFLAGS = $(module_flags)
 libextract_mplayer_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 # Oasis
 libextract_oasis_la_SOURCES = tracker-extract-oasis.c
-libextract_oasis_la_CFLAGS = $(LIBGSF_CFLAGS)
+libextract_oasis_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBGSF_CFLAGS)
 libextract_oasis_la_LDFLAGS = $(module_flags)
 libextract_oasis_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBGSF_LIBS)
 
 # PNG
 libextract_png_la_SOURCES = tracker-extract-png.c
-libextract_png_la_CFLAGS = $(LIBPNG_CFLAGS)
+libextract_png_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBPNG_CFLAGS)
 libextract_png_la_LDFLAGS = $(module_flags)
 libextract_png_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBPNG_LIBS)
 
 # PS
 libextract_ps_la_SOURCES = tracker-extract-ps.c
+libextract_ps_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_ps_la_LDFLAGS = $(module_flags)
 libextract_ps_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 # Totem
 libextract_totem_la_SOURCES = tracker-extract-totem.c
+libextract_totem_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_totem_la_LDFLAGS = $(module_flags)
 libextract_totem_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 # XMP
 libextract_xmp_la_SOURCES = tracker-extract-xmp.c
+libextract_xmp_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_xmp_la_LDFLAGS = $(module_flags)
 libextract_xmp_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 # HTML
 libextract_html_la_SOURCES = tracker-extract-html.c
-libextract_html_la_CFLAGS = $(LIBXML2_CFLAGS)
+libextract_html_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBXML2_CFLAGS)
 libextract_html_la_LDFLAGS = $(module_flags)
 libextract_html_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBXML2_LIBS)
 
 # MS Office
 libextract_msoffice_la_SOURCES = tracker-extract-msoffice.c
-libextract_msoffice_la_CFLAGS = $(LIBGSF_CFLAGS)
+libextract_msoffice_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBGSF_CFLAGS)
 libextract_msoffice_la_LDFLAGS = $(module_flags)
 libextract_msoffice_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBGSF_LIBS)
 
 # MS Office XML
 libextract_msoffice_xml_la_SOURCES = tracker-extract-msoffice-xml.c
-libextract_msoffice_xml_la_CFLAGS = $(LIBGSF_CFLAGS)
+libextract_msoffice_xml_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBGSF_CFLAGS)
 libextract_msoffice_xml_la_LDFLAGS = $(module_flags)
 libextract_msoffice_xml_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBGSF_LIBS)
 
 # PDF
 libextract_pdf_la_SOURCES = tracker-extract-pdf.cpp
-libextract_pdf_la_CXXFLAGS = $(POPPLER_CFLAGS)
+libextract_pdf_la_CXXFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(POPPLER_CFLAGS)
 libextract_pdf_la_LDFLAGS = $(module_flags)
 libextract_pdf_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(POPPLER_LIBS)
 
 # GStreamer
 libextract_gstreamer_la_SOURCES = tracker-extract-gstreamer.c
-libextract_gstreamer_la_CFLAGS = $(GSTREAMER_CFLAGS)
+libextract_gstreamer_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(GSTREAMER_CFLAGS)
 libextract_gstreamer_la_LDFLAGS = $(module_flags)
 libextract_gstreamer_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(GSTREAMER_LIBS)
 
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c
-libextract_gstreamer_helix_la_CFLAGS = $(GSTREAMER_CFLAGS)
+libextract_gstreamer_helix_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(GSTREAMER_CFLAGS)
 libextract_gstreamer_helix_la_LDFLAGS = $(module_flags) $(albumart_flags)
 libextract_gstreamer_helix_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(GSTREAMER_LIBS)
 
 # GUPnP DLNA
 libextract_gupnp_dlna_la_SOURCES = tracker-extract-gupnp-dlna.c
-libextract_gupnp_dlna_la_CFLAGS = $(GSTREAMER_CFLAGS) $(GUPNP_DLNA_CFLAGS)
+libextract_gupnp_dlna_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(GUPNP_DLNA_CFLAGS)
 libextract_gupnp_dlna_la_LDFLAGS = $(module_flags) $(albumart_flags)
 libextract_gupnp_dlna_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(GUPNP_DLNA_LIBS)
 
 # Xine
 libextract_xine_la_SOURCES = tracker-extract-libxine.c
-libextract_xine_la_CFLAGS = $(XINE_CFLAGS)
+libextract_xine_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(XINE_CFLAGS)
 libextract_xine_la_LDFLAGS = $(module_flags)
 libextract_xine_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(XINE_LIBS)
 
 # GIF
 libextract_gif_la_SOURCES = tracker-extract-gif.c
-libextract_gif_la_CFLAGS = $(LIBGIF_CFLAGS)
+libextract_gif_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBGIF_CFLAGS)
 libextract_gif_la_LDFLAGS = $(module_flags)
 libextract_gif_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBGIF_LIBS)
 
 # JPEG
 libextract_jpeg_la_SOURCES = tracker-extract-jpeg.c
-libextract_jpeg_la_CFLAGS = $(LIBJPEG_CFLAGS)
+libextract_jpeg_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBJPEG_CFLAGS)
 libextract_jpeg_la_LDFLAGS = $(module_flags)
 libextract_jpeg_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBJPEG_LIBS)
 
 # TIFF
 libextract_tiff_la_SOURCES = tracker-extract-tiff.c $(xmp_sources) $(iptc_sources)
-libextract_tiff_la_CFLAGS = $(LIBTIFF_CFLAGS)
+libextract_tiff_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(LIBTIFF_CFLAGS)
 libextract_tiff_la_LDFLAGS = $(module_flags)
 libextract_tiff_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS) \
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(LIBTIFF_LIBS)
 
 # Playlists using totem-pl-parser
 libextract_playlist_la_SOURCES = tracker-extract-playlist.c
-libextract_playlist_la_CFLAGS = $(TOTEM_PL_PARSER_CFLAGS)
+libextract_playlist_la_CFLAGS = \
+	$(TRACKER_EXTRACT_MODULES_CFLAGS) \
+	$(TOTEM_PL_PARSER_CFLAGS)
 libextract_playlist_la_LDFLAGS = $(module_flags)
 libextract_playlist_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TOTEM_PL_PARSER_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS) \
+	$(TOTEM_PL_PARSER_LIBS)
 
 # TEXT
 libextract_text_la_SOURCES = tracker-extract-text.c
+libextract_text_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_text_la_LDFLAGS = $(module_flags)
 libextract_text_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 # ICON
 libextract_icon_la_SOURCES = tracker-extract-icon.c
+libextract_icon_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_icon_la_LDFLAGS = $(module_flags)
 libextract_icon_la_LIBADD = \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS) \
-	$(TRACKER_EXTRACT_LIBS)
+	$(TRACKER_EXTRACT_MODULES_LIBS)
 
 #
 # Binaries
@@ -355,11 +394,9 @@ tracker_extract_LDADD = \
 	$(BUILD_LIBS) \
 	$(TRACKER_EXTRACT_LIBS)
 
-tracker_extract_CFLAGS = $(AM_CPPFLAGS)
-
 if HAVE_LIBGSF
 tracker_extract_SOURCES += tracker-gsf.c tracker-gsf.h
-tracker_extract_CFLAGS += $(LIBGSF_CFLAGS)
+tracker_extract_CFLAGS = $(LIBGSF_CFLAGS)
 tracker_extract_LDADD += $(LIBGSF_LIBS)
 endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]