--- gforth/Makefile.in	1995/11/28 18:45:27	1.44
+++ gforth/Makefile.in	1995/12/11 13:15:19	1.48
@@ -34,10 +34,10 @@ INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
-GCC	= gcc
+GCC	= @CC@
 CC	= $(GCC)
 FORTH	= ./gforth
-FORTHK	= $(FORTH) -i kernal.fi
+FORTHK	= $(FORTH) -i ./kernal.fi
 STRIP	= strip
 TEXI2DVI = texi2dvi
 DVI2PS	= dvips -D300
@@ -47,7 +47,7 @@ MAKEINFO = makeinfo
 XCFLAGS	= @CFLAGS@
 XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
-ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves
+ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@
 CFLAGS	= $(DEBUGFLAG) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):.\"
 
@@ -94,13 +94,14 @@ SOURCES	= Makefile.in configure.in confi
 	getopt.c getopt1.c getopt.h select.c \
 	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \
 	strerror.c strsignal.c \
-	makefile.dos mkdosmf.sed configure.bat startup.dos \
+	INSTALL.DOS makefile.dos mkdosmf.sed configure.bat \
+	startup.dos history.dos \
 	glosgen.glo glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC)
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth
+GEN = gforth version.fs
 
 OBJECTS	= engine.o io.o main.o @LIBOBJS@ @getopt_long@
 
@@ -113,9 +114,9 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernal_fi@
 #distributed documentation
 DOCDIST = gforth.texi gforth.fns gforth.ps gforth.info*
 
-KERNLS = kernl16b.fi+ kernl16l.fi+ \
-	 kernl32b.fi+ kernl32l.fi+ \
-	 kernl64b.fi+ kernl64l.fi+
+KERNLS = kernl16b.fi- kernl16l.fi- \
+	 kernl32b.fi- kernl32l.fi- \
+	 kernl64b.fi- kernl64l.fi-
 
 GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gforth.texi gforth.dvi gforth.ps Makefile configure
 
@@ -123,11 +124,14 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-all:	first more
+all:	version.fs more
 
-first:
-	$(MAKE) gforth
-	touch first
+version.c:	Makefile.in
+		echo "char gforth_version[]=\"$(VERSION)\" ;" >$@
+
+version.fs:	Makefile.in
+		$(MAKE) gforth
+		echo ": version-string s\" $(VERSION)\" ;" >$@
 
 more:	$(FORTH_GEN) gforth
 
@@ -142,8 +146,14 @@ more:	$(FORTH_GEN) gforth
 # `distclean' also deletes the files made by config.
 # `realclean' also deletes everything that could be regenerated automatically."
 
-clean:		
-		-$(RM) $(GEN) *.o *.s gforth.fi *.fi~ *.fi+ version.fs TAGS crossdoc.fd
+mostlyclean:
+		-$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs TAGS \
+		crossdoc.fd doc.fd gforth.aux gforth.cp gforth.cps \
+		gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \
+		gforth.toc gforth.tp gforth.vr html 
+
+clean:		mostlyclean
+		-$(RM) -rf $(GEN) *.o 
 
 distclean:	clean
 		-$(RM) machine.h kernal.fi config.cache config.log config.status Makefile
@@ -151,6 +161,11 @@ distclean:	clean
 realclean:	distclean
 		-$(RM) $(GEN_PRECIOUS)
 
+#mostlyclean, but also remove some of the stuff that is distributed
+virtualclean:	mostlyclean
+		-$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
+		gforth-$(VERSION).tar.gz config.cache *~
+
 dist:		$(SOURCES) $(FORTH_GEN) $(DOCDIST)
 		-rm -rf gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
@@ -190,6 +205,7 @@ binonlydist:	$(SOURCES) $(FORTH_GEN) gfo
 install:	gforth $(FORTH_SRC) kernal.fi gforth.fi gforth.1 gforth.info
 		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
 		touch $(datadir)/gforth/site-forth/site-init.fs
+		-$(RM) $(bindir)/gforth
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		ln -f $(bindir)/gforth $(bindir)/gforth-$(VERSION)
 		$(INSTALL_DATA) gforth.1 $(mandir)
@@ -197,8 +213,8 @@ install:	gforth $(FORTH_SRC) kernal.fi g
 		for i in $(FORTH_SRC); do \
 			$(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \
 		done
-		rm gforth.fi; make gforth.fi #gforth.fi contains some path names
-		$(INSTALL_DATA) kernal.fi gforth.fi $(libdir)/gforth/$(VERSION)
+		$(INSTALL_DATA) kernal.fi $(libdir)/gforth/$(VERSION)
+		$(FORTHK) startup.fs dumpimage.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names
 
 
 #deinstall all files specific to this version of gforth
@@ -210,13 +226,13 @@ uninstall:
 check:		test
 		touch test
 
-test:		gforth
+test:		gforth gforth.fi
 		$(FORTH) tester.fs coretest.fs -e bye
 		$(FORTH) code.fs checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i
 
-bench:		gforth
+bench:		gforth gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
 		time $(FORTH) siev.fs -e "main bye"
 		time $(FORTH) bubble.fs -e "main bye"
@@ -230,52 +246,52 @@ gforth:		$(OBJECTS)
 		$(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
 		@MAKE_EXE@
 
-kernl16l.fi+:	$(KERN_SRC) mach16l.fs $(FORTH_GEN0)
+kernl16l.fi-:	$(KERN_SRC) mach16l.fs $(FORTH_GEN0)
 		$(FORTHK) -p . -e 's" mach16l.fs"' main.fs
 
-kernl16b.fi+:	$(KERN_SRC) mach16b.fs $(FORTH_GEN0)
+kernl16b.fi-:	$(KERN_SRC) mach16b.fs $(FORTH_GEN0)
 		$(FORTHK) -p . -e 's" mach16b.fs"' main.fs
 
-kernl32l.fi+:	$(KERN_SRC) mach32l.fs $(FORTH_GEN0)
+kernl32l.fi-:	$(KERN_SRC) mach32l.fs $(FORTH_GEN0)
 		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
 
-kernl32b.fi+:	$(KERN_SRC) mach32b.fs $(FORTH_GEN0)
+kernl32b.fi-:	$(KERN_SRC) mach32b.fs $(FORTH_GEN0)
 		$(FORTHK) -p . -e 's" mach32b.fs"' main.fs
 
-kernl64l.fi+:	$(KERN_SRC) mach64l.fs $(FORTH_GEN0)
+kernl64l.fi-:	$(KERN_SRC) mach64l.fs $(FORTH_GEN0)
 		$(FORTHK) -p . -e 's" mach64l.fs"' main.fs
 
-kernl64b.fi+:	$(KERN_SRC) mach64b.fs $(FORTH_GEN0)
+kernl64b.fi-:	$(KERN_SRC) mach64b.fs $(FORTH_GEN0)
 		$(FORTHK) -p . -e 's" mach64b.fs"' main.fs
 
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
-		-$(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
+		-$(CP) kernl16l.fi- kernl16l.fi
 		@LINK_KERNL16L@
 
 kernl32b.fi:	$(KERNLS)
 		-$(CP) kernl32b.fi kernl32b.fi~
-		-$(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
+		-$(CP) kernl32l.fi- kernl32l.fi
 		@LINK_KERNL32L@
 
 kernl64b.fi:	$(KERNLS)
 		-$(CP) kernl64b.fi kernl64b.fi~
-		-$(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
+		-$(CP) kernl64l.fi- kernl64l.fi
 		@LINK_KERNL64L@
 
 gforth.fi:	@kernal_fi@ gforth startup.fs glocals.fs search-order.fs hash.fs float.fs debugging.fs environ.fs wordinfo.fs look.fs vt100.fs see.fs bufio.fs debug.fs history.fs vt100key.fs assert.fs source.fs blocks.fs struct.fs dumpimage.fs
@@ -307,12 +323,6 @@ aliases.fs:	primitives.b prims2x.fs
 primitives.fs:	primitives.b prims2x.fs
 		$(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
 
-version.fs:	Makefile.in
-		echo ": version-string s\" $(VERSION)\" ;" >$@
-
-version.c:	Makefile.in
-		echo "char gforth_version[]=\"$(VERSION)\" ;" >$@
-
 
 doc.fd:		makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
 		 toolsext.fs wordinfo.fs \
@@ -329,7 +339,7 @@ gforth.texi:	gforth.ds primitives.b ds2t
 checkdoc:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs
 		$(FORTHK) -p . ds2texi.fs answords.fs -e bye
 
-gforth.dvi:	gforth.texi
+gforth.dvi gforth.fns:	gforth.texi
 		$(TEXI2DVI) gforth.texi
 
 gforth.ps:	gforth.dvi
@@ -357,6 +367,9 @@ configure: configure.in
 makefile.dos: mkdosmf.sed Makefile.in
 	sed -f mkdosmf.sed <Makefile.in >makefile.dos
 
+history.dos: history.fs Makefile.in
+	sed -e "s,~/\.gforth-history,/gforth.his,g" <history.fs >history.dos
+
 startup.dos: startup.fs Makefile.in
 	sed -e "s/\\\\ include doskey/include doskey/g" \
 	    -e "s/include vt100key/\\\\ include vt100key/g" <startup.fs >startup.dos