--- gforth/Attic/Makefile	1994/06/17 13:28:31	1.5
+++ gforth/Attic/Makefile	1994/10/03 18:23:57	1.18
@@ -2,23 +2,29 @@
 
 RM	= echo 'Trying to remove'
 GCC	= gcc
+FORTH	= gforth
 CC	= gcc
-SWITCHES = -D_POSIX_VERSION -DDEFAULTBIN='"'$(PWD)'"' #-DUSE_TOS -DUSE_FTOS # -DDIRECT_THREADED 
+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
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
-LDFLAGS	= -g # -Xlinker -N
+LDFLAGS	= -g -Xlinker -N
 LDLIBS = -lm
 
 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 \
@@ -26,17 +32,17 @@ SOURCES	= Makefile primitives primitives
 
 RCS_FILES = $(SOURCES) INSTALL ToDo model high-level
 
-GEN = ansforth
+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 kernal.32limg
+FORTH_GEN = primitives.i prim_labels.i prim_alias.4th kernl32l.fi kernl32b.fi
 
-all:	ansforth aliases.fs
+all:	gforth aliases.fs
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -53,23 +59,30 @@ clean:
 		-rm $(GEN)
 
 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
 
-ansforth:	$(OBJECTS) $(FORTH_GEN)
-		-cp ansforth ansforth.old
+gforth:	$(OBJECTS) $(FORTH_GEN)
+		-cp gforth gforth~
 		$(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
 
-kernal.32limg:	search-order.fs cross.fs aliases.fs vars.fs add.fs \
-		environ.fs errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-                $(FORTH_GEN)
-		-cp kernal.32limg kernal.32limg.old
-		ansforth "include main.fs"
-
+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~
+		$(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~
+		$(FORTH) -e 's" mach32b.fs"' main.fs
 
 engine.s:	engine.c primitives.i prim_labels.i machine.h $(INCLUDES)
 		$(GCC) $(CFLAGS) -S engine.c
@@ -80,22 +93,27 @@ primitives.b:	primitives
 		m4 primitives >$@ 
 
 primitives.i :	primitives.b prims2x.fs
-		ansforth "include prims2x.fs s\" primitives.b\" ' output-c process-file bye" | awk -f from-cut-here >$@
+		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@
 
 prim_labels.i :	primitives.b prims2x.fs
-		ansforth "include prims2x.fs s\" primitives.b\" ' output-label process-file bye" | awk -f from-cut-here >$@
+		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@
 
-prim_alias.4th:	primitives.b prims2x.fs
-		ansforth "include prims2x.fs s\" primitives.b\" ' output-alias process-file bye" | awk -f from-cut-here >$@
+aliases.fs:	primitives.b prims2x.fs
+		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@
 
-aliases.fs:	prim_alias.4th
-		cp prim_alias.4th $@
+primitives.fs:	primitives.b prims2x.fs
+		$(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
 
 #primitives.4th:	primitives.b primitives2c.el
 #		$(EMACS) -batch -load primitives2c.el -funcall make-forth
 
 #GNU make default rules
-% ::		RCS/%,v
-		co $@
-%.o :		%.c $(INCLUDES)
+#% ::		RCS/%,v
+#		co $@
+
+%.s :		%.c $(INCLUDES)
+		$(CC) $(CFLAGS) -S $< -o $@
+
+%.o :		%.s
 		$(CC) $(CFLAGS) -c $< -o $@
+