--- gforth/Makefile.in 2002/03/22 20:36:25 1.219 +++ gforth/Makefile.in 2002/08/20 16:59:01 1.225 @@ -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) @@ -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 \ @@ -254,6 +257,8 @@ COMPAT = compat/README \ GFORTH_TEXI = doc/gforth.texi doc/version.texi +VMGEN_TEXI = doc/vmgen.texi doc/version.texi doc/fdl.texi + ALLSUBDIRS = engine ARCHS = \ @@ -326,8 +331,9 @@ SOURCES = $(CVSDIRS) compat Makefile.in 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) \ @@ -365,7 +371,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: @@ -530,9 +539,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 @@ -617,7 +627,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) $@- @@ -756,29 +766,39 @@ 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 +info: doc/gforth.info doc/vmgen.info + +doc/gforth.info: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) gforth.texi -doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI) - -cd doc; $(MAKEINFO) gforth.texi +doc/vmgen.info: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) vmgen.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 + +### 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/vmgen.txt: $(VMGEN_TEXI) + -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt + doc: info html doc/gforth.ps doc/gforth.txt TAGS # For an explanation of the following Makefile rules, see node