From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Tue, 20 Apr 1999 02:41:04 +0000 (+0000)
Subject: * automake.in (handle_lib_objects_cond): Only require the source
X-Git-Tag: merging-into-user-dep-gen~46
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=9a982a390a4307ca794d741d550e553fe9094b13;p=automake.git

* automake.in (handle_lib_objects_cond): Only require the source
of a LIBOBJ if it's not in BUILT_SOURCES.
Reported by Erez Zadok.
---

diff --git a/ChangeLog b/ChangeLog
index 0aa3bd34..6a7d01fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* automake.in (handle_lib_objects_cond): Only require the source
+	of a LIBOBJ if it's not in BUILT_SOURCES.
+	Reported by Erez Zadok.
+
 1999-04-19  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in: Treat `.class' files as Java source.
diff --git a/automake.in b/automake.in
index 2c532a71..8be24fe9 100755
--- a/automake.in
+++ b/automake.in
@@ -1462,7 +1462,9 @@ sub handle_lib_objects_cond
 		{
 		    ($rewrite = $iter) =~ s/\.c$/.P/;
 		    $dep_files{'.deps/' . $rewrite} = 1;
-		    &require_file_with_line ($var, $FOREIGN, $iter);
+		    &require_file_with_line ($var, $FOREIGN, $iter)
+		      unless &variable_defined ('BUILT_SOURCES')
+			&& grep ('^' . quotemeta $iter . '$', &variable_value_as_list ('BUILT_SOURCES', 'all'));
 		}
 	    }
 	}