--- gforth/Makefile.in	2004/12/31 13:04:11	1.302
+++ gforth/Makefile.in	2005/07/31 20:27:41	1.308
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -177,7 +177,8 @@ KERN_SRC = \
 	kernel/saccept.fs \
 	kernel/doers.fs \
 	kernel/getdoers.fs \
-	kernel/pass.fs
+	kernel/pass.fs \
+	kernel/xchars.fs
 
 EC_SRC = \
 	asm/README \
@@ -234,8 +235,9 @@ GFORTH_FI_SRC = \
 	wordinfo.fs \
 	arch/386/asm.fs arch/386/disasm.fs \
 	arch/amd64/asm.fs arch/amd64/disasm.fs \
-	arch/alpha/asm.fs arch/alpha/disasm.fs \
-	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs
+	arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\
+	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \
+	arch/mips/testasm.fs arch/mips/testdisasm.fs
 
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
 	ans-report.fs ansi.fs answords.fs \
@@ -443,6 +445,8 @@ kernel/version.fs:	version
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
 more:	engines $(FORTH_GEN) $(GEN)
+	@make check
+	@$(FORTH_FAST) --diag -e bye
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -614,7 +618,7 @@ checkone test:	gforth$(EXE) gforth.fi
 		  tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
 
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
-		$(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
+		$(FORTHB) -e 's" mach32b.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
 
 primtest:	gforth gforth-native test/primtest.fi FORCE
 		(echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?
@@ -723,7 +727,7 @@ prim.b:		prim cache0.vmg
 		sleep 1 #should make hpux-workaround unnecessary
 
 prim-fast.b:	prim cache1.vmg peeprules.vmg
-		m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@
+		m4 -DSTACK_CACHE_FILE=cache@STACK_CACHE_DEFAULT_FAST@.vmg -s $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs