[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
91-init-then-set.patch
From: |
Akim Demaille |
Subject: |
91-init-then-set.patch |
Date: |
Thu, 01 Mar 2001 01:04:57 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&generate_makefile): Call &initialize_per_input
*before* setting $am_file_name and $in_file_name.
Index: Makefile.in
--- Makefile.in Wed, 28 Feb 2001 23:04:21 +0100 akim (am/h/16_Makefile.i 1.28
644)
+++ Makefile.in Wed, 28 Feb 2001 23:40:56 +0100 akim (am/h/16_Makefile.i 1.28
644)
@@ -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 @@
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
Index: automake.in
--- automake.in Wed, 28 Feb 2001 23:06:47 +0100 akim (am/f/39_automake.i 1.98
755)
+++ automake.in Wed, 28 Feb 2001 23:40:43 +0100 akim (am/f/39_automake.i 1.98
755)
@@ -1045,6 +1045,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';
@@ -1058,7 +1061,6 @@ sub generate_makefile
my (@secondary_inputs);
($output, @secondary_inputs) = split (/:/, $output);
- &initialize_per_input;
$relative_dir = dirname ($output);
$am_relative_dir = dirname ($makefile);
@@ -6718,7 +6720,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
Index: m4/Makefile.in
--- m4/Makefile.in Wed, 28 Feb 2001 23:04:21 +0100 akim (am/h/15_Makefile.i
1.20 644)
+++ m4/Makefile.in Wed, 28 Feb 2001 23:40:56 +0100 akim (am/h/15_Makefile.i
1.20 644)
@@ -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 @@
DIST_SOURCES =
DATA = $(m4data_DATA)
-DIST_COMMON =
+DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
Index: tests/Makefile.in
--- tests/Makefile.in Wed, 28 Feb 2001 23:04:21 +0100 akim (am/h/14_Makefile.i
1.23 644)
+++ tests/Makefile.in Wed, 28 Feb 2001 23:40:56 +0100 akim (am/h/14_Makefile.i
1.23 644)
@@ -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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 91-init-then-set.patch,
Akim Demaille <=