--- gforth/Makefile.in	2004/06/13 17:04:28	1.297
+++ gforth/Makefile.in	2004/12/31 13:23:56	1.303
@@ -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 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -86,7 +86,7 @@ FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 #FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs
-STARTUP	= exboot.fs startup.fs @disgdb_fs@ @asm_fs@ @disasm_fs@
+STARTUP	= exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
 TEXI2PDF = texi2dvi --pdf -e
@@ -228,10 +228,12 @@ GFORTH_FI_SRC = \
 	stuff.fs \
 	tasker.fs \
 	termsize.fs \
+	utf-8.fs \
 	vt100.fs \
 	vt100key.fs \
 	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
 
@@ -240,7 +242,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	colorize.fs comp-i.fs \
 	depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
-	fsl-utils.4th glosgen.fs gray.fs httpd.fs proxy.fs \
+	fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
 	locate.fs more.fs other.fs prims2x.fs random.fs \
 	sokoban.fs string.fs table.fs tags.fs \
@@ -302,21 +304,8 @@ ARCHS =	\
 	arch/misc/sim.fs \
 	arch/misc/sokoban.fs \
 	arch/misc/tt.fs \
-	arch/6502/asm.fs \
 	arch/6502/prim.fs \
 	arch/6502/mach.fs \
-	arch/6502/zero.fs \
-	arch/6502/softuart.fs \
-	arch/6502/cold.fs \
-	arch/8086/asm.fs \
-	arch/8086/mach.fs \
-	arch/8086/mach.sh \
-	arch/8086/prim.fs \
-	arch/avr/asm.fs \
-	arch/c165/asm.fs \
-	arch/c165/mach.fs \
-	arch/c165/prim.fs \
-	arch/h8/asm.fs \
 	arch/shboom/asm.fs \
 	arch/shboom/compiler.fs \
 	arch/shboom/dis.fs \
@@ -328,11 +317,27 @@ ARCHS =	\
 	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
 
+#not included in distribution until distribution terms are included:
+ARCHS_NO_DIST = \
+	arch/6502/asm.fs \
+	arch/6502/cold.fs \
+	arch/6502/softuart.fs \
+	arch/6502/zero.fs \
+	arch/8086/asm.fs \
+	arch/8086/mach.fs \
+	arch/8086/mach.sh \
+	arch/8086/prim.fs \
+	arch/avr/asm.fs \
+	arch/c165/asm.fs \
+	arch/c165/mach.fs \
+	arch/c165/prim.fs \
+	arch/h8/asm.fs \
+	arch/sharc/unistd.h
+
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
 	vmgen-ex/engine.c vmgen-ex/fib.mini \
 	vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \
@@ -600,7 +605,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 -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 -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