--- gforth/Makefile.in	2003/11/02 18:18:35	1.286
+++ gforth/Makefile.in	2003/11/06 09:47:49	1.288
@@ -350,7 +350,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
 	doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
 	gforth.el \
-	prim peeprules.vmg engine/engine.c engine/main.c \
+	prim cache0.vmg cache1.vmg peeprules.vmg \
+	engine/engine.c engine/main.c \
 	engine/io.c engine/support.c engine/signals.c \
 	$(ARCHS) \
 	engine/profile.c \
@@ -374,7 +375,7 @@ RCS_FILES =  ToDo model high-level
 
 ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES)
 
-ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) 
+ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) 
 
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs
 
@@ -604,6 +605,10 @@ checkone test:	gforth$(EXE) gforth.fi
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
 		  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"
+
+
 bench:		gforth-fast$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
 		time $(FORTH_FAST) siev.fs -e "main bye"
@@ -703,12 +708,13 @@ gforth.fi:	$(kernel_fi) gforthmi gforth$
 
 # -------------	Make c-engine
 
-prim.b:		prim peeprules.vmg
+prim.b:		prim cache0.vmg
 		m4 -s $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
-prim-fast.b:    prim.b
-		cp prim.b prim-fast.b
+prim-fast.b:	prim cache1.vmg peeprules.vmg
+		m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@
+		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
 		GFORTH="$(FORTHP)" gfgen -fast
@@ -757,7 +763,7 @@ gforths: $(ENGINES) $(ENGINES_FAST)
 engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
 		cd engine && $(MAKE) $(ENGINES)
 
-engines-fast:	FORCE $(FORTH_GEN_ENGINES_FAST) engine/Makefile
+engines-fast:	FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile
 		cd engine && $(MAKE) $(ENGINES_FAST)
 
 # ------------- additional C primitives