From: Tom Tromey <tromey@redhat.com>
Date: Sun, 27 Apr 1997 17:57:27 +0000 (+0000)
Subject: further ansi2knr bug fixes
X-Git-Tag: pre-ian-conditionals~9
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=75f04f3b10a2d336de1c6fe53d53b3fded13db12;p=automake.git

further ansi2knr bug fixes
---

diff --git a/ChangeLog b/ChangeLog
index 4a97beb8..405f36f7 100644
--- 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 4a1e5568..67790f6a 100755
--- 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 6307d038..b5859e26 100644
--- 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: