[tracker/direct-access: 23/38] libtracker-sparql: Use dedicated module directory
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/direct-access: 23/38] libtracker-sparql: Use dedicated module directory
- Date: Fri, 13 Aug 2010 15:53:28 +0000 (UTC)
commit a2e159f053d0b1e855ca503b5191d78c4a7cc1f8
Author: Jürg Billeter <j bitron ch>
Date: Tue Jul 20 18:11:58 2010 +0200
libtracker-sparql: Use dedicated module directory
src/libtracker-direct/Makefile.am | 24 ++++++++----------------
tests/functional-tests/Makefile.am | 4 ++--
2 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index edf1c04..07adece 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.decl
+modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
+
INCLUDES = \
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
@@ -11,24 +13,19 @@ INCLUDES = \
$(GLIB2_CFLAGS) \
$(GCOV_CFLAGS)
-lib_LTLIBRARIES = libtracker-direct- TRACKER_API_VERSION@.la
-
-libtracker_directincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-direct
+modules_LTLIBRARIES = libtracker-direct.la
libtracker_direct_la_VALASOURCES = \
tracker-direct.vala
-libtracker_direct_ TRACKER_API_VERSION@_la_SOURCES = \
+libtracker_direct_la_SOURCES = \
libtracker-direct.vala.stamp \
$(libtracker_direct_la_VALASOURCES:.vala=.c)
-libtracker_direct_ TRACKER_API_VERSION@_la_LDFLAGS = \
- -shared -fPIC -module -avoid-version
-
-# -export-symbols-regex '^tracker_.*'
+libtracker_direct_la_LDFLAGS = \
+ -module -avoid-version -no-undefined
-libtracker_directinclude_HEADERS = \
- $(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+noinst_HEADERS = \
tracker-direct.h
# Vala sources
@@ -38,16 +35,11 @@ vapi_sources = \
$(top_srcdir)/src/libtracker-data/libtracker-data.vapi \
$(top_srcdir)/src/libtracker-data/tracker-sparql-query.vapi
-# Vala bindings
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = \
- tracker-direct-$(TRACKER_API_VERSION).vapi
-
libtracker-direct.vala.stamp: $(libtracker_direct_la_VALASOURCES) $(vapi_sources)
$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-direct.h --vapi tracker-direct-$(TRACKER_API_VERSION).vapi $^
$(AM_V_GEN)touch $@
-libtracker_direct_ TRACKER_API_VERSION@_la_LIBADD = \
+libtracker_direct_la_LIBADD = \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
$(GLIB2_LIBS)
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index 74d4595..6abc2ac 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -126,7 +126,7 @@ direct-test.vala.stamp: $(direct_test_VALASOURCES) $(direct_vapi_sources)
$(AM_V_GEN)touch $@
direct_test_LDADD = \
- $(top_builddir)/src/libtracker-direct/libtracker-direct-$(TRACKER_API_VERSION).la \
+ $(top_builddir)/src/libtracker-direct/libtracker-direct.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
$(GIO_LIBS) \
$(GLIB2_LIBS)
@@ -140,7 +140,7 @@ bus-test.vala.stamp: $(bus_test_VALASOURCES) $(bus_vapi_sources)
$(AM_V_GEN)touch $@
bus_test_LDADD = \
- $(top_builddir)/src/libtracker-bus/libtracker-bus-$(TRACKER_API_VERSION).la \
+ $(top_builddir)/src/libtracker-bus/libtracker-bus.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(GIO_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]