--- gforth/Makefile.in	1995/11/07 18:06:29	1.38
+++ gforth/Makefile.in	1995/11/29 20:20:32	1.45
@@ -34,10 +34,10 @@ INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
-GCC	= gcc
+GCC	= @GCC@
 CC	= $(GCC)
 FORTH	= ./gforth
-FORTHK	= $(FORTH) -p . -i kernal.fi
+FORTHK	= $(FORTH) -i kernal.fi
 STRIP	= strip
 TEXI2DVI = texi2dvi
 DVI2PS	= dvips -D300
@@ -49,7 +49,7 @@ XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@
-CFLAGS	= $(DEBUGFLAG) -pipe -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"
+CFLAGS	= $(DEBUGFLAG) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):.\"
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@
@@ -81,12 +81,13 @@ FORTH_SRC = anslocal.fs add.fs assert.fs
 	kernal.fs locals-test.fs look.fs main.fs makedoc.fs \
  	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
 	other.fs prims2x.fs random.fs search-order.fs see.fs sieve.fs source.fs \
-	startup.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs vt100.fs \
-	vt100key.fs wordinfo.fs wordsets.fs \
-	tester.fs coretest.fs	
+	startup.fs site-init.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs \
+	vt100.fs vt100key.fs wordinfo.fs wordsets.fs \
+	tester.fs coretest.fs \
+	bubble.fs siev.fs matrix.fs fib.fs
 
 SOURCES	= Makefile.in configure.in configure config.sub  config.guess \
-	install-sh INSTALL README ToDo BUGS model COPYING \
+	install-sh INSTALL README ToDo BUGS model COPYING Benchres \
 	gforth.ds texinfo.tex gforth.1 gforth.el \
 	primitives engine.c main.c io.c \
 	m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \
@@ -99,7 +100,7 @@ SOURCES	= Makefile.in configure.in confi
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth
+GEN = gforth first
 
 OBJECTS	= engine.o io.o main.o @LIBOBJS@ @getopt_long@
 
@@ -122,11 +123,11 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-all:
-	if [ ! -f gforth ]; then $(MAKE) first; fi
-	$(MAKE) more
+all:	first more
 
-first:	gforth
+first:
+	$(MAKE) gforth
+	touch first
 
 more:	$(FORTH_GEN) gforth
 
@@ -141,15 +142,26 @@ 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
+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
+		-$(RM) machine.h kernal.fi config.cache config.log config.status Makefile
 
 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)
@@ -187,27 +199,42 @@ binonlydist:	$(SOURCES) $(FORTH_GEN) gfo
 # 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)	
+		$(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)
 		$(INSTALL_DATA) gforth.info* $(infodir)
 		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
+		$(RM) gforth.fi; make gforth.fi #gforth.fi contains some path names
 		$(INSTALL_DATA) kernal.fi gforth.fi $(libdir)/gforth/$(VERSION)
 
+
+#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"
+
 check:		test
 		touch test
 
 test:		gforth
-		@echo 'Expect to see INCORRECT RESULT: { GS1 -> <TRUE> <TRUE> }'
-		@echo 'This is a bug of the testing program'
 		$(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
+		@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"
+		time $(FORTH) -m 160000 matrix.fs -e "main bye"
+		time $(FORTH) fib.fs -e "main bye"
+
 dvi:		gforth.dvi
 
 gforth:		$(OBJECTS)
@@ -216,22 +243,22 @@ gforth:		$(OBJECTS)
 		@MAKE_EXE@
 
 kernl16l.fi+:	$(KERN_SRC) mach16l.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach16l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach16l.fs"' main.fs
 
 kernl16b.fi+:	$(KERN_SRC) mach16b.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach16b.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach16b.fs"' main.fs
 
 kernl32l.fi+:	$(KERN_SRC) mach32l.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach32l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
 
 kernl32b.fi+:	$(KERN_SRC) mach32b.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach32b.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach32b.fs"' main.fs
 
 kernl64l.fi+:	$(KERN_SRC) mach64l.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach64l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach64l.fs"' main.fs
 
 kernl64b.fi+:	$(KERN_SRC) mach64b.fs $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach64b.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach64b.fs"' main.fs
 
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
@@ -281,16 +308,16 @@ primitives.b:	primitives
 		m4 primitives >$@ 
 
 primitives.i :	primitives.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@
+		$(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@
 
 prim_labels.i :	primitives.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@
+		$(FORTHK) -p . 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" >$@
+		$(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@
 
 primitives.fs:	primitives.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
+		$(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
 
 version.fs:	Makefile.in
 		echo ": version-string s\" $(VERSION)\" ;" >$@
@@ -303,23 +330,25 @@ doc.fd:		makedoc.fs float.fs search-orde
 		 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
-		$(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
+		$(FORTHK) -p . -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
 
 crossdoc.fd:	$(KERN_SRC) $(FORTH_GEN0)
-		$(FORTHK) -e 's" mach32l.fs"' main.fs
+		$(FORTHK) -p . -e 's" mach32l.fs"' main.fs
 
 gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
-		$(FORTHK) ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@
+		$(FORTHK) -p . ds2texi.fs -e "s\" 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
+		$(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
 		$(DVI2PS) gforth.dvi -o $@
 
+gforth.info*:	gforth.info
+
 gforth.info:	gforth.texi
 		-$(MAKEINFO) gforth.texi
 
@@ -342,4 +371,4 @@ makefile.dos: mkdosmf.sed Makefile.in
 
 startup.dos: startup.fs Makefile.in
 	sed -e "s/\\\\ include doskey/include doskey/g" \
-	    -e "s/include vt100key/\\\\ include vt100key/g" <$< >$@
\ No newline at end of file
+	    -e "s/include vt100key/\\\\ include vt100key/g" <startup.fs >startup.dos