* 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 0aa3bd34b8b82dc1c9d2f530405158a41d3ae703..6a7d01fdf57cc4b634632097f02a5eda4b2f992a 100644 (file)
--- 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 2c532a71fadbe98b447ec56621329cf0c35df4ba..8be24fe99e4a06e5a3d128b82d1087a057feac4e 100755 (executable)
--- 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'));
                }
            }
        }