[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-61-g2e705c4

[Ralf Wildenhues]

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=2e705c49f9742e52354de14bffbc4260a1ff375a

The branch, branch-1-10 has been updated
       via  2e705c49f9742e52354de14bffbc4260a1ff375a (commit)
       via  539cd6b9e27e480b6412b3ea4652b14f9c15b051 (commit)
       via  c98238eba0fdb09b29ac7ef198b0ad101189f1bb (commit)
      from  8a10270329377c9558103e1d8ddeb88b767c19be (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 2e705c49f9742e52354de14bffbc4260a1ff375a
Author: Ralf Wildenhues <address@hidden>
Date:   Tue May 12 00:15:43 2009 +0200

    Document some formatting restrictions for Makefile.am files.
    
    For PR automake/540:
    * doc/automake.texi (General Operation, Usage of Conditionals):
    Variable assignments should not be indented by TABs, rule commands
    should.  Conditional keyword statements should not be indented.
    Report by address@hidden
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 539cd6b9e27e480b6412b3ea4652b14f9c15b051
Author: Ralf Wildenhues <address@hidden>
Date:   Tue May 12 08:07:15 2009 +0200

    Recommend *-local hooks without commands, for extensibility.
    
    * doc/automake.texi (Clean): Show how to write the clean-local
    extension with separate phony target.
    * tests/Makefile.am (distclean-local-check): Practice what we
    preach by marking this phony, and a prerequisite of ...
    (distclean-local): ... this.

commit c98238eba0fdb09b29ac7ef198b0ad101189f1bb
Author: Eric Blake <address@hidden>
Date:   Tue Apr 28 15:19:41 2009 -0600

    scripts: normalize all timestamps to UTC
    
    * lib/compile (scriptversion): Update emacs hook.
    * lib/depcomp (scriptversion): Likewise.
    * lib/elisp-comp (scriptversion): Likewise.
    * lib/gnupload (scriptversion): Likewise.
    * lib/install-sh (scriptversion): Likewise.
    * lib/mdate-sh (scriptversion): Likewise.
    * lib/missing (scriptversion): Likewise.
    * lib/mkinstalldirs (scriptversion): Likewise.
    * lib/py-compile (scriptversion): Likewise.
    * lib/ylwrap (scriptversion): Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog         |   34 ++++++++++++++++++++++++++++++++++
 THANKS            |    1 +
 doc/automake.texi |   20 +++++++++++++++++++-
 lib/compile       |    5 +++--
 lib/depcomp       |    5 +++--
 lib/elisp-comp    |    8 +++++---
 lib/gnupload      |    5 +++--
 lib/install-sh    |    5 +++--
 lib/mdate-sh      |    9 +++++----
 lib/missing       |    7 ++++---
 lib/mkinstalldirs |    5 +++--
 lib/py-compile    |    8 +++++---
 lib/ylwrap        |    7 ++++---
 tests/Makefile.am |    4 +++-
 tests/Makefile.in |    4 +++-
 15 files changed, 98 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 118b34e..df7f536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2009-05-11  Ralf Wildenhues  <address@hidden>
+
+       For PR automake/540:
+       Document some formatting restrictions for Makefile.am files.
+       * doc/automake.texi (General Operation, Usage of Conditionals):
+       Variable assignments should not be indented by TABs, rule commands
+       should.  Conditional keyword statements should not be indented.
+       * THANKS: Update.
+       Report by Luo Yi.
+
+2009-05-02  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Recommend *-local hooks without commands, for extensibility.
+       * doc/automake.texi (Clean): Show how to write the clean-local
+       extension with separate phony target.
+       * tests/Makefile.am (distclean-local-check): Practice what we
+       preach by marking this phony, and a prerequisite of ...
+       (distclean-local): ... this.
+
+2009-04-28  Eric Blake  <address@hidden>
+
+       scripts: normalize all timestamps to UTC
+       * lib/compile (scriptversion): Update emacs hook.
+       * lib/depcomp (scriptversion): Likewise.
+       * lib/elisp-comp (scriptversion): Likewise.
+       * lib/gnupload (scriptversion): Likewise.
+       * lib/install-sh (scriptversion): Likewise.
+       * lib/mdate-sh (scriptversion): Likewise.
+       * lib/missing (scriptversion): Likewise.
+       * lib/mkinstalldirs (scriptversion): Likewise.
+       * lib/py-compile (scriptversion): Likewise.
+       * lib/ylwrap (scriptversion): Likewise.
+
 2009-04-25  Ralf Wildenhues  <address@hidden>
 
        manual: fix trivial grammar errors.
diff --git a/THANKS b/THANKS
index 932c9aa..e43bf63 100644
--- a/THANKS
+++ b/THANKS
@@ -178,6 +178,7 @@ Laurent Morichetti  address@hidden
 Leo Davis              address@hidden
 Leonardo Boiko         address@hidden
 Loulou Pouchet         address@hidden
+Luo Yi                 address@hidden
 Maciej Stachowiak      address@hidden
 Maciej W. Rozycki      address@hidden
 Manu Rouat             address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index d294844..ea31274 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1718,6 +1718,11 @@ supported.  This operator appends its right hand 
argument to the variable
 specified on the left.  Automake will translate the operator into
 an ordinary @samp{=} operator; @samp{+=} will thus work with any make program.
 
address@hidden indentation
+Further note that variable assignments should not be indented with
address@hidden characters, use spaces if necessary.  On the other hand,
+rule commands should be indented with a leading @key{TAB} character.
+
 Automake tries to keep comments grouped with any adjoining rules or
 variable definitions.
 
@@ -7812,6 +7817,17 @@ clean-local:
         -rm -rf testSubDir
 @end example
 
+Since @command{make} allows only one set of rules for a given target,
+a more extensible way of writing this is to use a separate target
+listed as a dependency:
+
address@hidden
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
+        -rm -rf testSubDir
address@hidden example
+
 As the GNU Standards aren't always explicit as to which files should
 be removed by which rule, we've adopted a heuristic that we believe
 was first formulated by Fran@,{c}ois Pinard:
@@ -8870,7 +8886,9 @@ endif !DEBUG
 @end example
 
 @noindent
-Unbalanced conditions are errors.
+Unbalanced conditions are errors.  The @code{if}, @code{else}, and
address@hidden statements should not be indented, i.e., start on column
+one.
 
 The @code{else} branch of the above two examples could be omitted,
 since assigning the empty string to an otherwise undefined variable
diff --git a/lib/compile b/lib/compile
index 61e0321..0825b48 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2009-03-03.21
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
 # Foundation, Inc.
@@ -139,5 +139,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/depcomp b/lib/depcomp
index 18b0fc5..aeba4e8 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-22.22
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
 # Software Foundation, Inc.
@@ -627,5 +627,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/elisp-comp b/lib/elisp-comp
index 2d1eb65..848c71e 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,7 +1,8 @@
 #!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
 # Franc,ois Pinard <address@hidden>, 1995.
 #
@@ -85,5 +86,6 @@ cp "$@" $tempdir
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/gnupload b/lib/gnupload
index 351c667..55e5c9f 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2009-03-05.20
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
 #
@@ -409,5 +409,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/install-sh b/lib/install-sh
index a5897de..6781b98 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 83d2700..e15a1e3 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2007-03-30.02
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
+# Software Foundation, Inc.
 # written by Ulrich Drepper <address@hidden>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -201,5 +201,6 @@ echo $day $month $year
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/missing b/lib/missing
index 70871a6..ac3d51c 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2008-12-21.33
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008  Free Software Foundation, Inc.
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <address@hidden>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -373,5 +373,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index ef7e16f..4191a45 100755
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2006-05-11.19
+scriptversion=2009-04-28.21; # UTC
 
 # Original author: Noah Friedman <address@hidden>
 # Created: 1993-05-16
@@ -157,5 +157,6 @@ exit $errstatus
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/py-compile b/lib/py-compile
index d6e900b..869a60a 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -1,9 +1,10 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 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
@@ -142,5 +143,6 @@ print" 2>/dev/null || :
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/ylwrap b/lib/ylwrap
index 7278b6a..02b8bbf 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2007-11-22.22
+scriptversion=2009-04-28.21; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2009 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <address@hidden>.
 #
@@ -219,5 +219,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dfccd6a..cfcd608 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -640,5 +640,7 @@ EXTRA_DIST = ChangeLog-old $(TESTS)
 # Each test case depends on defs, aclocal, and automake.
 check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 
-distclean-local:
+distclean-local: distclean-local-check
+.PHONY: distclean-local-check
+distclean-local-check:
        -rm -rf testSubDir
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ac373b0..011dbed 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1040,7 +1040,9 @@ uninstall-am:
        pdf-am ps ps-am uninstall uninstall-am
 
 
-distclean-local:
+distclean-local: distclean-local-check
+.PHONY: distclean-local-check
+distclean-local-check:
        -rm -rf testSubDir
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


hooks/post-receive
-- 
GNU Automake