From: Tom Tromey <tromey@redhat.com>
Date: Thu, 15 Feb 2001 03:56:36 +0000 (+0000)
Subject: 	* automake.in (add_depend2): Only emit a given object rule once.
X-Git-Tag: handle-languages~298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d1fd74854fc34b595231d83f29766544344c59d;p=thirdparty%2Fautomake.git

	* automake.in (add_depend2): Only emit a given object rule once.
	Fixes specflags6.test.
---

diff --git a/ChangeLog b/ChangeLog
index 7a8d9d2cb..de8a80720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-14  Tom Tromey  <tromey@redhat.com>
+
+	* automake.in (add_depend2): Only emit a given object rule once.
+	Fixes specflags6.test.
+
 2001-02-14  Richard Boulton  <richard@tartarus.org>
 
 	* tests/specflags6.test: New file.
diff --git a/THANKS b/THANKS
index 0c06acf81..eaf5e871c 100644
--- a/THANKS
+++ b/THANKS
@@ -117,6 +117,7 @@ Ralf Corsepius		corsepiu@faw.uni-ulm.de
 Ralph Schleicher	rs@purple.UL.BaWue.DE
 Ramón García Fernández	ramon@jl1.quim.ucm.es
 Rich Wales		richw@webcom.com
+Richard Boulton		richard@tartarus.org
 Rob Savoye		rob@cygnus.com
 Robert Bihlmeyer	robbe@orcus.priv.at
 Robert Boehne		rboehne@ricardo-us.com
diff --git a/automake.in b/automake.in
index aedac6afa..ba7b4ddb4 100755
--- a/automake.in
+++ b/automake.in
@@ -2880,6 +2880,7 @@ sub add_depend2
 	$xform .= 's/\@AMDEP\@.*$//;';
     }
 
+    local (%seen_files) = ();
     while ($i < $max)
     {
 	$derived = $list[$i];
@@ -2887,6 +2888,11 @@ sub add_depend2
 	$obj = $list[$i + 2];
 	$i += 3;
 
+	# We might see a given object twice, for instance if it is
+	# used under different conditions.
+	next if defined $seen_files{$obj};
+	$seen_files{$obj} = 1;
+
 	my $val = "${derived}_${flag}";
 
 	my $obj_compile = $language_map{"$lang-compile"};