* 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 606bb0661fe05bf08ac577c2a0227520af87b456..0595e62315e28cd543e6d3541221a3d131e52795 100644 (file)
--- 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 26898de85b5c388d3cde3373bd9d3425c46a0969..e4990f801452617fca59654e6d74f642dbdd4dd4 100755 (executable)
--- 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)