[m-rev.] work around mer_browser/mdbcomp dependency problem

[Fergus Henderson]

On 09-Dec-2003, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> browser/Mmakefile:
> 	Work around a problem where the mdbcomp library was being
> 	included in the mer_browser library, rather than just being
> 	referenced from it.

Sorry, that was not quite complete.  The following is also needed.

Estimated hours taken: 0.25
Branches: main

browser/Mercury.options:
trace/Mmakefile:
	Ensure that libmer_browser.so and libmer_trace.so link with
	the mer_mdbcomp library.  This is needed after my recent fix
	to ensure that the mer_mdbcomp library is referenced from the
	mer_browser library, rather than being included in it.

compiler/Mmakefile:
	Add a missing dependency on libmer_mdbcomp.$A.

Workspace: /home/ceres/fjh/mercury
Index: browser/Mercury.options
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/Mercury.options,v
retrieving revision 1.2
diff -u -d -r1.2 Mercury.options
--- browser/Mercury.options	27 Oct 2003 06:00:31 -0000	1.2
+++ browser/Mercury.options	10 Dec 2003 06:52:20 -0000
@@ -8,3 +8,5 @@
 
 MCFLAGS-mer_browser = --no-warn-nothing-exported
 MCFLAGS-mer_mdbcomp = --no-warn-nothing-exported
+
+EXTRA_LIBRARIES-libmer_browser.so = mer_mdbcomp
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.77
diff -u -d -r1.77 Mmakefile
--- compiler/Mmakefile	9 Dec 2003 14:57:57 -0000	1.77
+++ compiler/Mmakefile	10 Dec 2003 07:00:44 -0000
@@ -249,6 +249,7 @@
 $(MC_PROG): ../main.$O
 $(MC_PROG): $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 $(MC_PROG): $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
+$(MC_PROG): $(BROWSER_DIR)/lib$(MDBCOMP_LIB_NAME).$A
 $(MC_PROG): $(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A
 $(MC_PROG): $(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A
 $(MC_PROG): $(ANALYSIS_DIR)/lib$(ANALYSIS_LIB_NAME).$A
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.38
diff -u -d -r1.38 Mmakefile
--- trace/Mmakefile	9 Dec 2003 14:57:57 -0000	1.38
+++ trace/Mmakefile	10 Dec 2003 06:58:20 -0000
@@ -56,7 +56,8 @@
 
 LDFLAGS		= -L$(BROWSER_DIR) -L$(LIBRARY_DIR) \
 			-L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR) -L/usr/local/lib
-LDLIBS		= -l$(BROWSER_LIB_NAME) $(MLLIBS) $(SOCKET_LIBRARY) \
+LDLIBS		= -l$(BROWSER_LIB_NAME) -l$(MDBCOMP_LIB_NAME) \
+			$(MLLIBS) $(SOCKET_LIBRARY) \
 			$(NSL_LIBRARY) $(DL_LIBRARY) $(READLINE_LIBRARIES)
 THREADLIBS	= \
 		` case "$(GRADE)" in					\

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------