fixed colon3.test

diff --git a/ChangeLog b/ChangeLog
index 168313ae97a556679dc16af870f1869630932bf0..c6e8814d51bc84ee38dbb405c8ddcf1952f197c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Wed Mar 18 14:48:44 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_configure): Put secondary dependencies from
+       multi-":" AC_OUTPUT entry into dependency list for file created by
+       config.status, not file created by automake.  Test colon3.test.
+       (generate_makefile): Pass $output, not $makefile, to
+       handle_merge_targets.
+
        * Makefile.am (pkgdata_DATA): Added java.am, java-clean.am.
        * java-clean.am: New file.
        * java.am: New file.

diff --git a/TODO b/TODO
index b3136cbfe960da574a0602e7d1cae89d82f2fcda..cd3185a9093f24bbc9126630fa446616024044a5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 * something like this fails:
 
-       foo = ... \
+       foo = q \
 
        lib_LTLIBRARIES = foo.la
 

diff --git a/automake.in b/automake.in
index 3041f55232bcb8a0ffc6c02140e07cc30d6c147c..b90589564fdcf767f38a7b7989d70afb5fad6637 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -587,7 +587,7 @@ sub generate_makefile
     &handle_dependencies;
     &handle_tests;
     &handle_footer;
-    &handle_merge_targets ($makefile);
+    &handle_merge_targets ($output);
     &handle_installdirs;
     &handle_clean;
     &handle_phony;
@@ -3001,8 +3001,7 @@ sub handle_configure
                      . ': '
                      . ($seen_maint_mode ? '@MAINT@ ' : '')
                      . $amfile . ' '
-                     . '$(top_srcdir)/configure.in $(ACLOCAL_M4) '
-                     . join (' ', @rewritten) . "\n"
+                     . '$(top_srcdir)/configure.in $(ACLOCAL_M4)' . "\n"
                      . "\tcd \$(top_srcdir) && \$(AUTOMAKE) "
                      . ($cygnus_mode ? '--cygnus' : ('--' . $strictness_name))
                      . ($cmdline_use_dependencies ? '' : ' --include-deps')
@@ -3014,7 +3013,8 @@ sub handle_configure
                      # see comment above.
                      . ': '
                      . $infile . ' '
-                     . '$(top_builddir)/config.status'
+                     . join (' ', @rewritten)
+                     . ' $(top_builddir)/config.status'
                      # NOTE: Makefile only depends on BUILT_SOURCES
                      # when dependencies are being computed.  This is
                      # a workaround for an obscure bug with

diff --git a/tests/colon3.test b/tests/colon3.test
index c31938f411d7d479af78abc7f4360a835da0996f..41ee2127ad2bb9312dfeb689c784c5baf092be2f 100755 (executable)
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -24,13 +24,18 @@ $AUTOMAKE || exit 1
 test -f zardoz.in || exit 1
 
 # The generated file should refer to zardoz.in and zardoz.am, but
-# never just "zardoz".
-grep zardoz zardoz.in | fgrep -v 'zardoz.in' | fgrep -v 'zardoz.am' > O
+# never just "zardoz" -- except the actual automake invocation can
+# refer to it (don't ask).
+echo Grep1
+grep zardoz zardoz.in | fgrep -v 'zardoz.in' | fgrep -v 'zardoz.am' \
+   | fgrep -v AUTOMAKE > O
 # We cat the output file so we see in when verbose.
 cat O
 test -z "`cat O`" || exit 1
 
 # Makefile should depend on two.in.
+echo Grep2
 grep '^Makefile:.* two.in' zardoz.in || exit 1
 # Likewise three.in.
+echo Grep3
 grep '^Makefile:.* three.in' zardoz.in