* automake.in: Use strict vars and subs.

Declare `%require_file_found'.
(&handle_source_transform, &make_paragraphs): Declare my variables.

diff --git a/ChangeLog b/ChangeLog
index 250ec70a40e278529f0991ba138a7186c3b0ccb2..078c985a19c0263d7c0527072a4d839fc0f206b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       * automake.in: Use strict vars and subs.
+       Declare `%require_file_found'.
+       (&handle_source_transform, &make_paragraphs): Declare my variables.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
        * data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,

diff --git a/automake.in b/automake.in
index e00e4e342a52fa458db4a09504e98f4626d2f5bd..3e53c0aaf3a73813f127e075401b1c674212d0c8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -28,7 +28,7 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}'
 # Perl reimplementation by Tom Tromey <tromey@cygnus.com>.
 
 require 5.005;
-# FIXME: use strict;
+use strict 'vars', 'subs';
 use File::Basename;
 use IO::File;
 
@@ -847,7 +847,7 @@ foreach $am_file (@input_files)
 exit $exit_status;
 
 # FIXME: This should be `my'ed next to its subs.
-# use vars '%require_file_found';
+use vars '%require_file_found';
 
 ################################################################
 
@@ -1924,7 +1924,7 @@ sub handle_source_transform
        push (@dist_sources, $unxformed . '.c');
        push (@objects, $unxformed . $obj);
 
-       ($temp, @result) =
+       my ($temp, @result) =
          &handle_single_transform_list ($one_file . '_SOURCES',
                                         $one_file, $obj,
                                         "$unxformed.c");
@@ -6746,10 +6746,10 @@ sub make_paragraphs ($%)
 
     while (defined ($_ = shift @lines))
       {
+       my $paragraph = "$_";
        # If we are a rule, eat as long as we start with a tab.
        if (/$RULE_PATTERN/smo)
          {
-           $paragraph = "$_";
            while (defined ($_ = shift @lines) && $_ =~ /^\t/)
              {
                $paragraph .= "\n$_";
@@ -6760,7 +6760,6 @@ sub make_paragraphs ($%)
        # If we are a comments, eat as much comments as you can.
        elsif (/$COMMENT_PATTERN/smo)
          {
-           $paragraph = "$_";
            while (defined ($_ = shift @lines)
                   && $_ =~ /$COMMENT_PATTERN/smo)
              {
@@ -6768,11 +6767,6 @@ sub make_paragraphs ($%)
              }
            unshift (@lines, $_);
          }
-       # Otherwise, consider it as a lone content.
-       else
-         {
-           $paragraph .= "$_";
-         }
 
        push @res, $paragraph;
        $paragraph = '';