Added --verbose

diff --git a/ChangeLog b/ChangeLog
index 8ce9144dd2b5603a92d3e9049285dfeaa4b21985..f52ee9b35f68b395fcf13c157cb702b22855b8cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 Wed Feb 14 08:36:02 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       Implemented --verbose feature; idea from Greg Woods:
+       * automake.in (verbose): New global.
+       (generate_makefile): Print creating message if verbose.
+       (grep_for_vers_texi): Print message if verbose.
+       (handle_dependencies): Ditto.
+       (scan_configure): Ditto.
+       (read_am_file): Ditto.
+       (file_contents_with_transform): Ditto.
+       (parse_arguments): Added --verbose.
+       (initialize_global_constants): Ditto.
+
        * automake.in (get_object_extension): Use am_line_error.
        (handle_source_transform): Ditto.
        (handle_libraries): Ditto.
@@ -15,6 +26,7 @@ Wed Feb 14 08:36:02 1996  Tom Tromey  <tromey@creche.cygnus.com>
        (handle_configure): Use am_line_error.
        (scan_configure): Set config_header_line.
        (config_header_line): New global.
+       Use @PERL@ to find perl during exec.  From Greg Woods.
 
 Tue Feb 13 12:06:51 1996  Tom Tromey  <tromey@creche.cygnus.com>
 

diff --git a/TODO b/TODO
index 413b7213a7c2c5808654c630cb62be70cfde30eb..9e20f26b9faf614f3de43f523830626408bb7b5f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -181,6 +181,9 @@ version.texi handling
 gettext support
 all options
 
+Should include extended version of diagram from Autoconf (suggested by
+Greg Woods)
+
 ================================================================
 
 Libraries:

diff --git a/automake.in b/automake.in
index c3465b1e6d85a93b527ba6cb1cc10d2a15378481..f42755171acdbe2ebdf4202acf2277185a612f4b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2,7 +2,7 @@
 # -*- perl -*-
 # @configure_input@
 
-eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
+eval 'exec @PERL@ -S $0 ${1+"$@"}'
     if $running_under_some_shell;
 
 # automake - create Makefile.in from Makefile.am
@@ -60,6 +60,9 @@ $default_strictness_name = 'normal';
 # code should be included in generated Makefile.in.
 $cmdline_use_dependencies = 1;
 
+# TRUE if in verbose mode.
+$verbose = 0;
+
 # This holds our (eventual) exit status.  We don't actually exit until
 # we have processed all input files.
 $exit_status = 0;
@@ -223,6 +226,10 @@ sub parse_arguments
        {
            $install_missing = 1;
        }
+       elsif ($arglist[0] eq '--verbose')
+       {
+           $verbose = 1;
+       }
        elsif ($arglist[0] eq '--')
        {
            # Stop option processing.
@@ -262,7 +269,7 @@ sub generate_makefile
 {
     local ($makefile) = @_;
 
-    # print "creating ", $makefile, ".in\n";
+    print "automake: creating ", $makefile, ".in\n" if $verbose;
 
     &initialize_per_input;
     $relative_dir = &dirname ($makefile);
@@ -636,6 +643,7 @@ sub grep_for_vers_texi
        &am_error ("couldn't open \`$filename': $!");
        return '';
     }
+    print "automake: reading $filename\n" if $verbose;
 
     while (<TEXI>)
     {
@@ -1086,6 +1094,7 @@ sub handle_dependencies
                    &am_error ("couldn't open $depfile", $!);
                    next;
                }
+               print "automake: reading $depfile\n" if $verbose;
 
                # Slurp entire file.
                $output_rules .= join ('', <DEP_FILE>);
@@ -1541,6 +1550,7 @@ sub scan_configure
 {
     open (CONFIGURE, 'configure.in')
        || die "automake: couldn't open configure.in: $!\n";
+    print "automake: reading configure.in\n" if $verbose;
 
     # Reinitialize libsources here.  This isn't really necessary,
     # since we currently assume there is only one configure.in.  But
@@ -1787,6 +1797,7 @@ sub read_am_file
             'header-vars');
 
     open (AM_FILE, $amfile) || die "automake: couldn't open $amfile: $!\n";
+    print "automake: reading $amfile\n" if $verbose;
 
     $output_vars .= ("# Makefile.in generated automatically by automake "
                     . $VERSION . " from Makefile.am\n");
@@ -1983,6 +1994,7 @@ sub initialize_global_constants
   --install-missing     install missing standard files
   --output-dir=DIR      put generated Makefile.in's into DIR
   --strictness=LEVEL    set strictness level.  LEVEL is normal, gnu, gnits
+  --verbose             verbosely list files processed
   --version             print version number, then exit\n";
 
     # Copyright on generated Makefile.ins.
@@ -2084,6 +2096,7 @@ sub file_contents_with_transform
 
     open (FC_FILE, $file)
        || die "automake: installation error: cannot open \`$file'\n";
+    print "automake: reading $file\n" if $verbose;
 
     local ($was_rule) = 0;
     local ($result_vars) = '';