[tracker/vala-makefiles: 4/11] libtracker-sparql: Use Automake 1.11 Vala features

[Martyn James Russell <mr src gnome org>]

commit 1bce02b1a0868135a82bada704a8cd2140d7c648
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Nov 2 15:00:46 2010 +0200

    libtracker-sparql: Use Automake 1.11 Vala features

 src/libtracker-sparql/Makefile.am   |   52 +++++++++++++---------------------
 src/libtracker-sparql/tracker-uri.c |    2 -
 2 files changed, 20 insertions(+), 34 deletions(-)
---
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 4ee23bd..e065f98 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -2,6 +2,18 @@ include $(top_srcdir)/Makefile.decl
 
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
+lib_LTLIBRARIES = libtracker-sparql- TRACKER_API_VERSION@.la
+
+AM_VALAFLAGS =                                         \
+	-g                                             \
+	--includedir=libtracker-sparql                 \
+	--header tracker-sparql.h                      \
+	--vapi tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	--pkg gio-2.0 --pkg gmodule-2.0 --pkg dbus-glib-1 \
+	config.vapi                                    \
+	$(top_srcdir)/src/vapi/posix.vapi              \
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
 	-DSPARQL_MODULES_DIR=\""$(modulesdir)"\"       \
@@ -9,66 +21,42 @@ AM_CPPFLAGS =                                          \
 	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
-lib_LTLIBRARIES = libtracker-sparql- TRACKER_API_VERSION@.la
-
 libtracker_sparqlincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-sparql
 
-libtracker_sparql_la_VALASOURCES =                     \
+libtracker_sparql_ TRACKER_API_VERSION@_la_SOURCES =   \
 	tracker-builder.vala                           \
 	tracker-connection.vala                        \
 	tracker-cursor.vala                            \
 	tracker-backend.vala                           \
-	tracker-utils.vala
-
-libtracker_sparql_ TRACKER_API_VERSION@_la_SOURCES =   \
-	libtracker-sparql.vala.stamp                   \
-	$(libtracker_sparql_la_VALASOURCES:.vala=.c)   \
+	tracker-utils.vala                             \
 	tracker-uri.c
 
+libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD =    \
+	$(BUILD_LIBS)                                  \
+	$(LIBTRACKER_SPARQL_LIBS)
+
 libtracker_sparql_ TRACKER_API_VERSION@_la_LDFLAGS =   \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-#	-export-symbols-regex '^tracker_.*'
-
 libtracker_sparqlinclude_HEADERS =                     \
 	tracker-sparql.h
 
-# Vala sources
-vapi_sources =                                         \
-	config.vapi                                    \
-	$(top_srcdir)/src/vapi/posix.vapi              \
-	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
-
-libtracker-sparql.vala.stamp: $(libtracker_sparql_la_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-sparql --pkg gio-2.0 --pkg gmodule-2.0 --pkg dbus-glib-1 -H tracker-sparql.h --vapi tracker-sparql-$(TRACKER_API_VERSION).vapi $^
-	$(AM_V_GEN)touch $@
-
 tracker-sparql-$(TRACKER_API_VERSION).deps: tracker-sparql.deps
 	$(AM_V_GEN)cp $^ $@
 
-BUILT_SOURCES = libtracker-sparql.vala.stamp
-
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =                                            \
 	tracker-sparql-$(TRACKER_API_VERSION).vapi     \
 	tracker-sparql-$(TRACKER_API_VERSION).deps
 
-libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD =    \
-	$(BUILD_LIBS)                                  \
-	$(LIBTRACKER_SPARQL_LIBS)
-
 MAINTAINERCLEANFILES =                                 \
-	$(libtracker_sparql_la_VALASOURCES:.vala=.c)   \
-	libtracker-sparql.vala.stamp                   \
 	tracker-sparql-$(TRACKER_API_VERSION).vapi     \
 	tracker-sparql-$(TRACKER_API_VERSION).deps     \
 	tracker-sparql.h
 
 EXTRA_DIST =                                           \
 	config.vapi                                    \
-	$(libtracker_sparql_la_VALASOURCES)            \
-	libtracker-sparql.vala.stamp                   \
 	tracker-sparql-$(TRACKER_API_VERSION).vapi     \
-	tracker-sparql.deps                            \
-	tracker-sparql-$(TRACKER_API_VERSION).deps
+	tracker-sparql-$(TRACKER_API_VERSION).deps     \
+	tracker-sparql.deps
diff --git a/src/libtracker-sparql/tracker-uri.c b/src/libtracker-sparql/tracker-uri.c
index d5dca7c..0b04763 100644
--- a/src/libtracker-sparql/tracker-uri.c
+++ b/src/libtracker-sparql/tracker-uri.c
@@ -24,8 +24,6 @@
 
 #include <glib.h>
 
-#include "tracker-sparql.h"
-
 static const char *
 find_conversion (const char  *format,
                  const char **after)