diff --git a/.cvsignore b/.cvsignore index c49c6da7..446fbca3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,9 +13,9 @@ makebook* README aclocal.m4 config.h.in config.h configure Makefile.in build.sh.in build.sh SMakefile config.ami README.DOS Makefile.DOS configh.dos -NMakefile config.h.W32 config.h-vms glob/Makefile.in +NMakefile config.h.W32 config.h-vms -.deps .dep_segment glob/.deps +.deps .dep_segment _* sun4 i386 i386-netbsd hp300-netbsd hp300 rs6000 sun3 news800 amiga diff --git a/ChangeLog b/ChangeLog index 767504fc..021562be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ +1999-03-05 Paul D. Smith + + * Makefile.am, configure.in: Use AC_SUBST_FILE to insert the + maintMakefile instead of "include", to avoid automake 1.4 + incompatibility. + 1999-03-04 Paul D. Smith + * amiga.c, amiga.h, ar.c, arscan.c, commands.c, commands.h, + * default.c, dep.h, dir.c, expand.c, file.c, filedef.h, functions.c, + * implicit.c, job.c, job.h, main.c, make.h, misc.c, read.c, remake.c + * remote-cstms.c, remote-stub.c, rule.h, variable.c, variable.h, + * vpath.c, Makefile.ami, NMakefile.template, build.template, + * makefile.vms: Updated FSF address in the copyright notice. + * variable.c (try_variable_definition): If we see a conditional variable and we decide to set it, re-type it as recursive so it will be expanded properly later. diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 97b2e1d8..00000000 --- a/GNUmakefile +++ /dev/null @@ -1,58 +0,0 @@ -# This is a maintainer's-only makefile -# -# It bootstraps a GNU make maintainer's directory -# - -.SUFFIXES: - -NORECURSE = true - -ACLOCALARGS = - -CFLAGS = -g -O -Wall -D__USE_FIXED_PROTOTYPES__ -export CFLAGS - -# If the user asked for a specific target, invoke the Makefile instead. -# -.DEFAULT: - @[ -f Makefile.in -a -f configure -a -f aclocal.m4 -a -f config.h.in ] \ - || $(MAKE) __cfg NORECURSE= - @[ -f Makefile ] \ - || CFLAGS='-g -O -Wall -D__USE_FIXED_PROTOTYPES__' ./configure - $(MAKE) -f Makefile $@ - -.PHONY: __cfg __cfg_basic - -# This is variable since the glob subdirectory doesn't use it. -# -ACCONFIG = acconfig.h - -__cfg: __cfg_basic config.h.in TAGS -ifdef NORECURSE - @echo ""; echo "Now you should run:"; echo ""; \ - echo " make all"; echo ""; \ - echo "then, optionally, one of:"; echo ""; \ - echo " make dist"; \ - echo " make distdir"; \ - echo " make distcheck"; \ - echo "" -endif - -__cfg_basic: aclocal.m4 stamp-h.in configure Makefile.in - -aclocal.m4: configure.in $(wildcard acinclude.m4) - aclocal $(ACLOCALARGS) - -config.h.in: stamp-h.in -stamp-h.in: configure.in aclocal.m4 $(ACCONFIG) - autoheader - echo timestamp > $@ - -configure: configure.in aclocal.m4 - autoconf $(ACARGS) - -Makefile.in: configure.in config.h.in Makefile.am aclocal.m4 - automake --add-missing - -TAGS: - find . -name '*.[ch]' -print | etags - diff --git a/Makefile.am b/Makefile.am index 3bfaf47c..e1e99906 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,10 +127,4 @@ check-regression: all # --------------- Maintainer's Section -if MAINT_MAKEFILE -# Note this requires GNU make. Not to worry, since it will only be included -# in the Makefile if we're in the maintainer's environment. -# Ulp! Need a leading space to "hide" this include from automake's new (in -# 1.4) include feature :( - include $(srcdir)/maintMakefile -endif +@MAINT_MAKEFILE@ diff --git a/Makefile.ami b/Makefile.ami index 94845ec0..8a71d690 100644 --- a/Makefile.ami +++ b/Makefile.ami @@ -16,7 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Makefile for GNU Make diff --git a/NMakefile.template b/NMakefile.template index 8f2b3f37..d9f24589 100644 --- a/NMakefile.template +++ b/NMakefile.template @@ -16,7 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # NMakefile for GNU Make diff --git a/SMakefile.template b/SMakefile.template index 2caa82ea..5850abed 100644 --- a/SMakefile.template +++ b/SMakefile.template @@ -16,16 +16,17 @@ # # You should have received a copy of the GNU General Public License # along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Makefile for GNU Make # # Ultrix 2.2 make doesn't expand the value of VPATH. -VPATH = /make-3.74/ +VPATH = /make-%VERSION%/ # This must repeat the value, because configure will remove `VPATH = .'. -srcdir = /make-3.74/ +srcdir = /make-%VERSION%/ CC = sc RM = delete diff --git a/amiga.c b/amiga.c index d0e4ff50..db8ef0df 100644 --- a/amiga.c +++ b/amiga.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +MA 02111-1307, USA. */ #include "make.h" #include "variable.h" diff --git a/amiga.h b/amiga.h index e77d999c..99a1c598 100644 --- a/amiga.h +++ b/amiga.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +MA 02111-1307, USA. */ extern int MyExecute PARAMS ((char ** argv)); extern char * wildcard_expansion PARAMS ((char * wc, char * o)); diff --git a/ar.c b/ar.c index 04d74118..9ca1e15b 100644 --- a/ar.c +++ b/ar.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" diff --git a/arscan.c b/arscan.c index 09d01ad5..5c4a48f4 100644 --- a/arscan.c +++ b/arscan.c @@ -13,7 +13,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +USA. */ #include "make.h" diff --git a/build.template b/build.template index a4aa867c..aee512f7 100644 --- a/build.template +++ b/build.template @@ -17,7 +17,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # See Makefile.in for comments describing these variables. diff --git a/commands.c b/commands.c index 166b96d8..58107efe 100644 --- a/commands.c +++ b/commands.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "dep.h" diff --git a/commands.h b/commands.h index 9547fc36..edec9103 100644 --- a/commands.h +++ b/commands.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* Structure that gives the commands to make a file and information about where these commands came from. */ diff --git a/configure.in b/configure.in index bc72d7d3..87d80624 100644 --- a/configure.in +++ b/configure.in @@ -6,8 +6,6 @@ AC_INIT(vpath.c)dnl dnl A distinctive file to look for in srcdir. AM_INIT_AUTOMAKE(make, 3.77.90) AM_CONFIG_HEADER(config.h) -AM_CONDITIONAL(MAINT_MAKEFILE, test -r $srcdir/maintMakefile) - dnl Regular configure stuff AC_PROG_MAKE_SET @@ -174,6 +172,15 @@ case "$make_cv_sys_gnu_glob" in CPPFLAGS="$CPPFLAGS -I$srcdir/glob" ;; esac + +MAINT_MAKEFILE=/dev/null +if test -r $srcdir/maintMakefile; then + MAINT_MAKEFILE="$srcdir/maintMakefile" +fi +AC_SUBST_FILE(MAINT_MAKEFILE) + +dnl AM_CONDITIONAL(MAINT_MAKEFILE, test -r $srcdir/maintMakefile) + AC_OUTPUT(Makefile glob/Makefile build.sh) case "$make_badcust" in diff --git a/default.c b/default.c index 76a32324..902909fa 100644 --- a/default.c +++ b/default.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "rule.h" diff --git a/dep.h b/dep.h index 2f9561c9..ca8112fe 100644 --- a/dep.h +++ b/dep.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* Flag bits for the second argument to `read_makefile'. These flags are saved in the `changed' field of each diff --git a/dir.c b/dir.c index 9e1cf7af..9f79a4d3 100644 --- a/dir.c +++ b/dir.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" diff --git a/expand.c b/expand.c index 31c40249..db29174b 100644 --- a/expand.c +++ b/expand.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "filedef.h" diff --git a/file.c b/file.c index 22e95840..1321b551 100644 --- a/file.c +++ b/file.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include diff --git a/filedef.h b/filedef.h index 6ee52143..f4d894fe 100644 --- a/filedef.h +++ b/filedef.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* Structure that represents the info on one file diff --git a/function.c b/function.c index a04a4679..def38633 100644 --- a/function.c +++ b/function.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "filedef.h" diff --git a/glob/.cvsignore b/glob/.cvsignore new file mode 100644 index 00000000..e8e7be49 --- /dev/null +++ b/glob/.cvsignore @@ -0,0 +1 @@ +.deps Makefile.in diff --git a/implicit.c b/implicit.c index 4be5cf55..dfe19da4 100644 --- a/implicit.c +++ b/implicit.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "rule.h" diff --git a/job.c b/job.c index 7a77481e..5ea60671 100644 --- a/job.c +++ b/job.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "job.h" diff --git a/job.h b/job.h index d60247ad..4f2a3ae6 100644 --- a/job.h +++ b/job.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #ifndef SEEN_JOB_H #define SEEN_JOB_H diff --git a/main.c b/main.c index efad30db..7c141e8c 100644 --- a/main.c +++ b/main.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +MA 02111-1307, USA. */ #include "make.h" #include "dep.h" @@ -2363,7 +2364,7 @@ print_version () printf ("-%s", remote_description); printf (", by Richard Stallman and Roland McGrath.\n\ -%sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98\n\ +%sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99\n\ %s\tFree Software Foundation, Inc.\n\ %sThis is free software; see the source for copying conditions.\n\ %sThere is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ diff --git a/make.h b/make.h index 9f5af966..ee7721d8 100644 --- a/make.h +++ b/make.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* AIX requires this to be the first thing in the file. */ #if defined (_AIX) && !defined (__GNUC__) diff --git a/makefile.vms b/makefile.vms index a1ad8415..9b8208a2 100644 --- a/makefile.vms +++ b/makefile.vms @@ -16,7 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. CC = cc/warn CP = copy diff --git a/misc.c b/misc.c index 0612862b..87694e29 100644 --- a/misc.c +++ b/misc.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "dep.h" diff --git a/read.c b/read.c index 3303ba9d..1ce892d0 100644 --- a/read.c +++ b/read.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include diff --git a/remake.c b/remake.c index fdd868ac..4604ea5f 100644 --- a/remake.c +++ b/remake.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "filedef.h" diff --git a/remote-cstms.c b/remote-cstms.c index cf918163..18d4ed6e 100644 --- a/remote-cstms.c +++ b/remote-cstms.c @@ -18,7 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "job.h" diff --git a/remote-stub.c b/remote-stub.c index 1ff9b04a..69af3975 100644 --- a/remote-stub.c +++ b/remote-stub.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "filedef.h" diff --git a/rule.h b/rule.h index f57c7e01..30cc5449 100644 --- a/rule.h +++ b/rule.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* Structure used for pattern rules. */ diff --git a/variable.c b/variable.c index c0a2199f..4537023a 100644 --- a/variable.c +++ b/variable.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "dep.h" diff --git a/variable.h b/variable.h index b1d0daf4..4826c76d 100644 --- a/variable.h +++ b/variable.h @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* Codes in a variable definition saying where the definition came from. Increasing numeric values signify less-overridable definitions. */ diff --git a/vpath.c b/vpath.c index d3320313..41cc317c 100644 --- a/vpath.c +++ b/vpath.c @@ -14,7 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Make; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include "make.h" #include "filedef.h"