From: Tom Tromey <tromey@redhat.com>
Date: Mon, 27 Nov 1995 19:35:39 +0000 (+0000)
Subject: (generate_makefile): Put Makefile.in, Makefile.am in @dist_common
X-Git-Tag: Release-0-25~128
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5aa9243bac16fe69adfc511a9daeebdb25cf9eed;p=automake.git

(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 f296e885..6e56bd9e 100755
--- 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');