[m-dev.] diff: fix IL Mmake problems

[Fergus Henderson]

Estimated hours taken: 0.5

compiler/modules.m:
	Fix a bug with the Mmake dependencies for `il' and `.rlo'
	files in cases of code involving nested modules where the
	source file name doesn't directly match the fully-qualified
	module name.

scripts/Mmake.rules:
	Fix a cut-and-paste error in the rule for creating `.il' files.

Workspace: /home/pgrad/fjh/ws/hg
Index: compiler/modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.139
diff -u -d -r1.139 modules.m
--- compiler/modules.m	2000/11/17 17:48:15	1.139
+++ compiler/modules.m	2000/12/07 06:33:33
@@ -1946,7 +1946,17 @@
 					"$(ALL_MGNUCFLAGS) $(CFLAGS_FOR_PIC) ",
 					"\\\n",
 				"\t\t-c ", CFileName, " -o $@\n",
-				"endif # RM_C != :\n"
+				"endif # RM_C != :\n",
+				ILFileName, " : ", SourceFileName, "\n",
+				"\trm -f ", ILFileName, "\n",
+				"\t$(MCG) $(ALL_GRADEFLAGS) $(ALL_MCGFLAGS) ",
+					"--il-only $< > ", ErrFileName,
+					" 2>&1\n",
+				RLOFileName, " : ", SourceFileName, "\n",
+				"\trm -f ", RLOFileName, "\n",
+				"\t$(MCG) $(ALL_GRADEFLAGS) $(ALL_MCGFLAGS) ",
+					"--aditi-only $< > ", ErrFileName,
+					" 2>&1\n"
 			])
 		;
 			[]
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.84
diff -u -d -r1.84 Mmake.rules
--- scripts/Mmake.rules	2000/11/17 07:34:16	1.84
+++ scripts/Mmake.rules	2000/12/07 06:28:31
@@ -180,7 +180,7 @@
 
 # .NET back-end
 $(ils_subdir)%.il : %.m
-	rm -f $(ils_subdir)$*.c
+	rm -f $(ils_subdir)$*.il
 	$(MCG) $(ALL_GRADEFLAGS) $(ALL_MCGFLAGS) --il-only $< > $*.err 2>&1
 
 # If we are removing the .c files, we need to tell Make that we're

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------