--- gforth/Makefile.in	1997/03/04 17:49:45	1.87
+++ gforth/Makefile.in	1997/03/20 14:39:49	1.92
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+#Copyright (C) 1995-1997 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -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
@@ -135,22 +135,23 @@ 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 \
-	makedoc.fs comp-image.fs \
+	makedoc.fs \
 	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
 	more.fs other.fs prims2x.fs random.fs \
 	sieve.fs \
 	site-init.fs \
 	tt.fs sokoban.fs \
 	wordsets.fs \
-	tester.fs coretest.fs postponetest.fs dbltest.fs \
+	tester.fs coretest.fs postponetest.fs dbltest.fs other-tests.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs
 
-SOURCES	= CVS compat Makefile.in configure.in configure config.sub config.guess \
+SOURCES	= CVS compat Makefile.in gforth-makeimage \
+	configure.in configure config.sub config.guess \
 	acconfig.h config.h.in stamp-h.in \
 	install-sh INSTALL README ToDo BUGS model COPYING Benchres \
 	gforth.ds texinfo.tex gforth.1 gforth.el \
@@ -167,7 +168,7 @@ SOURCES	= CVS compat Makefile.in configu
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth version.fs
+GEN = gforth gforth-ditc version.fs version-stamp
 
 OBJECTS0 = io.o memcasecmp.o @LIBOBJS@ @getopt_long@
 OBJECTS	= engine.o main.o
@@ -185,7 +186,8 @@ DOCDIST = gforth.info* gforth.ps
 #stuff in a binonly distribution 
 BINONLYDIST = config.status Makefile gforth gforth-ditc \
 	$(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
-	machine.h config.h kernel.fi stamp-h version.h version.fs \
+	machine.h config.h kernel.fi \
+	stamp-h version.h version.fs version-stamp \
 	INSTALL.BINDIST
 
 KERNLS = kernl16b.fi- kernl16l.fi- \
@@ -202,7 +204,7 @@ all:	version.fs more
 
 #this rule avoids remaking everything after minor changes in Makefile.in
 version-stamp:	Makefile.in
-		test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@
+		(test -r $@ && test x'$(VERSION)' = x`cat $@`) || echo $(VERSION) >$@
 
 version.h:	version-stamp
 		echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@
@@ -347,6 +349,7 @@ uninstall:
 
 check test:	gforth gforth.fi
 		$(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
+		$(FORTH) other-tests.fs -e bye
 		$(FORTH) code.fs checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i
@@ -369,9 +372,6 @@ 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"
 
@@ -390,43 +390,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:	kernl%.fi- $(KERNLS)
-		-$(CP) $@ $@~
-		-$(CP) $< $@
-		@LINK_KERNL@
+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@
+
+kernl%.fi:	kernl%.fi- $(KERNLS)
+		-$(CP) $@ $@~
+		-$(CP) $< $@
 
 gforth.fi:	@kernel_fi@ gforth-makeimage gforth gforth-ditc $(GFORTH_FI_SRC)
-		GFORTH=./gforth-ditc $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
+		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
 
 #TAGS is a GNU standard target
 TAGS:		gforth.TAGS
@@ -464,20 +460,15 @@ 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" >$@
 
-doc.fd:		makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
-		 toolsext.fs wordinfo.fs \
-		 vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \
-		 doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs
+doc.fd:		makedoc.fs $(GFORTH_FI_SRC)
 		$(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
 
 crossdoc.fd:	$(KERN_SRC) version.fs $(FORTH_GEN0)
@@ -486,8 +477,9 @@ crossdoc.fd:	$(KERN_SRC) version.fs $(FO
 gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
 		$(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@
 
-checkdoc:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs
-		$(FORTHK) ds2texi.fs answords.fs -e bye
+checkdoc:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs gforth.texi
+		$(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd answords.fs -e bye
+		-grep unknown gforth.texi
 
 dvi:		gforth.dvi