From 540ab19a9dbe7f110aa1b0822ba0b87430fa1b30 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 23 Aug 2001 05:00:31 +0000 Subject: [PATCH] 2001-08-22 Richard Boulton Tom Tromey * 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. --- ChangeLog | 10 ++++++++++ automake.in | 2 +- lib/am/yacc.am | 8 ++------ tests/Makefile.am | 1 + tests/Makefile.in | 1 + 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd43fb3d..1248cef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-08-22 Richard Boulton + Tom Tromey + + * 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 * m4/missing.m4: Require AM_AUX_DIR_EXPAND and use $am_aux_dir. diff --git a/automake.in b/automake.in index e57d2a2d..6e947abb 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 c42be056..6fc6c16a 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 a508c98f..0ab455b4 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 d93da155..d8c0ce0e 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 -- 2.43.5