From 659352e2aae65bb841f15357c1d503f3f03470c3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 15 Feb 2001 03:56:36 +0000 Subject: [PATCH] * automake.in (add_depend2): Only emit a given object rule once. Fixes specflags6.test. --- ChangeLog | 5 +++++ THANKS | 1 + automake.in | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7a8d9d2c..de8a8072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-02-14 Tom Tromey + + * automake.in (add_depend2): Only emit a given object rule once. + Fixes specflags6.test. + 2001-02-14 Richard Boulton * tests/specflags6.test: New file. diff --git a/THANKS b/THANKS index 0c06acf8..eaf5e871 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 aedac6af..ba7b4ddb 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"}; -- 2.43.5