/[autoconf]/autoconf/bin/autoscan.in
ViewVC logotype

Diff of /autoconf/bin/autoscan.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.88 by akim, Fri Oct 25 08:22:52 2002 UTC revision 1.89 by adl, Thu Nov 7 14:11:31 2002 UTC
# Line 368  sub scan_file () Line 368  sub scan_file ()
368      if -f "$_.in";      if -f "$_.in";
369    
370    # Save $_ as Find::File requires it to be preserved.    # Save $_ as Find::File requires it to be preserved.
371    my $underscore = $_;    local $_ = $_;
372    
373    # Strip a useless leading `./'.    # Strip a useless leading `./'.
374    $File::Find::name =~ s,^\./,,;    $File::Find::name =~ s,^\./,,;
# Line 383  sub scan_file () Line 383  sub scan_file ()
383        used 'program', 'c++', $File::Find::name;        used 'program', 'c++', $File::Find::name;
384        scan_c_file ($_);        scan_c_file ($_);
385      }      }
386    elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile(\.in)?$/)    elsif ((/^((?:GNUm|M|m)akefile)(\.in)?$/ && ! -f "$1.am")
387             || /^(?:GNUm|M|m)akefile(\.am)?$/)
388      {      {
389        scan_makefile ($_);        scan_makefile ($_);
390      }      }
# Line 391  sub scan_file () Line 392  sub scan_file ()
392      {      {
393        scan_sh_file ($_);        scan_sh_file ($_);
394      }      }
   
   $_ = $underscore;  
395  }  }
396    
397    
# Line 519  sub output ($) Line 518  sub output ($)
518    output_kind ($file, 'identifier');    output_kind ($file, 'identifier');
519    output_kind ($file, 'function');    output_kind ($file, 'function');
520    
521    # Change DIR/Makefile.in to DIR/Makefile.    if (@makefiles)
   foreach my $m (@makefiles)  
522      {      {
523        $m =~ s/\.in$//;        # Change DIR/Makefile.in to DIR/Makefile.
524        $unique_makefiles{$m}++;        foreach my $m (@makefiles)
525            {
526              $m =~ s/\.(?:in|am)$//;
527              $unique_makefiles{$m}++;
528            }
529          print $file ("\nAC_CONFIG_FILES([",
530                       join ("\n                 ",
531                             sort keys %unique_makefiles), "])\n");
532      }      }
   print $file "\nAC_CONFIG_FILES([",  
        join ("\n                 ", sort keys %unique_makefiles), "])\n";  
533    print $file "AC_OUTPUT\n";    print $file "AC_OUTPUT\n";
534    
535    $file->close;    $file->close;

Legend:
Removed from v.1.88  
changed lines
  Added in v.1.89

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26