--- gforth/Makefile.in	2008/11/09 14:35:18	1.436
+++ gforth/Makefile.in	2009/01/25 18:17:05	1.443
@@ -82,7 +82,7 @@ BUILDFORTH = $(ENGINE) --die-on-signal -
 # the forth system plus flags we use to build
 FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs
-FORTHP = $(FORTH)
+#FORTHP = $(FORTH)
 ENGINE_FAST = ./gforth-fast
 FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
@@ -355,7 +355,14 @@ ARCHS =	\
 	arch/sharc/g21k-3.3.4-bp1.diff \
 	arch/r8c/asm.fs \
 	arch/r8c/mach.fs \
-	arch/r8c/prim.fs
+	arch/r8c/errors.fs \
+	arch/r8c/prim.fs \
+	arch/r8c/asm-test.fs \
+	arch/r8c/errors.fs \
+	arch/r8c/lauflicht.fs \
+	arch/r8c/tasker.fs \
+	arch/r8c/terminal.fs \
+	arch/sharc/unistd.h
 
 #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \
@@ -372,13 +379,7 @@ ARCHS_NO_DIST = \
 	arch/c165/mach.fs \
 	arch/c165/prim.fs \
 	arch/h8/asm.fs \
-	arch/r8c/asm-test.fs \
-	arch/r8c/errors.fs \
-	arch/r8c/lauflicht.fs \
-	arch/r8c/tasker.fs \
-	arch/r8c/terminal.fs \
-	arch/r8c/tt.fs \
-	arch/sharc/unistd.h
+	arch/r8c/tt.fs
 
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
 	vmgen-ex/engine.c vmgen-ex/fib.mini \
@@ -478,6 +479,9 @@ all: kernel/version.fs more check
 # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;
 
+#targets of failed commands should be deleted:
+.DELETE_ON_ERROR:
+
 #this rule avoids remaking everything after minor changes in Makefile.in
 version:	Makefile.in configure.in
 		if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi
@@ -1008,14 +1012,18 @@ config.status: configure
 	./config.status --recheck
 
 #create files for DOS, because DOS cannot do it itself
-makefile.dos engine/makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in
+makefile.dos: mkdosmf.sed Makefile.in
 	sed -f mkdosmf.sed <Makefile.in >makefile.dos
+
+engine/makefile.dos: mkdosmf.sed engine/Makefile.in
 	sed -f mkdosmf.sed <engine/Makefile.in >engine/makefile.dos
 
-makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in
+makefile.os2: mkos2mf.sed Makefile.in
 	sed -f mkos2mf.sed <Makefile.in >makefile.os2
+	echo '%.o:      %.c' >>makefile.os2
+	echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
+
+engine/makefile.os2: mkos2mf.sed engine/Makefile.in
 	sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
-	echo '%.o:	%.c' >>makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
-	echo '%.o:	%.c' >>engine/makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2
+	echo '%.o:      %.c' >>engine/makefile.os2
+	echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2