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

[Roberto Guido <rguido src gnome org>]

commit 1bdcd96dba55511fe99e88fefd46b6e863db4b7b
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 14:43:53 2010 +0100

    tracker-preferences: Cleaned up CFLAGS/LIBS

 configure.ac                        |   29 ++++++++++++++++++-----------
 src/tracker-preferences/Makefile.am |   17 +++++++----------
 2 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c222e6b..71d57b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,6 +361,19 @@ PKG_CHECK_MODULES(TRACKER_SEARCH_TOOL, [$TRACKER_SEARCH_TOOL_REQUIRED],
                   [have_tracker_search_tool=yes],
                   [have_tracker_search_tool=no])
 
+# Check requirements for tracker-preferences
+TRACKER_PREFERENCES_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
+                              gio-unix-2.0   >= $GLIB_REQUIRED
+                              gthread-2.0    >= $GLIB_REQUIRED
+                              gmodule-2.0    >= $GLIB_REQUIRED
+                              gtk+-2.0       >= $GTK_REQUIRED
+                              dbus-1         >= $DBUS_REQUIRED
+                              dbus-glib-1    >= $DBUS_GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_PREFERENCES, [$TRACKER_PREFERENCES_REQUIRED],
+                  [have_tracker_preferences=yes],
+                  [have_tracker_preferences=no])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
@@ -1359,19 +1372,13 @@ AC_ARG_ENABLE([tracker-preferences],
                              [enable the tracker preferences dialog [[default=auto]]]),,
               [enable_tracker_preferences=auto])
 
-if test "x$enable_tracker_preferences" != "xno" ; then
-   if test "x$have_app_requirements" != "xyes"; then
-      have_tracker_preferences="no"
-   else
-      have_tracker_preferences="yes"
+if test "x$enable_tracker_preferences" = "xyes" ; then
+   if test "x$have_tracker_preferences" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find tracker-preferences dependencies ($TRACKER_PREFERENCES_REQUIRED).])
    fi
 else
-   have_tracker_preferences="no  (disabled)"
-fi
-
-if test "x$enable_tracker_preferences" = "xyes"; then
-   if test "x$have_tracker_preferences" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find tracker-preferences dependencies ($APP_REQUIREMENTS).])
+   if text "x$enable_tracker_preferences" = "xno"; then
+      have_tracker_preferences="no  (disabled)"
    fi
 fi
 
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 9e9e78a..50aa630 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -10,17 +10,15 @@ desktop_DATA =  tracker-preferences.desktop
 pkgdata_DATA = tracker-preferences.ui
 
 INCLUDES = 								\
+	$(BUILD_CFLAGS)							\
+	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
 	-DTRACKER_DATADIR=\""$(datadir)/tracker"\" 			\
 	-DTRACKER_LOCALEDIR=\""$(localedir)"\" 				\
 	-DTRACKER_BINDIR=\""$(bindir)"\" 				\
 	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" 			\
-	-DTRACKER_COMPILATION 						\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)						\
-	$(TRACKER_APPS_CFLAGS)						\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)
+	$(TRACKER_PREFERENCES_CFLAGS)
 
 BUILT_SOURCES = 							\
 	tracker-preferences.vala.stamp
@@ -39,13 +37,12 @@ tracker_preferences_SOURCES = 						\
 
 tracker_preferences_LDADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(TRACKER_APPS_LIBS)						\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(TRACKER_PREFERENCES_LIBS)
 
 MAINTAINERCLEANFILES =							\
 	tracker-preferences.vala.stamp					\
-	$(tracker_preferences_VALASOURCES:.vala=.c)			\
-	$(NULL)
+	$(tracker_preferences_VALASOURCES:.vala=.c)
 
 EXTRA_DIST = 								\
 	$(pkgdata_DATA) 						\