From: Tom Tromey <tromey@redhat.com>
Date: Thu, 23 Aug 2001 05:00:34 +0000 (+0000)
Subject: 2001-08-22  Richard Boulton <richard@tartarus.org>
X-Git-Tag: Release-1-5b~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1ba61a28d5f141ea4f70f89411a0697be927a0;p=thirdparty%2Fautomake.git

2001-08-22  Richard Boulton <richard@tartarus.org>
	    Tom Tromey  <tromey@redhat.com>

	* automake.in (lang_yacc_target_hook): Make header file depend on
	.c file, not .y file.
	* lib/am/yacc.am: Non-generic rule changed to depend on %OBJ% (the
	.c file) rather than %SOURCE% (the .y file)  Removed `.y.h' rule.
	* tests/yacc7.test: New file.
	* tests/Makefile.am (TESTS): Added yacc7.test.
---

diff --git a/ChangeLog b/ChangeLog
index bd43fb3d9..1248cef76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-22  Richard Boulton <richard@tartarus.org>
+	    Tom Tromey  <tromey@redhat.com>
+
+	* automake.in (lang_yacc_target_hook): Make header file depend on
+	.c file, not .y file.
+	* lib/am/yacc.am: Non-generic rule changed to depend on %OBJ% (the
+	.c file) rather than %SOURCE% (the .y file)  Removed `.y.h' rule.
+	* tests/yacc7.test: New file.
+	* tests/Makefile.am (TESTS): Added yacc7.test.
+
 2001-08-22  Tim Van Holder  <tim.van.holder@pandora.be>
 
 	* m4/missing.m4: Require AM_AUX_DIR_EXPAND and use $am_aux_dir.
diff --git a/automake.in b/automake.in
index e57d2a2d9..6e947abb0 100755
--- a/automake.in
+++ b/automake.in
@@ -5203,7 +5203,7 @@ sub lang_yacc_target_hook
 	# Add a dependency for the generated header file, and arrange
 	# for that file to be included in the distribution.
 	# FIXME: this fails for `nodist_*_SOURCES'.
-	$output_rules .= "${header}: $input\n";
+	$output_rules .= "${header}: $output\n";
 	&push_dist_common ($header);
 	# If the files are built in the build directory, then we want
 	# to remove them with `make clean'.  If they are in srcdir
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index c42be0565..6fc6c16ae 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -32,10 +32,6 @@ else !%?MORE-THAN-ONE%
 endif !%?MORE-THAN-ONE%
 
 ## Also generate a dependency for the .h file.
-## FIXME: does this sort of suffix rule really work?
-if %?GENERIC%
-.%EXT%.h:
-	@:
-else !%?GENERIC%
-%BASE%.h: %SOURCE%
+if !%?GENERIC%
+%BASE%.h: %OBJ%
 endif !%?GENERIC%
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a508c98f2..0ab455b47 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -327,6 +327,7 @@ yacc3.test \
 yacc4.test \
 yacc5.test \
 yacc6.test \
+yacc7.test \
 yaccpp.test \
 yaccvpath.test
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d93da1558..d8c0ce0e4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -395,6 +395,7 @@ yacc3.test \
 yacc4.test \
 yacc5.test \
 yacc6.test \
+yacc7.test \
 yaccpp.test \
 yaccvpath.test