--- gforth/Makefile.in 1998/12/22 13:41:17 1.134 +++ gforth/Makefile.in 1999/03/23 20:24:15 1.151 @@ -53,7 +53,7 @@ osclass = @OSCLASS@ SHELL = /bin/sh RM = rm RMTREE = rm -rf -CP = cp +CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ @@ -62,10 +62,14 @@ INSTALL_DATA = @INSTALL_DATA@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) +FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTH = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) -FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$\~+$(PATHSEP)$(srcdir) -i $(kernel_fi) +FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) +ENGINE = ./gforth +FORTH = $(ENGINE) $(FORTH_ARGS) +ENGINE_FAST = $(ENGINE)-fast +FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) +FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) FORTHK = ./gforth $(FORTHKFLAGS) FORTHP = ./gforth --die-on-signal -i ./$(kernel_fi) STRIP = strip @@ -106,6 +110,7 @@ man1dir= $(mandir)/man1 man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ emacssitelispdir=@lispdir@ +siteforthdir=$(datadir)/gforth/site-forth CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ compat/CVS \ @@ -115,6 +120,8 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ arch/shboom/CVS \ +INCLUDES = engine/forth.h engine/threaded.h engine/io.h + KERN_SRC = \ kernel/aliases0.fs \ kernel/aliases.fs \ @@ -164,6 +171,7 @@ EC_SRC = \ GFORTH_FI_SRC = \ assert.fs \ + backtrace.fs \ blocked.fb \ blocks.fs \ bufio.fs \ @@ -205,13 +213,14 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) doc/makedoc.fs \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ machpc.fs more.fs other.fs prims2x.fs random.fs \ - siteinit.fs table.fs \ + table.fs \ tt.fs sokoban.fs \ unbuffered.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ test/other.fs test/checkans.fs \ bubble.fs siev.fs matrix.fs fib.fs \ - oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs + oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ + moofglos.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -228,9 +237,79 @@ GFORTH_TEXI = doc/gforth.texi doc/versi ALLSUBDIRS = engine +ARCHS = \ + arch/generic/machine.h \ + arch/m68k/machine.h \ + arch/mips/machine.h \ + arch/386/machine.h \ + arch/hppa/machine.h \ + arch/hppa/cache.c \ + arch/sparc/machine.h \ + arch/power/machine.h \ + arch/power/_sync_cache_range.c \ + arch/alpha/machine.h \ + arch/4stack/README \ + arch/4stack/asm.fs \ + arch/4stack/mach.fs \ + arch/4stack/prim.fs \ + arch/4stack/mach.sh \ + arch/4stack/relocate.fs \ + arch/misc/README \ + arch/misc/asm.fs \ + arch/misc/mach.fs \ + arch/misc/prim.fs \ + arch/misc/sim.fs \ + arch/misc/sokoban.fs \ + arch/misc/tt.fs \ + arch/6502/asm.fs \ + arch/6502/prim.fs \ + arch/6502/mach.fs \ + arch/6502/zero.fs \ + arch/6502/softuart.fs \ + arch/6502/cold.fs \ + arch/8086/asm.fs \ + arch/8086/mach.fs \ + arch/8086/mach.sh \ + arch/8086/prim.fs \ + arch/avr/asm.fs \ + arch/c165/asm.fs \ + arch/c165/mach.fs \ + arch/c165/prim.fs \ + arch/h8/asm.fs \ + arch/shboom/asm.fs \ + arch/shboom/compiler.fs \ + arch/shboom/dis.fs \ + arch/shboom/mach.fs \ + arch/shboom/prim.fs \ + arch/shboom/dis2.fs \ + arch/shboom/sh.p \ + arch/shboom/doers.fs + +SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \ + configure.in configure config.sub config.guess elisp-comp missing \ + acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ + install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ + COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ + doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ + gforth.el \ + prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ + engine/signals.c $(ARCHS) \ + engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ + engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ + engine/ansidecl.h engine/memmove.c \ + engine/pow10.c engine/atanh.c engine/cleanalign.c \ + engine/strerror.c engine/strsignal.c engine/dblsub.c \ + INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \ + dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \ + versions.bsh \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ + gforthmi.cmd glosgen.glo doc/glossaries.doc \ + $(INCLUDES) $(FORTH_SRC) $(COMPAT) \ + timings.sc + RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp +GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) kernel/version.fs # things that need a working forth system to be generated FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs @@ -239,14 +318,7 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.txt doc/gforth.ps - -#stuff in a binonly distribution -BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \ - $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ - arch/$(machine)/machine.h engine/config.h engine/Makefile \ - stamp-h kernel/version.fs version-stamp \ - INSTALL.BINDIST +DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -277,7 +349,7 @@ kernel/version.fs: version $(MAKE) gforth$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engine $(FORTH_GEN) gforth$(EXE) +more: engine $(FORTH_GEN) $(GEN) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -300,8 +372,17 @@ mostlyclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html \ gforth-$(VERSION).tar.gz +# Just the stuff needed to rebuild the documentation nac03feb1999 +docclean: FORCE + -$(RM) -rf doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \ + doc/gforth.aux doc/gforth.cp doc/gforth.cps \ + doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \ + doc/gforth.pg \ + doc/gforth.toc doc/gforth.tp doc/gforth.vr html + clean: mostlyclean - -$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \ + -$(RM) -rf $(GEN) engine/gforth$(EXE) \ + engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \ *.o engine/*.o arch/*/*.o version distclean: clean @@ -319,29 +400,33 @@ virtualclean: mostlyclean -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \ gforth-$(VERSION).tar.gz config.cache *~ */*~ -dist: - $(MAKE) -f Makedist $@ +#Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the +#Makefile if it contains our dist rules. Therefore we have put these +#rules in Makedist (you can use them with GNU make on these systems). +dist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +dosdist: Makedist FORCE + $(MAKE) -f Makedist d$@ -dosdist: - $(MAKE) -f Makedist $@ +srcdist: Makedist FORCE + $(MAKE) -f Makedist d$@ -srcdist: - $(MAKE) -f Makedist $@ +srconlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ -srconlydist: - $(MAKE) -f Makedist $@ +docdist: Makedist FORCE + $(MAKE) -f Makedist d$@ -docdist: - $(MAKE) -f Makedist $@ +htmldist: Makedist FORCE + $(MAKE) -f Makedist d$@ -htmldist: - $(MAKE) -f Makedist $@ +bindist: Makedist FORCE + $(MAKE) -f Makedist d$@ -bindist: - $(MAKE) -f Makedist $@ +binonlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ -binonlydist: - $(MAKE) -f Makedist $@ #strip gforth, because the debugging stuff is hardly useful once # gforth manages to execute more than a few primitives @@ -350,12 +435,16 @@ binonlydist: #supplying a lot of files that can be easily generated (only info is #hard to generate) install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs - touch $(datadir)/gforth/site-forth/siteinit.fs + touch $(siteforthdir)/siteinit.fs -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi + -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE) + (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) + $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) + (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) - $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi + $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) + (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ @@ -363,10 +452,10 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) $(RM) gforth.fi - GFORTHD="./gforth-ditc -i $(kernel_fi)" GFORTH="./gforth-ditc -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names + GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS - @if test -d $(emacssitelispdir); then \ + @if test -d "$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ @@ -377,7 +466,9 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker install-strip: install installdirs: mkinstalldirs - $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ + $(srcdir)/mkinstalldirs $$i; \ + done for i in $(CVSDIRS); do \ $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ done @@ -398,16 +489,16 @@ check test: gforth$(EXE) gforth.fi @echo 'Expect no differences' $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i -bench: gforth$(EXE) gforth.fi +bench: gforth-fast$(EXE) 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" + time $(FORTH_FAST) siev.fs -e "main bye" + time $(FORTH_FAST) bubble.fs -e "main bye" + time $(FORTH_FAST) -m 160000 matrix.fs -e "main bye" + time $(FORTH_FAST) fib.fs -e "main bye" # ------------- Make forth images -# Hot to make new images: +# How to make new images: # 1. Produce an image called kernlXYZ.fi- # the original kernel.fi is not touched because it's needed for creation # 2. copy old kernlXYZ.fi to kernlXYZ.fi~ @@ -508,12 +599,16 @@ gforth$(EXE): engines $(CP) engine/$@ $@ @GFORTH_EXE@ +gforth-fast$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHFAST_EXE@ + gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ -engines: FORCE - cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE) +engines: FORCE engine/Makefile + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) # ------------- additional C primitives @@ -542,8 +637,8 @@ prim.TAGS: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- -doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye +doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye doc/crossdoc.fd: $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye @@ -600,10 +695,7 @@ stamp-h: engine/config.h.in config.statu CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status echo timestamp > stamp-h -Makefile: Makefile.in engine/Makefile.in config.status - CONFIG_FILES="$@ Makedist engine/$@" CONFIG_HEADERS=engine/config.h ./config.status - -gforthmi: gforthmi.in config.status +Makefile Makedist engine/Makefile gforthmi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in config.status CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status config.status: configure