[tracker/configure-for-binaries: 22/80] tracker-miner-flickr: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 893e1ccc19c17d350bd97c475852088b373d0b29
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 17:00:40 2010 +0100

    tracker-miner-flickr: Cleaned up CFLAGS/LIBS

 configure.ac                    |   39 ++++++++++++++++++++++-----------------
 data/Makefile.am                |    2 +-
 data/dbus/Makefile.am           |    2 +-
 data/icons/scalable/Makefile.am |    2 +-
 data/miners/Makefile.am         |    2 +-
 src/miners/Makefile.am          |    2 +-
 src/miners/flickr/Makefile.am   |   18 ++++--------------
 7 files changed, 31 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c5ffed3..d66eae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,6 +358,18 @@ PKG_CHECK_MODULES(TRACKER_MINER_RSS, [$TRACKER_MINER_RSS_REQUIRED],
                   [have_tracker_miner_rss=yes],
                   [have_tracker_miner_rss=no])
 
+# Check requirements for tracker-miner-flickr
+TRACKER_MINER_FLICKR_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                               dbus-1       >= $DBUS_REQUIRED
+                               dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+                               rest-0.6     >= $REST_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_MINER_FLICKR, [$TRACKER_MINER_FLICKR_REQUIRED],
+                  [have_tracker_miner_flickr=yes],
+                  [have_tracker_miner_flickr=no])
+
+TRACKER_MINER_FLICKR_LIBS="$TRACKER_MINER_FLICKR_LIBS -lz -lm"
+
 # Check requirements for tracker-utils
 TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                         gio-unix-2.0 >= $GLIB_REQUIRED
@@ -1062,26 +1074,19 @@ AM_CONDITIONAL(HAVE_NETWORK_MANAGER, test "x$have_network_manager" = "xyes")
 AC_ARG_ENABLE(miner_flickr,
               AS_HELP_STRING([--enable-miner-flickr],
                              [enable Flickr miner [[default=auto]]]),,
-                             [enable_miner_flickr=auto])
-
-if test "x$enable_miner_flickr" != "xno"; then
-   PKG_CHECK_MODULES(MINER_FLICKR,
-                     [rest-0.6 >= $REST_REQUIRED],
-                     [have_miner_flickr=yes],
-                     [have_miner_flickr=no])
-   AC_SUBST(MINER_FLICKR_LIBS)
-   AC_SUBST(MINER_FLICKR_CFLAGS)
-else
-   have_miner_flickr="no  (disabled)"
-fi
+                             [enable_tracker_miner_flickr=auto])
 
-if test "x$enable_miner_flickr" = "xyes"; then
-   if test "x$have_miner_flickr" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find rest-0.6 >= $REST_REQUIRED for Flickr miner.])
+if test "x$enable_tracker_miner_flickr" = "xyes"; then
+   if test "x$have_tracker_miner_flickr" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find tracker-miner-flickr dependencies ($TRACKER_MINER_FLICKR_REQUIRED).])
+   fi
+else
+   if test "x$enable_tracker_miner_flickr" = "xno"; then
+      have_miner_flickr="no  (disabled)"
    fi
 fi
 
-AM_CONDITIONAL(HAVE_MINER_FLICKR, test "x$have_miner_flickr" = "xyes")
+AM_CONDITIONAL(HAVE_TRACKER_MINER_FLICKR, test "x$have_tracker_miner_flickr" = "xyes")
 
 ##################################################################
 # GLib, libunistring or libicu?
@@ -2191,7 +2196,7 @@ Data Miners:
           MeeGo                                 $have_meegotouch
 	RSS:                                    $have_tracker_miner_rss
 	Evolution:                              $have_miner_evolution ($evolution_plugins_dir)
-	Flickr:                                 $have_miner_flickr
+	Flickr:                                 $have_tracker_miner_flickr
 
 Plugins:
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 44ccde1..d0d149f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -52,7 +52,7 @@ if HAVE_TRACKER_MINER_RSS
 autostart_DATA += tracker-miner-rss.desktop
 endif
 
-if HAVE_MINER_FLICKR
+if HAVE_TRACKER_MINER_FLICKR
 autostart_DATA += tracker-miner-flickr.desktop
 endif
 
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 292e25d..282fe5d 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -44,7 +44,7 @@ if HAVE_TRACKER_MINER_RSS
 service_DATA += org.freedesktop.Tracker1.Miner.RSS.service
 endif
 
-if HAVE_MINER_FLICKR
+if HAVE_TRACKER_MINER_FLICKR
 service_DATA += org.freedesktop.Tracker1.Miner.Flickr.service
 endif
 
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index bffd291..52d2c2c 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -6,7 +6,7 @@ icon_DATA = tracker.svg
 minericonsdir = $(datadir)/tracker/icons
 minericons_DATA =
 
-if HAVE_MINER_FLICKR
+if HAVE_TRACKER_MINER_FLICKR
 minericons_DATA += tracker-miner-flickr.svg
 endif
 
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index 8a9c25a..8d72bb9 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -28,7 +28,7 @@ if HAVE_TRACKER_MINER_RSS
 tracker_miners_DATA += tracker-miner-rss.desktop
 endif
 
-if HAVE_MINER_FLICKR
+if HAVE_TRACKER_MINER_FLICKR
 tracker_miners_DATA += tracker-miner-flickr.desktop
 endif
 
diff --git a/src/miners/Makefile.am b/src/miners/Makefile.am
index 8b403b1..0cf41ea 100644
--- a/src/miners/Makefile.am
+++ b/src/miners/Makefile.am
@@ -6,6 +6,6 @@ if HAVE_TRACKER_MINER_RSS
 SUBDIRS += rss
 endif
 
-if HAVE_MINER_FLICKR
+if HAVE_TRACKER_MINER_FLICKR
 SUBDIRS += flickr
 endif
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index 3e41de5..d6ee5ed 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -10,13 +10,10 @@ INCLUDES =								\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
-	-I$(top_builddir)/src/libtracker-sparql		\
+	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
-	$(GMODULE_CFLAGS)						\
-	$(PANGO_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(MINER_FLICKR_CFLAGS)						\
-	$(GCOV_CFLAGS)
+	$(GCOV_CFLAGS)							\
+	$(TRACKER_MINER_FLICKR_CFLAGS)
 
 VALAFLAGS =								\
 	--pkg gio-2.0							\
@@ -39,15 +36,8 @@ tracker_miner_flickr_SOURCES =						\
 tracker_miner_flickr_LDADD =						\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(DBUS_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GIO_LIBS)							\
 	$(GCOV_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(MINER_FLICKR_LIBS)						\
-	-lz								\
-	-lm
+	$(TRACKER_MINER_FLICKR_LIBS)
 
 vapi_sources =								\
 	$(top_srcdir)/src/libtracker-miner/tracker-miner.vapi