--- gforth/Makefile.in	2002/09/22 09:54:19	1.229
+++ gforth/Makefile.in	2002/12/15 18:19:41	1.233
@@ -238,7 +238,8 @@ 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/signals.fs test/checkans.fs \
+	test/string.fs test/float.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 \
@@ -358,10 +359,12 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) kernel/version.fs
+GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-native$(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
+FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
+	engine/prim_superend.i engine/peephole.i engine/profile.i \
+	engine/prim_num.i
 FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
@@ -438,7 +441,7 @@ docclean:	FORCE
 
 clean:		mostlyclean
 		-$(RM) -rf $(GEN) engine/gforth$(EXE) \
-		engine/gforth-fast$(EXE) engine/gforth-itc$(EXE) \
+		engine/gforth-fast$(EXE) engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \
 		engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \
 		*.o engine/*.o arch/*/*.o version
 
@@ -542,8 +545,16 @@ uninstall:	FORCE
 		-$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION)
 		@echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(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 test/string.fs -e bye | diff -c - $(srcdir)/test/coretest.out
+check:		gforths	gforth.fi
+		make checkone ENGINE="./gforth --no-dynamic" &>/dev/null
+		make checkone ENGINE="./gforth-itc" &>/dev/null
+		make checkone ENGINE="./gforth-ditc" &>/dev/null
+		make checkone ENGINE="./gforth-fast --no-dynamic" &>/dev/null
+		make checkone ENGINE="./gforth" &>/dev/null
+		make checkone ENGINE="./gforth-fast" &>/dev/null
+
+checkone test:	gforth$(EXE) gforth.fi
+		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.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
@@ -679,8 +690,8 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 		$(CP) $@- $@
 		$(RM) $@-
 
-prim-nums:	prim.b prims2x.fs
-		$(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-prim-num dup process-file bye" >$@
+engine/prim_num.i:	prim.b prims2x.fs
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@
 
 gforth$(EXE):		engines
 		-$(CP) gforth$(EXE) gforth~
@@ -691,6 +702,10 @@ gforth-fast$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHFAST_EXE@
 
+gforth-native$(EXE):	engines
+		$(CP) engine/$@ $@
+#@GFORTHX_EXE@
+
 gforth-itc$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHITC_EXE@
@@ -702,10 +717,10 @@ gforth-ditc$(EXE):	engines
 gforth-prof$(EXE):	engines
 		$(CP) engine/$@ $@
 
-gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
+gforths: gforth$(EXE) gforth-fast$(EXE) gforth-native$(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-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
+		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-native$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
 
 # ------------- additional C primitives