more pre-built-sources support

diff --git a/ChangeLog b/ChangeLog
index 0c2d84523838f2b29183649de42d704c49ba997e..d42aca995253bc3d21ae19d7f2b30c212cfec17a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Jun  1 13:16:05 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_built_sources): Handle PRE_BUILT_SOURCES.
+       (handle_configure): Likewise.
+
        * depend2.am (.deps/%.P): Don't generate file if MKDEP fails.
        From Alexandre Oliva.
 

diff --git a/automake.in b/automake.in
index 4c90c5eb025ba6d22358174652532e71cc53ca79..9609b817147ec9c56cbe6f80728b54b3ace07d41 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1242,25 +1242,33 @@ sub handle_source_transform
 # Handle the BUILT_SOURCES variable.
 sub handle_built_sources
 {
-    return unless &variable_defined ('BUILT_SOURCES');
-    push (@all, '$(BUILT_SOURCES)');
+    local ($prefix);
 
-    local (@sources) = &variable_value_as_list ('BUILT_SOURCES', 'all');
-    local ($s);
-    foreach $s (@sources)
+    foreach $prefix ('', 'PRE_')
     {
-       if (/^\@.*\@$/)
+       next unless &variable_defined ($prefix . 'BUILT_SOURCES');
+       push (@all, '$(' . $prefix . 'BUILT_SOURCES)');
+
+       local (@sources) = &variable_value_as_list ($prefix. 'BUILT_SOURCES',
+                                                   'all');
+       local ($s);
+       foreach $s (@sources)
        {
-           # FIXME: is this really the right thing to do?
-           &am_line_error ('BUILT_SOURCES', "\`BUILT_SOURCES' should not contain a configure substitution");
-           last;
+           if (/^\@.*\@$/)
+           {
+               # FIXME: is this really the right thing to do?
+               &am_line_error ($prefix . 'BUILT_SOURCES',
+                               "\`" . $prefix
+                               . "BUILT_SOURCES' should not contain a configure substitution");
+               last;
+           }
        }
-    }
 
-    # We don't care about the return value of this function.  We just
-    # want to make sure to update %dep_files with the contents of
-    # BUILT_SOURCES.
-    &handle_single_transform_list (@sources);
+       # We don't care about the return value of this function.  We
+       # just want to make sure to update %dep_files with the
+       # contents of BUILT_SOURCES.
+       &handle_single_transform_list (@sources);
+    }
 }
 
 # Special-case @ALLOCA@ and @LIBOBJS@ in _LDADD or _LIBADD variables.
@@ -2902,7 +2910,7 @@ sub handle_configure
                      # a workaround for an obscure bug with
                      # AC_LINK_FILES.  Anyway, when dependencies are
                      # turned off, this shouldn't matter.
-                     . ($use_dependencies ? ' $(BUILT_SOURCES)' : '')
+                     . ($use_dependencies ? ' $(PRE_BUILT_SOURCES) $(BUILT_SOURCES)' : '')
                      . "\n"
                      . "\tcd \$(top_builddir) \\\n"
                      . "\t  && CONFIG_FILES="