further ansi2knr bug fixes

diff --git a/ChangeLog b/ChangeLog
index 4a97beb8ee88c12f69b85c6db7ce9cd9734fd6a3..405f36f7383bc08098d494937ac9ca0ccb90efea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Sun Apr 27 11:03:36 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_yacc_lex_cxx): Correctly compute
+       de_ansi_sources.
+
+       * clean-kr.am (distclean-kr): Do nothing; ansi2knr is removed in
+       kr-extra.am.
+
        * Makefile.am: Check to make sure there are no accidental
        configure substitutions.
 

diff --git a/automake.in b/automake.in
index 4a1e5568a6d333ec709ba8004c7cb1bb4d123f55..67790f6a44017e30ca1afed69d8866112e1dcdcf 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -916,8 +916,12 @@ sub handle_yacc_lex_cxx
                                     ':', '$(ANSI2KNR)'));
        # The ._c files also depend on ansi2knr.  We need both because
        # some makes don't apply transitivity through implicit rules.
-       local (%de_ansi_sources);
-       grep (($de_ansi_sources{$_} = $_) =~ s/o$/c/, keys %de_ansi_objects);
+       local (%de_ansi_sources, $val, $x);
+       foreach $x (keys %de_ansi_objects)
+       {
+           $x =~ s/o$/c/;
+           $de_ansi_sources{$x} = 1;
+       }
        &pretty_print_rule ('', '', ((sort keys %de_ansi_sources),
                                     ':', '$(ANSI2KNR)'));
     }

diff --git a/clean-kr.am b/clean-kr.am
index 6307d038529ff42e3fd6828d0bb32b8e2ece95f3..b5859e26489006a50807ddc01b6142ba494199a9 100644 (file)
--- a/clean-kr.am
+++ b/clean-kr.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,6 +21,5 @@ mostlyclean-kr:
 clean-kr:
 
 distclean-kr:
-       rm -f ansi2knr
 
 maintainer-clean-kr: