[tracker/vala-makefiles: 7/11] libtracker-direct: Use Automake 1.11 Vala features

[Martyn James Russell <mr src gnome org>]

commit 83f69e21bf61e8696c1055051cc4fc20344f8df2
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 3 16:38:36 2010 +0200

    libtracker-direct: Use Automake 1.11 Vala features

 src/libtracker-direct/Makefile.am |   59 ++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 37 deletions(-)
---
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index 56d3ed1..3b14e30 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -1,53 +1,38 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =                                          \
-	$(BUILD_CFLAGS)                                \
-	-I$(top_srcdir)/src                            \
-	-I$(top_builddir)/src                          \
-	$(LIBTRACKER_DIRECT_CFLAGS)
-
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
 modules_LTLIBRARIES = libtracker-direct.la
 
-libtracker_direct_la_VALASOURCES =                     \
-	tracker-direct.vala
-
-libtracker_direct_la_SOURCES =                         \
-	libtracker-direct.vala.stamp                   \
-	$(libtracker_direct_la_VALASOURCES:.vala=.c)
-
-libtracker_direct_la_LDFLAGS =                         \
-	-module -avoid-version -no-undefined
-
-noinst_HEADERS =                                       \
-	tracker-direct.h
-
-# Vala sources
-vapi_sources =                                         \
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
-	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
+AM_VALAFLAGS =                                         \
+	-g                                             \
+	--includedir=libtracker-direct                 \
+	--header tracker-direct.h                      \
+	--vapi tracker-direct.vapi                     \
+	--pkg gio-2.0 --pkg dbus-glib-1                \
+	$(top_srcdir)/src/vapi/posix.vapi              \
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-data/libtracker-data.vapi \
-	$(top_srcdir)/src/libtracker-data/tracker-sparql-query.vapi
+	$(top_srcdir)/src/libtracker-data/tracker-sparql-query.vapi \
+	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi
 
-libtracker-direct.vala.stamp: $(libtracker_direct_la_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-direct --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-direct.h --vapi tracker-direct.vapi $^
-	$(AM_V_GEN)touch $@
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	$(LIBTRACKER_DIRECT_CFLAGS)
 
-BUILT_SOURCES = libtracker-direct.vala.stamp
+libtracker_direct_la_SOURCES =                         \
+	tracker-direct.vala
 
 libtracker_direct_la_LIBADD =                          \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la \
 	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_DIRECT_LIBS)
 
-MAINTAINERCLEANFILES =                                 \
-	$(libtracker_direct_la_VALASOURCES:.vala=.c)   \
-	libtracker-direct.vala.stamp                   \
-	tracker-direct.h                               \
-	tracker-direct.vapi
+libtracker_direct_la_LDFLAGS =                         \
+	-module -avoid-version -no-undefined
 
-EXTRA_DIST =                                           \
-	$(libtracker_direct_la_VALASOURCES)            \
-	libtracker-direct.vala.stamp                   \
-	tracker-direct.vapi
+noinst_HEADERS =                                       \
+	tracker-direct.h