dependency fixes

diff --git a/ChangeLog b/ChangeLog
index ce22a9df7b25f9dc6f49fdae6fbbcda02fa300b9..cfc77e7ca483e8c6fa88c0b0ee0a05961c6798a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 Wed Apr  2 00:03:50 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_source_transform): Don't generate dependency
+       on config.h.
+       (scan_dependency_file): Strip the .P file from the target.
+
        * automake.in (handle_tags): Use single, not double, quotes when
        setting list variable.
+
        * data.am, header.am, libs.am, lisp.am, ltlib.am, progs-clean.am,
        progs.am, scripts.am, tags.am: Use single quotes to fill list
        variable; otherwise `$' in filename will not work.  From Per

diff --git a/TODO b/TODO
index 49c473b434b37dbe01160e4b4a769f8d83531cdc..9968d7a42631a56fd551136054b289dae04a64cc 100644 (file)
--- a/TODO
+++ b/TODO
@@ -20,9 +20,6 @@
 * should not put texiname_TEXINFOS into distribution
   should rename this macro anyway, to foo_texi_DEPENDENCIES
 
-* should be able to specify path to texinfo.tex so that 'make dvi'
-  will work even when it isn't in this dir.
-
 * *all* installed scripts should support --version, --help
 
 * have aclocal diagnose unrecognized AM_ macros
@@ -91,6 +88,8 @@ Some long-term projects:
   user or by automake if possible
 * Don't rearrange order of `include' lines relative to += assignments.
 * Handle += assignments at all.
+* Handle `include' lines by scanning other files, and adding
+  to Makefile.in dependency
 
 consider putting all check-* targets onto @check?
 To support --help/--version checking?
@@ -126,8 +125,6 @@ From Jason Molenda:
   understood this convention, and you could click on such text to
   go to the appropriate info page?
 
-!! should write autoconf-style doc entries for each m4 macro
-
 Jim's idea: should look for @setfilename and warn if filenames too long
 * guess split size
 

diff --git a/automake.in b/automake.in
index 85768b2db019d7bd5793ddf56ff690ba8541443f..de975d3e53662b3056cd6949a7862643354fe7c1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1165,12 +1165,6 @@ sub handle_source_transform
            unless $prefix eq 'EXTRA_';
     }
 
-    if (&variable_defined ('CONFIG_HEADER'))
-    {
-       $output_rules .= ('$(' . $one_file . "_OBJECTS): "
-                         . $contents{'CONFIG_HEADER'} . "\n");
-    }
-
     return $linker;
 }
 
@@ -2453,8 +2447,9 @@ sub scan_dependency_file
                return;
            }
 
-           $target = $1;
            $_ = $2;
+           # Make sure to strip the .P file from the target.
+           ($target = $1) =~ s, *\.deps/[^.]\.P,,;
 
            $first_line = 0;
        }