From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 25 Apr 2002 16:47:04 +0000 (+0000)
Subject: * automake.in (subobjname): Use the length of %subobjvar
X-Git-Tag: Release-1-6-1b~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d034c3b2e5fab46b23bd582c14b694a2748bc6a;p=thirdparty%2Fautomake.git

* automake.in (subobjname): Use the length of %subobjvar
instead	of $subobjnamenum.
(subobjnamenum): Remove.
---

diff --git a/ChangeLog b/ChangeLog
index 132be99d5..4c63b6d03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-25  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* automake.in (subobjname): Use the length of %subobjvar
+	instead	of $subobjnamenum.
+	(subobjnamenum): Remove.
+
 2002-04-25  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	For PR automake/307:
diff --git a/automake.in b/automake.in
index 930d582b8..7712b684e 100755
--- a/automake.in
+++ b/automake.in
@@ -2267,15 +2267,14 @@ sub define_objects_from_sources ($$$$$$$)
 #
 # This setup can be the case of a testsuite containing lots (>100) of
 # small C programs, all testing the same set of source files.
-my $subobjnamenum = 0;
 sub subobjname (@)
 {
     my $key = "@_";
 
     return $subobjvar{$key} if exists $subobjvar{$key};
 
-    ++$subobjnamenum;
-    my $name = "am__objects_${subobjnamenum}";
+    my $num = 1 + keys (%subobjvar);
+    my $name = "am__objects_${num}";
     $subobjvar{$key} = $name;
     return $name;
 }