--- gforth/Makefile.in	1995/11/07 18:06:29	1.38
+++ gforth/Makefile.in	1995/11/15 17:29:06	1.41
@@ -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=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@
@@ -83,10 +83,11 @@ FORTH_SRC = anslocal.fs add.fs assert.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	
+	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 \
@@ -189,6 +190,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)	
 		$(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 \
@@ -197,17 +199,29 @@ install:	gforth $(FORTH_SRC) kernal.fi g
 		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)
@@ -320,6 +334,8 @@ gforth.dvi:	gforth.texi
 gforth.ps:	gforth.dvi
 		$(DVI2PS) gforth.dvi -o $@
 
+gforth.info*:	gforth.info
+
 gforth.info:	gforth.texi
 		-$(MAKEINFO) gforth.texi