[tracker/configure-for-binaries: 20/27] tracker-miner-fs: Cleaned up CFLAGS/LIBS
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/configure-for-binaries: 20/27] tracker-miner-fs: Cleaned up CFLAGS/LIBS
- Date: Mon, 25 Oct 2010 12:31:20 +0000 (UTC)
commit e0bee5bbe955a2e0afbb7d5b362370a2b03a1b35
Author: Martyn Russell <martyn lanedo com>
Date: Fri Oct 22 16:20:50 2010 +0100
tracker-miner-fs: Cleaned up CFLAGS/LIBS
configure.ac | 12 ++++++++++++
src/miners/fs/Makefile.am | 14 +++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0a9bb40..36bec1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,6 +330,18 @@ TRACKER_EXTRACT_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED])
+# Check requirements for tracker-miner-fs
+TRACKER_MINER_FS_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"
+
+PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED])
+
+TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS -lz -lm"
+
# Check requirements for tracker-utils
TRACKER_UTILS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 7410f54..db78c89 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -17,10 +17,8 @@ INCLUDES = \
-I$(top_srcdir)/src/libtracker-sparql \
-I$(top_builddir)/src/libtracker-sparql \
$(WARN_CFLAGS) \
- $(GMODULE_CFLAGS) \
- $(GIO_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GCOV_CFLAGS)
+ $(GCOV_CFLAGS) \
+ $(TRACKER_MINER_FS_CFLAGS)
libexec_PROGRAMS = tracker-miner-fs
@@ -42,14 +40,8 @@ tracker_miner_fs_LDADD = \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(DBUS_LIBS) \
- $(GMODULE_LIBS) \
- $(GTHREAD_LIBS) \
- $(GIO_LIBS) \
$(GCOV_LIBS) \
- $(GLIB2_LIBS) \
- -lz \
- -lm
+ $(TRACKER_MINER_FS_LIBS)
if HAVE_MEEGOTOUCH
INCLUDES += $(MEEGOTOUCH_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]