--- gforth/Makefile.in 1998/12/12 22:32:03 1.129 +++ gforth/Makefile.in 1999/05/09 21:32:02 1.152 @@ -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,12 +62,16 @@ 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)$(srcdir) -i ./$(kernel_fi) -FORTHK = ./gforth $(FORTHKFLAGS) -FORTHP = ./gforth --die-on-signal -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 = $(ENGINE) $(FORTHKFLAGS) +FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) STRIP = strip TEXI2DVI = texi2dvi DVI2PS = dvips -Z @@ -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 \ @@ -166,6 +171,7 @@ EC_SRC = \ GFORTH_FI_SRC = \ assert.fs \ + backtrace.fs \ blocked.fb \ blocks.fs \ bufio.fs \ @@ -207,16 +213,25 @@ 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/control.fs compat/anslocal.fs \ - compat/struct.fs compat/loops.fs +COMPAT = compat/README \ + compat/anslocal.fs \ + compat/assert.fs \ + compat/control.fs \ + compat/defer.fs \ + compat/exception.fs \ + compat/loops.fs \ + compat/required.fs \ + compat/struct.fs \ + compat/vocabulary.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi @@ -270,7 +285,7 @@ ARCHS = \ arch/shboom/sh.p \ arch/shboom/doers.fs -SOURCES = $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi \ +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 \ @@ -278,14 +293,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in 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 \ - $(ARCHS) \ + 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 \ + 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 \ @@ -294,7 +309,7 @@ SOURCES = $(CVSDIRS) compat Makefile.in 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 @@ -303,20 +318,13 @@ 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- \ kernl64b.fi- kernl64l.fi- -GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile Makedist engine/Makefile configure #standards.info recommends this: .SUFFIXES: @@ -341,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. @@ -364,15 +372,24 @@ 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 -$(RM) config.cache config.log config.status \ - engine/config.h Makefile engine/Makefile \ + engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ - doc/version.texi + doc/version.texi gforthmi #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -383,78 +400,32 @@ virtualclean: mostlyclean -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \ gforth-$(VERSION).tar.gz config.cache *~ */*~ -#use dist targets only when srcdir=. -dist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#use dist targets only when srcdir=. -dosdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) - -$(RMTREE) gforth.$(DOSVERSION) - mkdir gforth.$(DOSVERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \ - (cd gforth.$(DOSVERSION); tar xf -) - $(MV) gforth.$(DOSVERSION)/engine/strsignal.c gforth.$(DOSVERSION)/engine/strsig.c - for i in 1 2 3 4 5 6 7 8; do \ - $(MV) gforth.$(DOSVERSION)/doc/gforth.info-$$i gforth.$(DOSVERSION)/doc/gforth.i$$i; \ - done - zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/* - -$(RMTREE) gforth.$(DOSVERSION) +#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$@ + +srcdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +srconlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ -#A source distribution contains only the things needed to install gforth, -#without the documents. -srcdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -srconlydist: $(SOURCES) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-srconly-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#A document distribution contains only the documents, which can be created -#with MAKE. -docdist: $(DOCDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(DOCDIST) | (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#a binary distribution contains the complete source distribution, -# the objects, the executable and the links. the objects are there for making -# make happy. -bindist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -) - strip gforth-$(VERSION)/gforth - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz - -#makes a package with only the stuff not present in the source -#package. For installation the source package is still needed! -#This is useful if you want to distribute many binary versions in -#little space (e.g., on floppy disk): Put the source package and -#all the binonly packages you are interested in on the disk. The user -#then just has to unpack the source and his favourite binonly into the -#same directory and has a full binary distribution. -binonlydist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -) - strip gforth-$(VERSION)/gforth - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz +docdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +htmldist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +bindist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +binonlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ #strip gforth, because the debugging stuff is hardly useful once @@ -463,21 +434,28 @@ binonlydist: $(SOURCES) $(FORTH_GEN0) @K #install does not depend on gforth.info, because that would require #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 doc/gforth.1 prim gforth.TAGS installdirs - touch $(datadir)/gforth/site-forth/siteinit.fs - -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir) - ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) +install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs + 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) + (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) + $(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)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done - for i in $(FORTH_SRC) prim; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ + -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + for i in $(FORTH_SRC) $(COMPAT) prim; do \ + $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names + $(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.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) - sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) - @if test -d $(emacssitelispdir); then \ + $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + @if test -d "$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ @@ -488,31 +466,39 @@ 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 + $(RM) -rf $(datadir)/gforth/$(VERSION)/arch $(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) - @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" check test: gforth$(EXE) gforth.fi $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye $(FORTH) test/other.fs -e bye + @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'" + @echo "Expect 'Missing: EDITOR FORGET'" $(FORTH) code.fs test/checkans.fs -e bye @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~ @@ -524,23 +510,23 @@ kernl16l.fi-: $(KERN_SRC) kernel/version $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16b.fs"' kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" kernl32l.fi-: $(KERN_SRC) kernel/version.fs mach32l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" kernl32b.fi-: $(KERN_SRC) kernel/version.fs mach32b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32b.fs"' kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" kernl64l.fi-: $(KERN_SRC) kernel/version.fs mach64l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64l.fs"' kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" kernl64b.fi-: $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" kernl-%.fi: arch/%/mach.fs \ $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) - $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" if [ -f `echo $< | sed s/fs/sh/` ]; \ then sh `echo $< | sed s/fs/sh/` $@; \ else $(CP) $@- $@; \ @@ -579,7 +565,7 @@ kernl64l.fi: $(KERNLS) # -$(CP) $< $@ gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) - GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs # ------------- Make c-engine @@ -608,17 +594,22 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth$(EXE): FORCE +gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ - cd engine && $(MAKE) gforth$(EXE) $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-ditc$(EXE): FORCE - cd engine && $(MAKE) gforth-ditc$(EXE) +gforth-fast$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHFAST_EXE@ + +gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ +engines: FORCE engine/Makefile + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) + # ------------- additional C primitives %.c: %.pri prim2cl.fs @@ -633,6 +624,9 @@ gforth-ditc$(EXE): FORCE TAGS: gforth.TAGS $(CP) gforth.TAGS $@ +install.TAGS: gforth.TAGS + sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS + gforth.TAGS: @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS $(FORTHK) etags.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS @@ -643,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 @@ -701,8 +695,8 @@ 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="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./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 ./config.status --recheck