--- gforth/Makefile.in	1999/05/17 13:37:53	1.155
+++ gforth/Makefile.in	1999/10/30 15:48:15	1.162
@@ -140,7 +140,7 @@ KERN_SRC = \
 	kernel/main.fs \
 	kernel/prim0.fs \
 	search.fs \
-	kernel/special.fs \
+	kernel/quotes.fs \
 	kernel/tools.fs \
 	kernel/toolsext.fs \
 	kernel/vars.fs \
@@ -153,7 +153,8 @@ KERN_SRC = \
 	kernel/nio.fs \
 	kernel/saccept.fs \
 	kernel/doers.fs \
-	kernel/getdoers.fs
+	kernel/getdoers.fs \
+	kernel/pass.fs
 
 EC_SRC = \
 	asm/README \
@@ -164,11 +165,9 @@ EC_SRC = \
 	asm/target.fs \
 	ec/README \
 	ec/mirror.fs \
-	ec/mirrors.fs \
 	ec/shex.fs \
 	ec/builttag.fs \
 	ec/dotx.fs \
-	ec/mirrored.fs \
 	ec/nesting.fs
 
 GFORTH_FI_SRC = \
@@ -179,6 +178,7 @@ GFORTH_FI_SRC = \
 	bufio.fs \
 	debug.fs \
 	debugs.fs \
+	ekey.fs \
 	savesys.fs \
 	environ.fs \
 	errors.fs \
@@ -212,7 +212,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs \
-	doc/makedoc.fs \
+	make-app.fs doc/makedoc.fs \
 	more.fs other.fs prims2x.fs random.fs \
 	table.fs \
 	tt.fs sokoban.fs \
@@ -306,7 +306,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
 	gforthmi.cmd glosgen.glo doc/glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC) $(COMPAT) \
-	timings.sc
+	timings.sc \
+	test/coretest.out test/checkans.out
 
 RCS_FILES =  ToDo model high-level
 
@@ -482,12 +483,9 @@ uninstall:	FORCE
 		@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/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out
 		$(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'
+		$(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out
 		$(FORTHK) -m 100000 prims2x.fs -e \
 		  "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \
 		  diff -c - $(srcdir)/engine/prim.i
@@ -677,11 +675,14 @@ html:		$(GFORTH_TEXI)
 doc/gforth.txt:	$(GFORTH_TEXI)
 		-cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt
 
-doc:		doc/gforth.ps html doc/gforth.txt
+doc:		info doc/gforth.ps html doc/gforth.txt
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
-$(srcdir)/configure:	configure.in aclocal.m4
+
+#Note: no target "$(srcdir)/configure", because that does not trigger 
+#unless $(srcdir)!="."
+configure:	configure.in aclocal.m4
 		cd $(srcdir) && autoconf
 
 aclocal.m4:	acinclude.m4 configure.in