Index: src/Tests/ResolvExpr/Abstype.c
===================================================================
--- src/Tests/ResolvExpr/Abstype.c	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
+++ src/Tests/ResolvExpr/Abstype.c	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -1,4 +1,2 @@
-// "cfa-cpp -nx Abstype.c"
-
 type T | { T x( T ); };
 
@@ -9,5 +7,5 @@
 
 forall( type T ) lvalue T *?( T * );
-int ?++( int *);
+int ?++( int * );
 int ?=?( int *, int );
 forall( dtype DT ) DT * ?=?( DT **, DT * );
Index: src/Tests/ResolvExpr/make-rules
===================================================================
--- src/Tests/ResolvExpr/make-rules	(revision a65d92e52b97fe1658884451a9f6553f519fc91a)
+++ src/Tests/ResolvExpr/make-rules	(revision 81419b56599b36f14d08bf2cbd8c25893ee2f52b)
@@ -1,21 +1,20 @@
 CFA = ../../cfa-cpp
 
-DIFF = /software/gnu/bin/diff
+EXPECTED := ${wildcard ${EXPECTDIR}/*.tst}
+TESTS := ${EXPECTED:${EXPECTDIR}/%=${OUTPUTDIR}/%}
+TEST_IN := ${TESTS:.tst=.c}
 
-# Basic SynTree printing
-EXPECTED := ${wildcard $(EXPECTDIR)/*.tst}
-TESTS := $(EXPECTED:$(EXPECTDIR)/%=$(OUTPUTDIR)/%)
-TEST_IN := $(TESTS:.tst=.c)
+.SILENT :
 
-$(OUTPUTDIR)/%.tst:%.c $(CFA)
-	-$(CFA) $(CFAOPT) < $< > $@ 2>&1
+${OUTPUTDIR}/%.tst : %.c ${CFA}
+	-${CFA} ${CFAOPT} < $< > $@ 2>&1
 
-$(OUTPUTDIR)/report: $(TESTS) $(EXPECTED)
+${OUTPUTDIR}/report : ${TESTS} ${EXPECTED}
 	rm -f $@
-	@for i in $(TESTS); do \
-	  echo "---"`basename $$i`"---" | tee -a $@; \
-	  $(DIFF) -B -w -u $(EXPECTDIR)/`basename $$i` $$i | tee -a $@; \
+	@for i in ${TESTS}; do \
+	     echo "---"`basename $$i`"---" | tee -a $@; \
+	     diff -B -w ${EXPECTDIR}/`basename $$i` $$i | tee -a $@; \
 	done
 
-clean:
-	rm -rf $(OUTPUTDIR)
+clean :
+	rm -rf ${OUTPUTDIR}