Always append to AM_VALAFLAGS, don't replace

This avoids losing --target-glib=2.24 (from configure.ac) in certain
test modules.

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>

diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am
index c4bd1a1..60a863a 100644 (file)
--- a/tests/eds/Makefile.am
+++ b/tests/eds/Makefile.am
@@ -22,7 +22,7 @@ LDADD = \
        -L$(top_srcdir)/backends/eds/lib \
        $(NULL)
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \

diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index 78f862a..6a74ba6 100644 (file)
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -25,7 +25,7 @@ RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
 
 # --disable-warnings is necessary so that we can test deprecated API such as
 # the IndividualAggregator.individuals_changed signal.
-AM_VALAFLAGS = \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --disable-warnings \
        --vapidir=$(abs_srcdir) \

diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am
index bc2e83a..2d26d56 100644 (file)
--- a/tests/key-file/Makefile.am
+++ b/tests/key-file/Makefile.am
@@ -16,7 +16,7 @@ LDADD = \
        $(GEE_LIBS) \
        $(NULL)
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \

diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am
index ec7da62..e7d5b2e 100644 (file)
--- a/tests/libsocialweb/Makefile.am
+++ b/tests/libsocialweb/Makefile.am
@@ -26,7 +26,7 @@ LDADD = \
 
 RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \

diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index fce8e0a..6865c07 100644 (file)
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -26,7 +26,7 @@ LDADD = \
 
 RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=$(abs_top_srcdir)/tests/lib/telepathy/contactlist/ \
        --vapidir=$(abs_top_builddir)/tests/lib/telepathy/contactlist/ \

diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
index 711fe6c..2bda2ee 100644 (file)
--- a/tests/tracker/Makefile.am
+++ b/tests/tracker/Makefile.am
@@ -24,7 +24,7 @@ LDADD = \
 
 RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus-tracker.sh
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \