* automake.in (add_depend2): Only emit a given object rule once.

	Fixes specflags6.test.

diff --git a/ChangeLog b/ChangeLog
index 7a8d9d2cbb243817b1c3079dfba51533b6d124f7..de8a80720937145764c0122f546ced2b697f316f 100644 (file)
--- 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 0c06acf81b46b7f9a701a5e178f8b4cc3b53dfd2..eaf5e871c06f0554b4bba8b224ff7c6a67588cd3 100644 (file)
--- 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 aedac6afa61c920fe49da436860500d7968de597..ba7b4ddb45fd991724a4ded2a33cb0b58ad276a0 100755 (executable)
--- 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"};