diff options
| -rw-r--r-- | .cvsignore | 4 | ||||
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | GNUmakefile | 58 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | Makefile.ami | 3 | ||||
| -rw-r--r-- | NMakefile.template | 3 | ||||
| -rw-r--r-- | SMakefile.template | 7 | ||||
| -rw-r--r-- | amiga.c | 3 | ||||
| -rw-r--r-- | amiga.h | 3 | ||||
| -rw-r--r-- | ar.c | 3 | ||||
| -rw-r--r-- | arscan.c | 3 | ||||
| -rw-r--r-- | build.template | 3 | ||||
| -rw-r--r-- | commands.c | 3 | ||||
| -rw-r--r-- | commands.h | 3 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | default.c | 3 | ||||
| -rw-r--r-- | dep.h | 3 | ||||
| -rw-r--r-- | dir.c | 3 | ||||
| -rw-r--r-- | expand.c | 3 | ||||
| -rw-r--r-- | file.c | 3 | ||||
| -rw-r--r-- | filedef.h | 3 | ||||
| -rw-r--r-- | function.c | 3 | ||||
| -rw-r--r-- | glob/.cvsignore | 1 | ||||
| -rw-r--r-- | implicit.c | 3 | ||||
| -rw-r--r-- | job.c | 3 | ||||
| -rw-r--r-- | job.h | 3 | ||||
| -rw-r--r-- | main.c | 5 | ||||
| -rw-r--r-- | make.h | 3 | ||||
| -rw-r--r-- | makefile.vms | 3 | ||||
| -rw-r--r-- | misc.c | 3 | ||||
| -rw-r--r-- | read.c | 3 | ||||
| -rw-r--r-- | remake.c | 3 | ||||
| -rw-r--r-- | remote-cstms.c | 3 | ||||
| -rw-r--r-- | remote-stub.c | 3 | ||||
| -rw-r--r-- | rule.h | 3 | ||||
| -rw-r--r-- | variable.c | 3 | ||||
| -rw-r--r-- | variable.h | 3 | ||||
| -rw-r--r-- | vpath.c | 3 |
38 files changed, 93 insertions, 104 deletions
@@ -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 @@ -1,5 +1,18 @@ +1999-03-05 Paul D. Smith <psmith@gnu.org> + + * 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 <psmith@gnu.org> + * 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 97b2e1d..0000000 --- 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 3bfaf47..e1e9990 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 94845ec..8a71d69 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 8f2b3f3..d9f2458 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 2caa82e..5850abe 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 @@ -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" @@ -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)); @@ -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" @@ -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 a4aa867..aee512f 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. @@ -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" @@ -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 bc72d7d..87d8062 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 @@ -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" @@ -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 @@ -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" @@ -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" @@ -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 <assert.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 @@ -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 0000000..e8e7be4 --- /dev/null +++ b/glob/.cvsignore @@ -0,0 +1 @@ +.deps Makefile.in @@ -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" @@ -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" @@ -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 @@ -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\ @@ -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 a1ad841..9b8208a 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 @@ -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" @@ -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 <assert.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. */ #include "make.h" #include "filedef.h" diff --git a/remote-cstms.c b/remote-cstms.c index cf91816..18d4ed6 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 1ff9b04..69af397 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" @@ -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. */ @@ -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" @@ -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. */ @@ -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" |