--- gforth/Makefile.in	2003/03/09 17:16:38	1.263
+++ gforth/Makefile.in	2003/08/04 20:32:34	1.269
@@ -88,7 +88,7 @@ FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 STARTUP	= -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
-DVI2PS	= dvips -Z
+DVI2PS	= dvips -t letterSize -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 MAKEINFO = makeinfo
 TEXI2HTML = texi2html
@@ -171,8 +171,7 @@ KERN_SRC = \
 	kernel/saccept.fs \
 	kernel/doers.fs \
 	kernel/getdoers.fs \
-	kernel/pass.fs \
-	kernel/groups.fs
+	kernel/pass.fs
 
 EC_SRC = \
 	asm/README \
@@ -357,20 +356,22 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	versions.bsh \
 	configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
 	gforthmi.cmd glosgen.glo doc/glossaries.doc \
-	$(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
+	$(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) \
 	timings.sc \
 	test/coretest.out test/checkans.out
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs
-#gforth-native$(EXE) gforth-prof$(EXE)
+ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) #gforth-native$(EXE)
+
+GEN = $(ENGINES) 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/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
+	engine/prim_num.i engine/prim_grp.i \
+	engine/costs.i engine/super2.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,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
@@ -446,13 +447,13 @@ docclean:	FORCE
 		doc/gforth.toc doc/gforth.tp doc/gforth.vr html
 
 clean:		mostlyclean
-		-$(RM) -rf $(GEN) engine/gforth$(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
+		-$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
+		engine/gforth$(EXE) engine/gforth-fast$(EXE) \
+                engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \
+		engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE)
 
 distclean:	clean
-		-$(RM) config.cache config.log config.status \
+		-$(RM) -rf config.cache config.log config.status \
 		engine/config.h Makefile Makedist engine/Makefile \
 		stamp-h engine/stamp-h \
 		doc/version.texi gforthmi vmgen
@@ -587,17 +588,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
 
@@ -709,6 +710,11 @@ engine/profile.i:	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
+engine/super2.i:	prim.b prims2x.fs
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-super2 dup process-file bye" >$@-
+		$(CP) $@- $@
+		$(RM) $@-
+
 engine/costs.i:	prim.b prims2x.fs
 		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@-
 		$(CP) $@- $@
@@ -716,7 +722,7 @@ engine/costs.i:	prim.b prims2x.fs
 
 kernel/aliases.fs:	prim.b prims2x.fs kernel/aliases0.fs
 		$(CP) kernel/aliases0.fs $@-
-		$(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@-
+		$(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -726,9 +732,6 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 		$(CP) $@- $@
 		$(RM) $@-
 
-kernel/groups.fs:	engine/prim_grp.i
-	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" >$@
 
@@ -756,10 +759,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) gforth-native$(EXE)
+gforths: $(ENGINES)
 
 engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
-		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
+		cd engine && $(MAKE) $(ENGINES)
 
 # ------------- additional C primitives