--- gforth/Makefile.in	2008/07/15 09:30:12	1.407
+++ gforth/Makefile.in	2008/07/15 21:54:43	1.410
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -348,14 +348,8 @@ ARCHS =	\
 	arch/sharc/types.h \
 	arch/sharc/g21k-3.3.4-bp1.diff \
 	arch/r8c/asm.fs \
-	arch/r8c/asm-test.fs \
-	arch/r8c/prim.fs \
-	arch/r8c/errors.fs \
-	arch/r8c/tt.fs \
-	arch/r8c/tasker.fs \
-	arch/r8c/lauflicht.fs \
-	arch/r8c/terminal.fs \
-	arch/r8c/mach.fs
+	arch/r8c/mach.fs \
+	arch/r8c/prim.fs
 
 #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \
@@ -372,6 +366,12 @@ 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
 
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
@@ -424,7 +424,7 @@ ENGINES = gforth$(EC)$(EXE) gforth-ditc$
 
 ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
 
-GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
+GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc
 
 # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
@@ -437,7 +437,7 @@ FORTH_GEN_ENGINE_FAST= \
 	engine/prim_num-fast.i engine/prim_grp-fast.i \
 	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_GEN0 = prim.b $(FORTH_GEN_PRIMB) version kernel/version.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
@@ -620,7 +620,7 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) gforth.fi install.TAGS
 		$(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
-		for i in $(LIBCC_SRC); do $(DESTDIR)$(bindir)/gforth -e "s\" $(DESTDIR)$(libccdir)\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done
+		for i in $(LIBCC_SRC); do libtool --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done
 		$(POST_INSTALL)
 		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
 		#$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info
@@ -647,7 +647,7 @@ uninstall:	FORCE
 check-libcc-named: $(LIBCC_SRC)
 		$(RMTREE) lib/gforth/$(VERSION)/libcc-named/
 		$(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/
-		for i in $(LIBCC_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done
+		for i in $(LIBCC_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(libccdir)\" ; is replace-rpath" $$i -e bye; done
 
 check:		gforths	gforth.fi 
 		$(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
@@ -806,7 +806,7 @@ MAKELINE-noll-reg = OPT=-noll-reg OPTDEF
 MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=
 MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o
 
-gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h $(kernel_fi)
+gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h
 	if test -z "$(OPT)"; then \
 		for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \
 	else \