[m-rev.] diff: avoid duplicate target warnings from mmake

[Peter Ross]

Hi,


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


Avoid warning about duplicate targets in the generated .dep file for
platforms which don't support shared libraries.

compiler/modules.m:
	If shared libraries aren't supported on the current platform,
	then $(EXT_FOR_SHARED_LIB) will equal $A, so wrap the target to
	build the shared library with a test to make sure that
	$(EXT_FOR_SHARED_LIB) is not equal to $A.

Index: compiler/modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.310
diff -u -r1.310 modules.m
--- compiler/modules.m	16 Nov 2004 00:45:11 -0000	1.310
+++ compiler/modules.m	5 Dec 2004 17:26:36 -0000
@@ -4747,6 +4747,7 @@
 	]),
 
 	io__write_strings(DepStream, [
+		"ifneq ($(EXT_FOR_SHARED_LIB),$A)\n",
 		SharedLibFileName, " : $(", MakeVarName, ".cs_or_ss) ",
 			"$(", MakeVarName, ".pic_os) ",
 			All_MLPicObjsString, " ", All_MLLibsDepString, "\n",
@@ -4754,7 +4755,8 @@
 			"-- ", InstallNameOpt, " $(ALL_LD_LIBFLAGS) -o ", 
 			SharedLibFileName, " \\\n",
 		"\t\t$(", MakeVarName, ".pic_os) ", All_MLPicObjsString,
-			" $(ALL_MLLIBS)\n\n"
+			" $(ALL_MLLIBS)\n",
+		"endif\n\n"
 	]),
 
 	io__write_strings(DepStream, [


-- 
Software Engineer                                (Work)   +32 2 757 10 15
Mission Critical                                 (Mobile) +32 485 482 559
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------