diff options
| author | Tom Tromey <tromey@redhat.com> | 1996-05-18 01:03:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1996-05-18 01:03:04 +0000 |
| commit | 69f7e2935c8df67071d222acedac82e5d97a1e99 (patch) | |
| tree | aefd7e642842d8b1c3ec6b62380fb87bd9cf57b6 | |
| parent | 08818d2d89a2e4d48e94808e2b5c8a8731739cb9 (diff) | |
| download | automake-69f7e2935c8df67071d222acedac82e5d97a1e99.tar.gz | |
Bug fixes
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rwxr-xr-x | automake.in | 4 | ||||
| -rw-r--r-- | tests/ChangeLog | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 2 | ||||
| -rwxr-xr-x | tests/number.test | 15 |
7 files changed, 27 insertions, 6 deletions
@@ -1,5 +1,8 @@ Fri May 17 09:02:02 1996 Tom Tromey <tromey@creche.cygnus.com> + * automake.in (handle_source_transform): Don't generate _OBJECTS + when no source files specified. Test number.test. + From Joerg-Martin Schwarz: * automake.in (seen_package, seen_version): New globals. (scan_configure): Look for PACKAGE= and VERSION=. @@ -1,8 +1,11 @@ New in 0.33: * More bug fixes +* More checking * More libtool fixes from Gord Matzigkeit; libtool support is still - preliminary however. + preliminary however * Added support for jm_MAINTAINER_MODE +* dist-zip support +* New "distcheck" target New in 0.32: * Many bug fixes diff --git a/automake.in b/automake.in index bd2bbde58..19bd0c3c0 100755 --- a/automake.in +++ b/automake.in @@ -546,9 +546,7 @@ sub handle_source_transform } elsif ($prefix eq '') { - $output_vars .= ($one_file . "_SOURCES = " . $unxformed . ".c\n" - . $one_file . "_OBJECTS = ". $unxformed - . $obj . "\n"); + $output_vars .= $one_file . "_SOURCES = " . $unxformed . ".c\n"; push (@sources, $unxformed . '.c'); push (@objects, $unxformed . $obj); $source_list = $unxformed . ".c "; diff --git a/tests/ChangeLog b/tests/ChangeLog index c29316a25..933e2ed38 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ Fri May 17 17:32:35 1996 Tom Tromey <tromey@creche.cygnus.com> + * number.test: New file. + * defs, many .test files: Define PACKAGE and VERSION in configure.in. diff --git a/tests/Makefile.am b/tests/Makefile.am index 1abedf68a..f5ab9b4bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,6 +7,6 @@ acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \ canon.test installsh.test empty.test rulepat.test insh.test canon2.test \ target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \ -canon3.test mdate2.test subdir.test backsl.test package.test +canon3.test mdate2.test subdir.test backsl.test package.test number.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 523482e02..4ddb4c7e2 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -45,7 +45,7 @@ acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \ canon.test installsh.test empty.test rulepat.test insh.test canon2.test \ target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \ -canon3.test mdate2.test subdir.test backsl.test package.test +canon3.test mdate2.test subdir.test backsl.test package.test number.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(top_srcdir)/mkinstalldirs diff --git a/tests/number.test b/tests/number.test new file mode 100755 index 000000000..e89630ce3 --- /dev/null +++ b/tests/number.test @@ -0,0 +1,15 @@ +#! /bin/sh + +# Test to make sure _OBJECTS only generated once. Bug reported by +# Joerg-Martin Schwarz. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +bin_PROGRAMS = zardoz +END + +$AUTOMAKE || exit 1 + +count=`grep -c '^zardoz_OBJECTS' Makefile.in` +test $count -eq 1 |