--- gforth/Makefile.in	1999/07/24 13:07:18	1.160
+++ gforth/Makefile.in	2000/05/19 09:24:37	1.171
@@ -72,12 +72,13 @@ FORTH_FAST	= $(ENGINE_FAST) $(FORTH_ARGS
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 FORTHP	= $(ENGINE) --die-on-signal -i ./$(kernel_fi)
+STARTUP	= -e 3 exboot.fs startup.fs
 STRIP	= strip
-TEXI2DVI = texi2dvi
+TEXI2DVI = texi2dvi -e
 DVI2PS	= dvips -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
-TEXI2HTML = texi2html
 MAKEINFO = makeinfo
+TEXI2HTML = texi2html
 
 # -------------	Compiler Flags
 
@@ -178,9 +179,11 @@ GFORTH_FI_SRC = \
 	bufio.fs \
 	debug.fs \
 	debugs.fs \
+	ekey.fs \
 	savesys.fs \
 	environ.fs \
 	errors.fs \
+	exceptions.fs \
 	extend.fs \
 	float.fs \
 	glocals.fs \
@@ -210,10 +213,10 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	code.fs colorize.fs comp-i.fs \
 	doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
-	glosgen.fs gray.fs \
+	glosgen.fs gray.fs httpd.fs \
 	make-app.fs doc/makedoc.fs \
 	more.fs other.fs prims2x.fs random.fs \
-	table.fs \
+	table.fs string.fs \
 	tt.fs sokoban.fs \
 	unbuffered.fs wordsets.fs \
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
@@ -453,9 +456,11 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
 		$(RM) gforth.fi
-		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names
+		GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) #gforth.fi contains some path names
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
+		# after install, remove these because they are owned by ROOT
+		$(RM) gforth.fi install.TAGS
 		@if test -d "$(emacssitelispdir)"; then \
 			$(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
 		else \
@@ -524,17 +529,14 @@ kernl64l.fi-:	$(KERN_SRC) kernel/version
 kernl64b.fi-:	$(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
-kernl-%.fi:	arch/%/mach.fs \
-		$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
+kernl-%.fi:	arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" $<"' $(srcdir)/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
+arch/%/mach.fs:	arch/%/prim.fs arch/%/asm.fs
 
 kernl16b.fi:	$(KERNLS)
 		-$(CP) kernl16b.fi kernl16b.fi~
@@ -565,7 +567,7 @@ kernl64l.fi:	$(KERNLS)
 #		-$(CP) $< $@
 
 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" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
+		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
 
 # -------------	Make c-engine
 
@@ -607,7 +609,7 @@ gforth-ditc$(EXE):	engines
 		$(CP) engine/$@ $@
 		@GFORTHDITC_EXE@
 
-engines:	FORCE engine/Makefile
+engines:	FORCE engine/Makefile engine/prim.i engine/prim_lab.i
 		cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE)
 
 # ------------- additional C primitives
@@ -628,7 +630,7 @@ install.TAGS:	gforth.TAGS
 		sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS
 
 gforth.TAGS:	@kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS
-		$(FORTHK) etags.fs startup.fs -e bye
+		$(FORTHK) etags.fs exceptions.fs startup.fs -e bye
 		cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
 		rm TAGS
 
@@ -638,7 +640,7 @@ prim.TAGS: 	prim.b prims2x.fs
 		$(RM) $@-
 
 doc/doc.fd:	doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
-		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
+		$(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs exceptions.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
 
 doc/crossdoc.fd:	$(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 		$(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye
@@ -669,12 +671,14 @@ doc/gforth.info doc/gforth.info-*: $(GFO
 html:		$(GFORTH_TEXI)
 		-$(RMTREE) html
 		-mkdir html
-		cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
+### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
+		cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi
+###		cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
 
 doc/gforth.txt:	$(GFORTH_TEXI)
 		-cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt
 
-doc:		doc/gforth.ps html doc/gforth.txt
+doc:		info doc/gforth.ps html doc/gforth.txt TAGS
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.