--- gforth/Attic/Makefile	1994/08/25 15:25:18	1.12
+++ gforth/Attic/Makefile	1994/10/24 19:15:52	1.19
@@ -4,7 +4,10 @@ RM	= echo 'Trying to remove'
 GCC	= gcc
 FORTH	= gforth
 CC	= gcc
-SWITCHES = -D_POSIX_VERSION -DUSE_FTOS -DDEFAULTBIN='"'`pwd`'"' -DDIRECT_THREADED -fcaller-saves #-DNDEBUG #turn off assertions
+SWITCHES = \
+	-fno-defer-pop -fcaller-saves \
+	-DUSE_TOS -DUSE_FTOS -DDEFAULTBIN='"'`pwd`'"' \
+	-DDIRECT_THREADED -D_POSIX_VERSION -DUSE_GETOPT #-DNDEBUG #turn off assertions
 CFLAGS	= -O4 -Wall -g $(SWITCHES)
 
 #-Xlinker -n puts text and data into the same 256M region
@@ -16,28 +19,31 @@ EMACS	= emacs
 
 INCLUDES = forth.h io.h
 
-FORTH_SRC = cross.fs debug.fs environ.fs errore.fs extend.fs \
-	filedump.fs glosgen.fs kernal.fs look.fs machine32b.fs \
-	machine32l.fs main.fs other.fs search-order.fs see.fs sieve.fs \
-	struct.fs tools.fs toolsext.fs vars.fs wordinfo.fs
+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 \
+	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
 
 SOURCES	= Makefile primitives primitives2c.el engine.c main.c io.c \
-	apollo68k.h decstation.h 386.h hppa.h sparc.h \
+	apollo68k.h decstation.h 386.h hppa.h sparc.h gforth.ds \
 	$(INCLUDES) $(FORTH_SRC)
 
 RCS_FILES = $(SOURCES) INSTALL ToDo model high-level
 
 GEN = gforth
 
-GEN_PRECIOUS = primitives.i prim_labels.i primitives.b prim_alias.4th aliases.fs
+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 prim_alias.4th kernl32l.fi kernl32b.fi
+FORTH_GEN = primitives.i prim_labels.i prim_alias.4th \
+	kernl32l.fi kernl32b.fi gforth.texi
 
-all:	gforth aliases.fs
+all:	gforth
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -51,31 +57,33 @@ all:	gforth aliases.fs
 # `realclean' also deletes everything that could be regenerated automatically."
 
 clean:		
-		-rm $(GEN)
+		-rm $(GEN) *.o *.s
 
 distclean:	clean
-		-rm machine.h
+		-rm machine.h machine.fs
 
 realclean:	distclean
 		-rm $(GEN_PRECIOUS)
 
-current:	$(RCS_FILES)
+#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.old
+		-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 \
-		machine32l.fs $(FORTH_GEN)
-		-cp kernl32l.fi kernl32l.fi.old
-		$(FORTH) -e 's" machine32l.fs" r/o open-file throw' main.fs
+		mach32l.fs $(FORTH_GEN)
+		-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 \
-		machine32b.fs $(FORTH_GEN)
-		-cp kernl32b.fi kernl32b.fi.old
-		$(FORTH) -e 's" machine32b.fs" r/o open-file throw' main.fs
+		mach32b.fs $(FORTH_GEN)
+		-cp kernl32b.fi kernl32b.fi~
+		$(FORTH) -e 's" mach32b.fs"' main.fs
 
 engine.s:	engine.c primitives.i prim_labels.i machine.h $(INCLUDES)
 		$(GCC) $(CFLAGS) -S engine.c
@@ -94,12 +102,25 @@ prim_labels.i :	primitives.b prims2x.fs
 aliases.fs:	primitives.b prims2x.fs
 		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@
 
+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) 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" >$@
+
+gforth.dvi:	gforth.texi
+		tex gforth.texi
+
 #primitives.4th:	primitives.b primitives2c.el
 #		$(EMACS) -batch -load primitives2c.el -funcall make-forth
 
 #GNU make default rules
 #% ::		RCS/%,v
 #		co $@
-#%.o :		%.c $(INCLUDES)
-#		$(CC) $(CFLAGS) -c $< -o $@
+
+%.s :		%.c $(INCLUDES)
+		$(CC) $(CFLAGS) -S $< -o $@
+
+%.o :		%.s
+		$(CC) $(CFLAGS) -c $< -o $@