tests: prefer AM_... variables to user-reserved ones in Makefile

* tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ...
(AM_TAP_LOG_DRIVER_FLAGS): ... to this.

diff --git a/ChangeLog b/ChangeLog
index 460c21314f04bae61338d0c7e8c04fa5156f5fab..9ff3427337d7930dcccced5b507d08a9105b2e65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: prefer AM_... variables to user-reserved ones in Makefile
+       * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ...
+       (AM_TAP_LOG_DRIVER_FLAGS): ... to this.
+
 2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: some minor fixlets w.r.t. TAP-based tests

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0414e4f04532b896bbf71d353061c5f523e67064..d12c6539c0ff5b7bc2f492a76150bda91e7e7b75 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,7 @@
 
 TEST_EXTENSIONS = .test .tap
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-TAP_LOG_DRIVER_FLAGS = --merge
+AM_TAP_LOG_DRIVER_FLAGS = --merge
 
 MAINTAINERCLEANFILES =
 EXTRA_DIST = ChangeLog-old

diff --git a/tests/Makefile.in b/tests/Makefile.in
index cec28b91bf1b466caa41e1a4c7d2ed42a4ea0602..faad2ae2a0dd5307427006c30005b97c2b350057 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -280,7 +280,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TEST_EXTENSIONS = .test .tap
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-TAP_LOG_DRIVER_FLAGS = --merge
+AM_TAP_LOG_DRIVER_FLAGS = --merge
 MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
        $(TESTS) tap-functions.sh plain-functions.sh \