--- gforth/Makefile.in	1997/02/09 21:51:38	1.84
+++ gforth/Makefile.in	1997/03/11 16:00:36	1.89
@@ -25,8 +25,8 @@
 
 #gforth version
 VERSION_MAJOR=0
-VERSION_MINOR=2
-VERSION_RELEASE=9
+VERSION_MINOR=3
+VERSION_RELEASE=0
 VERSION	=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
 DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)
 SHELL	= /bin/sh
@@ -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,7 +87,9 @@ 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 \
@@ -118,6 +121,7 @@ GFORTH_FI_SRC = \
 	look.fs \
 	search-order.fs \
 	see.fs \
+	see-ext.fs \
 	source.fs \
 	startup.fs \
 	struct.fs \
@@ -131,7 +135,7 @@ GFORTH_FI_SRC = \
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
 	ans-report.fs ansi.fs answords.fs \
 	checkans.fs \
-	code.fs colorize.fs \
+	code.fs colorize.fs comp-image.fs \
 	doskey.fs ds2texi.fs \
 	etags.fs filedump.fs \
 	glosgen.fs gray.fs \
@@ -156,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)
@@ -165,7 +169,9 @@ 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 primitives.fs
@@ -177,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
 
@@ -252,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)
 
@@ -353,23 +360,66 @@ 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@
+
+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"
+
+kernl16b.fi-:	$(KERN_SRC) version.fs mach16b.fs $(FORTH_GEN0)
+		$(FORTHK) -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
+
+kernl32l.fi-:	$(KERN_SRC) version.fs mach32l.fs $(FORTH_GEN0)
+		$(FORTHK) -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"
+
+kernl32b.fi-:	$(KERN_SRC) version.fs mach32b.fs $(FORTH_GEN0)
+		$(FORTHK) -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"
+
+kernl64l.fi-:	$(KERN_SRC) version.fs mach64l.fs $(FORTH_GEN0)
+		$(FORTHK) -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"
+
+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-:	mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
 
+kernl16b.fi:	$(KERNLS)
+		-$(CP) kernl16b.fi kernl16b.fi~
+		-$(CP) kernl16b.fi- kernl16b.fi
+
+kernl16l.fi:	$(KERNLS)
+		-$(CP) kernl16l.fi kernl16l.fi~
+		-$(CP) kernl16l.fi- kernl16l.fi
+
+kernl32b.fi:	$(KERNLS)
+		-$(CP) kernl32b.fi kernl32b.fi~
+		-$(CP) kernl32b.fi- kernl32b.fi
+
+kernl32l.fi:	$(KERNLS)
+		-$(CP) kernl32l.fi kernl32l.fi~
+		-$(CP) kernl32l.fi- kernl32l.fi
+
+kernl64b.fi:	$(KERNLS)
+		-$(CP) kernl64b.fi kernl64b.fi~
+		-$(CP) kernl64b.fi- kernl64b.fi
+
+kernl64l.fi:	$(KERNLS)
+		-$(CP) kernl64l.fi kernl64l.fi~
+		-$(CP) kernl64l.fi- kernl64l.fi
+
 kernl%.fi:	kernl%.fi- $(KERNLS)
 		-$(CP) $@ $@~
 		-$(CP) $< $@
-		@LINK_KERNL@
 
-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)
+		GFORTHD=./gforth-ditc $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
 
 #TAGS is a GNU standard target
 TAGS:		gforth.TAGS
@@ -386,9 +436,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
@@ -401,12 +457,10 @@ prim_labels.i :	primitives.b prims2x.fs
 		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@
 
 aliases.fs:	primitives.b prims2x.fs aliases0.fs
-		$(CP) aliases0.fs aliases.fs
-		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@
+		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" |cat aliases0.fs - >$@
 
 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" >>$@
+		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye"|cat primitives0.fs - >$@
 
 primitives.TAGS: primitives.b prims2x.fs
 		$(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@