[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)
      from  c98238eba0fdb09b29ac7ef198b0ad101189f1bb (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.

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

Summary of changes:
 ChangeLog         |   20 ++++++++++++++++++++
 THANKS            |    1 +
 doc/automake.texi |   20 +++++++++++++++++++-
 tests/Makefile.am |    4 +++-
 tests/Makefile.in |    4 +++-
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8150bb..df7f536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+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
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/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