[folks] Port the backend Makefile.ams to use automake-1.11's Vala support

[Philip Withnall <pwithnall src gnome org>]

commit 173e24e83691d0e06ba1528e86d2ec84bf079f08
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Sep 10 11:00:52 2010 +0100

    Port the backend Makefile.ams to use automake-1.11's Vala support

 backends/key-file/Makefile.am  |   46 ++++--------------------------------
 backends/telepathy/Makefile.am |   50 +++------------------------------------
 2 files changed, 10 insertions(+), 86 deletions(-)
---
diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am
index 13bad62..c877d6a 100644
--- a/backends/key-file/Makefile.am
+++ b/backends/key-file/Makefile.am
@@ -5,12 +5,16 @@ AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"KeyFileBackend\" \
 	$(NULL)
 
-VALAFLAGS += --vapidir=. --vapidir=$(top_srcdir)/folks
+VALAFLAGS += \
+	--vapidir=. \
+	--vapidir=$(top_srcdir)/folks \
+	$(addprefix --pkg ,$(folks_backend_key_file_deps)) \
+	$(NULL)
 
 backenddir = $(BACKEND_DIR)/key-file
 backend_LTLIBRARIES = libfolks-backend-key-file.la
 
-folks_backend_key_file_valasources = \
+libfolks_backend_key_file_la_SOURCES = \
 	kf-backend.vala \
 	kf-backend-factory.vala \
 	kf-persona.vala \
@@ -24,9 +28,6 @@ folks_backend_key_file_deps = \
 	gobject-2.0 \
 	$(NULL)
 
-libfolks_backend_key_file_la_SOURCES = \
-	$(folks_backend_key_file_valasources:.vala=.c)
-
 libfolks_backend_key_file_la_CPPFLAGS = \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -42,39 +43,4 @@ libfolks_backend_key_file_la_LIBADD = \
 
 libfolks_backend_key_file_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-folks-backend-key-file.h $(libfolks_backend_key_file_la_SOURCES): \
-		folks-backend-key-file.vala.stamp
-
-folks-backend-key-file.vapi folks-backend-key-file.vala.stamp: $(folks_backend_key_file_valasources)
-	$(VALA_V)$(VALAC) $(VALACFLAGS) $(VALAFLAGS) \
-		-H folks-backend-key-file.h -C \
-		--library folks-backend-key-file \
-		$(addprefix --pkg ,$(folks_backend_key_file_deps)) \
-		$(addprefix $(srcdir)/,$(folks_backend_key_file_valasources))
-	touch $@
-
-EXTRA_DIST = \
-	$(folks_backend_key_file_valasources) \
-	folks-backend-key-file.vala.stamp \
-	folks-backend-key-file.vapi \
-	$(NULL)
-
-CLEANFILES = \
-	folks-backend-key-file.h \
-	folks-backend-key-file.vala.stamp \
-	folks-backend-key-file.vapi \
-	$(libfolks_backend_key_file_la_SOURCES) \
-	$(NULL)
-
-MAINTAINERCLEANFILES = \
-	$(libfolks_backend_key_file_la_SOURCES) \
-	$(NULL)
-
-# set up the verbosity rules to avoid some build noise
-# XXX: once automake >= 1.11 is common, remove these, push valasources files
-# into SOURCES and add AM_PROG_VALAC to configure.ac
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo "  VALAC " $^;
-
 -include $(top_srcdir)/git.mk
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index fd09507..d704ac1 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -11,16 +11,14 @@ AM_CPPFLAGS = \
 VALAFLAGS += \
 	--vapidir=. \
 	--vapidir=$(top_builddir)/backends/telepathy/lib \
-	--vapidir=$(top_srcdir)/folks
+	--vapidir=$(top_srcdir)/folks \
+	$(addprefix --pkg ,$(folks_backend_telepathy_deps)) \
+	$(NULL)
 
 backenddir = $(BACKEND_DIR)/telepathy
 backend_LTLIBRARIES = libfolks-backend-telepathy.la
 
-##################################################################
-# Backend
-##################################################################
-
-folks_backend_telepathy_valasources = \
+libfolks_backend_telepathy_la_SOURCES = \
 	tp-backend.vala \
 	tp-backend-factory.vala \
 	$(NULL)
@@ -34,9 +32,6 @@ folks_backend_telepathy_deps = \
 	telepathy-glib \
 	$(NULL)
 
-libfolks_backend_telepathy_la_SOURCES = \
-	$(folks_backend_telepathy_valasources:.vala=.c)
-
 libfolks_backend_telepathy_la_CPPFLAGS = \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -57,41 +52,4 @@ libfolks_backend_telepathy_la_LIBADD = \
 
 libfolks_backend_telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-folks-backend-telepathy.h $(libfolks_backend_telepathy_la_SOURCES): \
-	folks-backend-telepathy.vala.stamp
-
-folks-backend-telepathy.vapi folks-backend-telepathy.vala.stamp: $(folks_backend_telepathy_valasources)
-	$(VALA_V)$(VALAC) $(VALACFLAGS) $(VALAFLAGS) \
-		-H folks-backend-telepathy.h -C \
-		--library folks-backend-telepathy \
-		$(addprefix --pkg ,$(folks_backend_telepathy_deps)) \
-		$(addprefix $(srcdir)/,$(folks_backend_telepathy_valasources))
-	touch $@
-
-##################################################################
-# General
-##################################################################
-
-EXTRA_DIST = \
-	$(folks_backend_telepathy_valasources) \
-	folks-backend-telepathy.vala.stamp \
-	folks-backend-telepathy.vapi \
-	$(NULL)
-
-CLEANFILES = \
-	folks-backend-telepathy.h \
-	folks-backend-telepathy.vala.stamp \
-	folks-backend-telepathy.vapi \
-	$(libfolks_backend_telepathy_la_SOURCES) \
-	$(NULL)
-
-MAINTAINERCLEANFILES = $(libfolks_backend_telepathy_la_SOURCES)
-
-# set up the verbosity rules to avoid some build noise
-# XXX: once automake >= 1.11 is common, remove these, push valasources files
-# into SOURCES and add AM_PROG_VALAC to configure.ac
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo "  VALAC " $^;
-
 -include $(top_srcdir)/git.mk