--- gforth/Makefile.in	1995/01/21 17:26:41	1.14
+++ gforth/Makefile.in	1995/02/09 17:49:50	1.18
@@ -20,15 +20,17 @@ FORTH	= ./gforth
 CC	= gcc
 TEXI2DVI = tex
 DVI2PS	= dvips
+#you can get texi2html from http://asis01.cern.ch/infohtml/texi2html.html
+TEXI2HTML = texi2html
 MAKEINFO = makeinfo
 XCFLAGS	= @CFLAGS@
 XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
-ENGINE_FLAGS =  -fforce-mem -fforce-addr -fomit-frame-pointer -fno-defer-pop -fcaller-saves
-CFLAGS	= -g -O4 -Wall $(SWITCHES)
+ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves
+CFLAGS	= @DEBUGFLAG@ -O4 -Wall $(SWITCHES)
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
-LDFLAGS	=  @LDFLAGS@ @GCCLDFLAGS@
+LDFLAGS	=  @DEBUGFLAG@ @LDFLAGS@ @GCCLDFLAGS@
 LDLIBS	= @LIBS@
 
 prefix = @prefix@
@@ -55,13 +57,13 @@ FORTH_SRC = add.fs assert.fs ansi.fs blo
 	startup.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs vt100.fs \
 	vt100key.fs wordinfo.fs wordsets.fs
 
-SOURCES	= CVS Makefile.in configure.in configure config.sub  config.guess \
-	install-sh INSTALL README ToDo BUGS model gforth.ds \
+SOURCES	= Makefile.in configure.in configure config.sub  config.guess \
+	install-sh INSTALL README ToDo BUGS model COPYING gforth.ds texinfo.tex \
 	primitives engine.c main.c io.c \
-	m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h 32bit.h \
+	m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \
 	getopt.c getopt1.c getopt.h select.c \
-	ecvt.c memcmp.c strtol.c strtoul.c memmove.c \
-	makefile.dos io-dos.h configure.bat startup.dos \
+	ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c \
+	makefile.dos configure.bat startup.dos \
 	glosgen.glo glossaries.doc \
 	$(INCLUDES) $(FORTH_SRC)
 
@@ -72,9 +74,11 @@ GEN = gforth
 OBJECTS	= engine.o io.o main.o @LIBOBJS@ @getopt_long@
 
 # things that need a working forth system to be generated
+FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs
+FORTH_GEN =  $(FORTH_GEN0) @KERNAL@ 
 # this is used for antidependences,
+FORTH_GEN1 = $(FORTH_GEN0) @gforth_fi@ 
 
-FORTH_GEN =  primitives.b primitives.i prim_labels.i aliases.fs @KERNAL@ 
 
 GEN_PRECIOUS = $(FORTH_GEN) gforth.texi gforth.dvi gforth.ps Makefile configure
 
@@ -119,9 +123,12 @@ dist:		$(SOURCES) $(FORTH_GEN)
 		gzip -9 -f gforth-$(VERSION).tar
 		-rm gforth-$(VERSION)
 
+#strip gforth, because the debugging stuff is hardly useful once
+# gforth manages to execute more than a few primitives
+
 install:	gforth $(FORTH_SRC) gforth.fi gforth.1 gforth.info
 		$(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth $(datadir)/gforth	
-		$(INSTALL_PROGRAM) gforth $(bindir)
+		$(INSTALL_PROGRAM) -s gforth $(bindir)
 		$(INSTALL_DATA) gforth.1 $(mandir)
 		$(INSTALL_DATA) gforth.info* $(infodir)
 		$(INSTALL_DATA) gforth.fi $(libdir)/gforth
@@ -139,42 +146,42 @@ gforth:	$(OBJECTS)
 
 kernl16l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-		mach16l.fs $(FORTH_GEN)
+		mach16l.fs $(FORTH_GEN1)
 		-$(CP) kernl16l.fi kernl16l.fi~
 		$(FORTH) -e 's" mach16l.fs"' main.fs
 		@LINK_KERNL16L@
 
 kernl16b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-		mach16b.fs $(FORTH_GEN)
+		mach16b.fs $(FORTH_GEN1)
 		-$(CP) kernl16b.fi kernl16b.fi~
 		$(FORTH) -e 's" mach16b.fs"' main.fs
 		@LINK_KERNL16B@
 
 kernl32l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-		mach32l.fs $(FORTH_GEN)
+		mach32l.fs $(FORTH_GEN1)
 		-$(CP) kernl32l.fi kernl32l.fi~
 		$(FORTH) -e 's" mach32l.fs"' main.fs
 		@LINK_KERNL32L@
 
 kernl32b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-		mach32b.fs $(FORTH_GEN)
+		mach32b.fs $(FORTH_GEN1)
 		-$(CP) kernl32b.fi kernl32b.fi~
 		$(FORTH) -e 's" mach32b.fs"' main.fs
 		@LINK_KERNL32B@
 
 kernl64l.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-		mach64l.fs $(FORTH_GEN)
+		mach64l.fs $(FORTH_GEN1)
 		-$(CP) kernl64l.fi kernl64l.fi~
 		$(FORTH) -e 's" mach64l.fs"' main.fs
 		@LINK_KERNL64L@
 
 kernl64b.fi:	main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
 		errore.fs kernal.fs extend.fs tools.fs toolsext.fs \
-		mach64b.fs $(FORTH_GEN)
+		mach64b.fs $(FORTH_GEN1)
 		-$(CP) kernl64b.fi kernl64b.fi~
 		$(FORTH) -e 's" mach64b.fs"' main.fs
 		@LINK_KERNL64B@
@@ -214,6 +221,11 @@ gforth.ps:	gforth.dvi
 gforth.info:	gforth.texi
 		-$(MAKEINFO) gforth.texi
 
+html:		gforth.texi
+		-$(RM) html/*
+		-mkdir html
+		cd html; $(TEXI2HTML) -menu -split_node ../gforth.texi
+
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
 Makefile: Makefile.in config.status