--- gforth/Makefile.in	1995/03/13 09:17:21	1.20
+++ gforth/Makefile.in	1995/07/25 15:28:02	1.29
@@ -16,8 +16,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 LN_S	= @LN_S@
 GCC	= gcc
+CC	= $(GCC)
 FORTH	= ./gforth
-CC	= gcc
+STRIP	= strip
 TEXI2DVI = tex
 DVI2PS	= dvips
 #you can get texi2html from http://asis01.cern.ch/infohtml/texi2html.html
@@ -27,7 +28,7 @@ XCFLAGS	= @CFLAGS@
 XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves
-CFLAGS	= @DEBUGFLAG@ -O4 -Wall $(SWITCHES)
+CFLAGS	= @DEBUGFLAG@ -pipe -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 LDFLAGS	=  @DEBUGFLAG@ @LDFLAGS@ @GCCLDFLAGS@
@@ -47,23 +48,25 @@ mandir = $(prefix)/man/man1
 
 INCLUDES = forth.h io.h
 
-FORTH_SRC = add.fs assert.fs ansi.fs blocks.fs bufio.fs checkans.fs \
+FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs blocks.fs bufio.fs checkans.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 \
 	float.fs glocals.fs glosgen.fs gray.fs hash.fs history.fs \
-	kernal.fs locals-test.fs look.fs main.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 \
 	startup.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs vt100.fs \
-	vt100key.fs wordinfo.fs wordsets.fs
+	vt100key.fs wordinfo.fs wordsets.fs \
+	tester.fs coretest.fs	
 
 SOURCES	= Makefile.in configure.in configure config.sub  config.guess \
 	install-sh INSTALL README ToDo BUGS model COPYING \
-	gforth.ds texinfo.tex gforth.1 \
+	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 \
 	getopt.c getopt1.c getopt.h select.c \
-	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c \
+	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \
+	strerror.c \
 	makefile.dos configure.bat startup.dos \
 	glosgen.glo glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC)
@@ -116,72 +119,104 @@ realclean:	distclean
 		-$(RM) $(GEN_PRECIOUS)
 
 dist:		$(SOURCES) $(FORTH_GEN)
-		-rm gforth-$(VERSION)
-		ln -s `pwd` gforth-$(VERSION)
-		echo "" $(SOURCES) $(FORTH_GEN) |\
-			sed -e 's| | gforth-$(VERSION)/|g' |\
-			xargs tar cvf gforth-$(VERSION).tar
-		gzip -9 -f gforth-$(VERSION).tar
-		-rm gforth-$(VERSION)
+		-rm -rf gforth-$(VERSION)
+		mkdir gforth-$(VERSION)
+		cp -p $(SOURCES) $(FORTH_GEN) gforth-$(VERSION)
+		tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz
+
+#a binary distribution contains the complete source distribution,
+# the objects, the executable and the links. the objects are there for making
+# make happy.
+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 gforth.fi gforth-$(VERSION)
+		strip gforth-$(VERSION)/gforth
+		tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz
+
+#makes a package with only the stuff not present in the source
+#package. For installation the source package is still needed!
+#This is useful if you want to distribute many binary versions in
+#little space (e.g., on floppy disk): Put the source package and
+#all the binonly packages you are interested in on the disk. The user
+#then just has to unpack the source and his favourite binonly into the
+#same directory and has a full binary distribution.
+binonlydist:	$(SOURCES) $(FORTH_GEN) gforth $(OBJECTS)
+		-rm -rf gforth-$(VERSION)
+		mkdir gforth-$(VERSION)
+		cp -p -d  config.status Makefile gforth $(OBJECTS) machine.h gforth.fi gforth-$(VERSION)
+		strip gforth-$(VERSION)/gforth
+		tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz
+
+
 
 #strip gforth, because the debugging stuff is hardly useful once
 # gforth manages to execute more than a few primitives
 
 install:	gforth $(FORTH_SRC) gforth.fi gforth.1 gforth.info
-		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth $(datadir)/gforth	
+		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION)	
 		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		$(INSTALL_DATA) gforth.1 $(mandir)
 		$(INSTALL_DATA) gforth.info* $(infodir)
-		$(INSTALL_DATA) gforth.fi $(libdir)/gforth
+		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		for i in $(FORTH_SRC); do \
-			$(CP) $$i $(datadir)/gforth; \
-			$(LN_S) $(datadir)/gforth/$$i $(libdir)/gforth \
+			$(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \
 		done
+
+check:		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) startup.fs blocks.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
+
 dvi:		gforth.dvi
 
-gforth:	$(OBJECTS)
+gforth:		$(OBJECTS)
 		-$(CP) gforth gforth~
 		$(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
 		@MAKE_EXE@
 
 kernl16l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach16l.fs $(FORTH_GEN1)
 		-$(CP) kernl16l.fi kernl16l.fi~
 		$(FORTH) -e 's" mach16l.fs"' main.fs
 		@LINK_KERNL16L@
 
 kernl16b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach16b.fs $(FORTH_GEN1)
 		-$(CP) kernl16b.fi kernl16b.fi~
 		$(FORTH) -e 's" mach16b.fs"' main.fs
 		@LINK_KERNL16B@
 
 kernl32l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach32l.fs $(FORTH_GEN1)
 		-$(CP) kernl32l.fi kernl32l.fi~
 		$(FORTH) -e 's" mach32l.fs"' main.fs
 		@LINK_KERNL32L@
 
 kernl32b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach32b.fs $(FORTH_GEN1)
 		-$(CP) kernl32b.fi kernl32b.fi~
 		$(FORTH) -e 's" mach32b.fs"' main.fs
 		@LINK_KERNL32B@
 
 kernl64l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach64l.fs $(FORTH_GEN1)
 		-$(CP) kernl64l.fi kernl64l.fi~
 		$(FORTH) -e 's" mach64l.fs"' main.fs
 		@LINK_KERNL64L@
 
 kernl64b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
+		errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \
 		mach64b.fs $(FORTH_GEN1)
 		-$(CP) kernl64b.fi kernl64b.fi~
 		$(FORTH) -e 's" mach64b.fs"' main.fs
@@ -210,13 +245,20 @@ aliases.fs:	primitives.b prims2x.fs
 primitives.fs:	primitives.b prims2x.fs
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
 
-doc.fs:		makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
+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 \
 		 vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \
 		 doskey.fs vt100key.fs startup.fs assert.fs debugging.fs
-		$(FORTH) -e "s\" doc.fs\"" makedoc.fs startup.fs -e bye
+		$(FORTH) -e "s\" doc.fd\"" makedoc.fs startup.fs -e bye
 
-gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fs
+gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
 		$(FORTH) ds2texi.fs >$@
 
 gforth.dvi:	gforth.texi
@@ -241,11 +283,3 @@ config.status: configure
 	./config.status --recheck
 configure: configure.in
 	cd $(srcdir) && autoconf
-
-#unnecessary and does not work with all makes
-#%.s :		%.c $(INCLUDES)
-#		$(CC) $(CFLAGS) -S $< -o $@
-
-#%.o :		%.s
-#		$(CC) $(CFLAGS) -c $< -o $@
-