From aa16a508e13e3676811b603b18e3126491b997e3 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 5 Mar 2001 14:38:00 +0000 Subject: [PATCH] * automake.in (&generate_makefile): Call &initialize_per_input *before* setting $am_file_name and $in_file_name. --- ChangeLog | 6 ++++++ Makefile.in | 14 +++++++------- automake.in | 6 ++++-- m4/Makefile.in | 4 ++-- tests/Makefile.in | 4 ++-- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index f90197b0..810917d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-03-05 Akim Demaille + + * automake.in (&generate_makefile): Call &initialize_per_input + *before* setting $am_file_name and $in_file_name. + + 2001-03-05 Akim Demaille * automake.in ($in_file_name, $am_file_name, $relative_dirs): diff --git a/Makefile.in b/Makefile.in index 8d9166fe..c77fb876 100644 --- 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 ad5039e6..b45eef51 100755 --- 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 e9a1b01d..7a43018c 100644 --- 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 9009342a..9190fc04 100644 --- 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: -- 2.43.5