--- gforth/vmgen-ex/Makefile	2003/01/30 00:07:48	1.6
+++ gforth/vmgen-ex/Makefile	2003/08/22 08:08:46	1.11
@@ -1,6 +1,6 @@
 #Makefile for vmgen example
 
-#Copyright (C) 2001 Free Software Foundation, Inc.
+#Copyright (C) 2001,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -19,12 +19,14 @@
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 LEX=flex -l
-YACC=bison
+YACC=bison -y
 #YACC=yacc
 VMGEN=vmgen
 #GCC=gcc -g -Wall
 GCC=gcc -O3 -fomit-frame-pointer -Wall
 CC=$(GCC)
+#M4=m4 -s #recommended if supported
+M4=m4
 OBJECTS_MINI=mini.tab.o support.o peephole.o profile.o disasm.o engine.o engine-debug.o
 
 mini: $(OBJECTS_MINI)
@@ -34,13 +36,13 @@ lex.yy.c: mini.l
 	$(LEX) mini.l
 
 mini.tab.c: mini.y
-	$(YACC) -b mini mini.y
+	$(YACC) mini.y && mv y.tab.c $@
 
 mini-vm.i mini-disasm.i mini-gen.i mini-labels.i mini-profile.i mini-peephole.i: mini.vmg
 	$(VMGEN) mini.vmg
 
 mini.vmg: mini-inst.vmg mini-super.vmg
-	m4 -s mini-inst.vmg >$@
+	$(M4) mini-inst.vmg >$@
 
 mini.tab.o: mini.tab.c mini-gen.i lex.yy.c mini.h
 
@@ -55,16 +57,16 @@ disasm.o: disasm.c mini-disasm.i mini.h
 engine.o: engine.c mini-vm.i mini-labels.i mini.h
 
 engine-debug.o: engine.c mini-vm.i mini-labels.i mini.h
-	$(GCC) -DVM_DEBUG -DVM_PROFILING -Dengine=engine_debug -c -o $@ engine.c
+	$(CC) -DVM_DEBUG -DVM_PROFILING -Dengine=engine_debug -c -o $@ engine.c
 
 clean:
 	rm -f *.o mini mini-*.i lex.yy.c mini.tab.c mini.vmg xxx-bench
 
 check:  mini
-	./mini test.mini|diff - test.out
+	./mini test.mini | tr -d '\015' | diff - test.out
 
 checkall:
-	for i in 1 3 5 8 9 10; do make clean; echo $i; make check VMGEN=../vmgen GCC="gcc -O3 -fomit-frame-pointer -Wall -DTHREADING_SCHEME=$i"; echo $i >>xxx-bench; time mini fib.mini 2>>xxx-bench; done; cat xxx-bench
+	for i in 1 3 5 8 9 10; do make clean; echo $i; make check VMGEN=../vmgen CC="gcc -O3 -fomit-frame-pointer -Wall -DTHREADING_SCHEME=$i"; echo $i >>xxx-bench; time mini fib.mini 2>>xxx-bench; done; cat xxx-bench
 
 #make profiles
 %.prof: %.mini mini