for review: fix for running tests in the term subdirectory

[Zoltan Somogyi]

Fergus, please review this.

tests/Mmake.common:
	Add a new action for removing .trans_opt files.

tests/term/Mmakefile:
	Make "mmake clean" depend on the target that removes .trans_opt files.
	Fix the "mmake depend" rule and the make variables on which it depends.

Zoltan.

cvs diff: Diffing .
Index: Mmake.common
===================================================================
RCS file: /home/mercury1/repository/tests/Mmake.common,v
retrieving revision 1.9
diff -u -u -r1.9 Mmake.common
--- Mmake.common	1997/11/22 17:13:52	1.9
+++ Mmake.common	1997/12/30 08:19:43
@@ -29,6 +30,9 @@
 
 clean_out:
 	rm -f *.out
+
+clean_trans_opt:
+	rm -f *.trans_opt
 
 clean_exp:
 	rm -f *.exp
cvs diff: Diffing benchmarks
cvs diff: Diffing general
cvs diff: Diffing hard_coded
cvs diff: Diffing invalid
cvs diff: Diffing misc_tests
cvs diff: Diffing term
Index: term/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/term/Mmakefile,v
retrieving revision 1.2
diff -u -u -r1.2 Mmakefile
--- Mmakefile	1997/12/30 02:59:57	1.2
+++ Mmakefile	1997/12/30 07:07:00
@@ -62,27 +62,31 @@
 	sum \
 	vangelder
 
-DEPENDS = $(PROGS:=.depend)
-TRANS_OPTS = $(PROGS:=.trans_opt)
-TRANS_OPT_RESS = $(PROGS:=.trans_opt_res)
+#-----------------------------------------------------------------------------#
+
+DEPENDS = $(PROGS:%=%.depend)
+TRANS_OPTS = $(PROGS:%=%.trans_opt)
+TRANS_OPT_RESS = $(PROGS:%=%.trans_opt_res)
 
 #-----------------------------------------------------------------------------#
 
 MCTRANSOPTFLAGS = --enable-termination --term-single-arg 5 --term-norm simple
 
-%.trans_opt: %.m
-	$(MC) $(MCFLAGS) --make-trans-opt $(MCTRANSOPTFLAGS) $< \
-		> $*.trans_opt_err 2>&1
+%.trans_opt:	%.m
+		$(MC) $(MCFLAGS) --make-trans-opt $(MCTRANSOPTFLAGS) $< \
+			> $*.trans_opt_err 2>&1
 
 %.trans_opt_res: %.trans_opt_exp %.trans_opt
-	diff -c $*.trans_opt_exp $*.trans_opt > $@
+		diff -c $*.trans_opt_exp $*.trans_opt > $@
 
 #-----------------------------------------------------------------------------#
 
-depend:
+depend:		$(DEPENDS)
+
+trans_opts:	$(TRANS_OPTS)
 
-trans_opts: $(TRANS_OPTS)
+check:		$(TRANS_OPT_RESS)
 
-check: $(TRANS_OPT_RESS)
+clean:		clean_trans_opt
 
 #-----------------------------------------------------------------------------#
cvs diff: Diffing valid
cvs diff: Diffing warnings