--- gforth/Makefile.in	1994/11/11 16:10:07	1.1
+++ gforth/Makefile.in	1994/11/23 16:54:37	1.5
@@ -1,49 +1,60 @@
 #Copyright 1992 by the ANSI figForth Development Group
 
-RM	= echo 'Trying to remove'
+VERSION	= 0.1alpha#gforth version
+RM	= rm
+CP	= cp
 GCC	= gcc
 FORTH	= gforth
 CC	= gcc
+MAKE	= gmake
 XCFLAGS	=
 XDEFINES	=
-SWITCHES	= $(XCFLAGS) $(XDEFINES) -DDEFAULTBIN='"'`pwd`'"' \
-	#-DNDEBUG #turn off assertions
-CFLAGS	= -O4 -Wall -g $(SWITCHES)
+SWITCHES	= $(XCFLAGS) $(XDEFINES) -DDEFAULTBIN='"'`pwd`'"' #-DNDEBUG #turn off assertions
+CFLAGS	= -O4 -Wall $(SWITCHES)
 
 #-Xlinker -n puts text and data into the same 256M region
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 LDFLAGS	= -Xlinker -N
-LDLIBS = -lm
+LDLIBS	= -lm
 
 EMACS	= emacs
 
 INCLUDES = forth.h io.h
 
 FORTH_SRC = add.fs assert.fs blocks.fs bufio.fs cross.fs debug.fs \
-	debugging.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \
-	float.fs glocals.fs glosgen.fs gray.fs hash.fs kernal.fs \
+	debugging.fs doskey.fs ds2texi.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 mach32b.fs mach32l.fs main.fs other.fs \
 	prims2x.fs search-order.fs see.fs sieve.fs startup.fs struct.fs \
-	test2.fs tools.fs toolsext.fs vars.fs vt100.fs wordinfo.fs
+	test2.fs tools.fs toolsext.fs vars.fs vt100.fs vt100key.fs wordinfo.fs
 
-SOURCES	= Makefile primitives primitives2c.el engine.c main.c io.c \
-	apollo68k.h decstation.h 386.h hppa.h sparc.h gforth.ds \
+SOURCES	= Makefile.in configure  config.sub  config.guess \
+	INSTALL README ToDo BUGS model gforth.ds \
+	primitives primitives2c.el engine.c main.c io.c \
+	apollo68k.h decstation.h 386.h hppa.h cache.c sparc.h \
+	getopt.c getopt1.c getopt.h \
 	$(INCLUDES) $(FORTH_SRC)
 
-RCS_FILES = $(SOURCES) INSTALL ToDo model high-level
+RCS_FILES =  ToDo model high-level
 
 GEN = gforth
 
-GEN_PRECIOUS = primitives.i prim_labels.i primitives.b aliases.fs
-
 OBJECTS	= engine.o io.o main.o
 
 # things that need a working forth system to be generated
 # this is used for antidependences,
-FORTH_GEN = primitives.i prim_labels.i \
-	kernl32l.fi kernl32b.fi gforth.texi
 
-all:	gforth
+FORTH_GEN =  primitives.b primitives.i prim_labels.i aliases.fs kernl32l.fi kernl32b.fi
+
+GEN_PRECIOUS = $(FORTH_GEN) gforth.texi gforth.dvi gforth.ps Makefile
+
+all:
+	if [ ! -x gforth ]; then $(MAKE) first; fi
+	$(MAKE) more
+
+first:	gforth
+
+more:	$(FORTH_GEN) gforth
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -57,32 +68,40 @@ all:	gforth
 # `realclean' also deletes everything that could be regenerated automatically."
 
 clean:		
-		-rm $(GEN) *.o *.s
+		-$(RM) $(GEN) *.o *.s
 
 distclean:	clean
-		-rm machine.h machine.fs
+		-$(RM) machine.h machine.fs
 
 realclean:	distclean
-		-rm $(GEN_PRECIOUS)
+		-$(RM) $(GEN_PRECIOUS)
+
+package:	$(SOURCES) $(GEN_PRECIOUS) CVS
+		-rm -rf gforth-$(VERSION)
+		mkdir gforth-$(VERSION)
+		cp -rp $^ gforth-$(VERSION)
+		touch gforth-$(VERSION)/Makefile.in
+		tar cvf gforth-$(VERSION).tar gforth-$(VERSION)
+		gzip -9 -f gforth-$(VERSION).tar
+		@echo add a zip command here		
 
-#does not work
-#gforth.tar.gz:	$(SOURCES) $(GEN_PRECIOUS) CVS
-#		cd ..; tar cvf gforth/gforth.tar gforth/{$^}; gzip -9 gforth/gforth.tar
+Makefile:	Makefile.in
+		configure
 
-gforth:	$(OBJECTS) $(FORTH_GEN)
-		-cp gforth gforth~
+gforth:	$(OBJECTS)
+		-$(CP) gforth gforth~
 		$(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
 
 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 \
 		mach32l.fs $(FORTH_GEN)
-		-cp kernl32l.fi kernl32l.fi~
+		-$(CP) kernl32l.fi kernl32l.fi~
 		$(FORTH) -e 's" mach32l.fs"' main.fs
 
 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 \
 		mach32b.fs $(FORTH_GEN)
-		-cp kernl32b.fi kernl32b.fi~
+		-$(CP) kernl32b.fi kernl32b.fi~
 		$(FORTH) -e 's" mach32b.fs"' main.fs
 
 engine.s:	engine.c primitives.i prim_labels.i machine.h $(INCLUDES)
@@ -106,11 +125,14 @@ primitives.fs:	primitives.b prims2x.fs
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
 
 gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs
-		$(FORTH) -e "warnings off" search-order.fs struct.fs debugging.fs ds2texi.fs prims2x.fs -e "s\" primitives.b\" ' register-doc process-file s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@
+		$(FORTH) ds2texi.fs >$@
 
 gforth.dvi:	gforth.texi
 		tex gforth.texi
 
+gforth.ps:	gforth.dvi
+		dvips gforth.dvi -o $@
+
 #primitives.4th:	primitives.b primitives2c.el
 #		$(EMACS) -batch -load primitives2c.el -funcall make-forth