--- gforth/Makefile.in	1995/12/04 16:38:51	1.47
+++ gforth/Makefile.in	1995/12/23 16:21:55	1.50
@@ -26,18 +26,19 @@
 #To do:
 #use $(srcdir) to make compilation in a non-srcdir possible
 
-VERSION	=0.1beta#gforth version
+VERSION	=0.1beta-pl1#gforth version
 SHELL	= /bin/sh
 RM	= rm
 CP	= cp
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DIR = ./install-sh -d
 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 +48,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):.\"
 
@@ -74,6 +75,11 @@ INCLUDES = forth.h threading.h io.h io-d
 KERN_SRC = main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 	errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs
 
+GFORTH_FI_SRC = 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
+
 FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs answords.fs blocks.fs bufio.fs checkans.fs \
 	code.fs colorize.fs cross.fs debug.fs debugging.fs doskey.fs ds2texi.fs \
 	dumpimage.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \
@@ -86,7 +92,7 @@ FORTH_SRC = anslocal.fs add.fs assert.fs
 	tester.fs coretest.fs \
 	bubble.fs siev.fs matrix.fs fib.fs
 
-SOURCES	= Makefile.in configure.in configure config.sub  config.guess \
+SOURCES	= CVS Makefile.in configure.in configure config.sub  config.guess \
 	install-sh INSTALL README ToDo BUGS model COPYING Benchres \
 	gforth.ds texinfo.tex gforth.1 gforth.el \
 	primitives engine.c main.c io.c \
@@ -94,13 +100,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 first
+GEN = gforth version.fs
 
 OBJECTS	= engine.o io.o main.o @LIBOBJS@ @getopt_long@
 
@@ -113,9 +120,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 +130,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
 
@@ -143,7 +153,7 @@ more:	$(FORTH_GEN) gforth
 # `realclean' also deletes everything that could be regenerated automatically."
 
 mostlyclean:
-		-$(RM) -rf *.s gforth.fi *.fi~ *.fi+ version.fs TAGS \
+		-$(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 
@@ -160,12 +170,12 @@ realclean:	distclean
 #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 *~
+		gforth-$(VERSION).tar.gz config.cache *~ *TAGS
 
 dist:		$(SOURCES) $(FORTH_GEN) $(DOCDIST)
 		-rm -rf gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
-		cp -p $(SOURCES) $(FORTH_GEN0) @KERNAL@ $(DOCDIST) gforth-$(VERSION)
+		$(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNAL@ $(DOCDIST) gforth-$(VERSION)
 		tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz
 		-rm -rf gforth-$(VERSION)
 
@@ -175,7 +185,7 @@ dist:		$(SOURCES) $(FORTH_GEN) $(DOCDIST
 bindist:	$(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile
 		-rm -rf gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
-		cp -p -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION)
+		$(CP) -rp -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION)
 		strip gforth-$(VERSION)/gforth
 		tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz
 
@@ -189,7 +199,7 @@ bindist:	$(SOURCES) $(FORTH_GEN) gforth
 binonlydist:	$(SOURCES) $(FORTH_GEN) gforth $(OBJECTS)
 		-rm -rf gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
-		cp -p -d  config.status Makefile gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION)
+		$(CP) -p -d  config.status Makefile gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION)
 		strip gforth-$(VERSION)/gforth
 		tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz
 
@@ -198,20 +208,22 @@ binonlydist:	$(SOURCES) $(FORTH_GEN) gfo
 #strip gforth, because the debugging stuff is hardly useful once
 # gforth manages to execute more than a few primitives
 
-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
+install:	gforth $(FORTH_SRC) kernal.fi gforth.fi gforth.1 gforth.info* 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
 		touch $(datadir)/gforth/site-forth/site-init.fs
-		-$(RM) $(bindir)/gforth
+		-$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
-		ln -f $(bindir)/gforth $(bindir)/gforth-$(VERSION)
+		ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)
 		$(INSTALL_DATA) gforth.1 $(mandir)
-		$(INSTALL_DATA) gforth.info* $(infodir)
-		for i in $(FORTH_SRC); do \
+		for i in gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
+		for i in $(FORTH_SRC) primitives; 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
+		sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION): gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
 
 #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'
@@ -242,56 +254,60 @@ 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
-		$(FORTHK) startup.fs dumpimage.fs -e "savesystem gforth.fi bye"
+gforth.fi:	@kernal_fi@ gforth $(GFORTH_FI_SRC)
+		$(FORTHK) startup.fs -e "savesystem gforth.fi bye"
+
+gforth.TAGS:	@kernal_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS
+		$(FORTHK) etags.fs startup.fs -e bye
+		cat TAGS primitives.TAGS kernal.TAGS >gforth.TAGS
 
 engine.s:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
 		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S engine.c
@@ -305,7 +321,7 @@ main.o:		main.c machine.h threading.h $(
 strtoul.o:	strtoul.c strtol.c
 
 primitives.b:	primitives
-		m4 primitives >$@ 
+		m4 -s $(srcdir)/primitives >$@ 
 
 primitives.i :	primitives.b prims2x.fs
 		$(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@
@@ -319,12 +335,8 @@ 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)\" ;" >$@
-
+primitives.TAGS: primitives.b prims2x.fs
+		$(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-tag process-file bye" >$@
 
 doc.fd:		makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
 		 toolsext.fs wordinfo.fs \
@@ -347,9 +359,7 @@ gforth.dvi gforth.fns:	gforth.texi
 gforth.ps:	gforth.dvi
 		$(DVI2PS) gforth.dvi -o $@
 
-gforth.info*:	gforth.info
-
-gforth.info:	gforth.texi
+gforth.info*:	gforth.texi
 		-$(MAKEINFO) gforth.texi
 
 html:		gforth.texi
@@ -360,15 +370,18 @@ html:		gforth.texi
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
 Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= GCC=$(GCC) ./config.status
+	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 config.status: configure
-	GCC=$(GCC) ./config.status --recheck
+	./config.status --recheck
 configure: configure.in
 	cd $(srcdir) && autoconf
 
 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