[Automake-commit] [SCM] GNU Automake branch, minor, updated. v1.14.1-32-g3a851d6

[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=3a851d6432589782cf47746443da922db3bf280a

The branch, minor has been updated
       via  3a851d6432589782cf47746443da922db3bf280a (commit)
       via  9b8c797c1e262d2fc61783f421eb338b0a08c0a6 (commit)
       via  49035b4d4f65132bd5426ec57e499152b52ba2c2 (commit)
       via  accb12f10f84f1439590eb4743457b13b3ff9919 (commit)
       via  ad9804e1b825ddb304bfaf62b7108f2b6e08dc81 (commit)
       via  f0a7083afefe98aa7aecf4ece592915395947631 (commit)
      from  c020f1ef664e1ec835d856ec5485769d0a9a7386 (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 3a851d6432589782cf47746443da922db3bf280a
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 21 10:22:29 2014 +0100

    Typofixes in warning messages and manual
    
    Fixes automake bug#16827 and bug#16997.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                        |   18 +++++++++++++++---
 THANKS                      |    2 ++
 bin/automake.in             |    4 ++--
 doc/automake.texi           |    4 +++-
 lib/Automake/Rule.pm        |    2 +-
 lib/am/check.am             |    4 +++-
 lib/am/distdir.am           |    8 ++++----
 t/list-of-tests.mk          |    1 +
 t/phony.sh                  |    1 +
 t/{phony.sh => precious.sh} |   13 +++++++------
 10 files changed, 39 insertions(+), 18 deletions(-)
 copy t/{phony.sh => precious.sh} (71%)

diff --git a/NEWS b/NEWS
index 8d902c0..9fbd3ca 100644
--- a/NEWS
+++ b/NEWS
@@ -82,9 +82,9 @@ New in 1.15:
 
 * Automake-generated testsuites:
 
-  - The default test-driver used by the Automake-generates testsuites now
-    append the result and exit status of each "plain" test to the associated
-    log file (automake bug#118149).
+  - The default test-driver used by the Automake-generates testsuites
+    now append the result and exit status of each "plain" test to the
+    associated log file (automake bug#11814).
 
   - The perl implementation of the TAP testsuite driver is no longer
     installed in the Automake's scripts directory, and is instead just
@@ -93,6 +93,18 @@ New in 1.15:
     implementation of the TAP driver (that is documented in the manual)
     is more portable and has feature parity with the perl implementation.
 
+  - The rule generating 'test-suite.log' no longer risk incurring in an
+    extra useless "make all" recursive invocation in some corner cases
+    (automake bug#16302).
+
+* Bug fixes:
+
+  - The user can now extend the special .PRECIOUS target, the same way
+    he could already do with the .MAKE .and .PHONY targets.
+
+  - Fixed confusing typos in the manual and in some warning messages
+    (automake bug#16827 and bug#16997).
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.14.1:
diff --git a/THANKS b/THANKS
index 2b4f8ee..550b565 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ Adam J. Richter                 address@hidden
 Adam Mercer                     address@hidden
 Adam Sampson                    address@hidden
 Adrian Bunk                     address@hidden
+Aharon Robbins                  address@hidden
 Akim Demaille                   address@hidden
 Alan Modra                      address@hidden
 Alex Hornby                     address@hidden
@@ -152,6 +153,7 @@ Harlan Stenn                    address@hidden
 He Li                           address@hidden
 Henrik Frystyk Nielsen          address@hidden
 Hib Eris                        address@hidden
+Holger Hans Peter Freyther      address@hidden
 Ian Lance Taylor                address@hidden
 Ignacy Gawedzki                 address@hidden
 Илья Н. Голубев                 address@hidden
diff --git a/bin/automake.in b/bin/automake.in
index 283d1bb..8808300 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -4645,9 +4645,9 @@ sub handle_factored_dependencies ()
       # to append dependencies.  This would not work if Automake
       # refrained from defining its own .PHONY target as it does
       # with other overridden targets.
-      # Likewise for '.MAKE'.
+      # Likewise for '.MAKE' and '.PRECIOUS'.
       my @undefined_conds = (TRUE,);
-      if ($_ ne '.PHONY' && $_ ne '.MAKE')
+      if ($_ ne '.PHONY' && $_ ne '.MAKE' && $_ ne '.PRECIOUS')
        {
          @undefined_conds =
            Automake::Rule::define ($_, 'internal',
diff --git a/doc/automake.texi b/doc/automake.texi
index 6d90182..8b92e1c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2,6 +2,8 @@
 @c %**start of header
 @setfilename automake.info
 @settitle automake
address@hidden UTF-8
address@hidden en
 @setchapternewpage off
 @c %**end of header
 
@@ -9142,7 +9144,7 @@ and @samp{./wrapper-script -d baz} to produce 
@file{foo.log},
 as a side-effect.
 
 It's important to note that, differently from what we've seen for the
-serial test harness (@pxref{Parallel Test Harness}), the
+serial test harness (@pxref{Serial Test Harness}), the
 @code{AM_TESTS_ENVIRONMENT} and @code{TESTS_ENVIRONMENT} variables
 @emph{cannot} be use to define a custom test runner; the
 @code{LOG_COMPILER} and @code{LOG_FLAGS} (or their extension-specific
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index a28a78d..5227009 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -340,8 +340,8 @@ sub reset()
      # Tarballing.
      'dist-all'             => [],
 
-     # Phonying.
      '.PHONY'               => [],
+     '.PRECIOUS'            => [],
      # Recursive install targets (so "make -n install" works for BSD Make).
      '.MAKE'               => [],
      );
diff --git a/lib/am/check.am b/lib/am/check.am
index 7012d5a..4d2a498 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -274,7 +274,9 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
        if test -n "$$am__remaking_logs"; then \
          echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
               "recursion detected" >&2; \
-       else \
+## Invoking this unconditionally could cause a useless "make all" to
+## be invoked when '$redo_logs' expands to empty (automake bug#16302).
+       elif test -n "$$redo_logs"; then \
          am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
        fi; \
        if $(am__make_dryrun); then :; else \
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index a8ad63c..f26a857 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -339,8 +339,8 @@ dist-xz: distdir
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
 .PHONY: dist-tarZ
 dist-tarZ: distdir
-       @echo WARNING: "Support for shar distribution archives is" \
-                      "deprecated." >&2
+       @echo WARNING: "Support for distribution archives compressed with" \
+                      "legacy program 'compress' is deprecated." >&2
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__post_remove_distdir)
@@ -348,8 +348,8 @@ dist-tarZ: distdir
 ?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
 .PHONY: dist-shar
 dist-shar: distdir
-       @echo WARNING: "Support for distribution archives compressed with" \
-                      "legacy program 'compress' is deprecated." >&2
+       @echo WARNING: "Support for shar distribution archives is" \
+                      "deprecated." >&2
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
        $(am__post_remove_distdir)
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 54afd8f..a9694d8 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -838,6 +838,7 @@ t/percent.sh \
 t/percent2.sh \
 t/per-target-flags.sh \
 t/phony.sh \
+t/precious.sh \
 t/pluseq.sh \
 t/pluseq2.sh \
 t/pluseq3.sh \
diff --git a/t/phony.sh b/t/phony.sh
index dd0c54a..a632776 100644
--- a/t/phony.sh
+++ b/t/phony.sh
@@ -26,6 +26,7 @@ EOF
 
 $ACLOCAL
 $AUTOMAKE
+$FGREP '.PHONY:' Makefile.in  # For debugging.
 test $($FGREP -c '.PHONY:' Makefile.in) -eq 3
 
 :
diff --git a/t/phony.sh b/t/precious.sh
similarity index 71%
copy from t/phony.sh
copy to t/precious.sh
index dd0c54a..8750305 100644
--- a/t/phony.sh
+++ b/t/precious.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,18 +14,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure .PHONY can be given dependencies several times.
-# From Ralf Corsepius.
+# Make sure .PRECIOUS can be extended by the user, and can be given
+# dependencies several times.
 
 . test-init.sh
 
 cat >Makefile.am << 'EOF'
-.PHONY: foo
-.PHONY: bar
+.PRECIOUS: foo
+.PRECIOUS: bar
 EOF
 
 $ACLOCAL
 $AUTOMAKE
-test $($FGREP -c '.PHONY:' Makefile.in) -eq 3
+$FGREP '.PRECIOUS:' Makefile.in  # For debugging.
+test $($FGREP -c '.PRECIOUS:' Makefile.in) -eq 3
 
 :


hooks/post-receive
-- 
GNU Automake