--- gforth/Makefile.in	2003/01/06 10:51:26	1.242
+++ gforth/Makefile.in	2003/02/01 14:28:06	1.253
@@ -37,7 +37,7 @@ DOSVERSION=`echo $(VERSION)|sed 's/\.//g
 
 machine=@machine@
 kernel_fi=@kernel_fi@
-EXE=@EXE@
+EXE=@EXEEXT@
 
 # this is the type of machine
 # used to extend the include path with ./arch/$machine
@@ -74,7 +74,7 @@ FORTHS	= $(ENGINE) $(FORTHS_ARGS)
 # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build
-FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)'
+FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' except.fs
 # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast
@@ -240,7 +240,7 @@ 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/float.fs \
+	test/string.fs test/float.fs test/gforth.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 \
@@ -342,9 +342,9 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	doc/vmgen.texi doc/fdl.texi \
 	gforth.el \
 	prim peeprules.vmg engine/engine.c engine/main.c \
-	engine/io.c engine/support.c engine/memcmpc.c engine/signals.c \
+	engine/io.c engine/support.c engine/signals.c \
 	$(ARCHS) \
-	engine/peephole.c engine/profile.c \
+	engine/profile.c \
 	engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
 	engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
 	engine/ansidecl.h engine/memmove.c \
@@ -367,9 +367,8 @@ GEN = gforth$(EXE) gforth-ditc$(EXE) gfo
 
 # 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 \
-	engine/prim_num.i engine/prim_grp.i \
-	engine/config.h
+	engine/prim_superend.i engine/profile.i \
+	engine/prim_num.i engine/prim_grp.i
 FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
@@ -551,22 +550,22 @@ uninstall:	FORCE
 		@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:		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
+		$(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
+		$(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1
+		$(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1
+		$(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1
+		$(MAKE) checkone ENGINE="./gforth" >/dev/null 2>&1
+		$(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
 		@echo "*** Check successful ***"
 
 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/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs -e bye | tr -d '\015' | 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
+		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
 		$(FORTH) prims2x.fs -e \
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
-		  diff -c - $(srcdir)/engine/prim.i
+		  tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
 
 bench:		gforth-fast$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
@@ -583,17 +582,17 @@ onebench:
 
 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"
+		@$(MAKE) onebench ENGINE_FAST="gforth-fast --dynamic"
 		@echo "*** gforth-fast not dynamic:"
-		@make onebench ENGINE_FAST="gforth-fast --no-dynamic"
+		@$(MAKE) onebench ENGINE_FAST="gforth-fast --no-dynamic"
 		@echo "*** gforth dynamic:"
-		@make onebench ENGINE_FAST="gforth --dynamic"
+		@$(MAKE) onebench ENGINE_FAST="gforth --dynamic"
 		@echo "*** gforth not dynamic:"
-		@make onebench ENGINE_FAST="gforth --no-dynamic"
+		@$(MAKE) onebench ENGINE_FAST="gforth --no-dynamic"
 		@echo "*** gforth-itc:"
-		@make onebench ENGINE_FAST=gforth-itc
+		@$(MAKE) onebench ENGINE_FAST=gforth-itc
 		@echo "*** gforth-ditc:"
-		@make onebench ENGINE_FAST=gforth-ditc
+		@$(MAKE) onebench ENGINE_FAST=gforth-ditc
 
 # -------------	Make forth images
 
@@ -623,12 +622,13 @@ kernl64l.fi-:	$(KERN_DEPS) mach64l.fs
 kernl64b.fi-:	$(KERN_DEPS) mach64b.fs
 		$(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
-kernl-%.fi:	arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
-		$(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
-		if [ -f `echo $< | sed s/fs/sh/` ]; \
-		then sh `echo $< | sed s/fs/sh/` $@; \
-		else $(CP) $@- $@; \
-		fi
+#Solaris make does not like that:
+#kernl-%.fi:	arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
+#		$(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
+#		if [ -f `echo $< | sed s/fs/sh/` ]; \
+#		then sh `echo $< | sed s/fs/sh/` $@; \
+#		else $(CP) $@- $@; \
+#		fi
 
 #SunOS make does not like that
 #arch/%/mach.fs:	arch/%/prim.fs arch/%/asm.fs
@@ -722,7 +722,7 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 		$(RM) $@-
 
 kernel/groups.fs:	engine/prim_grp.i
-	grep GROUP $< | cut -f2 -d, | sed -e 's/)/ ,/g' >$@
+	grep GROUP engine/prim_grp.i | cut -f2 -d, | sed -e 's/)/ ,/g' >$@
 
 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" >$@