--- gforth/Makefile.in	1995/10/11 19:39:32	1.34
+++ gforth/Makefile.in	1995/10/26 22:48:38	1.36
@@ -30,7 +30,7 @@ XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@
-CFLAGS	= -pipe -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"
+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)
 XLDFLAGS = @LDFLAGS@
@@ -50,12 +50,12 @@ infodir = $(prefix)/info
 mandir = $(prefix)/man/man1
 
 
-INCLUDES = forth.h io.h
+INCLUDES = forth.h threading.h io.h
 
 KERN_SRC = main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 	errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs
 
-FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs blocks.fs bufio.fs checkans.fs \
+FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs answords.fs blocks.fs bufio.fs checkans.fs \
 	code.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 \
@@ -73,7 +73,7 @@ SOURCES	= Makefile.in configure.in confi
 	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 pow10.c \
-	strerror.c \
+	strerror.c strsignal.c \
 	makefile.dos mkdosmf.sed configure.bat startup.dos \
 	glosgen.glo glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC)
@@ -245,12 +245,15 @@ kernl64l.fi:	$(KERNLS)
 gforth.fi:	@kernal_fi@ gforth startup.fs glocals.fs search-order.fs hash.fs float.fs debugging.fs environ.fs wordinfo.fs look.fs vt100.fs see.fs bufio.fs debug.fs history.fs vt100key.fs assert.fs blocks.fs struct.fs dumpimage.fs
 		$(FORTHK) startup.fs dumpimage.fs -e "savesystem gforth.fi bye"
 
-engine.s:	engine.c primitives.i prim_labels.i machine.h $(INCLUDES)
+engine.s:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
 		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S engine.c
 
-engine.o:	engine.c primitives.i prim_labels.i machine.h $(INCLUDES)
+engine.o:	engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
 		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c engine.c
 
+main.o:		main.c machine.h threading.h $(INCLUDES)
+		$(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c main.c
+
 strtoul.o:	strtoul.c strtol.c
 
 primitives.b:	primitives
@@ -281,8 +284,14 @@ doc.fd:		makedoc.fs float.fs search-orde
 		 doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs
 		$(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
 
+crossdoc.fd:	$(KERN_SRC) $(FORTH_GEN0)
+		$(FORTHK) -e 's" mach32l.fs"' main.fs
+
 gforth.texi:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
-		$(FORTHK) ds2texi.fs >$@
+		$(FORTHK) ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@
+
+checkdoc:	gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs
+		$(FORTHK) ds2texi.fs answords.fs -e bye
 
 gforth.dvi:	gforth.texi
 		$(TEXI2DVI) gforth.texi