* automake.in (handle_programs): Ooops. Really add LDADD

objects into _DEPENDENCIES.
* tests/libobj12.test: Check for it.

diff --git a/ChangeLog b/ChangeLog
index bff6e4f4e245f834f20f5912360a1c5256ef3457..0fb91818fe1fc2f3a2ad3cb12dda2d8021dd5063 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-17  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (handle_programs): Ooops.  Really add LDADD
+       objects into _DEPENDENCIES.
+       * tests/libobj12.test: Check for it.
+
 2002-09-17  Assar Westerlund  <assar@kth.se>
            Alexandre Duret-Lutz  <duret_g@epita.fr>
 

diff --git a/automake.in b/automake.in
index 7aa655a4910cf4fe0841187308bf99f560ead39e..5fa9086afc821533e8c2cca8af70957cdbf12004 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3125,7 +3125,7 @@ sub handle_programs
          # generate _DEPENDENCIES when appropriate.
          if (variable_defined ('LDADD'))
            {
-             $seen_libobjs = $seen_global_libobjs;
+             $seen_libobjs = &handle_lib_objects ($xname, 'LDADD');
            }
          elsif (! variable_defined ($xname . '_DEPENDENCIES'))
            {

diff --git a/tests/libobj12.test b/tests/libobj12.test
index 0e4ef9c33c5e1909c3b45a489cd89b8b548e38a0..ef47c883a1cbc6ee4cac7d20783d55d711f855ec 100755 (executable)
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -68,6 +68,7 @@ noinst_PROGRAMS = a b
 LDADD = @LIBOBJS@
 END
 $AUTOMAKE
+grep 'a_DEPENDENCIES.*LIBOBJS' Makefile.in
 echo 'a_SOURCES = foo.c' >> Makefile.am
 $AUTOMAKE 2>stderr && exit 1
 cat stderr