* header-vars.am (@SET_MAKE@): Added.

	* subdirs.am (@SET_MAKE@): Removed.  Report from Motoyuki
	Kasahara.

diff --git a/ChangeLog b/ChangeLog
index ecff028ee96d65440976e265cac3dbe9b80b4614..8b7d04b6b56dfee247aa7fe457e6682e5cab208a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-06  Tom Tromey  <tromey@cygnus.com>
+
+       * header-vars.am (@SET_MAKE@): Added.
+       * subdirs.am (@SET_MAKE@): Removed.  Report from Motoyuki
+       Kasahara.
+
 1999-12-19  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_dist_worker): Expand DIST_COMMON under all

diff --git a/THANKS b/THANKS
index 0459613261bc5d9cf6ec0c507d4fde5a07501b54..c05a445f03f4414200d30ec9bb50341918ee33e8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -74,13 +74,14 @@ Mark Galassi                rosalia@nis.lanl.gov
 Markku Rossi           mtr@ngs.fi
 Markus F.X.J. Oberhumer        k3040e4@wildsau.idv-edu.uni-linz.ac.at
 Matt Leach             mleach@cygnus.com
-Matthias Clasen                clasen@mathematik.uni-freiburg.de
 Matthew D. Langston    langston@SLAC.Stanford.EDU
+Matthias Clasen                clasen@mathematik.uni-freiburg.de
 Michael Brantley       Michael-Brantley@deshaw.com
 Michel de Ruiter       mdruiter@cs.vu.nl
 Miles Bader            miles@ccs.mt.nec.co.jp
 Miodrag Vallat         miodrag@ifrance.com
 Motoyuki Kasahara      m-kasahr@sra.co.jp
+Motoyuki Kasahara      m-kasahr@sra.co.jp
 NISHIDA Keisuke                knishida@nn.iij4u.or.jp
 Nelson H. F. Beebe     beebe@math.utah.edu
 Noah Friedman          friedman@gnu.ai.mit.edu

diff --git a/header-vars.am b/header-vars.am
index 84d2a060496d6a5e4f524e9d3851e18f36727be4..06eab555f7c570372faab77b1f35e76a46f7c934 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc.
+## Copyright (C) 1994-99, 2000 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -36,6 +36,8 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+@SET_MAKE@
+
 DESTDIR =
 
 ## Some derived variables that have been found to be useful.

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 84d2a060496d6a5e4f524e9d3851e18f36727be4..06eab555f7c570372faab77b1f35e76a46f7c934 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc.
+## Copyright (C) 1994-99, 2000 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -36,6 +36,8 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+@SET_MAKE@
+
 DESTDIR =
 
 ## Some derived variables that have been found to be useful.

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index ab96f5b6539d5c0f9d8526a472fcc4960bf96dac..b0ce04ac0488bd58c00980665b5f272d19f92588 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+## Copyright (C) 1994-99, 2000 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -22,8 +22,6 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 
-@SET_MAKE@
-
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive:

diff --git a/subdirs.am b/subdirs.am
index ab96f5b6539d5c0f9d8526a472fcc4960bf96dac..b0ce04ac0488bd58c00980665b5f272d19f92588 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+## Copyright (C) 1994-99, 2000 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -22,8 +22,6 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 
-@SET_MAKE@
-
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive: