[m-rev.] trivial diff: fix samples/c_interface Mmakefiles

Simon Taylor stayl at cs.mu.OZ.AU
Sun Dec 16 16:23:55 AEDT 2001


Estimated hours taken: 0.1
Branches: main, release

samples/c_interface/cpluscplus_calls_mercury/Mmakefile:
samples/c_interface/mercury_calls_c/Mmakefile:
samples/c_interface/mercury_calls_cplusplus/Mmakefile:
	Use MLOBJS, not MLLIBS, to hold the names of the
	non-Mercury object files.

Index: cplusplus_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/cplusplus_calls_mercury/Mmakefile,v
retrieving revision 1.5
diff -u -u -r1.5 Mmakefile
--- cplusplus_calls_mercury/Mmakefile	18 May 2001 14:23:55 -0000	1.5
+++ cplusplus_calls_mercury/Mmakefile	16 Dec 2001 04:55:37 -0000
@@ -31,7 +31,7 @@
 MLFLAGS=-g
 
 # tell the Mercury linker to link in cpp_main.o and mercury_lib.o
-MLLIBS=cpp_main.o mercury_lib.o
+MLOBJS=cpp_main.o mercury_lib.o
 
 #-----------------------------------------------------------------------------#
 
Index: mercury_calls_c/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/mercury_calls_c/Mmakefile,v
retrieving revision 1.3
diff -u -u -r1.3 Mmakefile
--- mercury_calls_c/Mmakefile	16 Sep 1999 04:46:19 -0000	1.3
+++ mercury_calls_c/Mmakefile	16 Dec 2001 04:55:53 -0000
@@ -8,7 +8,7 @@
 all: mercury_main
 
 # tell the Mercury linker to link in c_main.o
-MLLIBS=c_main.o
+MLOBJS=c_main.o
 
 # tell mmake that it needs to make c_main.o before it can make mercury_main
 mercury_main: c_main.o
Index: mercury_calls_cplusplus/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/mercury_calls_cplusplus/Mmakefile,v
retrieving revision 1.4
diff -u -u -r1.4 Mmakefile
--- mercury_calls_cplusplus/Mmakefile	5 Feb 2001 09:35:49 -0000	1.4
+++ mercury_calls_cplusplus/Mmakefile	16 Dec 2001 04:56:12 -0000
@@ -29,7 +29,7 @@
 #-----------------------------------------------------------------------------#
 
 # tell the Mercury linker to link in cpp_main.o
-MLLIBS=cpp_main.o
+MLOBJS=cpp_main.o
 
 # tell mmake that it needs to make cpp_main.o before it can make mercury_main
 mercury_main: cpp_main.o
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list