Re: FYI: check LIBOBJS duplicates on a per-target/library basis

[Alexandre Duret-Lutz]

This fix and check a bug I introduced in the previous patch.  Sorry.

2002-09-17  Alexandre Duret-Lutz  <address@hidden>

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

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1353
diff -u -r1.1353 automake.in
--- automake.in 17 Sep 2002 20:53:08 -0000      1.1353
+++ automake.in 17 Sep 2002 21:09:40 -0000
@@ -3125,7 +3125,7 @@
          # 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'))
            {
Index: tests/libobj12.test
===================================================================
RCS file: /cvs/automake/automake/tests/libobj12.test,v
retrieving revision 1.1
diff -u -r1.1 libobj12.test
--- tests/libobj12.test 17 Sep 2002 20:53:09 -0000      1.1
+++ tests/libobj12.test 17 Sep 2002 21:09:50 -0000
@@ -68,6 +68,7 @@
 LDADD = @LIBOBJS@
 END
 $AUTOMAKE
+grep 'a_DEPENDENCIES.*LIBOBJS' Makefile.in
 echo 'a_SOURCES = foo.c' >> Makefile.am
 $AUTOMAKE 2>stderr && exit 1
 cat stderr

-- 
Alexandre Duret-Lutz