From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 30 Jul 2012 19:02:59 +0000 (+0200)
Subject: [ng] cleanup: remove on almost-unused global vars: am_relative_dir
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53b5d112dcdad674b5ea4a85b9ce2401b1023291;p=thirdparty%2Fautomake.git

[ng] cleanup: remove on almost-unused global vars: am_relative_dir

* automake.in ($am_relative_dir): Delete, it was only used once ...
(generate_makefile): ... in here, so it's simpler to inline its
expansion.
(initialize_per_input): Don't reset the deleted variable.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/automake.in b/automake.in
index fed8f6a64..ceed50413 100644
--- a/automake.in
+++ b/automake.in
@@ -496,9 +496,7 @@ my $am_file = 'BUG';
 ## Variables reset by &initialize_per_input.  ##
 ## ------------------------------------------ ##
 
-# Basename and relative dir of the input file.
-my $am_relative_dir;
-# Same but wrt Makefile.in.
+# Relative dir of the output makefile.
 my $relative_dir;
 
 # Greatest timestamp of the output's dependencies (excluding
@@ -614,7 +612,6 @@ sub initialize_per_input ()
 {
     reset_local_duplicates ();
 
-    $am_relative_dir = undef;
     $relative_dir = undef;
 
     $output_deps_greatest_timestamp = 0;
@@ -6812,7 +6809,6 @@ sub generate_makefile ($$)
   my ($makefile, @inputs) = split (/:/, $output_files{$makefile_in});
 
   $relative_dir = dirname ($makefile);
-  $am_relative_dir = dirname ($makefile_am);
 
   read_main_am_file ($makefile_am, $makefile_in);
   if (handle_options)
@@ -6938,6 +6934,7 @@ sub generate_makefile ($$)
       return;
     }
 
+  my $am_relative_dir = dirname ($makefile_am);
   mkdir ($am_relative_dir, 0755) if ! -d $am_relative_dir;
 
   # We make sure that 'all:' is the first target.