[m-rev.] diff: fix extras/trailed_update link problems

[Simon Taylor]

Estimated hours taken: 0.5
Branches: main, release

extras/trailed_update/samples/Mmakefile:
extras/trailed_update/tests/Mmakefile:
	Fix problems linking in debug grades on Solaris
	(-ldl is not available with static linking).

Index: samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/samples/Mmakefile,v
retrieving revision 1.16
diff -u -u -r1.16 Mmakefile
--- samples/Mmakefile	2002/11/10 23:59:43	1.16
+++ samples/Mmakefile	2002/11/22 10:53:09
@@ -18,16 +18,14 @@
 # Link in the trailed_update library from ..
 MCFLAGS += -I..
 CFLAGS += -I..
-MLFLAGS += -R`pwd`/.. -L..
-MLLIBS = -ltrailed_update
+MLFLAGS += --mercury-libs static
+MLOBJS = ../libtrailed_update.a
 VPATH = ..:$(MMAKE_VPATH)
 C2INITARGS = ../trailed_update.init
 
 # We need the following to use shared libraries on Linux
 #CFLAGS += -DPIC_REG
 #MLFLAGS += --shared
-
-MLFLAGS += --static
 
 DIFF_OPTS=-c
 
Index: tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/tests/Mmakefile,v
retrieving revision 1.9
diff -u -u -r1.9 Mmakefile
--- tests/Mmakefile	2002/11/13 05:49:37	1.9
+++ tests/Mmakefile	2002/11/22 10:53:09
@@ -15,17 +15,15 @@
 MLFLAGS=-g
 
 # Link in the trailed_update library from ..
-MCFLAGS += -I.. $(EXTRA_MCFLAGS)
-MLFLAGS += -R`pwd`/.. -L.. $(EXTRA_MLFLAGS)
-MLLIBS = -ltrailed_update $(EXTRA_MLLIBS)
+MCFLAGS += -I..
+MLFLAGS += --mercury-libs static
+MLOBJS = ../libtrailed_update.a
 VPATH = ..:$(MMAKE_VPATH)
 C2INITARGS = ../trailed_update.init
 
 # We need the following to use shared libraries on Linux
 #MGNUCFLAGS += -DPIC_REG
 #MLFLAGS += --shared
-
-MLFLAGS += --static
 
 #-----------------------------------------------------------------------------#
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------