[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.1d-111-g126cd52

[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=126cd5242844fa9511cb6709fc5df72bf1851d14

The branch, maint has been updated
       via  126cd5242844fa9511cb6709fc5df72bf1851d14 (commit)
       via  5a37b0e7bf899d9b7d3835c176da926064b75bb2 (commit)
       via  66ab18aedf422dd2a463112acc8310779a7f703e (commit)
       via  53201da1387982ab0cc726e2aa79555c023111bf (commit)
       via  4ccf9a8034c597f33ce9592f06533e3cd096fd99 (commit)
      from  1021f5cf48784b6ed6b28834f14485b52b4c80e3 (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 126cd5242844fa9511cb6709fc5df72bf1851d14
Author: Stefano Lattarini <address@hidden>
Date:   Fri May 10 10:57:38 2013 +0200

    am: prefer a shorter idiom where possible
    
    That is, prefer:
    
        test -f FILE || do_action
    
    over:
    
        if test ! -f FILE; then do_action; else :; fi
    
    * lib/am/remake-hdr.am (%CONFIG_H%): Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 5a37b0e7bf899d9b7d3835c176da926064b75bb2
Merge: 1021f5c 66ab18a
Author: Stefano Lattarini <address@hidden>
Date:   Fri May 10 10:53:15 2013 +0200

    Merge branch 'branch-1.13.2' into maint
    
    * branch-1.13.2:
      cosmetics: fix few typos, grammaros and missing whitespace
      fixup: remove an obsolete comment
      docs: we still don't have the promised better Java interface

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

Summary of changes:
 THANKS                |    1 +
 doc/automake.texi     |    8 ++++----
 lib/am/check.am       |    2 +-
 lib/am/header-vars.am |    7 +++----
 lib/am/library.am     |    1 +
 lib/am/ltlibrary.am   |    1 +
 lib/am/program.am     |    1 +
 lib/am/remake-hdr.am  |    6 +++---
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/THANKS b/THANKS
index fd023e2..66b3270 100644
--- a/THANKS
+++ b/THANKS
@@ -261,6 +261,7 @@ Michael Brantley                address@hidden
 Michael Daniels                 address@hidden
 Michael Hofmann                 address@hidden
 Michael Ploujnikov              address@hidden
+Michael Zucchi                  address@hidden
 Michel de Ruiter                address@hidden
 Mike Castle                     address@hidden
 Mike Frysinger                  address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index dda78a5..8b5125e 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7603,11 +7603,11 @@ libtool, The Libtool Manual}) with the 
@code{LTLIBRARIES} primary.
 Automake provides some minimal support for Java bytecode compilation with
 the @code{JAVA} primary (in addition to the support for compiling Java to
 native machine code; @pxref{Java Support with gcj}).  Note however that
address@hidden interface and most features described here are deprecated}; the
-next automake release will strive to provide a better and cleaner
address@hidden interface and most features described here are deprecated}.
+Future Automake releases will strive to provide a better and cleaner
 interface, which however @emph{won't be backward-compatible}; the present
-interface will probably be removed altogether in future automake releases
-(1.13 or later), so don't use it in new code.
+interface will probably be removed altogether some time after the
+introduction of the new interface (if that ever materializes).
 
 Any @file{.java} files listed in a @code{_JAVA} variable will be
 compiled with @code{JAVAC} at build time.  By default, @file{.java}
diff --git a/lib/am/check.am b/lib/am/check.am
index b39395c..7012d5a 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -238,7 +238,7 @@ am__set_TESTS_bases = \
        $(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
-# exand to empty, as could happen e.g. with make check TESTS=''.
+# expand to empty, as could happen e.g. with make check TESTS=''.
 am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
 am--force-recheck:
        @:
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 4b9cc04..1a6f28e 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -33,8 +33,7 @@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n 
'$(MAKELEVEL)'
 
 ## Shell code that determines whether the current make instance is
 ## running with a given one-letter option (e.g., -k, -n) that takes
-## no argument.  Actually, the only supported option at the moment
-## is '-n' (support for '-k' will be added soon).
+## no argument.
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -53,7 +52,7 @@ am__make_running_with_option = \
 ## brittle, but is the best we can do.
     case $$MAKEFLAGS in \
 ## If we run "make TESTS='snooze nap'", FreeBSD make will export MAKEFLAGS
-## to " TESTS=foo\ nap", so that the simpler loop below (on word-splitted
+## to " TESTS=foo\ nap", so that the simpler loop below (on word-split
 ## $$MAKEFLAGS) would see a "make flag" equal to "nap", and would wrongly
 ## misinterpret that as and indication that make is running in dry mode.
 ## This has already happened in practice.  So we need this hack.
@@ -111,7 +110,7 @@ am__make_dryrun = (target_option=n; 
$(am__make_running_with_option))
 
 ## Shell code that determines whether make is running in "keep-going mode"
 ## ("make -k") or not.  Useful in rules that must recursively descend into
-## subdirectories, and decide whther to stop at the first error or not.
+## subdirectories, and decide whether to stop at the first error or not.
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 
 ## Some derived variables that have been found to be useful.
diff --git a/lib/am/library.am b/lib/am/library.am
index 2462984..c01d221 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -13,6 +13,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 %LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) 
$(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
        %SILENT%-rm -f %LIBRARY%
        %VERBOSE%$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) 
$(%XLIBRARY%_LIBADD)
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index 0c6f4c6..642d032 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -13,5 +13,6 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) 
$(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
        %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) 
$(%XLTLIBRARY%_LIBADD) $(LIBS)
diff --git a/lib/am/program.am b/lib/am/program.am
index c3b7962..131c4a9 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -13,6 +13,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 %PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) 
$(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP%
 ## Remove program before linking.  Otherwise the link will fail if the
 ## program is running somewhere.  FIXME: this could be a loss if
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index f2a203f..979427d 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -15,9 +15,9 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 %CONFIG_H%: %STAMP%
-## Recover from removal of CONFIG_HEADER
-       @if test ! -f $@; then rm -f %STAMP%; else :; fi
-       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) %STAMP%; else :; fi
+## Recover from removal of CONFIG_HEADER.
+       @test -f $@ || rm -f %STAMP%
+       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %STAMP%
 
 
 %STAMP%: %CONFIG_H_DEPS% $(top_builddir)/config.status


hooks/post-receive
-- 
GNU Automake