Based on report from Marcus G. Daniels. Fixes include.test.

	* automake.in (generate_makefile): Call read_main_am_file.
	(read_main_am_file): New sub.
	(read_am_file): Moved header generation code into
	read_main_am_file.

diff --git a/ChangeLog b/ChangeLog
index d0a0a4f67fb015f57d2f15bfd4d3c3d3a1439f61..75ef7ea97037d29c5dd74567734a4905ba3ec12a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-01-07  Tom Tromey  <tromey@cygnus.com>
+
+       Based on report from Marcus G. Daniels.  Fixes include.test.
+       * automake.in (generate_makefile): Call read_main_am_file.
+       (read_main_am_file): New sub.
+       (read_am_file): Moved header generation code into
+       read_main_am_file.
+
 1999-01-06  Gary V. Vaughan  <garyv@oranda.demon.co.uk>
 
        * automake.in (require_file_internal): qub perl on win32 hangs

diff --git a/automake.in b/automake.in
index d50e1bc669680c940392dce99e12342d2f0b004d..d8715563b6b6a010a14d982a7520f988044f1e4f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -585,7 +585,7 @@ sub generate_makefile
     push (@objects, '$(OBJECTS)')
        if &variable_defined ('OBJECTS');
 
-    &read_am_file ($makefile . '.am');
+    &read_main_am_file ($makefile . '.am');
     if (&handle_options)
     {
        # Fatal error.  Just return, so we can continue with next file.
@@ -5634,12 +5634,6 @@ sub read_am_file
     open (AM_FILE, $amfile) || die "automake: couldn't open \`$amfile': $!\n";
     print "automake: reading $amfile\n" if $verbose;
 
-    $output_vars = ("# $in_file_name generated automatically by automake "
-                   . $VERSION . " from $am_file_name\n");
-
-    # Generate copyright for generated Makefile.in.
-    $output_vars .= $gen_copyright;
-
     local ($saw_bk) = 0;
     local ($was_rule) = 0;
     local ($spacing) = '';
@@ -5678,12 +5672,6 @@ sub read_am_file
     $comment = '';
     $spacing = "\n";
 
-    # The keys here are variables we want to dump at the end of this
-    # function.  The values are corresponding comments.
-    local (%am_vars) = ();
-    local (@var_list) = ();
-    local (%def_type) = ();
-
     local ($is_ok_macro);
     while ($_)
     {
@@ -5967,6 +5955,26 @@ sub read_am_file
 
     &am_error ("unterminated conditionals: " . join (' ', @conditional_stack))
        if (@conditional_stack);
+}
+
+# Read main am file.
+sub read_main_am_file
+{
+    local ($amfile) = @_;
+
+    $output_vars = ("# $in_file_name generated automatically by automake "
+                   . $VERSION . " from $am_file_name\n");
+
+    # Generate copyright for generated Makefile.in.
+    $output_vars .= $gen_copyright;
+
+    # The keys here are variables we want to dump at the end of this
+    # function.  The values are corresponding comments.
+    local (%am_vars) = ();
+    local (@var_list) = ();
+    local (%def_type) = ();
+
+    &read_am_file ($amfile);
 
     # Compute relative location of the top object directory.
     local (@topdir) = ();

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 49f857326dfa880f6743b30f04b5de334649fc5c..c6258c30270a5a3ee90d0011e3fee968d8bb4106 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -65,7 +65,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test config.test confincl.test confsub.test       confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test    libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test        package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
+TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test config.test confincl.test confsub.test       confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test   link_f_only.test lisp.test mdate.test mdate2.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test prefix.test primary.test        primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
 
 
 EXTRA_DIST = defs $(TESTS)