* automake.in (scan_dependency_file): Don't give an error if there

	is text after the last line.  Report from Matthew D. Langston.

diff --git a/ChangeLog b/ChangeLog
index 52dce0370de11b58ca9b891c8e0765fda0d5842b..25f5dc766df2c53b74c683f50149b5adb9d5d063 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-10-16  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (scan_dependency_file): Don't give an error if there
+       is text after the last line.  Report from Matthew D. Langston.
+
        * m4/mktime.m4: Detect glibc mktime bug.  From Jim Meyering.
 
        * Makefile.am (SUBDIRS): Added `.' again.

diff --git a/automake.in b/automake.in
index d997dee3704aed4d184107f01186060964cc6901..ea8635a8d5da35b29c6343113a1ed3ab6ae85cd6 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2598,19 +2598,16 @@ sub scan_dependency_file
                                 ? ''
                                 : $top_builddir . '/');
 
-    while (<DEP_FILE>)
+    while (<DEP_FILE> && ! $last_line)
     {
-       if ($last_line)
-       {
-           # If LAST_LINE set then we've already seen what we thought
-           # was the last line.
-           goto bad_format;
-       }
        next if (/$WHITE_PATTERN/o);
        chop;
        if (! s/\\$//)
        {
-           # No trailing "\" means this should be the last line.
+           # No trailing "\" means this should be the last line of
+           # the first target.  We can have multiple targets due to
+           # the "deleted header file" fix.  For the generated
+           # Makefile we simply skip these fake targets.
            $last_line = 1;
        }