--- gforth/vmgen-ex/Makefile	2001/05/01 10:20:55	1.4
+++ gforth/vmgen-ex/Makefile	2003/02/01 14:28:08	1.8
@@ -25,9 +25,12 @@ 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: mini.tab.o support.o peephole.o profile.o disasm.o engine.o engine-debug.o
-	$(CC) $^ -o $@
+mini: $(OBJECTS_MINI)
+	$(CC) $(OBJECTS_MINI) -o $@
 
 lex.yy.c: mini.l
 	$(LEX) mini.l
@@ -39,7 +42,7 @@ mini-vm.i mini-disasm.i mini-gen.i mini-
 	$(VMGEN) mini.vmg
 
 mini.vmg: mini-inst.vmg mini-super.vmg
-	m4 -s $< >$@
+	$(M4) mini-inst.vmg >$@
 
 mini.tab.o: mini.tab.c mini-gen.i lex.yy.c mini.h
 
@@ -54,13 +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 $@ $<
+	$(GCC) -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
+	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
 
 #make profiles
 %.prof: %.mini mini