From c12ef214daf120ccba14bca8ba9bfab1ecaa4a98 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 19 Mar 1998 04:47:46 +0000
Subject: [PATCH] fixed colon3.test

---
 ChangeLog         | 6 ++++++
 TODO              | 2 +-
 automake.in       | 8 ++++----
 tests/colon3.test | 9 +++++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 168313ae9..c6e8814d5 100644
--- 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 b3136cbfe..cd3185a90 100644
--- 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 3041f5523..b90589564 100755
--- 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 c31938f41..41ee2127a 100755
--- 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
-- 
2.47.2