--- gforth/Makefile.in	2012/06/23 23:44:29	1.478
+++ gforth/Makefile.in	2012/11/28 03:31:22	1.491
@@ -48,6 +48,7 @@ PATHSEP = @PATHSEP@
 EC = @EC@
 ARCH= @ARCH@
 EXT = $(EC)$(ARCH)$(EXE)
+LA = $(EC)$(ARCH).la
 
 # ------------	Install Directories
 
@@ -88,7 +89,7 @@ MASSAGE_EXE = @MASSAGE_EXE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
-LN_S	= @LN_S@
+LN_S	= @LN_S@ -f
 M4      = @M4@
 GCC	= @CC@
 EMACS   = @EMACS@
@@ -237,6 +238,7 @@ GFORTH_FI_SRC2=\
 	hash.fs \
 	history.fs \
 	intcomp.fs \
+	i18n.fs \
 	mkdir.fs \
 	libcc.fs \
 	locals.fs \
@@ -245,6 +247,7 @@ GFORTH_FI_SRC2=\
 	prelude.fs \
 	quotes.fs \
 	quotedstring.fs \
+	parsedto.fs \
 	search.fs \
 	see.fs \
 	see-ext.fs \
@@ -255,6 +258,7 @@ GFORTH_FI_SRC2=\
 	struct.fs \
 	struct0x.fs \
 	stuff.fs \
+	substitute.fs \
 	tasker.fs \
 	termsize.fs \
 	utf-8.fs \
@@ -293,8 +297,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
 	colorize.fs comp-i.fs complex.fs \
 	depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
 	envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \
-	fsl-util.4th glosgen.fs gray.fs httpd.fs install-tags.fs \
-	make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \
+	fsl-util.4th fsl-util.fs glosgen.fs gray.fs httpd.fs install-tags.fs \
+	make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs fft-bench.fs \
 	other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \
 	regexp.fs sokoban.fs string.fs table.fs tags.fs \
 	tt.fs quotations.fs \
@@ -310,7 +314,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
 	oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
 	moofglos.fs fixpath.fs \
 	add.fs lib.fs oldlib.fs sieve.fs \
-	endtry-iferror.fs recover-endtry.fs smartdots.fs
+	endtry-iferror.fs recover-endtry.fs smartdots.fs \
+	unix/terminal-server.fs
 
 COMPAT = compat/README \
 	compat/anslocal.fs \
@@ -413,6 +418,9 @@ ARCHS_NO_DIST = \
 	arch/h8/asm.fs \
 	arch/r8c/tt.fs
 
+# temporary change.  DO NOT COMMIT
+ARCHS += $(ARCHS_NO_DIST)
+
 VMGEN_EX = 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 \
@@ -526,7 +534,7 @@ version:	Makefile.in configure.in
 kernel/version.fs:	version
 	echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
 
-more:	$(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@
+more:	$(ENGINES) $(FORTH_GEN) $(GEN) @libengines@ @build_libcc_named@
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -558,7 +566,8 @@ docclean:	FORCE
 		doc/gforth.toc doc/gforth.tp doc/gforth.vr html
 
 clean:		mostlyclean
-	-$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
+	-$(RM) -rf $(GEN) *.o engine/*.o engine/*.lo engine/*.la \
+	engine/.libs engine/libgforth* libgforth* arch/*/*.o version \
 	gforth-itc-noll$(EXT)  engine/gforth-itc-noll$(EXT)  \
 	gforth-ditc-noll$(EXT) engine/gforth-ditc-noll$(EXT) \
 	gforth-prof-noll$(EXT) engine/gforth-prof-noll$(EXT) \
@@ -614,6 +623,9 @@ binonlydist:	Makedist FORCE
 debdist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
 
+setup-debdist:	Makedist FORCE
+		$(MAKE) -f Makedist d$@
+
 #HPUX make breaks the cycle differently when the dates are equal, so
 # touch some of the files if it acts up
 hpux-workaround:
@@ -627,7 +639,7 @@ hpux-workaround:
 #hard to generate).
 #we rebuild gforth.fi, because it contains some path names.
 #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
-install:	gforth$(EXT) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @NO_CROSS@ gforth.fi
+install:	gforth$(EXT) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @libinstall@ @NO_CROSS@ gforth.fi
 		$(NORMAL_INSTALL)
 		touch $(DESTDIR)$(siteforthdir)/siteinit.fs
 		-$(RM) $(DESTDIR)$(bindir)/gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen
@@ -666,9 +678,9 @@ install:	gforth$(EXT) $(FORTH_SRC) $(ker
 		@NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) install.TAGS @NO_CROSS@gforth.fi
-		$(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
+		$(INSTALL_DATA) include/gforth$(ARCH)/$(VERSION)/* $(DESTDIR)$(includedir)/gforth$(ARCH)/$(VERSION)
 		if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \
-		   $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; \
+		   $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(VERSION)/libcc-named/libgf`basename $$i .fs`.la $(DESTDIR)$(libccdir)libgf`basename $$i .fs`.la; \
 		done; fi
 		$(POST_INSTALL)
 		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
@@ -676,9 +688,14 @@ install:	gforth$(EXT) $(FORTH_SRC) $(ker
 
 install-strip:	install
 
+libinstall:	$(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%)
+		for i in $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%); do \
+		   $(LIBTOOL) --silent --mode=install $(INSTALL) engine/$$i.la $(libdir)/$$i.la; \
+		done
+
 installdirs:	mkinstalldirs
 		$(NORMAL_INSTALL)
-		for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \
+		for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth$(ARCH)/$(VERSION) $(libccdir); do \
 			$(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
 		done
 		#
@@ -732,6 +749,7 @@ bench:		gforth-fast$(EXT) gforth.fi
 		time $(FORTH_FAST) bubble.fs -e "main bye"
 		time $(FORTH_FAST) matrix.fs -e "main bye"
 		time $(FORTH_FAST) fib.fs -e "main bye"
+		time $(FORTH_FAST) fft-bench.fs -e "main bye"
 
 onebench one-bench:
 	$(FORTH_FAST) onebench.fs
@@ -871,7 +889,7 @@ gforth-fast$(OPT)$(EXT): $(ENGINE_SOURCE
 	if test -z "$(OPT)"; then \
 		for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EXT) $@ && break; done; \
 	else \
-		( cd engine && $(MAKE) $@ ) && \
+		(cd engine && $(MAKE) $@ ) && \
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTHFAST_EXE@; \
@@ -902,6 +920,46 @@ gforth-prof$(EXT): $(ENGINE_SOURCES) $(F
 
 gforths: $(ENGINES) $(ENGINES_FAST)
 
+#For now, we have no way to check if the engines build correctly
+libgforth$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@
+	if test -z "$(OPT)"; then \
+		for i in $(OPTS); do $(MAKE) optlibgforth OPT=$$i && $(MAKE) optlibgforth2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \
+	else \
+		(cd engine && $(MAKE) $@ ); \
+		@NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
+	fi
+
+optlibgforth:
+	$(MAKE) libgforth$(OPT)$(EXT) $(MAKELINE$(OPT))
+
+optlibgforth2:
+	(cd engine && $(MAKE) libgforth$(EXT) $(MAKELINE$(OPT)))
+
+libgforth-fast$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h
+	if test -z "$(OPT)"; then \
+		for i in $(OPTS); do $(MAKE) optlibgforth-fast OPT=$$i && $(MAKE) optlibgforth-fast2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \
+	else \
+		(cd engine && $(MAKE) $@ ); \
+		@NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \
+	fi
+
+optlibgforth-fast:
+	$(MAKE) libgforth-fast$(OPT)$(EXT) $(MAKELINE$(OPT))
+
+optlibgforth-fast2:
+	(cd engine && $(MAKE) libgforth-fast$(EXT) $(MAKELINE$(OPT)))
+
+libgforth-itc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
+		cd engine && $(MAKE) libgforth-itc$(EXT) $(MAKELINE-noll)
+
+libgforth-ditc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
+		cd engine && $(MAKE) libgforth-ditc$(EXT) $(MAKELINE-noll)
+
+libgforth-prof$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
+		cd engine && $(MAKE) libgforth-prof$(EXT) $(MAKELINE-noll)
+
+libgforths: $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%)
+
 # ------------- additional C primitives
 
 .SUFFIXES:	.c .pri
@@ -1043,7 +1101,7 @@ engine/config.h: stamp-h
 stamp-h: engine/config.h.in config.status stamp-h.in
 	./config.status
 
-Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec:	Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in libforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in
+Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec gforthmi.sh:	Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in libforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in gforthmi.sh.in
 	./config.status
 
 config.status: configure