--- gforth/Makefile.in	1994/11/11 16:10:07	1.1
+++ gforth/Makefile.in	1994/11/17 15:55:52	1.4
@@ -1,19 +1,20 @@
 #Copyright 1992 by the ANSI figForth Development Group
 
-RM	= echo 'Trying to remove'
+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
 
@@ -40,10 +41,16 @@ 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 \
+FORTH_GEN = primitives.i prim_labels.i aliases.fs \
 	kernl32l.fi kernl32b.fi gforth.texi
 
-all:	gforth
+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 +64,32 @@ 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)
 
 #does not work
 #gforth.tar.gz:	$(SOURCES) $(GEN_PRECIOUS) CVS
 #		cd ..; tar cvf gforth/gforth.tar gforth/{$^}; gzip -9 gforth/gforth.tar
 
-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,7 +113,7 @@ 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