[tracker/configure-for-binaries: 7/23] libtracker-miner: Cleaned up CFLAGS/LIBS
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/configure-for-binaries: 7/23] libtracker-miner: Cleaned up CFLAGS/LIBS
- Date: Fri, 22 Oct 2010 17:06:12 +0000 (UTC)
commit 6d95749358e9a405bca20cb2f6dff539112253d5
Author: Martyn Russell <martyn lanedo com>
Date: Wed Oct 20 21:49:20 2010 +0100
libtracker-miner: Cleaned up CFLAGS/LIBS
configure.ac | 8 ++++++++
src/libtracker-miner/Makefile.am | 8 ++------
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 384be6d..ebe9a08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,14 @@ LIBTRACKER_FTS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
+# Check requirements for libtracker-miner
+LIBTRACKER_MINER_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ dbus-1 >= $DBUS_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(LIBTRACKER_MINER, [$LIBTRACKER_MINER_REQUIRED])
+
# 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/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 595a155..ccecd2c 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -14,10 +14,8 @@ INCLUDES = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(WARN_CFLAGS) \
- $(GLIB2_CFLAGS) \
$(GCOV_CFLAGS) \
- $(GIO_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(LIBTRACKER_MINER_CFLAGS)
lib_LTLIBRARIES = libtracker-miner- TRACKER_API_VERSION@.la
@@ -64,10 +62,8 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS = \
libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
- $(DBUS_LIBS) \
- $(GIO_LIBS) \
$(GCOV_LIBS) \
- $(GLIB2_LIBS)
+ $(LIBTRACKER_MINER_LIBS)
if HAVE_GNOME_KEYRING
libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]