--- gforth/Makefile.in 1996/01/07 17:22:06 1.52 +++ gforth/Makefile.in 1996/09/30 13:16:06 1.66 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995 Free Software Foundation, Inc. +#Copyright (C) 1995, 1996 Free Software Foundation, Inc. #This file is part of Gforth. @@ -33,12 +33,14 @@ CP = cp INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_DIR = ./install-sh -d +INSTALL_DIR = $(srcdir)/install-sh -d LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -FORTH = ./gforth -FORTHK = $(FORTH) -i ./kernal.fi +FORTHPATH = $(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):. +FORTH = ./gforth -p $(FORTHPATH):$(srcdir) +FORTHK = $(FORTH) -p .:$(srcdir) -i ./kernel.fi +FORTHP = ./gforth -i ./kernel.fi STRIP = strip TEXI2DVI = texi2dvi DVI2PS = dvips -D300 @@ -50,7 +52,7 @@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):.\" +CFLAGS = $(DEBUGFLAG) -I. -I$(srcdir) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -74,7 +76,7 @@ man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ emacssitelispdir=$(datadir)/emacs/site-lisp -INCLUDES = forth.h threading.h io.h io-dos.h config.h +INCLUDES = forth.h threading.h io.h KERN_SRC = \ add.fs \ @@ -82,16 +84,17 @@ KERN_SRC = \ cross.fs \ errore.fs \ extend.fs \ - kernal.fs \ + kernel.fs \ main.fs \ search-order.fs \ + special.fs \ tools.fs \ toolsext.fs \ - vars.fs \ - version.fs + vars.fs GFORTH_FI_SRC = \ assert.fs \ + blockedit.fb \ blocks.fs \ bufio.fs \ debug.fs \ @@ -102,6 +105,7 @@ GFORTH_FI_SRC = \ glocals.fs \ hash.fs \ history.fs \ + intcomp.fs \ look.fs \ search-order.fs \ see.fs \ @@ -109,13 +113,14 @@ GFORTH_FI_SRC = \ startup.fs \ struct.fs \ stuff.fs \ + tasker.fs \ termsize.fs \ vt100.fs \ vt100key.fs \ wordinfo.fs FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \ - anslocal.fs ansi.fs answords.fs \ + ansi.fs answords.fs \ checkans.fs \ code.fs colorize.fs \ doskey.fs ds2texi.fs \ @@ -128,19 +133,20 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) site-init.fs \ tt.fs sokoban.fs \ wordsets.fs \ - tester.fs coretest.fs \ - bubble.fs siev.fs matrix.fs fib.fs + tester.fs coretest.fs postponetest.fs dbltest.fs \ + bubble.fs siev.fs matrix.fs fib.fs \ + oof.fs oofsampl.fs -SOURCES = CVS Makefile.in configure.in configure config.sub config.guess \ - acconfig.h config.h.in \ +SOURCES = CVS compat Makefile.in configure.in configure config.sub config.guess \ + acconfig.h config.h.in stamp-h.in \ install-sh INSTALL README ToDo BUGS model COPYING Benchres \ gforth.ds texinfo.tex gforth.1 gforth.el \ - primitives engine.c main.c io.c \ + primitives engine.c main.c io.c memcasecmp.c \ m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \ getopt.c getopt1.c getopt.h select.c \ ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \ - strerror.c strsignal.c \ - INSTALL.DOS makefile.dos mkdosmf.sed configure.bat \ + strerror.c strsignal.c dblsub.c \ + INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \ startup.dos history.dos \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) @@ -149,16 +155,16 @@ RCS_FILES = ToDo model high-level GEN = gforth version.fs -OBJECTS = engine.o io.o main.o @LIBOBJS@ @getopt_long@ +OBJECTS = engine.o io.o main.o memcasecmp.o @LIBOBJS@ @getopt_long@ # things that need a working forth system to be generated FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs -FORTH_GEN = $(FORTH_GEN0) @KERNAL@ gforth.fi +FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, -FORTH_GEN1 = $(FORTH_GEN0) @kernal_fi@ +FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = gforth.texi gforth.fns gforth.ps gforth.info* +DOCDIST = gforth.ps gforth.info* KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -193,8 +199,8 @@ more: $(FORTH_GEN) gforth # `realclean' also deletes everything that could be regenerated automatically." mostlyclean: - -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs TAGS \ - crossdoc.fd doc.fd gforth.aux gforth.cp gforth.cps \ + -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs *TAGS \ + crossdoc.fd doc.fd gforth.texi gforth.fns gforth.aux gforth.cp gforth.cps \ gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \ gforth.toc gforth.tp gforth.vr html @@ -202,20 +208,22 @@ clean: mostlyclean -$(RM) -rf $(GEN) *.o distclean: clean - -$(RM) machine.h kernal.fi config.cache config.log config.status config.h Makefile + -$(RM) machine.h kernel.fi config.cache config.log config.status config.h Makefile -realclean: distclean - -$(RM) $(GEN_PRECIOUS) +#realclean is useless, but dangerous, so it's commented out +#realclean: distclean +# -$(RM) $(GEN_PRECIOUS) #mostlyclean, but also remove some of the stuff that is distributed virtualclean: mostlyclean -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \ - gforth-$(VERSION).tar.gz config.cache *~ *TAGS + gforth-$(VERSION).tar.gz config.cache *~ */*~ +#use dist targets only when srcdir=. dist: $(SOURCES) $(FORTH_GEN) $(DOCDIST) -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNAL@ $(DOCDIST) gforth-$(VERSION) + $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth-$(VERSION) tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz -rm -rf gforth-$(VERSION) @@ -225,7 +233,7 @@ dist: $(SOURCES) $(FORTH_GEN) $(DOCDIST bindist: $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -rp -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION) + $(CP) -rp -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernel.fi gforth-$(VERSION) strip gforth-$(VERSION)/gforth tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz @@ -239,7 +247,7 @@ bindist: $(SOURCES) $(FORTH_GEN) gforth binonlydist: $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -p -d config.status Makefile gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION) + $(CP) -p -d config.status Makefile gforth $(OBJECTS) machine.h kernel.fi gforth-$(VERSION) strip gforth-$(VERSION)/gforth tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz @@ -248,7 +256,7 @@ binonlydist: $(SOURCES) $(FORTH_GEN) gfo #strip gforth, because the debugging stuff is hardly useful once # gforth manages to execute more than a few primitives -install: gforth $(FORTH_SRC) kernal.fi gforth.fi gforth.1 gforth.info* primitives gforth.TAGS +install: gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 gforth.info primitives gforth.TAGS for i in $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth; do \ $(INSTALL_DIR) $$i; \ done @@ -256,20 +264,22 @@ install: gforth $(FORTH_SRC) kernal.fi g -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION) $(INSTALL_PROGRAM) -s gforth $(bindir) ln $(bindir)/gforth $(bindir)/gforth-$(VERSION) - $(INSTALL_DATA) gforth.1 $(mandir) - for i in gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + $(INSTALL_DATA) $(srcdir)/gforth.1 $(mandir) + for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) primitives; do \ - $(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \ + $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ done - $(INSTALL_DATA) kernal.fi $(libdir)/gforth/$(VERSION) - $(FORTHK) startup.fs dumpimage.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names - sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION): gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) + $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION) + $(FORTHP) startup.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names + sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) if test -d $(emacssitelispdir); then \ - $(INSTALL_DATA) gforth.el $(emacssitelispdir); \ - else ; \ - echo "please install gforth.el in your .../emacs/site-lisp directory"; \ + $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ + else \ + echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi +install-strip: install + #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: @@ -280,10 +290,10 @@ check: test touch test test: gforth gforth.fi - $(FORTH) tester.fs coretest.fs -e bye + $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye $(FORTH) code.fs checkans.fs -e bye @echo 'Expect no differences' - $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i + $(FORTH) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i bench: gforth gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' @@ -299,23 +309,23 @@ gforth: $(OBJECTS) $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@ @MAKE_EXE@ -kernl16l.fi-: $(KERN_SRC) mach16l.fs $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach16l.fs"' main.fs +kernl16l.fi-: $(KERN_SRC) version.fs mach16l.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl16b.fi-: $(KERN_SRC) mach16b.fs $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach16b.fs"' main.fs +kernl16b.fi-: $(KERN_SRC) version.fs mach16b.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl32l.fi-: $(KERN_SRC) mach32l.fs $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach32l.fs"' main.fs +kernl32l.fi-: $(KERN_SRC) version.fs mach32l.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl32b.fi-: $(KERN_SRC) mach32b.fs $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach32b.fs"' main.fs +kernl32b.fi-: $(KERN_SRC) version.fs mach32b.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl64l.fi-: $(KERN_SRC) mach64l.fs $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach64l.fs"' main.fs +kernl64l.fi-: $(KERN_SRC) version.fs mach64l.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl64b.fi-: $(KERN_SRC) mach64b.fs $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach64b.fs"' main.fs +kernl64b.fi-: $(KERN_SRC) version.fs mach64b.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" kernl16b.fi: $(KERNLS) -$(CP) kernl16b.fi kernl16b.fi~ @@ -347,21 +357,21 @@ kernl64l.fi: $(KERNLS) -$(CP) kernl64l.fi- kernl64l.fi @LINK_KERNL64L@ -gforth.fi: @kernal_fi@ gforth $(GFORTH_FI_SRC) +gforth.fi: @kernel_fi@ gforth $(GFORTH_FI_SRC) $(FORTHK) startup.fs -e "savesystem gforth.fi bye" -gforth.TAGS: @kernal_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS +gforth.TAGS: @kernel_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS $(FORTHK) etags.fs startup.fs -e bye - cat TAGS primitives.TAGS kernal.TAGS >gforth.TAGS + cat TAGS primitives.TAGS kernel.TAGS >gforth.TAGS -engine.s: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S engine.c +engine.s: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h + $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S $(srcdir)/engine.c -engine.o: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c engine.c +engine.o: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h + $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c -main.o: main.c machine.h threading.h $(INCLUDES) - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c main.c +main.o: main.c machine.h threading.h $(INCLUDES) config.h + $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c strtoul.o: strtoul.c strtol.c @@ -369,42 +379,46 @@ primitives.b: primitives m4 -s $(srcdir)/primitives >$@ primitives.i : primitives.b prims2x.fs - $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@ prim_labels.i : primitives.b prims2x.fs - $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ aliases.fs: primitives.b prims2x.fs - $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@ primitives.fs: primitives.b prims2x.fs - $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@ primitives.TAGS: primitives.b prims2x.fs - $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-tag process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@ doc.fd: makedoc.fs float.fs search-order.fs glocals.fs environ.fs \ toolsext.fs wordinfo.fs \ vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \ doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs - $(FORTHK) -p . -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye + $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye -crossdoc.fd: $(KERN_SRC) $(FORTH_GEN0) - $(FORTHK) -p . -e 's" mach32l.fs"' main.fs +crossdoc.fd: $(KERN_SRC) version.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach32l.fs"' main.fs -e bye gforth.texi: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd - $(FORTHK) -p . ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@ + $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@ checkdoc: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs - $(FORTHK) -p . ds2texi.fs answords.fs -e bye + $(FORTHK) ds2texi.fs answords.fs -e bye + +dvi: gforth.dvi gforth.dvi gforth.fns: gforth.texi - $(TEXI2DVI) gforth.texi + $(TEXI2DVI) $(srcdir)/gforth.texi gforth.ps: gforth.dvi $(DVI2PS) gforth.dvi -o $@ -gforth.info*: gforth.texi +info: gforth.info + +gforth.info: gforth.texi -$(MAKEINFO) gforth.texi html: gforth.texi @@ -412,6 +426,8 @@ html: gforth.texi -mkdir html cd html; $(TEXI2HTML) -menu -split_node ../gforth.texi +doc: gforth.ps html + # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. ${srcdir}/configure: configure.in