--- gforth/Makefile.in	1998/10/14 22:36:41	1.121
+++ gforth/Makefile.in	1998/10/18 23:16:50	1.123
@@ -37,6 +37,7 @@ DOSVERSION=`echo $VERSION|sed 's/\.//g'`
 
 machine=@machine@
 kernel_fi=@kernel_fi@
+EXE=@EXE@
 
 # this is the type of machine
 # used to extend the include path with ./arch/$machine
@@ -305,7 +306,7 @@ SOURCES	= CVS engine/CVS compat Makefile
 
 RCS_FILES =  ToDo model high-level
 
-GEN = gforth gforth-ditc kernel/version.fs version-stamp
+GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp
 
 # things that need a working forth system to be generated
 FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs
@@ -317,7 +318,7 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps
 
 #stuff in a binonly distribution 
-BINONLYDIST = config.status Makefile gforth gforth-ditc \
+BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \
 	$(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
 	arch/$(machine)/machine.h engine/config.h engine/Makefile \
 	stamp-h kernel/version.fs version-stamp \
@@ -349,10 +350,10 @@ version:	Makefile.in
 # shell und file utilities.
 
 kernel/version.fs:	version
-	$(MAKE) gforth
+	$(MAKE) gforth$(EXE)
 	$(SHELL) versions.bsh $(VERSION)
 
-more:	engine $(FORTH_GEN) gforth
+more:	engine $(FORTH_GEN) gforth$(EXE)
 
 #from the gcc Makefile: 
 #"Deletion of files made during compilation.
@@ -376,7 +377,7 @@ mostlyclean:	FORCE
 		gforth-$(VERSION).tar.gz
 
 clean:		mostlyclean
-		-$(RM) -rf $(GEN) engine/gforth engine/gforth-ditc \
+		-$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \
 		*.o engine/*.o arch/*/*.o version
 
 distclean:	clean
@@ -470,11 +471,11 @@ binonlydist:	$(SOURCES) $(FORTH_GEN0) @K
 #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is
 #hard to generate)
-install:	gforth $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs
+install:	gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs
 		touch $(datadir)/gforth/site-forth/siteinit.fs
-		-$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
-		$(INSTALL_PROGRAM) -s gforth $(bindir)
-		ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)
+		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
+		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)
+		ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
 		-for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
 		for i in $(FORTH_SRC) prim; do \
@@ -503,14 +504,14 @@ uninstall:	FORCE
 		-$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)
 		@echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
 
-check test:	gforth gforth.fi
+check test:	gforth$(EXE) gforth.fi
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye
 		$(FORTH) test/other.fs -e bye
 		$(FORTH) code.fs test/checkans.fs -e bye
 		@echo 'Expect no differences'
 		$(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i
 
-bench:		gforth gforth.fi
+bench:		gforth$(EXE) gforth.fi
 		@echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
 		time $(FORTH) siev.fs -e "main bye"
 		time $(FORTH) bubble.fs -e "main bye"
@@ -545,14 +546,18 @@ kernl64l.fi-:	$(KERN_SRC) kernel/version
 kernl64b.fi-:	$(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
-kernl-%.fi:	arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) \
-		arch/%/prim.fs arch/%/asm.fs
+kernl-%.fi:	arch/%/mach.fs \
+		$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
 		if [ -f `echo $< | sed s/fs/sh/` ]; \
 		then sh `echo $< | sed s/fs/sh/` $@; \
 		else $(CP) $@- $@; \
 		fi
 
+arch/%/mach.fs:	arch/%/prim.fs
+
+arch/%/prim.fs:	arch/%/asm.fs
+
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
 		-$(CP) kernl16b.fi- kernl16b.fi
@@ -581,7 +586,7 @@ kernl64l.fi:	$(KERNLS)
 #		-$(CP) $@ $@~
 #		-$(CP) $< $@
 
-gforth.fi:	$(kernel_fi) gforthmi gforth gforth-ditc $(GFORTH_FI_SRC)
+gforth.fi:	$(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC)
 		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
 
 # -------------	Make c-engine
@@ -611,14 +616,14 @@ kernel/prim.fs:	prim.b prims2x.fs kernel
 		$(CP) $@- $@
 		$(RM) $@-
 
-gforth:		FORCE
-		-$(CP) gforth gforth~
-		$(MAKE) -C engine gforth
+gforth$(EXE):		FORCE
+		-$(CP) gforth$(EXE) gforth~
+		cd engine && $(MAKE) gforth$(EXE)
 		$(CP) engine/$@ $@
 		@GFORTH_EXE@
 
-gforth-ditc:	FORCE
-		$(MAKE) -C engine gforth-ditc
+gforth-ditc$(EXE):	FORCE
+		cd engine && $(MAKE) gforth-ditc$(EXE)
 		$(CP) engine/$@ $@
 		@GFORTHDITC_EXE@
 
@@ -704,12 +709,9 @@ stamp-h:	config.h.in config.status
 		CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
 		echo timestamp > stamp-h
 
-Makefile:	Makefile.in config.status
+Makefile:	Makefile.in engine/Makefile.in config.status
 		CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
 
-engine/Makefile: engine/Makefile.in config.status
-		CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
-     
 config.status:	configure
 		./config.status --recheck