[tracker/gstreamer-with-dlna: 1/7] tracker-extract: disable compilation of the gupnp-dlna extractor

[Aleksander Morgado <aleksm src gnome org>]

commit 6db93bba217f6fb2e2be21d3294f050d705358b8
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Tue Jul 12 12:41:11 2011 +0200

    tracker-extract: disable compilation of the gupnp-dlna extractor

 src/tracker-extract/16-upnp-guess.rule.in   |    4 ----
 src/tracker-extract/91-upnp-generic.rule.in |    4 ----
 src/tracker-extract/Makefile.am             |   24 +++++-------------------
 3 files changed, 5 insertions(+), 27 deletions(-)
---
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 73ebf4c..7597336 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -38,10 +38,8 @@ rules_in_files = \
 	15-gstreamer-guess.rule.in \
 	15-playlist.rule.in \
 	15-real-media.rule.in \
-	16-upnp-guess.rule.in \
 	90-gstreamer-generic.rule.in \
 	90-text-generic.rule.in \
-	91-upnp-generic.rule.in \
 	92-xine-generic.rule.in \
 	93-mplayer-generic.rule.in \
 	93-totem-generic.rule.in
@@ -122,10 +120,6 @@ modules_LTLIBRARIES += libextract-gstreamer.la
 rules_DATA += 10-svg.rule 15-gstreamer-guess.rule 90-gstreamer-generic.rule
 endif
 
-if HAVE_GUPNP_DLNA
-modules_LTLIBRARIES += libextract-gupnp-dlna.la
-rules_DATA += 16-upnp-guess.rule 91-upnp-generic.rule
-endif
 
 if HAVE_GSTREAMER_HELIX
 modules_LTLIBRARIES += libextract-gstreamer-helix.la
@@ -330,6 +324,11 @@ libextract_gstreamer_la_LIBADD = \
 	$(BUILD_LIBS) \
 	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(GSTREAMER_LIBS)
+if HAVE_GUPNP_DLNA
+libextract_gstreamer_la_CFLAGS += $(GUPNP_DLNA_CFLAGS)
+libextract_gstreamer_la_LIBADD += $(GUPNP_DLNA_LIBS)
+endif
+
 
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c
@@ -343,19 +342,6 @@ libextract_gstreamer_helix_la_LIBADD = \
 	$(TRACKER_EXTRACT_MODULES_LIBS) \
 	$(GSTREAMER_LIBS)
 
-# GUPnP DLNA
-libextract_gupnp_dlna_la_SOURCES = tracker-extract-gupnp-dlna.c
-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_MODULES_LIBS) \
-	$(GUPNP_DLNA_LIBS)
-
 # Xine
 libextract_xine_la_SOURCES = tracker-extract-libxine.c
 libextract_xine_la_CFLAGS = \