--- gforth/Makefile.in	2002/01/14 08:40:23	1.215
+++ gforth/Makefile.in	2002/04/01 15:34:34	1.220
@@ -64,9 +64,11 @@ GCC	= @CC@
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@
-FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
+FORTHS_ARGS =  -p $(FORTHPATH)$(PATHSEP)$(srcdir)
+FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)
 ENGINE = ./gforth
 FORTH	= $(ENGINE) $(FORTH_ARGS)
+FORTHS	= $(ENGINE) $(FORTHS_ARGS)
 # the (existing) forth system to use for cross compiling and primitives tables
 # 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)
@@ -235,7 +237,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/other.fs test/checkans.fs \
+	test/string.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 \
 	moofglos.fs fixpath.fs \
@@ -349,10 +351,11 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs
+GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(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/prim_superend.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs
+FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i engine/prim_superend.i engine/peephole.i engine/profile.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@ 
@@ -389,7 +392,7 @@ kernel/version.fs:	version
 	$(MAKE) gforth$(EXE)
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
-more:	engine $(FORTH_GEN) $(GEN)
+more:	engines $(FORTH_GEN) $(GEN)
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -422,7 +425,8 @@ docclean:	FORCE
 
 clean:		mostlyclean
 		-$(RM) -rf $(GEN) engine/gforth$(EXE) \
-		engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \
+		engine/gforth-fast$(EXE) engine/gforth-itc$(EXE) \
+		engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \
 		*.o engine/*.o arch/*/*.o version
 
 distclean:	clean
@@ -528,6 +532,7 @@ uninstall:	FORCE
 check test:	gforth$(EXE) gforth.fi
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs -e bye | 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) prims2x.fs -e \
 		  "c-flag on s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
@@ -624,6 +629,11 @@ engine/prim_lab.i:	prim.b prims2x.fs
 		$(CP) $@- $@
 		$(RM) $@-
 
+engine/prim_names.i:	prim.b prims2x.fs
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@-
+		$(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) $@- $@
@@ -635,7 +645,7 @@ engine/peephole.i:	prim.b prims2x.fs
 		$(RM) $@-
 
 engine/profile.i:	prim.b prims2x.fs
-		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile process-file bye" >$@-
+		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined process-file bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -665,6 +675,10 @@ gforth-fast$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHFAST_EXE@
 
+gforth-itc$(EXE):	engines
+		$(CP) engine/$@ $@
+		@GFORTHITC_EXE@
+
 gforth-ditc$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHDITC_EXE@
@@ -672,8 +686,10 @@ gforth-ditc$(EXE):	engines
 gforth-prof$(EXE):	engines
 		$(CP) engine/$@ $@
 
-engines:	FORCE engine/Makefile engine/prim.i engine/prim_lab.i engine/peephole.i engine/profile.i
-		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
+gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
+
+engines:	FORCE $(FORTH_GEN_ENGINE) engine/Makefile
+		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
 
 # ------------- additional C primitives