--- gforth/Makefile.in	2007/03/04 22:32:29	1.342
+++ gforth/Makefile.in	2007/03/18 21:46:01	1.345
@@ -523,15 +523,11 @@ virtualclean:	mostlyclean
 #Makefile if it contains our dist rules.  Therefore we have put these
 #rules in Makedist (you can use them with GNU make on these systems).
 
-dist:		Makedist machpc.fs FORCE
-		-sed -e 's/@[E]C_MODE@/false/g' -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' -e 's/@[L]IBFFIFLAG@/false/g' <machpc.fs.in >machpc.fs
+dist:		Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
-dosdist:	Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
+dosdist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
 srcdist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
@@ -545,15 +541,11 @@ docdist:	Makedist FORCE
 htmldist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
 
-bindist:	Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
+bindist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
-binonlydist:	Makedist machpc.fs FORCE
-		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
+binonlydist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
-		-$(RM) machpc.fs
 
 #HPUX make breaks the cycle differently when the dates are equal, so
 # touch some of the files if it acts up
@@ -649,7 +641,7 @@ check-nofast: gforth$(EXE) gforth.fi
 		$(FORTHS) test/gforth-nofast.fs -e bye
 
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
-		$(FORTHB) -e 's" mach32b.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
+		$(FORTHB) -e 's" mach32l.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 $$?
@@ -661,26 +653,16 @@ bench:		gforth-fast$(EXE) gforth.fi
 		time $(FORTH_FAST) matrix.fs -e "main bye"
 		time $(FORTH_FAST) fib.fs -e "main bye"
 
-onebench:
-		@echo 'sieve bubble matrix  fib'
-		@echo -n " "`\time 2>&1 -f "%U" $(FORTH_FAST) siev.fs -e "main bye"`
-		@echo -n "  "`\time 2>&1 -f "%U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye"`
-		@echo -n "   "`\time 2>&1 -f "%U" $(FORTH_FAST) matrix.fs -e "main bye"`
-		@echo "  "`\time 2>&1 -f "%U" $(FORTH_FAST) fib.fs -e "main bye"`
-
-all-bench:	gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi
-		@echo "*** gforth-fast dynamic:"
-		@$(MAKE) onebench ENGINE_FAST="./gforth-fast --dynamic"
-		@echo "*** gforth-fast not dynamic:"
-		@$(MAKE) onebench ENGINE_FAST="./gforth-fast --no-dynamic"
-		@echo "*** gforth dynamic:"
-		@$(MAKE) onebench ENGINE_FAST="./gforth --dynamic"
-		@echo "*** gforth not dynamic:"
-		@$(MAKE) onebench ENGINE_FAST="./gforth --no-dynamic"
-		@echo "*** gforth-itc:"
-		@$(MAKE) onebench ENGINE_FAST=./gforth-itc
-		@echo "*** gforth-ditc:"
-		@$(MAKE) onebench ENGINE_FAST=./gforth-ditc
+onebench one-bench:
+	$(FORTH_FAST) onebench.fs
+
+all-bench allbench:	gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi
+	./gforth-fast --dynamic onebench.fs
+	./gforth-fast --no-dynamic onebench.fs
+	./gforth --dynamic onebench.fs
+	./gforth --no-dynamic onebench.fs
+	./gforth-itc onebench.fs
+	./gforth-ditc onebench.fs
 
 # -------------	Make forth images
 
@@ -809,10 +791,10 @@ gforth-prof$(EXE):	engines
 
 gforths: $(ENGINES) $(ENGINES_FAST)
 
-engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
+engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
 		cd engine && $(MAKE) $(ENGINES)
 
-engines-fast:	FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile
+engines-fast:	FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h
 		cd engine && $(MAKE) $(ENGINES_FAST)
 
 # ------------- additional C primitives