[FYI] {test-protocols} tests: prefer AM_... variables to user-reserved ones in Makefile

[Stefano Lattarini]

* tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ...
(AM_TAP_LOG_DRIVER_FLAGS): ... to this.
---
 ChangeLog         |    6 ++++++
 tests/Makefile.am |    2 +-
 tests/Makefile.in |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 460c213..9ff3427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-29  Stefano Lattarini  <address@hidden>
 
+       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  <address@hidden>
+
        tests: some minor fixlets w.r.t. TAP-based tests
        The variable that is used by our test scripts to decide whether
        they are "plain" or TAP-based is `using_tap'; however, some
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0414e4f..d12c653 100644
--- 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 cec28b9..faad2ae 100644
--- 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 \
-- 
1.7.2.3