--- gforth/Makefile.in 2003/12/31 13:44:14 1.291 +++ gforth/Makefile.in 2007/03/18 21:46:01 1.345 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. #This file is part of Gforth. @@ -58,6 +58,7 @@ MV = mv TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +MASSAGE_EXE = @MASSAGE_EXE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ @@ -76,7 +77,7 @@ FORTHS = $(ENGINE) $(FORTHS_ARGS) # possible to override this variable at the command line for an initial build (jaw) BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) # the forth system plus flags we use to build -FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)' +FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast @@ -86,10 +87,10 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) #FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) #the "-2 image-included-files +!" undoes the change to image-included-files # in exboot.fs -STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ +STARTUP = exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip -TEXI2DVI = texi2dvi -e -TEXI2PDF = texi2dvi --pdf -e +TEXI2DVI = @TEXI2DVI@ +TEXI2PDF = @TEXI2DVI@ --pdf DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo @@ -109,7 +110,9 @@ XLDFLAGS = @LDFLAGS@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ -# ------------ Install Directorys +STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ + +# ------------ Install Directories VPATH = @srcdir@ prefix = @prefix@ @@ -138,9 +141,9 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \ arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ - arch/arm/CVS + arch/arm/CVS arch/r8c/CVS -INCLUDES = engine/forth.h engine/threaded.h engine/io.h +INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h KERN_SRC = \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ @@ -148,7 +151,6 @@ KERN_SRC = \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ - chains.fs \ kernel/cbr.fs \ kernel/cloop.fs \ kernel/cond.fs \ @@ -177,12 +179,14 @@ KERN_SRC = \ kernel/saccept.fs \ kernel/doers.fs \ kernel/getdoers.fs \ - kernel/pass.fs + kernel/pass.fs \ + kernel/xchars.fs EC_SRC = \ asm/README \ asm/bitmask.fs \ asm/numref.fs \ + chains.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ @@ -191,7 +195,8 @@ EC_SRC = \ ec/shex.fs \ ec/builttag.fs \ ec/dotx.fs \ - ec/nesting.fs + ec/nesting.fs \ + build-ec.in GFORTH_FI_SRC = \ assert.fs \ @@ -202,7 +207,9 @@ GFORTH_FI_SRC = \ code.fs \ debug.fs \ debugs.fs \ + dis-gdb.fs \ ekey.fs \ + envos.fs \ savesys.fs \ environ.fs \ errors.fs \ @@ -227,32 +234,38 @@ GFORTH_FI_SRC = \ stuff.fs \ tasker.fs \ termsize.fs \ + utf-8.fs \ vt100.fs \ vt100key.fs \ wordinfo.fs \ arch/386/asm.fs arch/386/disasm.fs \ - arch/alpha/asm.fs arch/alpha/disasm.fs \ - arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs + arch/amd64/asm.fs arch/amd64/disasm.fs \ + arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\ + arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \ + arch/mips/testasm.fs arch/mips/testdisasm.fs \ + arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ - colorize.fs comp-i.fs \ - dosekey.fs doskey.fs ds2texi.fs \ - envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ - glosgen.fs gray.fs httpd.fs proxy.fs \ + colorize.fs comp-i.fs complex.fs \ + depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ + envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \ + fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \ make-app.fs doc/makedoc.fs \ locate.fs more.fs other.fs prims2x.fs random.fs \ - sokoban.fs string.fs table.fs tags.fs \ + regexp.fs sokoban.fs string.fs table.fs tags.fs \ tt.fs \ - unbuffer.fs wordsets.fs \ + unbuffer.fs wordsets.fs xwords.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ test/string.fs test/float.fs test/gforth.fs \ test/other.fs test/signals.fs test/checkans.fs \ - test/primtest.fs \ + test/primtest.fs test/coreext.fs test/deferred.fs \ + test/coremore.fs test/gforth-nofast.fs \ bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ moofglos.fs fixpath.fs \ - add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \ + endtry-iferror.fs recover-endtry.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -260,6 +273,7 @@ COMPAT = compat/README \ compat/control.fs \ compat/defer.fs \ compat/exception.fs \ + compat/execute-parsing.fs \ compat/loops.fs \ compat/required.fs \ compat/strcomp.fs \ @@ -274,6 +288,7 @@ ALLSUBDIRS = engine ARCHS = \ arch/generic/machine.h \ + arch/generic/128bit.h \ arch/m68k/machine.h \ arch/mips/machine.h \ arch/386/machine.h \ @@ -301,21 +316,8 @@ ARCHS = \ 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 \ @@ -327,10 +329,35 @@ ARCHS = \ arch/sharc/mach.fs \ arch/sharc/machine.h \ arch/sharc/compile.sharc \ - arch/sharc/unistd.h \ arch/sharc/systypes.h \ arch/sharc/types.h \ - arch/sharc/g21k-3.3.4-bp1.diff + arch/sharc/g21k-3.3.4-bp1.diff \ + arch/r8c/asm.fs \ + arch/r8c/asm-test.fs \ + arch/r8c/prim.fs \ + arch/r8c/errors.fs \ + arch/r8c/tt.fs \ + arch/r8c/tasker.fs \ + arch/r8c/lauflicht.fs \ + arch/r8c/terminal.fs \ + arch/r8c/mach.fs + +#not included in distribution until distribution terms are included: +ARCHS_NO_DIST = \ + arch/6502/asm.fs \ + arch/6502/cold.fs \ + arch/6502/softuart.fs \ + arch/6502/zero.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/sharc/unistd.h VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ vmgen-ex/engine.c vmgen-ex/fib.mini \ @@ -345,7 +372,7 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - engine/config.h.in stamp-h.in \ + engine/config.h.in stamp-h.in envos.fs.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ BUILD-FROM-SCRATCH model \ COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ @@ -371,13 +398,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ - test/coretest.out test/checkans.out + test/coretest.out test/checkans.out test/gforth.out \ + cache-fast*.vmg RCS_FILES = ToDo model high-level ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs @@ -395,14 +423,14 @@ FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) ke FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB) FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, -FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ +FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs #distributed documentation DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ - doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps + doc/vmgen.info doc/vmgen.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -437,6 +465,8 @@ kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs more: engines $(FORTH_GEN) $(GEN) + @make check + @$(FORTH_FAST) --diag -e bye #from the gcc Makefile: #"Deletion of files made during compilation. @@ -477,7 +507,8 @@ distclean: clean -$(RM) -rf config.cache config.log config.status \ engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ - doc/version.texi gforthmi vmgen + doc/version.texi gforthmi vmgen \ + prim-fast.b $(FORTH_GEN_ENGINE_FAST) #realclean is useless, but dangerous, so it's commented out realclean: distclean @@ -492,15 +523,11 @@ virtualclean: mostlyclean #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 machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +dist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs -dosdist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +dosdist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs srcdist: Makedist FORCE $(MAKE) -f Makedist d$@ @@ -514,15 +541,11 @@ docdist: Makedist FORCE htmldist: Makedist FORCE $(MAKE) -f Makedist d$@ -bindist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +bindist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs -binonlydist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +binonlydist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs #HPUX make breaks the cycle differently when the dates are equal, so # touch some of the files if it acts up @@ -538,75 +561,85 @@ hpux-workaround: #we rebuild gforth.fi, because it contains some path names. #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership. install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs - touch $(siteforthdir)/siteinit.fs - -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen - -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) - -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) - $(INSTALL_PROGRAM) gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) - $(INSTALL_PROGRAM) gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) - $(INSTALL_PROGRAM) gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) - $(INSTALL_SCRIPT) gforthmi $(bindir)/gforthmi-$(VERSION) - $(INSTALL_SCRIPT) vmgen $(bindir)/vmgen-$(VERSION) - $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) - (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) - (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) - -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done + $(NORMAL_INSTALL) + touch $(DESTDIR)$(siteforthdir)/siteinit.fs + -$(RM) $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen + -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) + -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) + $(INSTALL_PROGRAM) gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) + $(INSTALL_PROGRAM) gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) + $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION) + $(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION) + $(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) + (cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) + -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir) + -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done - $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - @if test -d "$(emacssitelispdir)"; then \ - $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ + $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) + @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ + $(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - 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)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) - $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) - $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) + $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS - $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info - $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info + $(POST_INSTALL) + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info install-strip: install installdirs: mkinstalldirs + $(NORMAL_INSTALL) for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ - $(srcdir)/mkinstalldirs $$i; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done for i in $(CVSDIRS); do \ - $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \ done - $(RM) -rf $(datadir)/gforth/$(VERSION)/engine + $(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION) - @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-itc$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" + $(NORMAL_UNINSTALL) + -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" check: gforths gforth.fi - $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 @echo "*** Check successful ***" checkone test: gforth$(EXE) gforth.fi - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye + $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out $(FORTH) prims2x.fs -e \ "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ tr -d '\015' | diff -c - $(srcdir)/engine/prim.i +check-nofast: gforth$(EXE) gforth.fi + $(FORTHS) test/gforth-nofast.fs -e bye + test/primtest.fi: test/primtest.fs mach32l.fs cross.fs $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye" @@ -620,25 +653,16 @@ bench: gforth-fast$(EXE) gforth.fi time $(FORTH_FAST) matrix.fs -e "main bye" time $(FORTH_FAST) fib.fs -e "main bye" -onebench: - @\time -f "siev %U" $(FORTH_FAST) siev.fs -e "main bye" - @\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye" - @\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye" - @\time -f "fib %U" $(FORTH_FAST) fib.fs -e "main bye" - -all-bench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi - @echo "*** gforth-fast dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth-fast --dynamic" - @echo "*** gforth-fast not dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth-fast --no-dynamic" - @echo "*** gforth dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth --dynamic" - @echo "*** gforth not dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth --no-dynamic" - @echo "*** gforth-itc:" - @$(MAKE) onebench ENGINE_FAST=./gforth-itc - @echo "*** gforth-ditc:" - @$(MAKE) onebench ENGINE_FAST=./gforth-ditc +onebench one-bench: + $(FORTH_FAST) onebench.fs + +all-bench allbench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi + ./gforth-fast --dynamic onebench.fs + ./gforth-fast --no-dynamic onebench.fs + ./gforth --dynamic onebench.fs + ./gforth --no-dynamic onebench.fs + ./gforth-itc onebench.fs + ./gforth-ditc onebench.fs # ------------- Make forth images @@ -716,15 +740,15 @@ prim.b: prim cache0.vmg m4 -s $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache1.vmg peeprules.vmg - m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@ +prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg + m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast $(FORTH_GEN_ENGINE): prim.b prims2x.fs - GFORTH="$(FORTHP)" gfgen + GFORTH="$(FORTHP)" $(srcdir)/gfgen kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- @@ -741,14 +765,17 @@ kernel/prim.fs: prim.b prims2x.fs kernel gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTH_EXE@ gforth-fast$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTHFAST_EXE@ gforth-native$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ gforth-itc$(EXE): engines @@ -764,10 +791,10 @@ gforth-prof$(EXE): engines gforths: $(ENGINES) $(ENGINES_FAST) -engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile +engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h cd engine && $(MAKE) $(ENGINES) -engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile +engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h cd engine && $(MAKE) $(ENGINES_FAST) # ------------- additional C primitives @@ -902,16 +929,15 @@ stamp-h.in: configure.in aclocal.m4 echo timestamp > $(srcdir)/stamp-h.in engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status +stamp-h: engine/config.h.in config.status stamp-h.in ./config.status -Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in +Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in ./config.status config.status: configure ./config.status --recheck - #create files for DOS, because DOS cannot do it itself makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in sed -f mkdosmf.sed makefile.dos