--- gforth/Makefile.in	2003/01/03 17:28:12	1.241
+++ gforth/Makefile.in	2003/03/02 13:12:32	1.257
@@ -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
@@ -59,6 +59,7 @@ TAR	= tar cf -
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
@@ -74,7 +75,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
@@ -236,11 +237,11 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
 	more.fs other.fs prims2x.fs random.fs \
-	table.fs string.fs \
-	tt.fs sokoban.fs \
+	sokoban.fs string.fs table.fs tags.fs \
+	tt.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 \
@@ -336,15 +337,16 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	gforthmi.in vmgen.in README.vmgen NEWS.vmgen \
 	configure.in configure config.sub config.guess elisp-comp missing \
 	engine/config.h.in stamp-h.in \
-	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \
+	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
+	BUILD-FROM-SCRATCH model \
 	COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
 	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
-	doc/vmgen.texi doc/fdl.texi \
+	doc/vmgen.texi doc/fdl.texi doc/gpl.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,7 +369,7 @@ 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_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
@@ -378,7 +380,8 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@
 KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs
 
 #distributed documentation
-DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps
+DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
+	  doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps
 
 KERNLS = kernl16b.fi- kernl16l.fi- \
 	 kernl32b.fi- kernl32l.fi- \
@@ -504,17 +507,20 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		touch $(siteforthdir)/siteinit.fs
 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen
 		-$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
+		-$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)
 		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
 		(cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))
 		$(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
 		(cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
+		$(INSTALL_PROGRAM) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)
+		(cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE))
 		$(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
 		$(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)
 		$(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
 		(cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
 		(cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
-		-for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
+		-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done
 		for i in $(FORTH_SRC) $(COMPAT) prim; do \
 			$(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \
 		done
@@ -529,8 +535,12 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) gforth.fi install.TAGS
-		@echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \
+		@$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info || \
+		echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \
 		echo "* Gforth: (gforth).	A fast interpreter for the Forth language."
+		@$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info || \
+		echo ">>>>> Please make an entry for Vmgen in your info dir file; e.g.:"; \
+		echo "* Vmgen: (vmgen).               Virtual machine interpreter generator"
 
 install-strip:	install
 
@@ -546,26 +556,26 @@ installdirs:	mkinstalldirs
 #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'
 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"
+		-$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(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)/gforth-itc$(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)'
@@ -582,17 +592,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
 
@@ -622,12 +632,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
@@ -721,7 +732,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" >$@