[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-49-gebd8c6d

[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=ebd8c6da618f519bde2559b7db750e1185a7f9a2

The branch, master has been updated
       via  ebd8c6da618f519bde2559b7db750e1185a7f9a2 (commit)
      from  642786a5f68161ef9d69a88cbae6c97ecbc6de32 (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 ebd8c6da618f519bde2559b7db750e1185a7f9a2
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Apr 27 22:26:04 2009 +0200

    silent-rules: fix alignment of less verbose output.
    
    * automake.in (define_verbose_var): Define `$silent_var' as
    VAR_ASIS, not VAR_PRETTY, to avoid squashing of multiple
    adjacent spaces.
    * tests/silent.test: Amend test.
    Report by Jan Engelhardt.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog         |    9 +++++++++
 automake.in       |    5 ++++-
 tests/silent.test |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36cc6b6..6ad0409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-27  Ralf Wildenhues  <address@hidden>
+
+       silent-rules: fix alignment of less verbose output.
+       * automake.in (define_verbose_var): Define `$silent_var' as
+       VAR_ASIS, not VAR_PRETTY, to avoid squashing of multiple
+       adjacent spaces.
+       * tests/silent.test: Amend test.
+       Report by Jan Engelhardt.
+
 2009-04-25  Ralf Wildenhues  <address@hidden>
 
        manual: fix trivial grammar errors.
diff --git a/automake.in b/automake.in
index fe2ff3d..20ef3bd 100755
--- a/automake.in
+++ b/automake.in
@@ -1158,12 +1158,15 @@ sub define_verbose_var ($$)
     my ($name, $val) = @_;
     my $var = verbose_var ($name);
     my $pvar = verbose_private_var ($name);
+    my $silent_var = $pvar . '_0';
     if (option 'silent-rules')
       {
        # Using `$V' instead of `$(V)' breaks IRIX make.
        define_variable ($var, '$(' . $pvar . '_$(V))', INTERNAL);
        define_variable ($pvar . '_', '$(' . $pvar . 
'_$(AM_DEFAULT_VERBOSITY))', INTERNAL);
-       define_variable ($pvar . '_0', $val, INTERNAL);
+       Automake::Variable::define ($silent_var, VAR_AUTOMAKE, '', TRUE, $val,
+                                   '', INTERNAL, VAR_ASIS)
+         if (! vardef ($silent_var, TRUE));
       }
 }
 
diff --git a/tests/silent.test b/tests/silent.test
index 4eb11d5..73d6bff 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -66,7 +66,7 @@ cat stdout
 grep ' -c' stdout && Exit 1
 grep ' -o foo' stdout && Exit 1
 grep mv stdout && Exit 1
-grep 'CC .*foo\.' stdout
+grep 'CC    .*foo\.' stdout
 grep 'CC .*bar\.' stdout
 grep 'CC .*baz\.' stdout
 grep 'CC .*bla\.' stdout


hooks/post-receive
-- 
GNU Automake