(generate_makefile): Put Makefile.in, Makefile.am in @dist_common

(handle_configure): Use @dist_common as appropriate

diff --git a/automake.in b/automake.in
index f296e88587f598b720ef75a3b54c70a00fc88d88..6e56bd9e059f40ee9bcfb8c92c416c96cc9e52fe 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -209,7 +209,7 @@ sub generate_makefile
     $output_trailer = '';
     @suffixes = ();
     %contents = ();
-    @dist_common = ();
+    @dist_common = ('Makefile.in', 'Makefile.am');
     @install_data = ();
     @install_exec = ();
     @uninstall = ();
@@ -657,8 +657,8 @@ sub handle_configure
     {
        if (-f 'aclocal.m4')
        {
-           # FIXME use dist_common here.
            $output_vars .= "ACLOCAL = aclocal.m4\n";
+           push (@dist_common, 'aclocal.m4');
        }
        $output_rules .= &file_contents ('remake');
     }
@@ -667,18 +667,20 @@ sub handle_configure
        && $contents{'CONFIG_HEADER'} !~ m,/,)
     {
        # Header defined and in this directory.
-       # FIXME use dist_common here where appropriate.
        if (-f 'acconfig.h')
        {
            $output_vars .= "ACCONFIG = acconfig.h\n";
+           push (@dist_common, 'acconfig.h');
        }
        if (-f 'config.h.top')
        {
            $output_vars .= "CONFIG_TOP = config.h.top\n";
+           push (@dist_common, 'config.h.top');
        }
        if (-f 'config.h.bot')
        {
            $output_vars .= "CONFIG_BOT = config.h.bot\n";
+           push (@dist_common, 'config.h.bot');
        }
 
        push (@dist_common, 'stamp-h.in', $contents{'CONFIG_HEADER'} . '.in');