--- gforth/Makefile.in	2002/03/13 16:59:12	1.218
+++ gforth/Makefile.in	2002/08/14 09:00:22	1.223
@@ -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) \
@@ -349,7 +355,7 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 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
@@ -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:
@@ -423,7 +432,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,6 +539,7 @@ 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"| \
@@ -671,6 +682,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 +693,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,18 +766,25 @@ 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/vmgen.info: $(VMGEN_TEXI)
+		cd doc; $(MAKEINFO) vmgen.texi
 
-doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
-		-cd doc; $(MAKEINFO) gforth.texi
 
 ### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
 html:		$(GFORTH_TEXI)