[tracker/configure-for-binaries: 69/80] libtracker-miner: Merge NM/KEYRING into CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit da8d05e8d345b38dd8788136e0b710f03a82766b
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 26 11:04:26 2010 +0100

    libtracker-miner: Merge NM/KEYRING into CFLAGS/LIBS

 configure.ac                     |   14 +++++++-----
 src/libtracker-miner/Makefile.am |   41 +++++++++++++-------------------------
 2 files changed, 22 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 70592b9..3689d19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1071,11 +1071,12 @@ AC_ARG_ENABLE(gnome_keyring,
 
 if test "x$enable_gnome_keyring" != "xno"; then
    PKG_CHECK_MODULES(GNOME_KEYRING,
-                     [ gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED ],
+                     [gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED],
                      [have_gnome_keyring=yes],
                      [have_gnome_keyring=no])
-   AC_SUBST(GNOME_KEYRING_LIBS)
-   AC_SUBST(GNOME_KEYRING_CFLAGS)
+
+   LIBTRACKER_MINER_CFLAGS="$LIBTRACKER_MINER_CFLAGS $GNOME_KEYRING_CFLAGS"
+   LIBTRACKER_MINER_LIBS="$LIBTRACKER_MINER_LIBS $GNOME_KEYRING_LIBS"
 
    if test "x$have_gnome_keyring" = "xyes"; then
       AC_DEFINE(HAVE_GNOME_KEYRING, [], [Define if we have Gnome Keyring for password storage])
@@ -1101,11 +1102,12 @@ AC_ARG_ENABLE(network_manager,
 
 if test "x$enable_network_manager" != "xno"; then
    PKG_CHECK_MODULES(NETWORK_MANAGER,
-                     [ libnm-glib >= $NETWORK_MANAGER_REQUIRED ],
+                     [libnm-glib >= $NETWORK_MANAGER_REQUIRED],
                      [have_network_manager=yes],
                      [have_network_manager=no])
-   AC_SUBST(NETWORK_MANAGER_LIBS)
-   AC_SUBST(NETWORK_MANAGER_CFLAGS)
+
+   LIBTRACKER_MINER_CFLAGS="$LIBTRACKER_MINER_CFLAGS $NETWORK_MANAGER_CFLAGS"
+   LIBTRACKER_MINER_LIBS="$LIBTRACKER_MINER_LIBS $NETWORK_MANAGER_LIBS"
 
    if test "x$have_network_manager" = "xyes"; then
       AC_DEFINE(HAVE_NETWORK_MANAGER, [], [Define if we have NetworkManager for network status detection])
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index fcf483a..8243ff6 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -7,11 +7,11 @@ include Makefile-shared-sources.decl
 
 AM_CPPFLAGS =						\
 	$(BUILD_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src				\
 	-DSHAREDIR=\""$(datadir)"\"			\
 	-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\"	\
 	-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" 	\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
 	$(LIBTRACKER_MINER_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-miner- TRACKER_API_VERSION@.la
@@ -63,31 +63,15 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(LIBTRACKER_MINER_LIBS)
 
 if HAVE_GNOME_KEYRING
-libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += 	\
-	tracker-password-provider-gnome.c
-
-libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD +=	\
-	$(GNOME_KEYRING_LIBS)
-
-AM_CPPFLAGS +=						\
-	$(GNOME_KEYRING_CFLAGS)
+libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += tracker-password-provider-gnome.c
 else
-libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += 	\
-	tracker-password-provider-keyfile.c
+libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += tracker-password-provider-keyfile.c
 endif
 
 if HAVE_NETWORK_MANAGER
-libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES +=	\
-	tracker-network-provider-network-manager.c
-
-libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD +=	\
-	$(NETWORK_MANAGER_LIBS)
-
-AM_CPPFLAGS +=						\
-	$(NETWORK_MANAGER_CFLAGS)
+libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += tracker-network-provider-network-manager.c
 else
-libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES +=	\
-	tracker-network-provider-dummy.c
+libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += tracker-network-provider-dummy.c
 endif
 
 $(top_builddir)/src/libtracker-miner/tracker-marshal.h: tracker-marshal.list
@@ -135,14 +119,17 @@ tracker-miner-web-glue.h: $(top_srcdir)/data/dbus/tracker-miner-web.xml $(top_sr
 
 tracker-miner-web-full.xml: tracker-miner-web-glue.h
 
-BUILT_SOURCES = $(dbus_sources) $(libtracker_miner_marshal_sources) $(vapi_DATA)
+BUILT_SOURCES = 					\
+	$(dbus_sources) 				\
+	$(libtracker_miner_marshal_sources) 		\
+	$(vapi_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = tracker-miner-web-full.xml
 
-EXTRA_DIST = 				\
-	tracker-marshal.list		\
-	tracker-miner.vapi		\
-	tracker-miner.deps		\
+EXTRA_DIST = 						\
+	tracker-marshal.list				\
+	tracker-miner.vapi				\
+	tracker-miner.deps				\
 	tracker-miner-web-full.xml