--- gforth/Makefile.in	2008/02/23 13:03:55	1.388
+++ gforth/Makefile.in	2008/04/19 19:15:14	1.394
@@ -107,6 +107,7 @@ SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTD
 ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@
 CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'
+CPPFLAGS = @CPPFLAGS@
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@
@@ -298,7 +299,6 @@ ALLSUBDIRS = engine
 
 ARCHS =	\
 	arch/generic/machine.h \
-	arch/generic/128bit.h \
 	arch/m68k/machine.h \
 	arch/mips/machine.h \
 	arch/386/machine.h \
@@ -384,7 +384,7 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-
 ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \
 	engine/engine.c engine/main.c \
 	engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \
-	engine/profile.c \
+	engine/profile.c engine/128bit.h \
 	engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
 	engine/ecvt.c engine/memcmp.c engine/rint.c \
 	engine/strtol.c engine/strtoul.c \
@@ -413,7 +413,7 @@ SOURCES	= $(CVSDIRS) $(ENGINE_SOURCES) c
 	$(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
 	timings.sc \
 	test/coretest.out test/checkans.out test/gforth.out \
-	cache-fast*.vmg
+	cache*.vmg peeprules.vmg prim
 
 RCS_FILES =  ToDo model high-level
 
@@ -454,6 +454,7 @@ KERNLS = kernl16b$(EC).fi- kernl16l$(EC)
 	 kernl32b$(EC).fi- kernl32l$(EC).fi- \
 	 kernl64b$(EC).fi- kernl64l$(EC).fi-
 
+# -------------        Make forth images
 GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 	doc/gforth.texi doc/gforth.dvi doc/gforth.ps \
 	doc/vmgen.dvi doc/vmgen.ps \
@@ -482,7 +483,6 @@ kernel/version.fs:	version
 
 more:	$(ENGINES) $(FORTH_GEN) $(GEN)
 	@$(MAKE) check
-	@$(FORTH_FAST) --diag -e bye
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -530,7 +530,7 @@ distclean:	clean
 
 #realclean is useless, but dangerous, so it's commented out
 realclean:	distclean
-		-$(RM) $(GEN_PRECIOUS)
+		-$(RM) -rf $(GEN_PRECIOUS) `cat .cvsignore`
 
 #mostlyclean, but also remove some of the stuff that is distributed
 virtualclean:	mostlyclean
@@ -646,6 +646,7 @@ check:		gforths	gforth.fi
 		$(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1
 		$(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
 		@echo "*** Check successful ***"
+		./gforth-fast --diag -e bye
 
 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
@@ -849,7 +850,7 @@ gforths: $(ENGINES) $(ENGINES_FAST)
 		$(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@
 
 %.so:		%.c
-		$(GCC) -shared $(CFLAGS) $< -o $@
+		$(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 # -------------	Make Documentation
 
@@ -997,6 +998,6 @@ makefile.os2 engine/makefile.os2: mkos2m
 	sed -f mkos2mf.sed <Makefile.in >makefile.os2
 	sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
 	echo '%.o:	%.c' >>makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2
+	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
 	echo '%.o:	%.c' >>engine/makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2
+	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2