[tracker/vala-makefiles: 5/10] libtracker-bus: Use Automake 1.11 Vala features

[Martyn James Russell <mr src gnome org>]

commit fab2498e4415011ea087ae370d445b95d7941940
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Nov 2 15:26:52 2010 +0200

    libtracker-bus: Use Automake 1.11 Vala features

 src/libtracker-bus/Makefile.am |   67 ++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 40 deletions(-)
---
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index d911d12..8f1e820 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -2,63 +2,50 @@ include $(top_srcdir)/Makefile.decl
 
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
+modules_LTLIBRARIES = libtracker-bus.la
+
+AM_VALAFLAGS =                                         \
+	-g                                             \
+	--includedir=libtracker-bus                    \
+	--header tracker-bus.h                         \
+	--vapi tracker-bus.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-common/libtracker-common.vapi \
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	tracker-bus-fd-cursor.vapi                     \
+	tracker-bus-fd-update.vapi
+
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
 	-I$(top_srcdir)/src                            \
 	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_BUS_CFLAGS)
 
-modules_LTLIBRARIES = libtracker-bus.la
-
-libtracker_bus_la_VALASOURCES =                        \
-	tracker-bus.vala                               \
-	tracker-array-cursor.vala
+LIBADD =                                               \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(LIBTRACKER_BUS_LIBS)
 
 libtracker_bus_la_SOURCES =                            \
-	libtracker-bus.vala.stamp                      \
-	$(libtracker_bus_la_VALASOURCES:.vala=.c)      \
-	tracker-bus-fd-cursor.h                        \
+	tracker-bus.vala                               \
+	tracker-array-cursor.vala                      \
 	tracker-bus-fd-cursor.c                        \
 	tracker-bus-fd-update.c                        \
-	tracker-bus-fd-update.h                        \
-	tracker-bus-shared.c                           \
-	tracker-bus-shared.h
+	tracker-bus-shared.c
 
 libtracker_bus_la_LDFLAGS =                            \
 	-module -avoid-version -no-undefined
 
 noinst_HEADERS =                                       \
-	tracker-bus.h
-
-# Vala sources
-vapi_sources =                                         \
-	$(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
-	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
-	tracker-bus-fd-cursor.vapi                     \
-	tracker-bus-fd-update.vapi
-
-libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
-	$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-bus --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus.vapi $^
-	$(AM_V_GEN)touch $@
-
-BUILT_SOURCES = libtracker-bus.vala.stamp
-
-libtracker_bus_la_LIBADD =                             \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)                                  \
-	$(LIBTRACKER_BUS_LIBS)
-
-MAINTAINERCLEANFILES =                                 \
-	$(libtracker_bus_la_VALASOURCES:.vala=.c)      \
-	libtracker-bus.vala.stamp                      \
-	tracker-bus.vapi                               \
-	tracker-bus.h
+	tracker-bus.h                                  \
+	tracker-bus-fd-cursor.h                        \
+	tracker-bus-fd-update.h                        \
+	tracker-bus-shared.h
 
 EXTRA_DIST =                                           \
-	$(libtracker_bus_la_VALASOURCES)               \
-	libtracker-bus.vala.stamp                      \
-	tracker-bus.vapi                               \
 	tracker-bus-fd-cursor.vapi                     \
 	tracker-bus-fd-update.vapi