From f1c2fed4c54a793ca00a85f49cd9bab9b8c1ca8d Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 17 Sep 2002 21:11:48 +0000 Subject: [PATCH] * automake.in (handle_programs): Ooops. Really add LDADD objects into _DEPENDENCIES. * tests/libobj12.test: Check for it. --- ChangeLog | 6 ++++++ automake.in | 2 +- tests/libobj12.test | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bff6e4f4..0fb91818 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-17 Alexandre Duret-Lutz + + * automake.in (handle_programs): Ooops. Really add LDADD + objects into _DEPENDENCIES. + * tests/libobj12.test: Check for it. + 2002-09-17 Assar Westerlund Alexandre Duret-Lutz diff --git a/automake.in b/automake.in index 7aa655a4..5fa9086a 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 0e4ef9c3..ef47c883 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 -- 2.43.5