* automake.in (&generate_makefile): Call &initialize_per_input

*before* setting $am_file_name and $in_file_name.

diff --git a/ChangeLog b/ChangeLog
index f90197b094b28e0268c89a5e8438a410bf40f287..810917d2a14177a45cace067ae268583008c7de7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&generate_makefile): Call &initialize_per_input
+       *before* setting $am_file_name and $in_file_name.
+
+       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in ($in_file_name, $am_file_name, $relative_dirs):

diff --git a/Makefile.in b/Makefile.in
index 8d9166fea8f464a6f12e7c302e8e46f7c1c239f7..c77fb87611f3b49d25e88b585afa17934d3bf040 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-#  generated automatically by automake 1.4e from 
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -129,12 +129,12 @@ DVIS = automake.dvi
 TEXINFOS = automake.texi
 DATA =  $(dist_pkgdata_DATA) $(dist_script_DATA)
 
-DIST_COMMON =  README  $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
-COPYING ChangeLog INSTALL NEWS README-alpha THANKS TODO aclocal.in \
-aclocal.m4 ansi2knr.1 ansi2knr.c automake.in compile config.guess \
-config.sub configure configure.in depcomp elisp-comp install-sh \
-mdate-sh missing mkinstalldirs py-compile stamp-vti texinfo.tex \
-version.texi ylwrap
+DIST_COMMON =  README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
+COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \
+THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \
+compile config.guess config.sub configure configure.in depcomp \
+elisp-comp install-sh mdate-sh missing mkinstalldirs py-compile \
+stamp-vti texinfo.tex version.texi ylwrap
 
 DIST_SUBDIRS =  $(SUBDIRS)
 all: all-recursive

diff --git a/automake.in b/automake.in
index ad5039e6a7c1f1f714d7de4df68c0fa3e7bff4c3..b45eef51440b75efc69bb5ef63ded7413a7ec890 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1051,6 +1051,9 @@ sub generate_makefile
 {
     my ($output, $makefile) = @_;
 
+    # Reset all the Makefile.am related variables.
+    &initialize_per_input;
+
     # Name of input file ("Makefile.am") and output file
     # ("Makefile.in").  These have no directory components.
     $am_file_name = basename ($makefile) . '.am';
@@ -1064,7 +1067,6 @@ sub generate_makefile
     my (@secondary_inputs);
     ($output, @secondary_inputs) = split (/:/, $output);
 
-    &initialize_per_input;
     $relative_dir = dirname ($output);
     $am_relative_dir = dirname ($makefile);
 
@@ -6736,7 +6738,7 @@ sub read_main_am_file
     # Generate copyright header for generated Makefile.in.
     my $ov = $output_vars;
     $output_vars = ("# $in_file_name generated automatically by automake "
-                  . $VERSION . " from $am_file_name\n");
+                  . $VERSION . " from $am_file_name.\n");
     $output_vars .= $gen_copyright;
 
     # Now go through and delete all the variables that the user did

diff --git a/m4/Makefile.in b/m4/Makefile.in
index e9a1b01d1594d1c6cb45478dd78e7a2b7b50cd9c..7a43018c9b3cb19fae67f9132c20d21747fca571 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-#  generated automatically by automake 1.4e from 
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -94,7 +94,7 @@ CONFIG_CLEAN_FILES =
 DIST_SOURCES = 
 DATA =  $(m4data_DATA)
 
-DIST_COMMON =  
+DIST_COMMON =  Makefile.am Makefile.in
 
 all: all-am
 .SUFFIXES:

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9009342ad81b321d7b866ad9f9251108e5a3fbca..9190fc04821ca3a529fd125818596afc470d893f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-#  generated automatically by automake 1.4e from 
+# Makefile.in generated automatically by automake 1.4e from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -361,7 +361,7 @@ subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DIST_SOURCES = 
-DIST_COMMON =  
+DIST_COMMON =  Makefile.am Makefile.in
 
 all: all-am
 .SUFFIXES: