[folks] Un-break parallel building the eds backend.

[Travis Reitter <treitter src gnome org>]

commit 120b058f7d40e879136a84df8975ffdd305ce6ac
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Mon Jul 18 16:09:53 2011 -0700

    Un-break parallel building the eds backend.
    
    It would fail after a maintainer-clean or distclean with:
    
    make[4]: *** No rule to make target `folks-eds.vapi', needed by `all-am'.
      Stop.
    make[4]: *** Waiting for unfinished jobs....
    
    This is because we were setting VALAFLAGS, which was overriding the
    definition from configure.ac and generally causing havok.

 backends/eds/lib/Makefile.am |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index cb26f8a..53905b3 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -35,25 +35,25 @@ libfolks_eds_la_SOURCES = \
 	$(folks_eds_valasources) \
 	$(NULL)
 
-VALAFLAGS = \
+# XXX: it would be nice to do something like this below:
+#    $(addprefix --pkg ,$(folks_backend_eds_deps)) \
+# to factor out repetition, but automake's Vala support doesn't like it
+# because it assumes it can simply match every flag in any _VALAFLAGS string.
+libfolks_eds_la_VALAFLAGS = \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks \
-	$(addprefix --pkg ,$(folks_backend_eds_deps)) \
+	--pkg folks \
+	--pkg gee-1.0 \
+	--pkg gio-2.0 \
+	--pkg gobject-2.0 \
+	--pkg libebook-1.2 \
+	--pkg libedataserver-1.2 \
+	--pkg libxml-2.0 \
 	--includedir folks \
 	--vapi folks-eds.vapi \
 	-H folks/folks-eds.h \
 	$(NULL)
 
-folks_backend_eds_deps = \
-	folks \
-	gee-1.0 \
-	gio-2.0 \
-	gobject-2.0 \
-	libebook-1.2 \
-	libedataserver-1.2 \
-	libxml-2.0 \
-	$(NULL)
-
 libfolks_eds_la_CFLAGS = \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \