--- gforth/Makefile.in	2009/03/17 17:40:49	1.445
+++ gforth/Makefile.in	2010/03/22 17:08:06	1.450
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -235,6 +235,7 @@ GFORTH_FI_SRC = \
 	locals.fs \
 	look.fs \
 	mkdir.fs \
+	prelude.fs \
 	quotes.fs \
 	search.fs \
 	see.fs \
@@ -254,6 +255,8 @@ GFORTH_FI_SRC = \
 	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/alpha/testasm.fs\
+	arch/arm/asm.fs arch/arm/disasm.fs \
+	arch/arm/testdisasm.fs arch/arm/testdisasm.out arch/arm/Makefile \
 	arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \
 	arch/mips/testasm.fs arch/mips/testdisasm.fs \
 	arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
@@ -281,6 +284,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	test/other.fs test/signals.fs test/checkans.fs \
 	test/primtest.fs test/coreext.fs test/deferred.fs \
 	test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
+	test/macros.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 \
@@ -295,6 +299,7 @@ COMPAT = compat/README \
 	compat/exception.fs \
 	compat/execute-parsing.fs \
 	compat/loops.fs \
+	compat/macros.fs \
 	compat/required.fs \
 	compat/strcomp.fs \
 	compat/struct.fs \
@@ -427,9 +432,9 @@ SOURCES	= $(ENGINE_SOURCES) compat Makef
 
 RCS_FILES =  ToDo model high-level
 
-ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)
+ENGINES = gforth$(EC)$(EXE) @NO_EC@ gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)
 
-ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
+ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
 
 GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc
 
@@ -445,7 +450,7 @@ FORTH_GEN_ENGINE_FAST= \
 	engine/costs-fast.i engine/super2-fast.i
 FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
 FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)
-FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
+FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ @NO_EC@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
 
@@ -474,7 +479,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-all: kernel/version.fs more check
+all: kernel/version.fs more @NO_EC@ check
 
 # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;
@@ -673,7 +678,7 @@ checkone test: gforth.fi engine/prim-s.i
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
-		$(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
+		$(FORTHS) test/coremore.fs test/gforth.fs test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
 		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
 		$(FORTH) prims2x.fs -e \
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
@@ -823,7 +828,7 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTH_EXE@; \
-		$(MAKE) checkone check-nofast ENGINE=./engine/$@; \
+		@NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
 	fi
 
 optgforth:
@@ -837,7 +842,7 @@ gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTHFAST_EXE@; \
-		$(MAKE) checkone ENGINE=./engine/$@; \
+		@NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \
 	fi
 
 optgforth-fast: