--- gforth/Makefile.in	2001/05/01 14:34:59	1.207
+++ gforth/Makefile.in	2001/12/24 20:39:29	1.212
@@ -68,11 +68,13 @@ FORTH_ARGS = --die-on-signal -p $(FORTHP
 ENGINE = ./gforth
 FORTH	= $(ENGINE) $(FORTH_ARGS)
 # the (existing) forth system to use for cross compiling and primitives tables
-BUILDFORTH = $(FORTHK)
+# per default we use the one in this directory for a rebuild. It is also
+# possible to override this variable at the command line for an initial build (jaw)
+BUILDFORTH = $(ENGINE) --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build
 FORTHB = $(BUILDFORTH) -m 1000000 -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs
-FORTHP = $(FORTH) -m 1000000
+FORTHP = $(FORTHB)
 ENGINE_FAST = $(ENGINE)-fast
 FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -m 1000000 -i $(kernel_fi)
@@ -350,7 +352,7 @@ RCS_FILES =  ToDo model high-level
 GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs
 
 # things that need a working forth system to be generated
-FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs
+FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i engine/prim_superend.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
@@ -622,6 +624,11 @@ engine/prim_lab.i:	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
+engine/prim_superend.i:	prim.b prims2x.fs
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@-
+		$(CP) $@- $@
+		$(RM) $@-
+
 engine/peephole.i:	prim.b prims2x.fs
 		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@-
 		$(CP) $@- $@
@@ -682,6 +689,9 @@ engines:	FORCE engine/Makefile engine/pr
 TAGS:		gforth.TAGS
 		$(CP) gforth.TAGS $@
 
+tags:		gforth.tags
+		$(CP) gforth.tags $@
+
 install.TAGS:	gforth.TAGS
 		sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS
 
@@ -690,6 +700,11 @@ gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(
 		cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
 		rm TAGS
 
+gforth.tags:	@kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags
+		$(FORTHK) tags.fs except.fs startup.fs -e bye
+		cat tags prim.tags kernel.tags >gforth.tags
+		rm tags
+
 prim.TAGS: 	prim.b prims2x.fs
 		#echo '2c\' >prim.TAGS.sed
 		#echo $(srcdir)/prim >>prim.TAGS.sed
@@ -698,9 +713,20 @@ prim.TAGS: 	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
+prim.tags: 	prim.b prims2x.fs
+		#echo '2c\' >prim.TAGS.sed
+		#echo $(srcdir)/prim >>prim.TAGS.sed
+		#$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-
+		$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@-
+		$(CP) $@- $@
+		$(RM) $@-
+
 kernel.TAGS:
 		rm kernl16l.fi-; $(MAKE) @kernel_fi@
 
+kernel.tags:
+		rm kernl16l.fi-; $(MAKE) @kernel_fi@
+
 doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
 		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye