--- gforth/Makefile.in	1996/12/14 14:21:18	1.76
+++ gforth/Makefile.in	1997/03/11 16:00:36	1.89
@@ -23,8 +23,12 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 
-VERSION	=0.2.1#gforth version
-DOSVERSION=021#gforth version
+#gforth version
+VERSION_MAJOR=0
+VERSION_MINOR=3
+VERSION_RELEASE=0
+VERSION	=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
+DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)
 SHELL	= /bin/sh
 RM	= rm
 RMTREE	= rm -rf
@@ -33,7 +37,6 @@ TAR	= tar cf -
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = $(srcdir)/install-sh -d
 LN_S	= @LN_S@
 GCC	= @CC@
 CC	= $(GCC)
@@ -41,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
@@ -81,13 +85,17 @@ emacssitelispdir=$(datadir)/emacs/site-l
 INCLUDES = forth.h threading.h io.h
 
 KERN_SRC = \
-	add.fs \
+	aliases0.fs \
 	aliases.fs \
+	args.fs \
+	conditionals.fs \
+	cond-old.fs \
 	cross.fs \
 	errore.fs \
-	extend.fs \
+	files.fs \
 	kernel.fs \
 	main.fs \
+	primitives0.fs \
 	search-order.fs \
 	special.fs \
 	tools.fs \
@@ -103,6 +111,8 @@ GFORTH_FI_SRC = \
 	debugging.fs \
 	dumpimage.fs \
 	environ.fs \
+	errors.fs \
+	extend.fs \
 	float.fs \
 	glocals.fs \
 	hash.fs \
@@ -111,6 +121,7 @@ GFORTH_FI_SRC = \
 	look.fs \
 	search-order.fs \
 	see.fs \
+	see-ext.fs \
 	source.fs \
 	startup.fs \
 	struct.fs \
@@ -124,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 \
@@ -149,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)
@@ -158,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@ 
@@ -170,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
 
@@ -186,14 +200,18 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf
 
 all:	version.fs more
 
-version.h:	Makefile.in
+#this rule avoids remaking everything after minor changes in Makefile.in
+version-stamp:	Makefile.in
+		test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@
+
+version.h:	version-stamp
 		echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@
 
-version.fs:	Makefile.in
+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.
@@ -241,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)
 
@@ -294,22 +312,20 @@ binonlydist:	$(SOURCES) $(FORTH_GEN0) @K
 #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is
 #hard to generate)
-install:	gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS
-		for i in $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth; do \
-			$(INSTALL_DIR) $$i; \
-		done
+install:	gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS installdirs
 		touch $(datadir)/gforth/site-forth/site-init.fs
 		-$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)
-		$(INSTALL_DATA) $(srcdir)/gforth.1 $(mandir)
-		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)
-		$(FORTHP) $(FORTHSIZES) startup.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names
-		sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/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); \
 		else \
@@ -320,17 +336,20 @@ install:	gforth $(FORTH_SRC) kernel.fi g
 
 install-strip:	install
 
+installdirs:	mkinstalldirs
+		$(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
+
 #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:	
 		-$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)
-		@echo -e "Type\n$(RM) -rf $(bindir)/gforth $(mandir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
+		@echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
 
 check test:	gforth gforth.fi
 		$(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
 		$(FORTH) code.fs checkans.fs -e bye
 		@echo 'Expect no differences'
-		$(FORTH) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i
+		$(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i
 
 bench:		gforth gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
@@ -341,9 +360,13 @@ 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)
@@ -364,38 +387,39 @@ 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-:	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
-		@LINK_KERNL16B@
 
 kernl16l.fi:	$(KERNLS)
 		-$(CP) kernl16l.fi kernl16l.fi~
 		-$(CP) kernl16l.fi- kernl16l.fi
-		@LINK_KERNL16L@
 
 kernl32b.fi:	$(KERNLS)
 		-$(CP) kernl32b.fi kernl32b.fi~
 		-$(CP) kernl32b.fi- kernl32b.fi
-		@LINK_KERNL32B@
 
 kernl32l.fi:	$(KERNLS)
 		-$(CP) kernl32l.fi kernl32l.fi~
 		-$(CP) kernl32l.fi- kernl32l.fi
-		@LINK_KERNL32L@
 
 kernl64b.fi:	$(KERNLS)
 		-$(CP) kernl64b.fi kernl64b.fi~
 		-$(CP) kernl64b.fi- kernl64b.fi
-		@LINK_KERNL64B@
 
 kernl64l.fi:	$(KERNLS)
 		-$(CP) kernl64l.fi kernl64l.fi~
 		-$(CP) kernl64l.fi- kernl64l.fi
-		@LINK_KERNL64L@
 
-gforth.fi:	@kernel_fi@ gforth $(GFORTH_FI_SRC)
-		$(FORTHK) $(FORTHSIZES) startup.fs -e "savesystem gforth.fi bye"
+kernl%.fi:	kernl%.fi- $(KERNLS)
+		-$(CP) $@ $@~
+		-$(CP) $< $@
+
+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
@@ -412,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
@@ -426,11 +456,11 @@ primitives.i :	primitives.b prims2x.fs
 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
-		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@
+aliases.fs:	primitives.b prims2x.fs aliases0.fs
+		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" |cat aliases0.fs - >$@
 
-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
+		$(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" >$@