Bug fixes

diff --git a/ChangeLog b/ChangeLog
index 37fadfa59fd80a0a56ab9611af39e19956f049a8..74c797c4e084f9541bb079cfc0be3382b45469c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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=.

diff --git a/NEWS b/NEWS
index 58a828d4e01acaf4b361216de6c7d126f15abf5b..25afd45f5f77e67c0bbbddafcae687ac139ebba7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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
 \f
 New in 0.32:
 * Many bug fixes

diff --git a/automake.in b/automake.in
index bd2bbde58ef098f4139c18dc94520d865c8d7d9f..19bd0c3c0a2a7a48f5054ecc31c52727da3bb6df 100755 (executable)
--- 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 c29316a25202d184f9599a223c2f6b075555de42..933e2ed38b1b2f0447bfe5b11d32882f37fdde81 100644 (file)
--- 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 1abedf68a090a255657f0b78dc75792e18f23437..f5ab9b4bb4ff6f2dbd7f235d0ec36aecb41670ed 100644 (file)
--- 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 523482e02bbef41edd9b9096493cb729d70bf24e..4ddb4c7e283d403c97c1c067303ac435635b56bf 100644 (file)
--- 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 (executable)
index 0000000..e89630c
--- /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