+Tue Feb 13 12:06:51 1996 Tom Tromey <tromey@creche.cygnus.com>
+
+ * automake.in (scan_configure): Handle case where more than one .o
+ is put into LIBOBJS at once. Test libobj.test.
+
Mon Feb 12 10:39:28 1996 Tom Tromey <tromey@creche.cygnus.com>
* automake.in (scan_configure): Ignore "\" in AC_OUTPUT line.
local ($in_ac_output, @make_list) = 0;
local ($seen_arg_prog) = 0;
local ($seen_canonical) = 0;
+ local ($libobj_iter);
while (<CONFIGURE>)
{
# Remove comments from current line.
$libsources{$_ . '.c'} = 1;
}
}
- elsif (/LIBOBJS="(.*)\.o\s+\$LIBOBJS"/)
+ elsif (/LIBOBJS="(.*)\s+\$LIBOBJS"/
+ || /LIBOBJS="\$LIBOBJS\s+(.*)"/)
{
- $libsources{$1 . '.c'} = 1;
- }
- elsif (/LIBOBJS="\$LIBOBJS\s+(.*)\.o"/)
- {
- $libsources{$1 . '.c'} = 1;
+ foreach $libobj_iter (split (/\s+/, $1))
+ {
+ if ($libobj_iter =~ /^(.*)\.o$/)
+ {
+ $libsources{$1 . '.c'} = 1;
+ }
+ }
}
# Process the AC_OUTPUT macro.
+Tue Feb 13 11:54:39 1996 Tom Tromey <tromey@creche.cygnus.com>
+
+ * libobj.test: New file.
+
Mon Feb 12 10:05:48 1996 Tom Tromey <tromey@creche.cygnus.com>
* acouttbs.test: New file.
## FIXME Ulrich has suggested implementing this in Automake.
## Perhaps he is right.
TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
-acoutnoq.test acouttbs.test
+acoutnoq.test acouttbs.test libobj.test
DIST_OTHER = $(TESTS)
AUTOMAKE_OPTIONS = gnits
TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
-acoutnoq.test acouttbs.test
+acoutnoq.test acouttbs.test libobj.test
DIST_OTHER = $(TESTS)
DIST_COMMON = ChangeLog Makefile.am Makefile.in
--- /dev/null
+#!/bin/sh
+
+# Test for bug reported by Jim Meyering:
+# automake-0.29 didn't handle this line properly.
+# LIBOBJS="$LIBOBJS fsusage.o mountlist.o"
+
+. $srcdir/defs
+
+cat > configure.in << 'END'
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+LIBOBJS="$LIBOBJS fsusage.o mountlist.o"
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = tu
+tu_SOURCES =
+tu_LIBADD = @LIBOBJS@
+END
+
+: > fsusage.c
+: > mountlist.c
+
+$AUTOMAKE