[tracker/vala-makefiles: 10/11] tracker-miner-flickr: Use Automake 1.11 Vala features

[Martyn James Russell <mr src gnome org>]

commit 815d8d32281015547bccdbf60a37cd7859f43aed
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Nov 3 17:24:13 2010 +0200

    tracker-miner-flickr: Use Automake 1.11 Vala features

 src/miners/flickr/Makefile.am |   53 ++++++++++++++---------------------------
 1 files changed, 18 insertions(+), 35 deletions(-)
---
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index b316913..547becf 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -1,5 +1,17 @@
 include $(top_srcdir)/Makefile.decl
 
+libexec_PROGRAMS = tracker-miner-flickr
+
+AM_VALAFLAGS =                                         \
+	-g --thread                                    \
+	--includedir=libtracker-client                 \
+	--header tracker-sparql-builder.h              \
+	--vapi tracker-sparql-query.vapi               \
+	--pkg gio-2.0 --pkg rest-0.6 --pkg posix       \
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql- TRACKER_API_VERSION@.vapi \
+	$(top_srcdir)/src/libtracker-miner/tracker-miner.vapi
+
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
 	-DSHAREDIR=\""$(datadir)"\"                    \
@@ -9,44 +21,15 @@ AM_CPPFLAGS =                                          \
 	-I$(top_builddir)/src                          \
 	$(TRACKER_MINER_FLICKR_CFLAGS)
 
-VALAFLAGS =                                            \
-	--pkg gio-2.0                                  \
-	--pkg rest-0.6                                 \
-	--pkg posix                                    \
-	--thread
-
-libexec_PROGRAMS = tracker-miner-flickr
-
-tracker_miner_flickr_VALASOURCES =                     \
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql- TRACKER_API_VERSION@.vapi \
-	tracker-miner-flickr.vala
-
-tracker_miner_flickr_SOURCES =                         \
-	tracker-miner-flickr.vala.stamp                \
-	$(tracker_miner_flickr_VALASOURCES:.vala=.c)   \
-	tracker-writeback.c                            \
-	tracker-writeback.h
-
-tracker_miner_flickr_LDADD =                           \
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_FLICKR_LIBS)
 
-vapi_sources =                                         \
-	$(top_srcdir)/src/libtracker-miner/tracker-miner.vapi
-
-tracker-miner-flickr.vala.stamp: $(tracker_miner_flickr_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) $^
-	$(AM_V_GEN)touch $@
-
-BUILT_SOURCES =                                        \
-	tracker-miner-flickr.vala.stamp
-
-MAINTAINERCLEANFILES =                                 \
-	$(tracker_miner_flickr_VALASOURCES:.vala=.c)   \
-	tracker-miner-flickr.vala.stamp
+tracker_miner_flickr_SOURCES =                         \
+	tracker-miner-flickr.vala                      \
+	tracker-writeback.c
 
-EXTRA_DIST =                                           \
-	$(tracker_miner_flickr_VALASOURCES)            \
-	tracker-miner-flickr.vala.stamp
+noinst_HEADERS =                                       \
+	tracker-writeback.h