From: Tom Tromey <tromey@redhat.com>
Date: Mon, 28 Aug 2000 23:33:28 +0000 (+0000)
Subject: 	* automake.in (yacc, yaccxx, lex, lexxx): Set `derived-autodep'
X-Git-Tag: Release-1-4b~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae2f74804cb4e8be2ca31f004437245888c07b0d;p=thirdparty%2Fautomake.git

	* automake.in (yacc, yaccxx, lex, lexxx): Set `derived-autodep'
	key.
	(register_language): Default the `derived-autodep' option.
	(handle_single_transform_list): Add to %dep_files if language has
	`derived-autodep' set.  Re-fixes lex4.test.
---

diff --git a/ChangeLog b/ChangeLog
index 606bb0661..0595e6231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-28  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (yacc, yaccxx, lex, lexxx): Set `derived-autodep'
+	key.
+	(register_language): Default the `derived-autodep' option.
+	(handle_single_transform_list): Add to %dep_files if language has
+	`derived-autodep' set.  Re-fixes lex4.test.
+
 2000-08-27  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (handle_single_transform_list): Only add to
diff --git a/automake.in b/automake.in
index 26898de85..e4990f801 100755
--- a/automake.in
+++ b/automake.in
@@ -334,13 +334,13 @@ $obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')';
 		    'h', 'H', 'hxx', 'h++', 'hh', 'hpp', 'inc');
 
 # For now, yacc and lex can't be handled on a per-exe basis.
-&register_language ('yacc', 'ansi-p=1',
+&register_language ('yacc', 'ansi-p=1', 'derived-autodep=yes',
 		    'y');
-&register_language ('yaccxx', 'linker=CXXLINK',
+&register_language ('yaccxx', 'linker=CXXLINK', 'derived-autodep=yes',
 		    'y++', 'yy', 'yxx', 'ypp');
-&register_language ('lex', 'ansi-p=1',
+&register_language ('lex', 'ansi-p=1', 'derived-autodep=yes',
 		    'l');
-&register_language ('lexxx', 'linker=CXXLINK',
+&register_language ('lexxx', 'linker=CXXLINK', 'derived-autodep=yes',
 		    'l++', 'll', 'lxx', 'lpp');
 
 &register_language ('asm',
@@ -1387,7 +1387,9 @@ sub handle_single_transform_list
 
 	    # Transform .o or $o file into .P file (for automatic
 	    # dependency code).
-	    if ($lang && $language_map{$lang . '-autodep'} ne 'no')
+	    if ($lang
+		&& ($language_map{$lang . '-autodep'} ne 'no'
+		    || $language_map{$lang . '-derived-autodep'} eq 'yes'))
 	    {
 		local ($depfile) = $object;
 		$depfile =~ s/\.([^.]*)$/.P$1/;
@@ -5311,6 +5313,7 @@ sub register_language
     $language_map{$language . '-ansi-p'} = 0;
     $language_map{$language . '-linker'} = '';
     $language_map{$language . '-autodep'} = 'no';
+    $language_map{$language . '-derived-autodep'} = 'no';
 
     local ($iter);
     foreach $iter (@options)