--- gforth/Makefile.in	2011/01/15 15:31:39	1.457
+++ gforth/Makefile.in	2011/11/16 23:15:05	1.463
@@ -109,7 +109,7 @@ FORTHB = $(BUILDFORTH) exboot.fs -e 'fpa
 ENGINE_FAST = ./gforth-fast
 FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
-FORTHK	= $(ENGINE) $(FORTHKFLAGS)
+FORTHK	= ./kforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 #FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs
@@ -181,6 +181,7 @@ KERN_SRC = \
 	kernel/basics.fs \
 	kernel/int.fs \
 	kernel/comp.fs \
+	kernel/recognizer.fs \
 	kernel/io.fs \
 	kernel/input.fs \
 	kernel/license.fs \
@@ -245,6 +246,7 @@ GFORTH_FI_SRC2=\
 	simp-see.fs \
 	source.fs \
 	startup.fs \
+	str-exec.fs \
 	struct.fs \
 	struct0x.fs \
 	stuff.fs \
@@ -464,7 +466,7 @@ FORTH_GEN_ENGINE_FAST= \
 	engine/costs-fast.i engine/super2-fast.i
 FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
 FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)
-FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_EC@ gforth.fi
+FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_CROSS@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
 
@@ -493,7 +495,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-all: kernel/version.fs more @NO_EC@ check
+all: kernel/version.fs more @NO_CROSS@ check
 
 # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;
@@ -690,7 +692,7 @@ check:		gforths	gforth.fi
 		./gforth-fast --diag -e bye
 
 checkone test: gforth.fi engine/prim-s.i
-		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
+		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>/dev/null | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
 		$(FORTHS) test/coremore.fs test/gforth.fs test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
@@ -843,7 +845,7 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTH_EXE@; \
-		@NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
+		@NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
 	fi
 
 optgforth:
@@ -857,7 +859,7 @@ gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTHFAST_EXE@; \
-		@NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \
+		@NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \
 	fi
 
 optgforth-fast: