[tracker/vala-makefiles: 8/13] libtracker-data: Use Automake 1.11 Vala features
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/vala-makefiles: 8/13] libtracker-data: Use Automake 1.11 Vala features
- Date: Wed, 10 Nov 2010 11:19:27 +0000 (UTC)
commit 11c79d7cbd1cc3faedd49257cb01572ac66f7d43
Author: Martyn Russell <martyn lanedo com>
Date: Wed Nov 3 16:47:49 2010 +0200
libtracker-data: Use Automake 1.11 Vala features
src/libtracker-data/Makefile.am | 76 ++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 45 deletions(-)
---
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index bba01ce..4624b18 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -1,5 +1,17 @@
include $(top_srcdir)/Makefile.decl
+AM_VALAFLAGS = \
+ -g \
+ --includedir=libtracker-data \
+ --header tracker-sparql-query.h \
+ --vapi tracker-sparql-query.vapi \
+ --pkg gio-2.0 \
+ $(top_srcdir)/src/vapi/posix.vapi \
+ $(top_srcdir)/src/vapi/glib-2.0-fixes.vapi \
+ $(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
+ $(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+ libtracker-data.vapi
+
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
@@ -7,19 +19,15 @@ AM_CPPFLAGS = \
-DSHAREDIR=\""$(datadir)"\" \
$(LIBTRACKER_DATA_CFLAGS)
-BUILT_SOURCES = libtracker-data.vala.stamp
-
libtracker_datadir = $(libdir)/tracker-$(TRACKER_API_VERSION)
libtracker_data_LTLIBRARIES = libtracker-data.la
-libtracker_data_la_VALASOURCES = \
+libtracker_data_la_SOURCES = \
tracker-sparql-expression.vala \
tracker-sparql-pattern.vala \
tracker-sparql-query.vala \
tracker-sparql-scanner.vala \
- tracker-turtle-reader.vala
-
-libtracker_data_la_SOURCES = \
+ tracker-turtle-reader.vala \
tracker-class.c \
tracker-collation.c \
tracker-data-backup.c \
@@ -35,9 +43,21 @@ libtracker_data_la_SOURCES = \
tracker-namespace.c \
tracker-ontology.c \
tracker-ontologies.c \
- tracker-property.c \
- libtracker-data.vala.stamp \
- $(libtracker_data_la_VALASOURCES:.vala=.c)
+ tracker-property.c
+
+libtracker_data_la_LIBADD = \
+ $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
+ $(BUILD_LIBS) \
+ $(LIBTRACKER_DATA_LIBS)
+
+if HAVE_TRACKER_FTS
+libtracker_data_la_LIBADD += \
+ $(top_builddir)/src/libtracker-fts/libtracker-fts.la
+endif
+
+libtracker_data_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
noinst_HEADERS = \
tracker-class.h \
@@ -59,39 +79,5 @@ noinst_HEADERS = \
tracker-property.h \
tracker-sparql-query.h
-vapi_sources = \
- $(top_srcdir)/src/vapi/posix.vapi \
- $(top_srcdir)/src/vapi/glib-2.0-fixes.vapi \
- $(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
- $(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
- libtracker-data.vapi
-
-libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources)
- $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-data -H tracker-sparql-query.h --vapi tracker-sparql-query.vapi --pkg gio-2.0 $^
- touch $@
-
-libtracker_data_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-libtracker_data_la_LIBADD = \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
- $(BUILD_LIBS) \
- $(LIBTRACKER_DATA_LIBS)
-
-if HAVE_TRACKER_FTS
-libtracker_data_la_LIBADD += \
- $(top_builddir)/src/libtracker-fts/libtracker-fts.la
-endif
-
-MAINTAINERCLEANFILES = \
- libtracker-data.vala.stamp \
- $(libtracker_data_la_VALASOURCES:.vala=.c) \
- tracker-sparql-query.h \
- $(NULL)
-
-EXTRA_DIST = $(libtracker_data_la_VALASOURCES) \
- libtracker-data.vala.stamp \
- libtracker-data.vapi \
- tracker-sparql-query.vapi
-
+BUILT_SOURCES = \
+ libtracker_data_la_vala.stamp
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]