--- gforth/Makefile.in	2007/06/17 19:26:42	1.352
+++ gforth/Makefile.in	2007/08/21 10:33:51	1.365
@@ -59,12 +59,13 @@ CP	= cp -p
 MV	= mv
 TAR	= tar cf -
 INSTALL	= @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 MASSAGE_EXE = @MASSAGE_EXE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
+M4      = @M4@
 GCC	= @CC@
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
@@ -236,6 +237,7 @@ GFORTH_FI_SRC = \
 	source.fs \
 	startup.fs \
 	struct.fs \
+	struct0x.fs \
 	stuff.fs \
 	tasker.fs \
 	termsize.fs \
@@ -261,7 +263,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	regexp.fs sokoban.fs string.fs table.fs tags.fs \
 	tt.fs \
 	unbuffer.fs wordsets.fs xwords.fs \
-	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
+	test/tester.fs test/ttester.fs \
+	test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
 	test/primtest.fs test/coreext.fs test/deferred.fs \
@@ -383,8 +386,8 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 	engine/config.h.in stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
 	BUILD-FROM-SCRATCH model \
-	COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
-	doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
+	COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
+	doc/gforth.ds doc/gforth.1 doc/version.texi.in \
 	doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
 	gforth.el \
 	prim cache0.vmg cache1.vmg peeprules.vmg \
@@ -415,7 +418,7 @@ ENGINES = gforth$(EC)$(EXE) gforth-ditc$
 
 ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) 
 
-GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs
+GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs 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 \
@@ -508,7 +511,8 @@ clean:		mostlyclean
 		-$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
 		engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \
                 engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \
-		engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE)
+		engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \
+		engine/prim-s.i
 
 distclean:	clean
 		-$(RM) -rf config.cache config.log config.status \
@@ -594,12 +598,12 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		done
 		$(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
 		@if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
-			$(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \
+			$(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
 		else \
-			echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
+			echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
 		fi
 		-$(RM) gforth.fi
-		GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
+		GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
 		$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
 		$(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
 		$(RM) gforth.fi install.TAGS
@@ -636,7 +640,7 @@ check:		gforths	gforth.fi
 		$(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
 		@echo "*** Check successful ***"
 
-checkone test:	gforth$(EC)$(EXE) gforth.fi
+checkone test:	gforth$(EC)$(EXE) gforth.fi engine/prim-s.i
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
@@ -644,7 +648,7 @@ checkone test:	gforth$(EC)$(EXE) gforth.
 		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
 		$(FORTH) prims2x.fs -e \
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
-		  tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
+		  tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i
 
 check-nofast: gforth$(EC)$(EXE) gforth.fi
 		$(FORTHS) test/gforth-nofast.fs -e bye
@@ -741,16 +745,16 @@ kernl64l$(EC).fi:	$(KERNLS)
 #		-$(CP) $< $@
 
 gforth.fi:	$(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs
-		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
+		GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
 
 # -------------	Make c-engine
 
 prim.b:		prim cache0.vmg
-		m4 -s $(srcdir)/prim >$@
+		$(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
-prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg
-		m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@
+prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in
+		$(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
@@ -759,6 +763,9 @@ $(FORTH_GEN_ENGINE_FAST): prim-fast.b pr
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs
 		GFORTH="$(FORTHP)" $(srcdir)/gfgen
 
+engine/prim-s.i: engine/prim.i
+	grep -v '^#line ' $(srcdir)/engine/prim.i >$@
+
 kernel/aliases.fs:	prim.b prims2x.fs kernel/aliases0.fs
 		$(CP) kernel/aliases0.fs $@-
 		$(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-
@@ -858,6 +865,12 @@ kernel.TAGS:
 kernel.tags:
 		rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
 
+#elc files
+gforth.elc:	gforth.el
+		emacs -batch -f batch-byte-compile $<
+
+#Documentation
+
 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 except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
 
@@ -873,6 +886,7 @@ doc/gforth.texi:	doc/gforth.ds prim.b ds
 checkdoc:	doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
 		$(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
 		-grep unknown doc/gforth.texi
+		-grep doc- doc/gforth.texi
 
 dvi:		doc/gforth.dvi doc/vmgen.dvi