* automake.in (subobjname): Use the length of %subobjvar

instead	of $subobjnamenum.
(subobjnamenum): Remove.

diff --git a/ChangeLog b/ChangeLog
index 132be99d533fb2a4c83c97d8b1dd135d2bc951a7..4c63b6d03b19547cf0b13850b6f1321e6505d7bd 100644 (file)
--- 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 930d582b8be85f1e39e4b8478726e8f6a6c7f0c0..7712b684e6ab2cf2d79520f20e75076a98320a3e 100755 (executable)
--- 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;
 }