--- gforth/Makefile.in 1995/11/09 18:06:19 1.39 +++ gforth/Makefile.in 1996/02/19 18:57:24 1.54 @@ -26,18 +26,19 @@ #To do: #use $(srcdir) to make compilation in a non-srcdir possible -VERSION =0.1beta#gforth version +VERSION =0.2.0#gforth version SHELL = /bin/sh RM = rm CP = cp INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = ./install-sh -d LN_S = @LN_S@ -GCC = gcc +GCC = @CC@ CC = $(GCC) FORTH = ./gforth -FORTHK = $(FORTH) -p . -i kernal.fi +FORTHK = $(FORTH) -i ./kernal.fi STRIP = strip TEXI2DVI = texi2dvi DVI2PS = dvips -D300 @@ -47,9 +48,9 @@ MAKEINFO = makeinfo XCFLAGS = @CFLAGS@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions -ENGINE_FLAGS = -fno-defer-pop -fcaller-saves +ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -pipe -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\" +CFLAGS = $(DEBUGFLAG) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):.\" #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -57,6 +58,7 @@ GCCLDFLAGS = @GCCLDFLAGS@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS) LDLIBS = @LIBS@ +VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ @@ -66,40 +68,86 @@ datadir = $(prefix)/share #read-only architecture-dependent non-ascii files libdir = $(prefix)/lib infodir = $(prefix)/info -mandir = $(prefix)/man/man1 - - -INCLUDES = forth.h threading.h io.h io-dos.h - -KERN_SRC = main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \ - errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs - -FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs answords.fs blocks.fs bufio.fs checkans.fs \ - code.fs colorize.fs cross.fs debug.fs debugging.fs doskey.fs ds2texi.fs \ - dumpimage.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \ - float.fs glocals.fs glosgen.fs gray.fs hash.fs history.fs \ - kernal.fs locals-test.fs look.fs main.fs makedoc.fs \ - mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ - other.fs prims2x.fs random.fs search-order.fs see.fs sieve.fs source.fs \ - startup.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs vt100.fs \ - vt100key.fs wordinfo.fs wordsets.fs \ - tester.fs coretest.fs - -SOURCES = Makefile.in configure.in configure config.sub config.guess \ - install-sh INSTALL README ToDo BUGS model COPYING \ +mandir = $(prefix)/man +man1dir= $(mandir)/man1 +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 + +KERN_SRC = \ + add.fs \ + aliases.fs \ + cross.fs \ + errore.fs \ + extend.fs \ + kernal.fs \ + main.fs \ + search-order.fs \ + tools.fs \ + toolsext.fs \ + vars.fs \ + version.fs + +GFORTH_FI_SRC = \ + assert.fs \ + blocks.fs \ + bufio.fs \ + debug.fs \ + debugging.fs \ + dumpimage.fs \ + environ.fs \ + float.fs \ + glocals.fs \ + hash.fs \ + history.fs \ + look.fs \ + search-order.fs \ + see.fs \ + source.fs \ + startup.fs \ + struct.fs \ + stuff.fs \ + termsize.fs \ + vt100.fs \ + vt100key.fs \ + wordinfo.fs + +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \ + anslocal.fs ansi.fs answords.fs \ + checkans.fs \ + code.fs colorize.fs \ + doskey.fs ds2texi.fs \ + etags.fs filedump.fs \ + glosgen.fs gray.fs \ + makedoc.fs \ + mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ + more.fs other.fs prims2x.fs random.fs \ + sieve.fs \ + site-init.fs \ + tt.fs sokoban.fs \ + wordsets.fs \ + tester.fs coretest.fs \ + bubble.fs siev.fs matrix.fs fib.fs + +SOURCES = CVS Makefile.in configure.in configure config.sub config.guess \ + acconfig.h config.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 \ 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 \ - makefile.dos mkdosmf.sed configure.bat startup.dos \ + INSTALL.DOS makefile.dos mkdosmf.sed configure.bat \ + startup.dos history.dos \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) RCS_FILES = ToDo model high-level -GEN = gforth +GEN = gforth version.fs OBJECTS = engine.o io.o main.o @LIBOBJS@ @getopt_long@ @@ -112,9 +160,9 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernal_fi@ #distributed documentation DOCDIST = gforth.texi gforth.fns gforth.ps gforth.info* -KERNLS = kernl16b.fi+ kernl16l.fi+ \ - kernl32b.fi+ kernl32l.fi+ \ - kernl64b.fi+ kernl64l.fi+ +KERNLS = kernl16b.fi- kernl16l.fi- \ + kernl32b.fi- kernl32l.fi- \ + kernl64b.fi- kernl64l.fi- GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gforth.texi gforth.dvi gforth.ps Makefile configure @@ -122,11 +170,14 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf .SUFFIXES: .SUFFIXES: .c .o -all: - if [ ! -f gforth ]; then $(MAKE) first; fi - $(MAKE) more +all: version.fs more + +version.c: Makefile.in + echo "char gforth_version[]=\"$(VERSION)\" ;" >$@ -first: gforth +version.fs: Makefile.in + $(MAKE) gforth + echo ": version-string s\" $(VERSION)\" ;" >$@ more: $(FORTH_GEN) gforth @@ -141,19 +192,31 @@ more: $(FORTH_GEN) gforth # `distclean' also deletes the files made by config. # `realclean' also deletes everything that could be regenerated automatically." -clean: - -$(RM) $(GEN) *.o *.s gforth.fi +mostlyclean: + -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs TAGS \ + crossdoc.fd doc.fd gforth.aux gforth.cp gforth.cps \ + gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \ + gforth.toc gforth.tp gforth.vr html + +clean: mostlyclean + -$(RM) -rf $(GEN) *.o distclean: clean - -$(RM) machine.h kernal.fi config.cache config.log + -$(RM) machine.h kernal.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 dist: $(SOURCES) $(FORTH_GEN) $(DOCDIST) -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - cp -p $(SOURCES) $(FORTH_GEN0) @KERNAL@ $(DOCDIST) gforth-$(VERSION) + $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNAL@ $(DOCDIST) gforth-$(VERSION) tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz -rm -rf gforth-$(VERSION) @@ -163,7 +226,7 @@ dist: $(SOURCES) $(FORTH_GEN) $(DOCDIST bindist: $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - cp -p -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 kernal.fi gforth-$(VERSION) strip gforth-$(VERSION)/gforth tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz @@ -177,7 +240,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 kernal.fi gforth-$(VERSION) strip gforth-$(VERSION)/gforth tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz @@ -186,26 +249,50 @@ 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 - $(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) +install: gforth $(FORTH_SRC) kernal.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 + touch $(datadir)/gforth/site-forth/site-init.fs + -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION) $(INSTALL_PROGRAM) -s gforth $(bindir) + ln $(bindir)/gforth $(bindir)/gforth-$(VERSION) $(INSTALL_DATA) gforth.1 $(mandir) - $(INSTALL_DATA) gforth.info* $(infodir) - for i in $(FORTH_SRC); do \ + for i in gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + for i in $(FORTH_SRC) primitives; do \ $(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \ done - rm gforth.fi; make gforth.fi #gforth.fi contains some path names - $(INSTALL_DATA) kernal.fi gforth.fi $(libdir)/gforth/$(VERSION) + $(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) + if test -d $(emacssitelispdir); then \ + $(INSTALL_DATA) gforth.el $(emacssitelispdir); \ + else ; \ + echo "please install gforth.el in your .../emacs/site-lisp directory"; \ + fi + +#deinstall all files specific to this version of gforth +#to uninstall version foo, type `make uninstall VERSION=foo' +uninstall: + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION) + @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(mandir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" check: test - touch test + #touch test -test: gforth - $(FORTH) tester.fs coretest.fs -e bye +test: gforth gforth.fi + $(FORTH) tester.fs coretest.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 +bench: gforth gforth.fi + @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' + time $(FORTH) siev.fs -e "main bye" + time $(FORTH) bubble.fs -e "main bye" + time $(FORTH) -m 160000 matrix.fs -e "main bye" + time $(FORTH) fib.fs -e "main bye" + dvi: gforth.dvi gforth: $(OBJECTS) @@ -213,56 +300,60 @@ gforth: $(OBJECTS) $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@ @MAKE_EXE@ -kernl16l.fi+: $(KERN_SRC) mach16l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16l.fs"' main.fs +kernl16l.fi-: $(KERN_SRC) mach16l.fs $(FORTH_GEN0) + $(FORTHK) -p . -e 's" mach16l.fs"' main.fs -kernl16b.fi+: $(KERN_SRC) mach16b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16b.fs"' main.fs +kernl16b.fi-: $(KERN_SRC) mach16b.fs $(FORTH_GEN0) + $(FORTHK) -p . -e 's" mach16b.fs"' main.fs -kernl32l.fi+: $(KERN_SRC) mach32l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' main.fs +kernl32l.fi-: $(KERN_SRC) mach32l.fs $(FORTH_GEN0) + $(FORTHK) -p . -e 's" mach32l.fs"' main.fs -kernl32b.fi+: $(KERN_SRC) mach32b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32b.fs"' main.fs +kernl32b.fi-: $(KERN_SRC) mach32b.fs $(FORTH_GEN0) + $(FORTHK) -p . -e 's" mach32b.fs"' main.fs -kernl64l.fi+: $(KERN_SRC) mach64l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64l.fs"' main.fs +kernl64l.fi-: $(KERN_SRC) mach64l.fs $(FORTH_GEN0) + $(FORTHK) -p . -e 's" mach64l.fs"' main.fs -kernl64b.fi+: $(KERN_SRC) mach64b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64b.fs"' main.fs +kernl64b.fi-: $(KERN_SRC) mach64b.fs $(FORTH_GEN0) + $(FORTHK) -p . -e 's" mach64b.fs"' main.fs kernl16b.fi: $(KERNLS) -$(CP) kernl16b.fi kernl16b.fi~ - -$(CP) kernl16b.fi+ kernl16b.fi + -$(CP) kernl16b.fi- kernl16b.fi @LINK_KERNL16B@ kernl16l.fi: $(KERNLS) -$(CP) kernl16l.fi kernl16l.fi~ - -$(CP) kernl16l.fi+ kernl16l.fi + -$(CP) kernl16l.fi- kernl16l.fi @LINK_KERNL16L@ kernl32b.fi: $(KERNLS) -$(CP) kernl32b.fi kernl32b.fi~ - -$(CP) kernl32b.fi+ kernl32b.fi + -$(CP) kernl32b.fi- kernl32b.fi @LINK_KERNL32B@ kernl32l.fi: $(KERNLS) -$(CP) kernl32l.fi kernl32l.fi~ - -$(CP) kernl32l.fi+ kernl32l.fi + -$(CP) kernl32l.fi- kernl32l.fi @LINK_KERNL32L@ kernl64b.fi: $(KERNLS) -$(CP) kernl64b.fi kernl64b.fi~ - -$(CP) kernl64b.fi+ kernl64b.fi + -$(CP) kernl64b.fi- kernl64b.fi @LINK_KERNL64B@ kernl64l.fi: $(KERNLS) -$(CP) kernl64l.fi kernl64l.fi~ - -$(CP) kernl64l.fi+ kernl64l.fi + -$(CP) kernl64l.fi- kernl64l.fi @LINK_KERNL64L@ -gforth.fi: @kernal_fi@ gforth startup.fs glocals.fs search-order.fs hash.fs float.fs debugging.fs environ.fs wordinfo.fs look.fs vt100.fs see.fs bufio.fs debug.fs history.fs vt100key.fs assert.fs source.fs blocks.fs struct.fs dumpimage.fs - $(FORTHK) startup.fs dumpimage.fs -e "savesystem gforth.fi bye" +gforth.fi: @kernal_fi@ gforth $(GFORTH_FI_SRC) + $(FORTHK) startup.fs -e "savesystem gforth.fi bye" + +gforth.TAGS: @kernal_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS + $(FORTHK) etags.fs startup.fs -e bye + cat TAGS primitives.TAGS kernal.TAGS >gforth.TAGS engine.s: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S engine.c @@ -276,49 +367,45 @@ main.o: main.c machine.h threading.h $( strtoul.o: strtoul.c strtol.c primitives.b: primitives - m4 primitives >$@ + m4 -s $(srcdir)/primitives >$@ primitives.i : primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@ + $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@ prim_labels.i : primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ + $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ aliases.fs: primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@ + $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@ primitives.fs: primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@ - -version.fs: Makefile.in - echo ": version-string s\" $(VERSION)\" ;" >$@ - -version.c: Makefile.in - echo "char gforth_version[]=\"$(VERSION)\" ;" >$@ + $(FORTHK) -p . 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" >$@ 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) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye + $(FORTHK) -p . -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye crossdoc.fd: $(KERN_SRC) $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' main.fs + $(FORTHK) -p . -e 's" mach32l.fs"' main.fs gforth.texi: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd - $(FORTHK) ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@ + $(FORTHK) -p . ds2texi.fs -e "s\" 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) ds2texi.fs answords.fs -e bye + $(FORTHK) -p . ds2texi.fs answords.fs -e bye -gforth.dvi: gforth.texi +gforth.dvi gforth.fns: gforth.texi $(TEXI2DVI) gforth.texi gforth.ps: gforth.dvi $(DVI2PS) gforth.dvi -o $@ -gforth.info: gforth.texi +gforth.info*: gforth.texi -$(MAKEINFO) gforth.texi html: gforth.texi @@ -328,16 +415,34 @@ html: gforth.texi # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. +${srcdir}/configure: configure.in + cd ${srcdir} && autoconf + +# autoheader might not change config.h.in, so touch a stamp file. +${srcdir}/config.h.in: stamp-h.in +${srcdir}/stamp-h.in: configure.in acconfig.h + cd ${srcdir} && autoheader + echo timestamp > ${srcdir}/stamp-h.in + +config.h: stamp-h +stamp-h: config.h.in config.status + CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status + echo > stamp-h Makefile: Makefile.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status + config.status: configure - ./config.status --recheck -configure: configure.in - cd $(srcdir) && autoconf + ./config.status --recheck + +#create files for DOS, because DOS cannot do it itself makefile.dos: mkdosmf.sed Makefile.in sed -f mkdosmf.sed makefile.dos +history.dos: history.fs Makefile.in + sed -e "s,~/\.gforth-history,/gforth.his,g" history.dos + startup.dos: startup.fs Makefile.in sed -e "s/\\\\ include doskey/include doskey/g" \ - -e "s/include vt100key/\\\\ include vt100key/g" <$< >$@ \ No newline at end of file + -e "s/include vt100key/\\\\ include vt100key/g" startup.dos +