--- gforth/Makefile.in	2004/12/31 13:04:11	1.302
+++ gforth/Makefile.in	2006/02/17 16:23:10	1.314
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -109,7 +109,9 @@ XLDFLAGS = @LDFLAGS@
 LDFLAGS	=  $(DEBUGFLAG) $(XLDFLAGS)
 LDLIBS	= @LIBS@
 
-# ------------	Install Directorys
+STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@
+
+# ------------	Install Directories
 
 VPATH = @srcdir@
 prefix = @prefix@
@@ -177,7 +179,8 @@ KERN_SRC = \
 	kernel/saccept.fs \
 	kernel/doers.fs \
 	kernel/getdoers.fs \
-	kernel/pass.fs
+	kernel/pass.fs \
+	kernel/xchars.fs
 
 EC_SRC = \
 	asm/README \
@@ -200,6 +203,7 @@ GFORTH_FI_SRC = \
 	blocks.fs \
 	bufio.fs \
 	code.fs \
+	complex.fs \
 	debug.fs \
 	debugs.fs \
 	dis-gdb.fs \
@@ -211,6 +215,7 @@ GFORTH_FI_SRC = \
 	except.fs \
 	extend.fs \
 	float.fs \
+	fft.fs \
 	glocals.fs \
 	hash.fs \
 	history.fs \
@@ -234,8 +239,9 @@ GFORTH_FI_SRC = \
 	wordinfo.fs \
 	arch/386/asm.fs arch/386/disasm.fs \
 	arch/amd64/asm.fs arch/amd64/disasm.fs \
-	arch/alpha/asm.fs arch/alpha/disasm.fs \
-	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs
+	arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\
+	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \
+	arch/mips/testasm.fs arch/mips/testdisasm.fs
 
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
 	ans-report.fs ansi.fs answords.fs \
@@ -251,11 +257,11 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
-	test/primtest.fs \
+	test/primtest.fs test/coreext.fs \
 	bubble.fs siev.fs matrix.fs fib.fs \
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs fixpath.fs \
-	add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs
+	add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs
 
 COMPAT = compat/README \
 	compat/anslocal.fs \
@@ -263,6 +269,7 @@ COMPAT = compat/README \
 	compat/control.fs \
 	compat/defer.fs \
 	compat/exception.fs \
+	compat/execute-parsing.fs \
 	compat/loops.fs \
 	compat/required.fs \
 	compat/strcomp.fs \
@@ -383,7 +390,7 @@ RCS_FILES =  ToDo model high-level
 
 ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES)
 
-ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) 
+ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) 
 
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs
 
@@ -443,6 +450,8 @@ kernel/version.fs:	version
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
 more:	engines $(FORTH_GEN) $(GEN)
+	@make check
+	@$(FORTH_FAST) --diag -e bye
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -483,7 +492,8 @@ distclean:	clean
 		-$(RM) -rf config.cache config.log config.status \
 		engine/config.h Makefile Makedist engine/Makefile \
 		stamp-h engine/stamp-h \
-		doc/version.texi gforthmi vmgen
+		doc/version.texi gforthmi vmgen \
+		prim-fast.b $(FORTH_GEN_ENGINE_FAST)
 
 #realclean is useless, but dangerous, so it's commented out
 realclean:	distclean
@@ -605,7 +615,7 @@ check:		gforths	gforth.fi
 		@echo "*** Check successful ***"
 
 checkone test:	gforth$(EXE) gforth.fi
-		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs test/deferred.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
+		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs test/deferred.fs test/coreext.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
 		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
@@ -614,7 +624,7 @@ checkone test:	gforth$(EXE) gforth.fi
 		  tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
 
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
-		$(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
+		$(FORTHB) -e 's" mach32b.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
 
 primtest:	gforth gforth-native test/primtest.fi FORCE
 		(echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?
@@ -722,8 +732,8 @@ prim.b:		prim cache0.vmg
 		m4 -s $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
-prim-fast.b:	prim cache1.vmg peeprules.vmg
-		m4 -DM4_ENGINE_FAST -s $(srcdir)/prim >$@
+prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg
+		m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs