--- gforth/Makefile.in 2002/03/13 16:59:12 1.218 +++ gforth/Makefile.in 2002/09/22 09:54:19 1.229 @@ -64,9 +64,11 @@ GCC = @CC@ CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHS_ARGS = -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) ENGINE = ./gforth FORTH = $(ENGINE) $(FORTH_ARGS) +FORTHS = $(ENGINE) $(FORTHS_ARGS) # the (existing) forth system to use for cross compiling and primitives tables # per default we use the one in this directory for a rebuild. It is also # possible to override this variable at the command line for an initial build (jaw) @@ -74,7 +76,7 @@ BUILDFORTH = $(ENGINE) --die-on-signal - # the forth system plus flags we use to build FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs -FORTHP = $(FORTHB) +FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) @@ -206,6 +208,7 @@ GFORTH_FI_SRC = \ intcomp.fs \ locals.fs \ look.fs \ + quotes.fs \ search.fs \ see.fs \ see-ext.fs \ @@ -235,7 +238,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) tt.fs sokoban.fs \ unbuffer.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/string.fs test/other.fs test/checkans.fs \ + test/string.fs test/other.fs test/signals.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 \ moofglos.fs fixpath.fs \ @@ -249,11 +252,14 @@ COMPAT = compat/README \ compat/exception.fs \ compat/loops.fs \ compat/required.fs \ + compat/strcomp.fs \ compat/struct.fs \ compat/vocabulary.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi +VMGEN_TEXI = doc/vmgen.texi doc/version.texi doc/fdl.texi + ALLSUBDIRS = engine ARCHS = \ @@ -321,13 +327,16 @@ VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil vmgen-ex/simple.mini vmgen-ex/stat.awk vmgen-ex/support.c \ vmgen-ex/test.mini vmgen-ex/test.out +VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%) + SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ - gforthmi.in vmgen.in README.vmgen \ + gforthmi.in vmgen.in README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ - COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ + COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ + doc/vmgen.texi doc/fdl.texi \ gforth.el \ prim peeprules.vmg engine/engine.c engine/main.c \ engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \ @@ -343,13 +352,13 @@ SOURCES = $(CVSDIRS) compat Makefile.in versions.bsh \ configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ - $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) \ + $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ test/coretest.out test/checkans.out RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs +GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) kernel/version.fs # things that need a working forth system to be generated FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i engine/prim_superend.i engine/peephole.i engine/profile.i @@ -358,6 +367,9 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ +#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 @@ -365,7 +377,10 @@ 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 Makedist engine/Makefile configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ + doc/gforth.texi doc/gforth.dvi doc/gforth.ps \ + doc/vmgen.dvi doc/vmgen.ps \ + Makefile Makedist engine/Makefile configure #standards.info recommends this: .SUFFIXES: @@ -423,7 +438,8 @@ docclean: FORCE clean: mostlyclean -$(RM) -rf $(GEN) engine/gforth$(EXE) \ - engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \ + engine/gforth-fast$(EXE) engine/gforth-itc$(EXE) \ + engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \ *.o engine/*.o arch/*/*.o version distclean: clean @@ -529,9 +545,10 @@ uninstall: FORCE check test: gforth$(EXE) gforth.fi $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs -e bye | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye + $(FORTHS) test/signals.fs -e bye $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out $(FORTH) prims2x.fs -e \ - "c-flag on s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ + "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ diff -c - $(srcdir)/engine/prim.i bench: gforth-fast$(EXE) gforth.fi @@ -551,22 +568,22 @@ bench: gforth-fast$(EXE) gforth.fi # 3. copy new kernels to kernlXYZ.fi # these are the ones we want to use now -kernl16l.fi-: $(KERN_SRC) kernel/version.fs mach16l.fs machpc.fs $(FORTH_GEN0) +kernl16l.fi-: $(KERN_DEPS) mach16l.fs $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs machpc.fs $(FORTH_GEN0) +kernl16b.fi-: $(KERN_DEPS) mach16b.fs $(FORTHB) -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 machpc.fs $(FORTH_GEN0) +kernl32l.fi-: $(KERN_DEPS) mach32l.fs $(FORTHB) -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 machpc.fs $(FORTH_GEN0) +kernl32b.fi-: $(KERN_DEPS) mach32b.fs $(FORTHB) -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 machpc.fs $(FORTH_GEN0) +kernl64l.fi-: $(KERN_DEPS) mach64l.fs $(FORTHB) -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 machpc.fs $(FORTH_GEN0) +kernl64b.fi-: $(KERN_DEPS) mach64b.fs $(FORTHB) -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) @@ -616,7 +633,7 @@ prim.b: prim peeprules.vmg m4 -s $(srcdir)/prim >$@ engine/prim.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- $(CP) $@- $@ $(RM) $@- @@ -645,6 +662,11 @@ engine/profile.i: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- +engine/costs.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@- @@ -657,10 +679,8 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -kernel/peephole.fs: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' noop ' output-forth-peephole process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +prim-nums: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-prim-num dup process-file bye" >$@ gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ @@ -671,6 +691,10 @@ gforth-fast$(EXE): engines $(CP) engine/$@ $@ @GFORTHFAST_EXE@ +gforth-itc$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHITC_EXE@ + gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ @@ -678,10 +702,10 @@ gforth-ditc$(EXE): engines gforth-prof$(EXE): engines $(CP) engine/$@ $@ -gforths: gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) +gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile - cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) # ------------- additional C primitives @@ -751,30 +775,43 @@ checkdoc: doc/gforth.ds prim.b ds2texi.f $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi -dvi: doc/gforth.dvi +dvi: doc/gforth.dvi doc/vmgen.dvi doc/gforth.dvi doc/gforth.fns: $(GFORTH_TEXI) cd doc; $(TEXI2DVI) gforth.texi +doc/vmgen.dvi: $(VMGEN_TEXI) + cd doc; $(TEXI2DVI) vmgen.texi + doc/gforth.ps: doc/gforth.dvi $(DVI2PS) doc/gforth.dvi -o $@ -info: doc/gforth.info +doc/vmgen.ps: doc/vmgen.dvi + $(DVI2PS) doc/vmgen.dvi -o $@ + +info: doc/gforth.info doc/vmgen.info -doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI) - -cd doc; $(MAKEINFO) gforth.texi +doc/gforth.info: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) gforth.texi -### need makeinfo 4.0 to generate html. Otherwise, use texi2html.. -html: $(GFORTH_TEXI) - -$(RMTREE) html - -mkdir html - cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi -### cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi +doc/vmgen.info: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) vmgen.texi + + +### need makeinfo 4.2 to generate html with these rules +doc/gforth: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) --html gforth.texi + +doc/vmgen: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) --html vmgen.texi doc/gforth.txt: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt -doc: info html doc/gforth.ps doc/gforth.txt TAGS +doc/vmgen.txt: $(VMGEN_TEXI) + -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt + +doc: info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. @@ -795,11 +832,11 @@ stamp-h.in: configure.in acconfig.h engine/config.h: stamp-h stamp-h: engine/config.h.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status + CONFIG_FILES=$@ CONFIG_HEADERS="engine/config.h" ./config.status echo timestamp > stamp-h -Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in config.status - CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./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 + CONFIG_FILES="$@" CONFIG_HEADERS="engine/config.h" ./config.status config.status: configure ./config.status --recheck