From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Oct 1998 11:43:15 +0000 (+0000)
Subject: 	* automake.in (scan_dependency_file): Don't give an error if there
X-Git-Tag: Release-1-3d~35
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8be04791c141c4e51779b8c9d15db0fe2052a638;p=automake.git

	* 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 52dce037..25f5dc76 100644
--- 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 d997dee3..ea8635a8 100755
--- 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;
 	}