[m-rev.] diff: minor fixes for build system.

[Tyson Dowd]

Hi,

===================================================================

Estimated hours taken: 0.5
Branches: main

runtime/Mmakefile:
	Add a rule to remove the DOTNET_DLLS for clean_local.

scripts/Mmake.rules:
	Put the local include directory before the installed one when
	compiling with MC++.
	Also fix the rule for .cpp.dll to be the same as the subdir
	rule.

Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.75
diff -u -r1.75 Mmakefile
--- runtime/Mmakefile	2001/07/18 08:13:44	1.75
+++ runtime/Mmakefile	2001/07/26 10:33:06
@@ -238,7 +238,10 @@
 
 # We need to build the following DLLs for the .NET runtime
 DOTNET_DLLS=mercury_il.dll mercury_mcpp.dll
- 
+
+clean_local:
+	rm -f $(DOTNET_DLLS)
+	
 runtime: $(DOTNET_DLLS)
 
 mercury_mcpp.dll: mercury_il.dll

Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.103
diff -u -r1.103 Mmake.rules
--- scripts/Mmake.rules	2001/07/24 14:19:23	1.103
+++ scripts/Mmake.rules	2001/07/26 10:33:07
@@ -247,8 +247,9 @@
 # IL to generate a DLL if we are in a non-IL grade.
 ifeq ($(findstring il,$(GRADE)),il)        
 $(os_subdir)%.dll : %.cpp
-	$(MS_CL) -CLR$(MS_CL_NOASM) -I`cygpath -w $(MERC_C_INCL_DIR)` \
-		-AI`cygpath -w $(MERC_DLL_DIR)` $(ALL_MS_CLFLAGS) $< \
+	$(MS_CL) -CLR$(MS_CL_NOASM) $(ALL_MS_CLFLAGS) \
+		-I`cygpath -w $(MERC_C_INCL_DIR)` \
+		-AI`cygpath -w $(MERC_DLL_DIR)` $< \
 		-link -noentry mscoree.lib -dll $(MS_CL_LIBS) -out:$@
 	rm -f $*.obj
 
@@ -355,7 +356,9 @@
 	$(MS_ILASM) $(ALL_MS_ILASMFLAGS) /quiet /OUT=$@ $< 
 
 .cpp.dll:
-	$(MS_CL) -CLR($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< \
+	$(MS_CL) -CLR($MS_CL_NOASM) $(ALL_MS_CLFLAGS) \
+		-I`cygpath -w $(MERC_C_INCL_DIR)` \
+		-AI`cygpath -w $(MERC_DLL_DIR)` $< \
 		-link -noentry mscoree.lib -dll $(MS_CL_LIBS) -out:$@
 	rm -f $*.obj
 

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------