[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-55-g27f63d4

[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=27f63d48b2cbf9a8a0af1185821929fade57298f

The branch, master has been updated
       via  27f63d48b2cbf9a8a0af1185821929fade57298f (commit)
      from  b6bebfca48c126f13ff9ddc86c809564b3d7e56a (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 27f63d48b2cbf9a8a0af1185821929fade57298f
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>

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

Summary of changes:
 ChangeLog         |   10 ++++++++++
 THANKS            |    1 +
 doc/automake.texi |    9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 722ac98..329879c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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-03  Ralf Wildenhues  <address@hidden>
 
        Fix copyright years in *.am files.
diff --git a/THANKS b/THANKS
index 2017bcb..bf2be2d 100644
--- a/THANKS
+++ b/THANKS
@@ -187,6 +187,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 09a5dd2..e877942 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1775,6 +1775,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.
 
@@ -9565,7 +9570,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


hooks/post-receive
-- 
GNU Automake