Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1954
diff -u -w -r1.1954 ChangeLog
--- ChangeLog	24 Aug 2002 01:38:52 -0000	1.1954
+++ ChangeLog	24 Aug 2002 03:34:50 -0000
@@ -1,3 +1,8 @@
+2002-08-23  Assar Westerlund  <address@hidden>
+
+	* automake.in (check_libobjs_sources): only complain if the target
+	actually includes @LIBOBJS@ or @LTLIBOBJS@
+
 2002-08-23  Pavel Roskin  <address@hidden>
 
 	* lib/am/progs.am: Exit in case of install failure, otherwise
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1342
diff -u -w -r1.1342 automake.in
--- automake.in	23 Aug 2002 13:32:55 -0000	1.1342
+++ automake.in	24 Aug 2002 03:34:57 -0000
@@ -2177,6 +2177,20 @@
 {
     my ($one_file, $unxformed) = @_;
 
+    my @objs;
+    my $found_libobjs = 0;
+
+    @objs = &variable_value_as_list_recursive ($unxformed, 'all');
+    foreach my $i (@objs) {
+      if($i =~ /^\@(LT)address@hidden/) {
+	$found_libobjs = 1;
+	last;
+      }
+    }
+    if (!$found_libobjs) {
+      return;
+    }
+
     foreach my $prefix ('', 'EXTRA_', 'dist_', 'nodist_',
 			'dist_EXTRA_', 'nodist_EXTRA_')
     {
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.431
diff -u -w -r1.431 Makefile.am
--- tests/Makefile.am	23 Aug 2002 19:11:31 -0000	1.431
+++ tests/Makefile.am	24 Aug 2002 03:34:57 -0000
@@ -218,6 +218,7 @@
 libobj8.test \
 libobj10.test \
 libobj11.test \
+libobj12.test \
 library.test \
 library2.test \
 libtool.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.553
diff -u -w -r1.553 Makefile.in
--- tests/Makefile.in	23 Aug 2002 19:11:32 -0000	1.553
+++ tests/Makefile.in	24 Aug 2002 03:34:58 -0000
@@ -306,6 +306,7 @@
 libobj8.test \
 libobj10.test \
 libobj11.test \
+libobj12.test \
 library.test \
 library2.test \
 libtool.test \
Index: tests/libobj12.test
===================================================================
RCS file: tests/libobj12.test
diff -N tests/libobj12.test
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/libobj12.test	24 Aug 2002 03:34:58 -0000
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# $Id$
+
+# test if a file can be mentioned in LIBOBJS and explicitly
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_EXEEXT
+AC_LIBOBJ([foo])
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libfoo.a libbar.a
+libfoo_a_SOURCES =
+libfoo_a_LIBADD = @LIBOBJS@
+
+libbar_a_SOURCES = foo.c
+END
+
+: > foo.c
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1