--- gforth/Makefile.in	1997/02/06 21:22:56	1.82
+++ gforth/Makefile.in	1997/03/04 17:49:45	1.87
@@ -44,7 +44,8 @@ PATHSEP = @PATHSEP@
 FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP).
 FORTHSIZES = @FORTHSIZES@
 FORTH	= ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir)
-FORTHK	= ./gforth -p .$(PATHSEP)$(srcdir) -i ./kernel.fi
+FORTHKFLAGS= -p .$(PATHSEP)$(srcdir) -i ./kernel.fi
+FORTHK	= ./gforth $(FORTHKFLAGS)
 FORTHP	= ./gforth -i ./kernel.fi
 STRIP	= strip
 TEXI2DVI = texi2dvi
@@ -86,12 +87,15 @@ INCLUDES = forth.h threading.h io.h
 KERN_SRC = \
 	aliases0.fs \
 	aliases.fs \
+	args.fs \
 	conditionals.fs \
+	cond-old.fs \
 	cross.fs \
 	errore.fs \
 	files.fs \
 	kernel.fs \
 	main.fs \
+	primitives0.fs \
 	search-order.fs \
 	special.fs \
 	tools.fs \
@@ -117,6 +121,7 @@ GFORTH_FI_SRC = \
 	look.fs \
 	search-order.fs \
 	see.fs \
+	see-ext.fs \
 	source.fs \
 	startup.fs \
 	struct.fs \
@@ -134,7 +139,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	doskey.fs ds2texi.fs \
 	etags.fs filedump.fs \
 	glosgen.fs gray.fs \
-	makedoc.fs \
+	makedoc.fs comp-image.fs \
 	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
 	more.fs other.fs prims2x.fs random.fs \
 	sieve.fs \
@@ -155,7 +160,7 @@ SOURCES	= CVS compat Makefile.in configu
 	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c atanh.c \
 	strerror.c strsignal.c dblsub.c \
 	INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \
-	startup.dos history.dos \
+	startup.dos history.dos mkinstalldirs \
 	configure.cmd mkos2mf.sed os2conf.h makefile.os2 \
 	glosgen.glo glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC)
@@ -164,10 +169,12 @@ RCS_FILES =  ToDo model high-level
 
 GEN = gforth version.fs
 
-OBJECTS	= engine.o io.o main.o memcasecmp.o @LIBOBJS@ @getopt_long@
+OBJECTS0 = io.o memcasecmp.o @LIBOBJS@ @getopt_long@
+OBJECTS	= engine.o main.o
+OBJECTS_DITC =  engine-ditc.o main-ditc.o
 
 # things that need a working forth system to be generated
-FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs
+FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs primitives.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
@@ -176,7 +183,8 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@
 DOCDIST = gforth.info* gforth.ps
 
 #stuff in a binonly distribution 
-BINONLYDIST = config.status Makefile gforth $(OBJECTS) \
+BINONLYDIST = config.status Makefile gforth gforth-ditc \
+	$(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
 	machine.h config.h kernel.fi stamp-h version.h version.fs \
 	INSTALL.BINDIST
 
@@ -203,7 +211,7 @@ version.fs:	version-stamp
 		$(MAKE) gforth
 		echo ": version-string s\" $(VERSION)\" ;" >$@
 
-more:	$(FORTH_GEN) gforth
+more:	$(OBJECTS) $(FORTH_GEN) gforth
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -251,7 +259,7 @@ dist:		$(SOURCES) $(FORTH_GEN0) @KERNEL@
 dosdist:	$(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)
 		-$(RMTREE) gforth.$(DOSVERSION)
 		mkdir gforth.$(DOSVERSION)
-		$(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth.$(DOSVERSION)
+		$(CP) -rp $(SOURCES) $(FORTH_GEN) $(DOCDIST) gforth.$(DOSVERSION)
 		zip -r9 gforth.zip gforth.$(DOSVERSION)/*
 		-$(RMTREE) gforth.$(DOSVERSION)
 
@@ -309,13 +317,14 @@ install:	gforth $(FORTH_SRC) kernel.fi g
 		-$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)
-		$(INSTALL_DATA) $(srcdir)/gforth.1 $(man1dir)
-		for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
+		-$(INSTALL_DATA) $(srcdir)/gforth.1 $(man1dir)
+		-for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
 		for i in $(FORTH_SRC) primitives; do \
 			$(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \
 		done
 		$(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION)
 		$(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names
+		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		sed s:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
 		if test -d $(emacssitelispdir); then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
@@ -351,11 +360,18 @@ bench:		gforth gforth.fi
 
 dvi:		gforth.dvi
 
-gforth:		$(OBJECTS)
+gforth:		$(OBJECTS) $(OBJECTS0)
 		-$(CP) gforth gforth~
-		$(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
+		$(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@
 		@MAKE_EXE@
 
+gforth-ditc:	$(OBJECTS_DITC) $(OBJECTS0)
+		$(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@
+		@MAKE_EXE@
+
+kernl%.fi-:	mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0)
+		$(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
+
 kernl16l.fi-:	$(KERN_SRC) version.fs mach16l.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
 
@@ -374,6 +390,11 @@ kernl64l.fi-:	$(KERN_SRC) version.fs mac
 kernl64b.fi-:	$(KERN_SRC) version.fs mach64b.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
+kernl%.fi:	kernl%.fi- $(KERNLS)
+		-$(CP) $@ $@~
+		-$(CP) $< $@
+		@LINK_KERNL@
+
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
 		-$(CP) kernl16b.fi- kernl16b.fi
@@ -404,10 +425,8 @@ kernl64l.fi:	$(KERNLS)
 		-$(CP) kernl64l.fi- kernl64l.fi
 		@LINK_KERNL64L@
 
-gforth.fi:	@kernel_fi@ gforth $(GFORTH_FI_SRC)
-		$(FORTHK) --clear-dictionary $(FORTHSIZES) startup.fs -e "savesystem gforth.fi1 bye"
-		$(FORTHK)  --clear-dictionary --offset-image $(FORTHSIZES) startup.fs -e "savesystem gforth.fi2 bye"
-		$(FORTHK) -m 100000 startup.fs  comp-image.fs -e "comp-image gforth.fi1 gforth.fi2 gforth.fi bye"
+gforth.fi:	@kernel_fi@ gforth-makeimage gforth gforth-ditc $(GFORTH_FI_SRC)
+		GFORTH=./gforth-ditc $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
 
 #TAGS is a GNU standard target
 TAGS:		gforth.TAGS
@@ -424,9 +443,15 @@ engine.s:	engine.c primitives.i prim_lab
 engine.o:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h
 		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c
 
+engine-ditc.o:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h
+		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine.c
+
 main.o:		main.c machine.h threading.h $(INCLUDES) config.h version.h
 		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c
 
+main-ditc.o:	main.c machine.h threading.h $(INCLUDES) config.h version.h
+		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/main.c
+
 strtoul.o:	strtoul.c strtol.c
 
 primitives.b:	primitives
@@ -442,8 +467,9 @@ aliases.fs:	primitives.b prims2x.fs alia
 		$(CP) aliases0.fs aliases.fs
 		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@
 
-primitives.fs:	primitives.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
+primitives.fs:	primitives.b prims2x.fs primitives0.fs
+		$(CP) primitives0.fs primitives.fs
+		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@
 
 primitives.TAGS: primitives.b prims2x.fs
 		$(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@