--- gforth/Makefile.in	2000/10/09 14:12:25	1.191
+++ gforth/Makefile.in	2000/11/13 22:10:30	1.194
@@ -116,12 +116,12 @@ emacssitelispdir=@lispdir@
 siteforthdir=$(datadir)/gforth/site-forth
 
 CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \
-	compat/CVS \
+	compat/CVS unix/CVS \
 	arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \
 	arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \
 	arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \
 	arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \
-	arch/shboom/CVS arch/ia64/CVS
+	arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS
 
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h
 
@@ -154,6 +154,7 @@ KERN_SRC = \
 	kernel/int.fs \
 	kernel/comp.fs \
 	kernel/io.fs \
+	kernel/input.fs \
 	kernel/license.fs \
 	kernel/nio.fs \
 	kernel/saccept.fs \
@@ -218,7 +219,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	code.fs colorize.fs comp-i.fs \
 	doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
-	glosgen.fs gray.fs httpd.fs \
+	glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
 	more.fs other.fs prims2x.fs random.fs \
 	table.fs string.fs \
@@ -229,7 +230,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs \
-	add.fs lib.fs sieve.fs
+	add.fs lib.fs sieve.fs unix/socket.fs
 
 COMPAT = compat/README \
 	compat/anslocal.fs \
@@ -294,15 +295,14 @@ ARCHS =	\
 	arch/shboom/prim.fs \
 	arch/shboom/dis2.fs \
 	arch/shboom/sh.p \
-	arch/shboom/doers.fs
-
-#	arch/sharc/mach.fs \
-#	arch/sharc/machine.h \
-#	arch/sharc/compile.sharc \
-#	arch/sharc/unistd.h \
-#	arch/sharc/systypes.h \
-#	arch/sharc/types.h \
-#	arch/sharc/g21k-3.3.4-bp1.diff
+	arch/shboom/doers.fs \
+	arch/sharc/mach.fs \
+	arch/sharc/machine.h \
+	arch/sharc/compile.sharc \
+	arch/sharc/unistd.h \
+	arch/sharc/systypes.h \
+	arch/sharc/types.h \
+	arch/sharc/g21k-3.3.4-bp1.diff
 
 SOURCES	= $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \
 	configure.in configure config.sub config.guess elisp-comp missing \
@@ -508,7 +508,7 @@ check test:	gforth$(EXE) gforth.fi
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out
-		$(FORTHK) -m 100000 prims2x.fs -e \
+		$(FORTH) -m 100000 prims2x.fs -e \
 		  "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \
 		  diff -c - $(srcdir)/engine/prim.i
 
@@ -594,24 +594,24 @@ prim.b:		prim
 		m4 -s $(srcdir)/prim >$@ 
 
 engine/prim.i:		prim.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c process-file bye" >$@-
+		$(FORTH) -m 1000000 prims2x.fs -e "c-flag on s\" prim.b\" ' output-c process-file bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 engine/prim_lab.i:	prim.b prims2x.fs
-		$(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label process-file bye" >$@-
+		$(FORTH) -m 1000000 prims2x.fs -e "c-flag on s\" prim.b\" ' output-label process-file bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 kernel/aliases.fs:	prim.b prims2x.fs kernel/aliases0.fs
 		$(CP) kernel/aliases0.fs $@-
-		$(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias process-file bye" >>$@-
+		$(FORTH) -m 1000000 prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias process-file bye" >>$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 kernel/prim.fs:	prim.b prims2x.fs kernel/prim0.fs
 		$(CP) kernel/prim0.fs kernel/prim.fs-
-		$(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@-
+		$(FORTH) -m 1000000 prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -656,7 +656,7 @@ gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(
 prim.TAGS: 	prim.b prims2x.fs
 		echo '2c\' >prim.TAGS.sed
 		echo $(srcdir)/prim >>prim.TAGS.sed
-		$(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" | sed -f prim.TAGS.sed >$@-
+		$(FORTH) -m 1000000 prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" | sed -f prim.TAGS.sed >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
@@ -671,12 +671,12 @@ doc/crossdoc.fd:	$(KERN_SRC) kernel/vers
 
 doc/gforth.texi:	doc/gforth.ds prim.b ds2texi.fs prims2x.fs \
 		doc/doc.fd doc/crossdoc.fd
-		$(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-
+		$(FORTH) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-
 		$(CP) $@- $@
 		$(RM) $@-
 
 checkdoc:	doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
-		$(FORTHK) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
+		$(FORTH) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
 		-grep unknown doc/gforth.texi
 
 dvi:		doc/gforth.dvi