[m-rev.] diff: update tests/valid/Mmakefile for IL grades

[Fergus Henderson]

Estimated hours taken: 0.25
Branches: main

tests/valid/Mmakefile:
	For IL grades, build the .dll file rather than the .o file.

Workspace: /mnt/roy/fjh/traveller/mercury
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.114
diff -u -d -r1.114 Mmakefile
--- tests/valid/Mmakefile	2002/10/22 07:29:27	1.114
+++ tests/valid/Mmakefile	2002/10/22 08:03:55
@@ -242,13 +242,23 @@
 OS_SUBDIR=
 RLOS_SUBDIR=
 ILS_SUBDIR=
+DLLS_SUBDIR=
 else
 OS_SUBDIR=$(os_subdir)
 RLOS_SUBDIR=$(rlos_subdir)
 ILS_SUBDIR=$(ils_subdir)
+DLLS_SUBDIR=$(dlls_subdir)
 endif
 
-OBJS =	$(OBJ_PROGS:%=$(OS_SUBDIR)%.$O) \
+
+ifeq ($(findstring il,$(GRADE)),il)
+	TARGET_OBJ_EXT=dll
+	TARGET_OBJ_SUBDIR=$(DLLS_SUBDIR)
+else
+	TARGET_OBJ_EXT=$(O)
+	TARGET_OBJ_SUBDIR=$(OS_SUBDIR)
+endif
+OBJS =	$(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) \
 		$(ALL_RLO_PROGS:%=$(RLOS_SUBDIR)%.rlo) \
 		$(IL_PROGS:%=$(ILS_SUBDIR)%.il)
 
@@ -276,7 +286,7 @@
 # can be found by `mmc --make'.
 include Mercury.options
 
-$(OBJ_PROGS:%=%.runtest): %.runtest: %.$O ;
+$(OBJ_PROGS:%=%.runtest): %.runtest: %.$(TARGET_OBJ_EXT) ;
 
 $(ALL_RLO_PROGS:%=%.runtest): %.runtest: %.rlo ;
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------