[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-203-g3497cbc

[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=3497cbc55268e2daf66bf179978883fc92183cc2

The branch, master has been updated
       via  3497cbc55268e2daf66bf179978883fc92183cc2 (commit)
       via  d8efaeb33f3e662005bfe504264c54ee72b45156 (commit)
      from  c15d9a8e130cd79e9d79a8ede5a8f431ead5216f (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 3497cbc55268e2daf66bf179978883fc92183cc2
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Oct 22 21:31:46 2008 +0200

    Cleanup of per-input global variables in automake.in.
    
    * automake.in ($output_vars, $output_all, $output_header)
    ($output_rules, $output_trailer): Fix comment, and sort
    declarations in the order they will appear in the output.
    ($all_target): Unused variable, remove.
    (Variables not reset by &initialize_per_input.): New section,
    clarify that %am_file_cache is not reset.
    (initialize_per_input): Reset $am_file_name, $am_relative_dir,
    $in_file_name, $relative_dir, and $topsrcdir to `undef' rather
    than the empty string; $topsrcdir was not reset at all.  Sort
    remaining variables in the same order as in the section
    `Variables reset by &initialize_per_input'.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit d8efaeb33f3e662005bfe504264c54ee72b45156
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Oct 22 21:21:55 2008 +0200

    Let stderr output end up on fd 2 in testsuite.
    
    * tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
    descriptor 2.
    * tests/getopt.test: Fix erroneous multiple redirection,
    uncovered by above change.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog         |   21 +++++++++++++++++++++
 automake.in       |   40 +++++++++++++++++++++-------------------
 tests/defs.in     |    2 +-
 tests/getopt.test |    4 ++--
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9edc057..44390c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2008-10-22  Ralf Wildenhues  <address@hidden>
+
+       Cleanup of per-input global variables in automake.in.
+       * automake.in ($output_vars, $output_all, $output_header)
+       ($output_rules, $output_trailer): Fix comment, and sort
+       declarations in the order they will appear in the output.
+       ($all_target): Unused variable, remove.
+       (Variables not reset by &initialize_per_input.): New section,
+       clarify that %am_file_cache is not reset.
+       (initialize_per_input): Reset $am_file_name, $am_relative_dir,
+       $in_file_name, $relative_dir, and $topsrcdir to `undef' rather
+       than the empty string; $topsrcdir was not reset at all.  Sort
+       remaining variables in the same order as in the section
+       `Variables reset by &initialize_per_input'.
+
+       Let stderr output end up on fd 2 in testsuite.
+       * tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
+       descriptor 2.
+       * tests/getopt.test: Fix erroneous multiple redirection,
+       uncovered by above change.
+
 2008-10-19  Ralf Wildenhues  <address@hidden>
 
        Fix DisjConditions module to be thread-safe for perl >= 5.7.2.
diff --git a/automake.in b/automake.in
index 591b451..fea0906 100755
--- a/automake.in
+++ b/automake.in
@@ -479,13 +479,13 @@ my $topsrcdir;
 # configure's dependencies).
 my $output_deps_greatest_timestamp;
 
-# These two variables are used when generating each Makefile.in.
+# These variables are used when generating each Makefile.in.
 # They hold the Makefile.in until it is ready to be printed.
-my $output_rules;
 my $output_vars;
-my $output_trailer;
 my $output_all;
 my $output_header;
+my $output_rules;
+my $output_trailer;
 
 # This is the conditional stack, updated on if/else/endif, and
 # used to build Condition objects.
@@ -552,9 +552,6 @@ my %known_programs;
 # trailing `/'.
 my %de_ansi_files;
 
-# This is the name of the redirect `all' target to use.
-my $all_target;
-
 # This keeps track of which extensions we've seen (that we care
 # about).
 my %extension_seen;
@@ -584,6 +581,13 @@ my $get_object_extension_was_run;
 
 # Record each file processed by make_paragraphs.
 my %transformed_files;
+
+
+################################################################
+
+## ---------------------------------------------- ##
+## Variables not reset by &initialize_per_input.  ##
+## ---------------------------------------------- ##
 
 # Cache each file processed by make_paragraphs.
 # (This is different from %transformed_files because
@@ -625,19 +629,20 @@ sub initialize_per_input ()
 {
     reset_local_duplicates ();
 
-    $am_file_name = '';
-    $am_relative_dir = '';
+    $am_file_name = undef;
+    $am_relative_dir = undef;
 
-    $in_file_name = '';
-    $relative_dir = '';
+    $in_file_name = undef;
+    $relative_dir = undef;
+    $topsrcdir = undef;
 
     $output_deps_greatest_timestamp = 0;
 
-    $output_rules = '';
     $output_vars = '';
-    $output_trailer = '';
     $output_all = '';
     $output_header = '';
+    $output_rules = '';
+    $output_trailer = '';
 
     Automake::Options::reset;
     Automake::Variable::reset;
@@ -652,6 +657,10 @@ sub initialize_per_input ()
     @check_tests = ();
 
     %clean_files = ();
+    %compile_clean_files = ();
+
+    # We always include `.'.  This isn't strictly correct.
+    %libtool_clean_directories = ('.' => 1);
 
     @sources = ();
     @dist_sources = ();
@@ -669,8 +678,6 @@ sub initialize_per_input ()
 
     %de_ansi_files = ();
 
-    $all_target = '';
-
     %extension_seen = ();
 
     %language_scratch = ();
@@ -683,11 +690,6 @@ sub initialize_per_input ()
 
     $get_object_extension_was_run = 0;
 
-    %compile_clean_files = ();
-
-    # We always include `.'.  This isn't strictly correct.
-    %libtool_clean_directories = ('.' => 1);
-
     %transformed_files = ();
 }
 
diff --git a/tests/defs.in b/tests/defs.in
index c0e310f..e7d9d39 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -382,7 +382,7 @@ AUTOMAKE_run ()
   shift
   exitcode=0
   $AUTOMAKE ${1+"$@"} >stdout 2>stderr || exitcode=$?
-  cat stderr
+  cat stderr >&2
   cat stdout
   test $exitcode = $expected_exitcode || Exit 1
 }
diff --git a/tests/getopt.test b/tests/getopt.test
index 46fcb4e..8dc9512 100755
--- a/tests/getopt.test
+++ b/tests/getopt.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2008  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
@@ -31,7 +31,7 @@ grep ':.*nonexistent' stderr && Exit 1
 
 
 # Similarly, this should fail ...
-AUTOMAKE_fails --nonexistent 2>stderr
+AUTOMAKE_fails --nonexistent
 grep ':.*nonexistent' stderr
 
 # ... but this should not.


hooks/post-receive
--
GNU Automake