* bin/autoscan.in (&scan_c_file, &scan_sh_file, &scan_makefile):

Remove $filepath, useless.
(&scan_makefile): Don't remove the $(FOO), ${FOO} and @FOO@
variables, they are really part of the tokens.
Split the input line on spaces and then look for tokens.
Now autoscan ceases to ask for AC_PROG_LEX for the package Bison
because of `lex$U.$(OBJEXT)'.
(&scan_files): Use "@list" instead of join.
* doc/Makefile.am (CLEANFILES): Add *.fns.

diff --git a/ChangeLog b/ChangeLog
index deba39bb865a48874c79ab32784e409264afa137..fa48c1ee47557d077f680ec85678a115db094176 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+       * bin/autoscan.in (&scan_c_file, &scan_sh_file, &scan_makefile):
+       Remove $filepath, useless.
+       (&scan_makefile): Don't remove the $(FOO), ${FOO} and @FOO@
+       variables, they are really part of the tokens.
+       Split the input line on spaces and then look for tokens.
+       Now autoscan ceases to ask for AC_PROG_LEX for the package Bison
+       because of `lex$U.$(OBJEXT)'.
+       (&scan_files): Use "@list" instead of join.
+       * doc/Makefile.am (CLEANFILES): Add *.fns.
+
+       
 2001-11-26  Akim Demaille  <akim@epita.fr>
 
        * tests/autoreconf.in, tests/autom4te.in, tests/autoupdate.in:

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 56960fe1d8386a0457b7331fc1a154cc40320090..3626cc379d6532608deff28865c4d886b42a1ccf 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -207,8 +207,7 @@ sub used ($$;$)
 sub scan_c_file ($)
 {
   my ($filename) = @_;
-  my $filepath = $File::Find::name;
-  push (@cfiles, $filepath);
+  push @cfiles, $File::Find::name;
 
   # Nonzero if in a multiline comment.
   my $in_comment = 0;
@@ -279,33 +278,36 @@ sub scan_c_file ($)
 sub scan_makefile ($)
 {
   my ($filename) = @_;
-  my $filepath = $File::Find::name;
-  push (@makefiles, $filepath);
+  push @makefiles, $File::Find::name;
 
   my $file = new Autom4te::XFile "<$filename";
 
   while ($_ = $file->getline)
     {
-      # Strip out comments and variable references.
+      # Strip out comments.
       s/#.*//;
-      s/\$\([^\)]*\)//g;
-      s/\${[^\}]*}//g;
-      s/@[^@]*@//g;
 
       # Variable assignments.
       while (s/\b([a-zA-Z_]\w*)\s*=/ /)
        {
          used ('makevars', $1);
        }
-      # Libraries.
-      while (s/\B-l([a-zA-Z_]\w*)\b/ /)
-       {
-         used ('libraries', $1);
-       }
-      # Tokens in the code.
-      while (s/(?<![-\w.])([a-zA-Z_][\w+.-]+)/ /)
+      # Be sure to catch a whole word.  For instance `lex$U.$(OBJEXT)'
+      # is a single token.  Otherwise we might believe `lex' is needed.
+      foreach my $word (split (/\s+/))
        {
-         used ('programs', $1);
+         # Libraries.
+         if ($word =~ /^-l([a-zA-Z_]\w*)$/)
+           {
+             used ('libraries', $1);
+           }
+         # Tokens in the code.
+         # We allow some additional characters, e.g., `+', since
+         # autoscan/programs includes `c++'.
+         if ($word =~ /^[a-zA-Z_][\w+]*$/)
+           {
+             used ('programs', $word);
+           }
        }
     }
 
@@ -318,8 +320,7 @@ sub scan_makefile ($)
 sub scan_sh_file ($)
 {
   my ($filename) = @_;
-  my $filepath = $File::Find::name;
-  push (@shfiles, $filepath);
+  push @shfiles, $File::Find::name;
 
   my $file = new Autom4te::XFile "<$filename";
 
@@ -390,9 +391,9 @@ sub scan_files ()
 
   if ($verbose)
     {
-      print "cfiles:", join(" ", @cfiles), "\n";
-      print "makefiles:", join(" ", @makefiles), "\n";
-      print "shfiles:", join(" ", @shfiles), "\n";
+      print "cfiles: @cfiles\n";
+      print "makefiles: @makefiles\n";
+      print "shfiles: @shfiles\n";
 
       foreach my $kind (@kinds)
        {
@@ -595,7 +596,8 @@ if ($configure_ac)
   {
     check_configure_ac ($configure_ac);
   }
-
+# This close is really needed.  For some reason, probably best named
+# a bug, it seems that the dtor of $LOG is not called automatically
+# at END.  It results in a truncated file.
 $log->close;
-
 exit 0;

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d1caa969cd5d10aaf6ff8f3c51dbba1e9c81bda2..44e9005f53c49cd1f993882181d7229c0c4948c9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,7 +29,8 @@ standards_TEXINFOS = make-stds.texi
 # Files from texi2dvi that should be removed, but which Automake does
 # not know.
 CLEANFILES = autoconf.acs  autoconf.cvs  autoconf.mss  autoconf.prs \
-            autoconf.ats  autoconf.evs  autoconf.ovs  autoconf.tmp \
+            autoconf.ats  autoconf.evs  autoconf.fns  autoconf.ovs \
+             autoconf.tmp \
             autoconf*.html standards*.html \
             autoconf*.pdf standards*.pdf
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index a1fde65ae09a1e37ac26696c2b51cd489536129b..16caf816f429b62bd87fa860823a4b7244d1a6b7 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -80,7 +80,8 @@ standards_TEXINFOS = make-stds.texi
 # Files from texi2dvi that should be removed, but which Automake does
 # not know.
 CLEANFILES = autoconf.acs  autoconf.cvs  autoconf.mss  autoconf.prs \
-            autoconf.ats  autoconf.evs  autoconf.ovs  autoconf.tmp \
+            autoconf.ats  autoconf.evs  autoconf.fns  autoconf.ovs \
+             autoconf.tmp \
             autoconf*.html standards*.html \
             autoconf*.pdf standards*.pdf