[folks] Make a distinction between valac and vapigen flags.

[Travis Reitter <treitter src gnome org>]

commit 45977b1f901d8cf241061f74a1859ae142111143
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Mon Sep 27 11:13:16 2010 -0700

    Make a distinction between valac and vapigen flags.

 backends/telepathy/lib/Makefile.am          |    9 +++++++--
 configure.ac                                |    4 ++--
 folks/Makefile.am                           |    2 +-
 tests/lib/telepathy/contactlist/Makefile.am |    4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 5257a8e..85e4f18 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -9,6 +9,10 @@ VALAFLAGS += \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks
 
+VAPIGENFLAGS += \
+	--vapidir=. \
+	--vapidir=$(top_srcdir)/folks
+
 noinst_LTLIBRARIES = libtp-lowlevel.la
 folks_telepathydir = $(libdir)
 folks_telepathy_LTLIBRARIES = libfolks-telepathy.la
@@ -65,7 +69,8 @@ INTROSPECTION_GIRS += tp-lowlevel.gir
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
 tp-lowlevel.vapi: tp-lowlevel.gir
-	$(AM_V_GEN)$(VAPIGEN) $(VALAFLAGS) --library tp-lowlevel \
+	$(AM_V_GEN)$(VAPIGEN) $(VAPIGENFLAGS) \
+		--library tp-lowlevel \
 		--pkg gio-2.0 \
 		--pkg telepathy-glib \
 		tp-lowlevel.gir
@@ -139,7 +144,7 @@ folks_telepathy_vapi_deps = \
 	$(NULL)
 
 folks-telepathy.vapi folks-telepathy.vala.stamp: $(folks_telepathy_vapi_deps)
-	$(VALA_V)$(VALAC) $(VALACFLAGS) $(VALAFLAGS) -H folks-telepathy.h -C \
+	$(VALA_V)$(VALAC) $(VALAFLAGS) -H folks-telepathy.h -C \
 		--library folks-telepathy \
 		$(addprefix --pkg ,$(folks_telepathy_deps)) \
 		$(addprefix $(srcdir)/,$(folks_telepathy_valasources))
diff --git a/configure.ac b/configure.ac
index ce10df6..358d715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,9 +77,9 @@ VALA_REQUIRED=0.10.0
 AM_PROG_VALAC([$VALA_REQUIRED])
 
 # require GLib >= 2.24 so GLib.Array, etc. reffing is handled automatically
-VALACFLAGS="$VALACFLAGS --target-glib=2.24"
-AC_SUBST([VALACFLAGS])
+VALAFLAGS="$VALAFLAGS --target-glib=2.24"
 AC_SUBST([VALAFLAGS])
+AC_SUBST([VAPIGENFLAGS])
 AC_SUBST([VAPIDIR])
 
 AC_PATH_PROG([VAPIGEN], [vapigen], [vapigen])
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 2789efc..bccb3a3 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -64,7 +64,7 @@ folks_HEADERS = folks.h
 folks.h $(libfolks_la_SOURCES): folks.vala.stamp
 
 folks.vapi folks.vala.stamp: $(folks_valasources)
-	$(VALA_V)$(VALAC) $(VALACFLAGS) -C -H folks.h \
+	$(VALA_V)$(VALAC) $(VALAFLAGS) -C -H folks.h \
 		--library folks --vapidir=. $(addprefix --pkg ,$(folks_deps)) \
 		$(folks_valasources)
 	touch $@
diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index d1bc032..8ce4470 100644
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -4,7 +4,7 @@
 # copy-and-modify (moving it to a better namespace), or make changes in the
 # copy in telepathy-glib first.
 
-VALAFLAGS += \
+VAPIGENFLAGS += \
 	--vapidir=. \
 	--pkg gobject-2.0 \
 	--pkg gio-2.0 \
@@ -58,7 +58,7 @@ tp_test_contactlist_gir_NAMESPACE = TpTest
 INTROSPECTION_GIRS += tp-test-contactlist.gir
 
 tp-test-contactlist.vapi: tp-test-contactlist.gir
-	$(AM_V_GEN)$(VAPIGEN) $(VALAFLAGS) --library tp-test-contactlist \
+	$(AM_V_GEN)$(VAPIGEN) $(VAPIGENFLAGS) --library tp-test-contactlist \
 		tp-test-contactlist.gir
 
 BUILT_SOURCES = \