[tracker/rss-enclosures] tracker-store: Cleaned up CFLAGS/LIBS

[Roberto Guido <rguido src gnome org>]

commit da0edcbc74177b26f01413703a0450c854325e24
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 22:34:38 2010 +0100

    tracker-store: Cleaned up CFLAGS/LIBS

 configure.ac                  |   13 +++++++++++++
 src/tracker-store/Makefile.am |   22 ++--------------------
 2 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3c30d97..9b5cd98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,6 +313,19 @@ PKG_CHECK_MODULES(TRACKER_EXPLORER, [$TRACKER_EXPLORER_REQUIRED],
                   [have_tracker_explorer=yes],
                   [have_tracker_explorer=no])
 
+# Check requirements for tracker-store
+TRACKER_STORE_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                        gio-unix-2.0 >= $GLIB_REQUIRED
+                        gthread-2.0  >= $GLIB_REQUIRED
+                        gmodule-2.0  >= $GLIB_REQUIRED
+                        dbus-1       >= $DBUS_REQUIRED
+                        dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+                        sqlite3      >= $SQLITE_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_STORE, [$TRACKER_STORE_REQUIRED])
+
+TRACKER_STORE_LIBS="$TRACKER_STORE_LIBS -lz -lm"
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 55e1dc2..13c0895 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -14,14 +14,8 @@ INCLUDES =								\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
-	$(GTHREAD_CFLAGS)						\
-	$(GMODULE_CFLAGS)						\
-	$(GIO_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(FAM_CFLAGS)							\
-	$(SQLITE3_CFLAGS)
+	$(TRACKER_STORE_CFLAGS)
 
 #
 # Daemon sources
@@ -53,25 +47,13 @@ tracker_store_SOURCES =							\
 	tracker-steroids.c						\
 	tracker-steroids.h
 
-if OS_WIN32
-tracker_store_win_libs = -lws2_32 -lkernel32
-endif
-
 tracker_store_LDADD =							\
 	$(plugin_libs)							\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(SQLITE3_LIBS)							\
-	$(DBUS_LIBS)							\
-	$(GIO_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							\
 	$(GCOV_LIBS)							\
-	$(tracker_store_win_libs)					\
-	-lz								\
-	-lm
+	$(TRACKER_STORE_LIBS)
 
 marshal_sources =                                         		\
         tracker-marshal.h                             			\