--- gforth/Makefile.in	1996/02/19 19:19:33	1.55
+++ gforth/Makefile.in	1996/05/09 18:12:57	1.61
@@ -92,6 +92,7 @@ KERN_SRC = \
 
 GFORTH_FI_SRC = \
 	assert.fs \
+	blockedit.fb \
 	blocks.fs \
 	bufio.fs \
 	debug.fs \
@@ -102,6 +103,7 @@ GFORTH_FI_SRC = \
 	glocals.fs \
 	hash.fs \
 	history.fs \
+	interpretation.fs \
 	look.fs \
 	search-order.fs \
 	see.fs \
@@ -109,13 +111,14 @@ GFORTH_FI_SRC = \
 	startup.fs \
 	struct.fs \
 	stuff.fs \
+	tasker.fs \
 	termsize.fs \
 	vt100.fs \
 	vt100key.fs \
 	wordinfo.fs
 
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
-	anslocal.fs ansi.fs answords.fs \
+	ansi.fs answords.fs \
 	checkans.fs \
 	code.fs colorize.fs \
 	doskey.fs ds2texi.fs \
@@ -128,10 +131,10 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	site-init.fs \
 	tt.fs sokoban.fs \
 	wordsets.fs \
-	tester.fs coretest.fs \
+	tester.fs coretest.fs postponetest.fs dbltest.fs \
 	bubble.fs siev.fs matrix.fs fib.fs
 
-SOURCES	= CVS Makefile.in configure.in configure config.sub config.guess \
+SOURCES	= CVS compat Makefile.in configure.in configure config.sub config.guess \
 	acconfig.h config.h.in \
 	install-sh INSTALL README ToDo BUGS model COPYING Benchres \
 	gforth.ds texinfo.tex gforth.1 gforth.el \
@@ -139,7 +142,7 @@ SOURCES	= CVS Makefile.in configure.in c
 	m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \
 	getopt.c getopt1.c getopt.h select.c \
 	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \
-	strerror.c strsignal.c \
+	strerror.c strsignal.c dblsub.c \
 	INSTALL.DOS makefile.dos mkdosmf.sed configure.bat \
 	startup.dos history.dos \
 	glosgen.glo glossaries.doc \
@@ -211,7 +214,7 @@ distclean:	clean
 #mostlyclean, but also remove some of the stuff that is distributed
 virtualclean:	mostlyclean
 		-$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
-		gforth-$(VERSION).tar.gz config.cache *~ *TAGS
+		gforth-$(VERSION).tar.gz config.cache *~ */*~
 
 dist:		$(SOURCES) $(FORTH_GEN) $(DOCDIST)
 		-rm -rf gforth-$(VERSION)
@@ -278,10 +281,10 @@ uninstall:
 		@echo -e "Type\n$(RM) -rf $(bindir)/gforth $(mandir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
 
 check:		test
-		#touch test
+		touch test
 
 test:		gforth gforth.fi
-		$(FORTH) tester.fs coretest.fs dbltest.fs -e bye
+		$(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
 		$(FORTH) code.fs checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i
@@ -301,22 +304,22 @@ gforth:		$(OBJECTS)
 		@MAKE_EXE@
 
 kernl16l.fi-:	$(KERN_SRC) mach16l.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach16l.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl16b.fi-:	$(KERN_SRC) mach16b.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach16b.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl32l.fi-:	$(KERN_SRC) mach32l.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl32b.fi-:	$(KERN_SRC) mach32b.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach32b.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl64l.fi-:	$(KERN_SRC) mach64l.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach64l.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl64b.fi-:	$(KERN_SRC) mach64b.fs $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach64b.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
@@ -349,10 +352,10 @@ kernl64l.fi:	$(KERNLS)
 		@LINK_KERNL64L@
 
 gforth.fi:	@kernal_fi@ gforth $(GFORTH_FI_SRC)
-		$(FORTHK) startup.fs -e "savesystem gforth.fi bye"
+		$(FORTHK) -p . startup.fs -e "savesystem gforth.fi bye"
 
 gforth.TAGS:	@kernal_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS
-		$(FORTHK) etags.fs startup.fs -e bye
+		$(FORTHK) -p . etags.fs startup.fs -e bye
 		cat TAGS primitives.TAGS kernal.TAGS >gforth.TAGS
 
 engine.s:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
@@ -391,7 +394,7 @@ doc.fd:		makedoc.fs float.fs search-orde
 		$(FORTHK) -p . -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
 
 crossdoc.fd:	$(KERN_SRC) $(FORTH_GEN0)
-		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
+		$(FORTHK) -p . interpretation.fs -e 's" mach32l.fs"' main.fs
 
 gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
 		$(FORTHK) -p . ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@