diff: fix GRADE-conditional Mmakefile code

[Fergus Henderson]

tests/valid/Mmakefile:
tests/debugger/Mmakefile:
	Change the tests for grade `jump' and `fast' so that they also
	catch grades `jump.gc', `fast.gc', etc.

Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- Mmakefile	1998/05/18 02:05:11	1.5
+++ Mmakefile	1998/07/12 17:17:06
@@ -15,16 +15,21 @@
 
 MCFLAGS = --trace all $(EXTRA_MCFLAGS)
 
-# Not all grades can be used with stack layouts
-#
-ifeq ($(GRADE),jump) 
-	PROGS=
+# Base grades `jump' and `fast' cannot be used with
+# stack layouts (which are required for tracing).
+
+ifneq "$(findstring asm_,$(GRADE))" ""
+    PROGS=$(DEBUGGER_PROGS)
 else
-	ifeq ($(GRADE),fast)
-		PROGS=
+    ifneq "$(findstring jump,$(GRADE))" ""
+	PROGS=
+    else
+	ifneq "$(findstring fast,$(GRADE))" ""
+	    PROGS=
 	else
-		PROGS=$(DEBUGGER_PROGS)
+	    PROGS=$(DEBUGGER_PROGS)
 	endif
+    endif
 endif
 
 LIBPROGS=	$(PROGS:%=%_lib)
@@ -52,7 +57,7 @@
 
 #-----------------------------------------------------------------------------#
 
-DEPS=		$(ALLPROGS:%=%.dep)
+DEPS=		$(ALLPROGS:%=$(deps_subdir)%.dep)
 DEPENDS=	$(ALLPROGS:%=%.depend)
 OUTS=		$(PROGS:%=%.out)
 LIBOUTS=	$(LIBPROGS:%=%.out)
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.19
diff -u -r1.19 Mmakefile
--- Mmakefile	1998/06/19 00:43:16	1.19
+++ Mmakefile	1998/07/12 17:18:06
@@ -102,15 +102,20 @@
 #	mode_merge_insts.m
 
 
-# Not all grades can be used with accurate GC
+# Base grades `jump' and `fast'
+# cannot be used with accurate GC
 
-ifeq ($(GRADE),jump) 
-    SOURCES=$(OTHER_SOURCES)
+ifneq "$(findstring asm_,$(GRADE))" ""
+    SOURCES=$(AGC_SOURCES) $(OTHER_SOURCES)
 else
-    ifeq ($(GRADE),fast)
+    ifneq "$(findstring jump,$(GRADE))" ""
         SOURCES=$(OTHER_SOURCES)
     else
-        SOURCES=$(AGC_SOURCES) $(OTHER_SOURCES)
+        ifneq "$(findstring fast,$(GRADE))" ""
+            SOURCES=$(OTHER_SOURCES)
+        else
+            SOURCES=$(AGC_SOURCES) $(OTHER_SOURCES)
+        endif
     endif
 endif
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.