[folks] Do not assign to VALAFLAGS

[Simon McVittie <smcv src gnome org>]

commit 225f7042476504cedc1b35a7d2c91d7876841ec3
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Mon Mar 11 13:12:02 2013 +0000

    Do not assign to VALAFLAGS
    
    Users should be able to do "make VALAFLAGS=--enable-experimental-non-null"
    without overriding necessary flags like --target-glib=2.24. The variable
    for use by package maintainers is AM_VALAFLAGS.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695628
    Signed-off-by: Simon McVittie <simon mcvittie collabora co uk>
    Reviewed-by: Philip Withnall <philip tecnocode co uk>

 backends/eds/Makefile.am           |    3 +--
 backends/libsocialweb/Makefile.am  |    3 +--
 backends/telepathy/Makefile.am     |    3 +--
 backends/tracker/Makefile.am       |    3 +--
 configure.ac                       |    4 ++--
 tests/lib/Makefile.am              |    2 +-
 tests/lib/eds/Makefile.am          |    2 +-
 tests/lib/key-file/Makefile.am     |    2 +-
 tests/lib/libsocialweb/Makefile.am |    2 +-
 tests/lib/tracker/Makefile.am      |    2 +-
 tools/Makefile.am                  |    3 +--
 tools/inspect/Makefile.am          |    3 +--
 12 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am
index 3aea5f2..55042b5 100644
--- a/backends/eds/Makefile.am
+++ b/backends/eds/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = lib
 
 BACKEND_NAME = "eds"
 
-VALAFLAGS += \
-       $(AM_VALAFLAGS) \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_builddir)/backends/eds/lib \
diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am
index bf763be..f7229b1 100644
--- a/backends/libsocialweb/Makefile.am
+++ b/backends/libsocialweb/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = lib
 
 BACKEND_NAME = "libsocialweb"
 
-VALAFLAGS += \
-       $(AM_VALAFLAGS) \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_builddir)/backends/libsocialweb/lib \
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index df3cc80..431c154 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = lib
 
 BACKEND_NAME = "telepathy"
 
-VALAFLAGS += \
-       $(AM_VALAFLAGS) \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=$(abs_srcdir) \
        --vapidir=$(abs_builddir) \
diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am
index ac3ce9a..1ab955d 100644
--- a/backends/tracker/Makefile.am
+++ b/backends/tracker/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = lib
 
 BACKEND_NAME = "tracker"
 
-VALAFLAGS += \
-       $(AM_VALAFLAGS) \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=vapi \
diff --git a/configure.ac b/configure.ac
index da9db72..803671a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,8 +293,8 @@ AS_IF([test "x$enable_vala" = "xyes"], [
 
         # require GLib >= 2.24 so GLib.Array, etc. reffing is handled
         # automatically
-        VALAFLAGS="$VALAFLAGS --target-glib=2.24"
-        AC_SUBST([VALAFLAGS])
+        AM_VALAFLAGS="--target-glib=2.24"
+        AC_SUBST([AM_VALAFLAGS])
         AC_SUBST([VAPIGENFLAGS])
         AC_SUBST([VAPIDIR])
 
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 9c55831..178d67b 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -53,7 +53,7 @@ libfolks_test_la_LIBADD = \
 
 libfolks_test_la_VALAFLAGS = \
        $(ERROR_VALAFLAGS) \
-       $(VALAFLAGS) \
+       $(AM_VALAFLAGS) \
        --vapidir=$(top_srcdir)/folks \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am
index dfa5238..b87f85b 100644
--- a/tests/lib/eds/Makefile.am
+++ b/tests/lib/eds/Makefile.am
@@ -1,4 +1,4 @@
-VALAFLAGS += \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --library=eds-test \
        --header=eds-test.h \
diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am
index 495496d..24892d1 100644
--- a/tests/lib/key-file/Makefile.am
+++ b/tests/lib/key-file/Makefile.am
@@ -1,4 +1,4 @@
-VALAFLAGS += \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --library=kf-test \
        --header=kf-test.h \
diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index 5e4bfb4..6f6d6a4 100644
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -1,4 +1,4 @@
-VALAFLAGS += \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --library=libsocialweb-test \
        --header=libsocialweb-test.h \
diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index a7d07b8..0c2b45a 100644
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -1,4 +1,4 @@
-VALAFLAGS += \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --library=tracker-test \
        --header=tracker-test.h \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4e24272..731908e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,8 +10,7 @@ if ENABLE_IMPORT_TOOL
 bin_PROGRAMS = folks-import
 endif
 
-VALAFLAGS = \
-       $(AM_VALAFLAGS) \
+AM_VALAFLAGS += \
        --vapidir=$(top_builddir)/folks \
        --pkg=gee-0.8 \
        --pkg=libxml-2.0 \
diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am
index b62af9a..376b9d0 100644
--- a/tools/inspect/Makefile.am
+++ b/tools/inspect/Makefile.am
@@ -1,5 +1,4 @@
-VALAFLAGS = \
-       $(AM_VALAFLAGS) \
+AM_VALAFLAGS += \
        --vapidir=$(top_srcdir)/folks \
        --pkg=posix \
        --pkg=readline \