From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 17 Sep 2002 21:11:49 +0000 (+0000)
Subject: * automake.in (handle_programs): Ooops.  Really add LDADD
X-Git-Tag: Release-1-6d~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13d64b8cebbd6097b960597b3167b8d055104200;p=thirdparty%2Fautomake.git

* automake.in (handle_programs): Ooops.  Really add LDADD
objects into _DEPENDENCIES.
* tests/libobj12.test: Check for it.
---

diff --git a/ChangeLog b/ChangeLog
index bff6e4f4e..0fb91818f 100644
--- 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 7aa655a49..5fa9086af 100755
--- 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 0e4ef9c33..ef47c883a 100755
--- 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