[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1b-129-g73e9f71

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=73e9f71c130dd620350553752d63edb761336e0e

The branch, master has been updated
       via  73e9f71c130dd620350553752d63edb761336e0e (commit)
       via  f637fc39a65cac7eb7050359e6c352a235f64528 (commit)
       via  24dbfd93188d5302545d55b59a3853b2115a982e (commit)
       via  d3844bbf1e1fb6ee580e24a9746ed5753b8c00b0 (commit)
       via  3d9997bc7128f8ffa91590e7fa69dea9b2b23a46 (commit)
       via  43e25e3849a040a4bb2dd9bab04446f0c9e88f69 (commit)
       via  9fa6029855f48e73ebac0243e1ccebe3628730ee (commit)
       via  4cb56244fa7d51fe105784ccf6447604753e6ac6 (commit)
       via  711fb0c7252e3c0538ba089b356fa55bc77e1c3c (commit)
      from  b9384c4a1b1340aba53b979c7840bb6a1d3e70b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73e9f71c130dd620350553752d63edb761336e0e
Merge: b9384c4 f637fc3
Author: Stefano Lattarini <address@hidden>
Date:   Fri Feb 15 15:39:02 2013 +0100

    Merge branch 'maint'
    
    * maint:
      typofix: in comments in 't/ax/test-lib.sh'
      tests on TAP: don't run the driver with perl unconditionally
      typofix: in comments in 'automake.in'
      tests: remove obsolete (and now wrong) comment
      typofix: in diagnostic in test 't/tap-realtime.sh'
      automake: fix reference to relevant tests in comments
      NEWS: we no longer plan to drop $(INCLUDES) support in next major version

-----------------------------------------------------------------------

Summary of changes:
 NEWS                |    4 ----
 automake.in         |   10 +++++-----
 t/ax/am-test-lib.sh |    2 --
 t/ax/tap-setup.sh   |    2 +-
 t/ax/test-lib.sh    |    2 +-
 t/tap-realtime.sh   |    2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index de85f94..2e26485 100644
--- a/NEWS
+++ b/NEWS
@@ -80,10 +80,6 @@ New in 1.13.2:
     DJGPP project).  Note however that both Cygwin and MSYS/MinGW on
     modern Windows versions will continue to be fully supported.
 
-  - Support for the long-deprecated INCLUDES variable will be removed
-    altogether in Automake 1.14.  The AM_CPPFLAGS variable should be
-    used instead.
-
   - Automake-provided scripts and makefile recipes might (finally!)
     start assuming a POSIX shell in Automake 1.14.
 
diff --git a/automake.in b/automake.in
index 4776581..70214e4 100644
--- a/automake.in
+++ b/automake.in
@@ -5127,7 +5127,7 @@ sub scan_autoconf_config_files ($$)
       # Handle $local:$input syntax.
       my ($local, @rest) = split (/:/);
       @rest = ("$local.in",) unless @rest;
-      # Keep in sync with 'conffile-leading-dot.test'.
+      # Keep in sync with test 'conffile-leading-dot.sh'.
       msg ('unsupported', $where,
            "omit leading './' from config file names such as '$local';"
            . "\nremake rules might be subtly broken otherwise")
@@ -5951,7 +5951,7 @@ sub register_language (%)
   # Update the pattern of known extensions.
   accept_extensions (@{$lang->extensions});
 
-  # Upate the $suffix_rule map.
+  # Update the $suffix_rule map.
   foreach my $suffix (@{$lang->extensions})
     {
       foreach my $dest (&{$lang->output_extensions} ($suffix))
@@ -6541,7 +6541,7 @@ sub read_am_file ($$)
                # otherwise OSF make will implicitly copy the included
                # file in the build tree during "make distdir" to satisfy
                # the dependency.
-               # (subdircond2.test and subdircond3.test will fail.)
+               # (subdir-am-cond.sh and subdir-ac-cond.sh will fail)
                push_dist_common ("\$\(top_srcdir\)/$path");
              }
            else
@@ -6552,7 +6552,7 @@ sub read_am_file ($$)
                # otherwise OSF make will implicitly copy the included
                # file in the build tree during "make distdir" to satisfy
                # the dependency.
-               # (subdircond2.test and subdircond3.test will fail.)
+               # (subdir-am-cond.sh and subdir-ac-cond.sh will fail)
                push_dist_common ("\$\(srcdir\)/$path");
                $path = $relative_dir . "/" . $path if $relative_dir ne '.';
              }
@@ -7388,7 +7388,7 @@ sub push_required_file
     }
   # This is needed to allow a construct in a non-top-level Makefile.am
   # to require a file in the build-aux directory (see at least the test
-  # script 'test-driver-is-distributed.test').  This is related to the
+  # script 'test-driver-is-distributed.sh').  This is related to the
   # automake bug#9546.  Note that the use of $config_aux_dir instead
   # of $am_config_aux_dir here is deliberate and necessary.
   elsif ($dir eq $config_aux_dir)
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 0ceb4d0..1662d38 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -439,8 +439,6 @@ fetch_tap_driver ()
     || framework_failure_ "couldn't fetch $am_tap_implementation TAP driver"
   sed 10q tap-driver # For debugging.
 }
-# The shell/awk implementation of the TAP driver is still mostly dummy, so
-# use the perl implementation by default for the moment.
 am_tap_implementation=${am_tap_implementation-shell}
 
 # $PYTHON and support for PEP-3147.  Needed to check our python-related
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
index 4fef7b3..6955c86 100644
--- a/t/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
@@ -36,7 +36,7 @@ fetch_tap_driver
 if test -f Makefile.am~; then
   mv -f Makefile.am~ Makefile.am \
     || fatal_ "failed to restore Makefile.am"
-  echo 'TEST_LOG_DRIVER = $(PERL) $(srcdir)/tap-driver' >> Makefile.am \
+  echo 'TEST_LOG_DRIVER = $(srcdir)/tap-driver' >> Makefile.am \
     || fatal_ "failed to update Makefile.am"
   $AUTOMAKE Makefile \
     || fatal_ "failed to remake Makefile.in"
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 81f9170..a3c16ee 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -258,7 +258,7 @@ am_set_exit_traps ()
   trap "fatal_ 'caught signal SIGINT'" 2
   trap "fatal_ 'caught signal SIGTERM'" 15
   # Various shells seems to just ignore SIGQUIT under some circumstances,
-  # even if the signal is not blocked; however, if the signal it trapped,
+  # even if the signal is not blocked; however, if the signal is trapped,
   # the trap gets correctly executed.  So we also trap SIGQUIT.
   # Here is a list of some shells that have been verified to exhibit the
   # problematic behavior with SIGQUIT:
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
index 11e607d..e9b2b0c 100755
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
@@ -45,7 +45,7 @@ rm -f expect-check
 # user as soon as it gets it.
 if ! using_gmake; then
   case $MAKE in
-    *\ -j*) skip_ "doesn't with non-GNU concurrent make";;
+    *\ -j*) skip_ "doesn't work with non-GNU concurrent make";;
   esac
   # Prevent Sun Distributed Make from trying to run in parallel.
   DMAKE_MODE=serial; export DMAKE_MODE


hooks/post-receive
-- 
GNU Automake