[tracker/configure-for-binaries: 8/80] libtracker-sparql: Cleaned up CFLAGS/LIBS
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/configure-for-binaries: 8/80] libtracker-sparql: Cleaned up CFLAGS/LIBS
- Date: Wed, 27 Oct 2010 14:18:25 +0000 (UTC)
commit 6b4da369ed087b153fa5a6abeb2176e91ad0ecb4
Author: Martyn Russell <martyn lanedo com>
Date: Wed Oct 20 21:53:57 2010 +0100
libtracker-sparql: Cleaned up CFLAGS/LIBS
configure.ac | 8 ++++++++
src/libtracker-sparql/Makefile.am | 9 +++------
2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ad70398..5c55783 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,6 +273,14 @@ LIBTRACKER_MINER_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES(LIBTRACKER_MINER, [$LIBTRACKER_MINER_REQUIRED])
+# Check requirements for libtracker-sparql
+LIBTRACKER_SPARQL_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_SPARQL, [$LIBTRACKER_SPARQL_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-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 7d872a0..0d13f74 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -9,9 +9,8 @@ INCLUDES = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(WARN_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GLIB2_CFLAGS) \
- $(GCOV_CFLAGS)
+ $(GCOV_CFLAGS) \
+ $(LIBTRACKER_SPARQL_CFLAGS)
lib_LTLIBRARIES = libtracker-sparql- TRACKER_API_VERSION@.la
@@ -59,10 +58,8 @@ vapi_DATA = \
tracker-sparql-$(TRACKER_API_VERSION).deps
libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD = \
- $(GLIB2_LIBS) \
- $(DBUS_LIBS) \
$(GCOV_LIBS) \
- $(GIO_LIBS)
+ $(LIBTRACKER_SPARQL_LIBS)
MAINTAINERCLEANFILES = \
$(libtracker_sparql_la_VALASOURCES:.vala=.c) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]