diff: bug fix for clpr samples.

[Tyson Dowd]

On 02-Mar-1998, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> On 02-Mar-1998, Tyson Dowd <trd at cs.mu.OZ.AU> wrote:
> > extras/clpr/samples/Mmakefile:
> > 	Use MLFLAGS += --shared, rather than redefining ML, and
> > 	rather than using --mercury-libs shared. 
> ...
> >  # The following is needed so that we can use shared libraries on Linux
> >  MGNUCFLAGS += -DPIC_REG
> > -ML = ml --mercury-libs shared
> > +MLFLAGS += --shared
> >  
> >  # The following would be needed to use static libraries on Linux
> >  # MLLIBS = ../libcfloat_lib.a -lclpr
>    # ML = ml --mercury-libs static
> 
> Your change looks fine, as far as it goes, but I don't think it goes
> far enough.  You should delete or fix the comments quoted immediately
> above about using static libraries on Linux.  You should also apply a
> similar fix to extras/trailed_update/samples/Mmakefile.

Oh, sorry, didn't even look at that below (serves me right for mailing
off on Monday a diff I prepared on Friday).

How's this?

----

Estimated hours taken: 1.0

Fix bugs uncovered/introduced by recent changes to ml.

extras/clpr/samples/Mmakefile:
extras/trailed_update/samples/Mmakefile:
	Use MLFLAGS += --shared, rather than redefining ML, and
	rather than using --mercury-libs shared. 
	Similar changes for doing static linking.


Index: extras/clpr/samples/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/clpr/samples/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- Mmakefile	1998/02/11 09:10:09	1.7
+++ Mmakefile	1998/03/02 06:32:37
@@ -23,11 +23,12 @@
 
 # The following is needed so that we can use shared libraries on Linux
 MGNUCFLAGS += -DPIC_REG
-ML = ml --mercury-libs shared
+MLFLAGS += --shared
 
 # The following would be needed to use static libraries on Linux
-# MLLIBS = ../libcfloat_lib.a -lclpr
-# ML = ml --mercury-libs static
+# (comment out the lines above first)
+#MLLIBS = ../libcfloat_lib.a -lclpr
+#MLFLAGS += --static
 
 #-----------------------------------------------------------------------------#
 
Index: extras/trailed_update/samples/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/extras/trailed_update/samples/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- Mmakefile	1998/02/18 10:31:54	1.5
+++ Mmakefile	1998/03/02 06:38:40
@@ -24,11 +24,12 @@
 %_init.c: $(C2INITFLAGS)
 
 # We need the following to use shared libraries on Linux
-# MGNUCFLAGS += -DPIC_REG
-# ML = ml --mercury-libs shared
+MGNUCFLAGS += -DPIC_REG
+MLFLAGS += --shared
 
-ML = ml --mercury-libs static
-MLLIBS = ../libtrailed_update.a
+
+#MLFLAGS += --static
+#MLLIBS = ../libtrailed_update.a
 
-- 
       Tyson Dowd           # There isn't any reason why Linux can't be
                            # implemented as an enterprise computing solution.
     trd at cs.mu.oz.au        # Find out what you've been missing while you've
http://www.cs.mu.oz.au/~trd # been rebooting Windows NT. -- InfoWorld, 1998.