[tracker/configure-for-binaries: 73/77] tracker-miner-fs: Merge MEEGOTOUCH into CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 8f0157e8f6e031ee0bd8af28801c789f6e4c03ad
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 26 11:24:51 2010 +0100

    tracker-miner-fs: Merge MEEGOTOUCH into CFLAGS/LIBS

 configure.ac              |    5 +++--
 src/miners/fs/Makefile.am |    6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9139ff8..c9bc918 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,8 +652,9 @@ if test "x$enable_maemo" != "xno"; then
                      [meegotouch >= $MEEGOTOUCH_REQUIRED],
                      [have_meegotouch=yes],
                      [have_meegotouch=no])
-   AC_SUBST(MEEGOTOUCH_CFLAGS)
-   AC_SUBST(MEEGOTOUCH_LIBS)
+
+   TRACKER_MINER_FS_CFLAGS="$TRACKER_MINER_FS_CFLAGS $MEEGOTOUCH_CFLAGS"
+   TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $MEEGOTOUCH_LIBS"
 
    if test "x$have_meegotouch" = "xyes"; then
       AC_DEFINE(HAVE_MEEGOTOUCH, [], [Define if we have meegotouch])
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index cdf403a..3c937d7 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -2,11 +2,11 @@ include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS =								\
 	$(BUILD_CFLAGS)							\
+	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
 	$(TRACKER_MINER_FS_CFLAGS)
 
 libexec_PROGRAMS = tracker-miner-fs
@@ -33,9 +33,7 @@ tracker_miner_fs_LDADD =						\
 	$(TRACKER_MINER_FS_LIBS)
 
 if HAVE_MEEGOTOUCH
-AM_CPPFLAGS += $(MEEGOTOUCH_CFLAGS)
 tracker_miner_fs_SOURCES += tracker-miner-applications-meego.cpp
-tracker_miner_fs_LDADD += $(MEEGOTOUCH_LIBS)
 endif
 
 marshal_sources =							\