[m-rev.] trivial diff: fixes for version-0_10_y branch

[Fergus Henderson]

Estimated hours taken: 0.1
Branches: release

Copy some bug fixes from the main branch to the release branch.

extras/clpr/Mmakefile:
        Fix a bug that broke the nightly tests with EXTRA_MGNUCFLAGS=--c-debug:
        pass -Wno-strict-prototypes in CFLAGS rather than MGNUCFLAGS.

extras/clpr/samples/Mmakefile:
        Use CFLAGS rather than MGNUCFLAGS for C compiler options.
        Delete some long obsolete code to support EXTRA_* variables,
        since that feature is built in to Mmake now.

Workspace: /mnt/venus/home/venus/fjh/ws-venus/mercury
Index: extras/clpr/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/clpr/Mmakefile,v
retrieving revision 1.21
diff -u -d -r1.21 Mmakefile
--- extras/clpr/Mmakefile	2001/02/12 19:16:46	1.21
+++ extras/clpr/Mmakefile	2001/07/04 06:19:17
@@ -31,7 +31,7 @@
 
 # The CLP(R) header clpr/lib.h is missing some prototypes,
 # so we need to disable some warnings.
-MGNUCFLAGS += -Wno-strict-prototypes
+CFLAGS += -Wno-strict-prototypes
 
 # We need to make sure that the CLP(R) library gets initialized
 C2INITARGS = cfloat.c
Index: extras/clpr/samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/clpr/samples/Mmakefile,v
retrieving revision 1.12.2.1
diff -u -d -r1.12.2.1 Mmakefile
--- extras/clpr/samples/Mmakefile	2001/06/25 15:08:27	1.12.2.1
+++ extras/clpr/samples/Mmakefile	2001/07/04 06:20:38
@@ -9,12 +9,12 @@
 GRADEFLAGS += --use-trail
 
 # Enable C debugging
-MGNUCFLAGS = -g
+CFLAGS = -g
 MLFLAGS = -g
 RM_C = :
 
 # Link in the CLP(R) library and the cfloat_lib library
-MGNUCFLAGS += -I..
+CFLAGS += -I..
 MCFLAGS += -I..
 MLFLAGS += -R`pwd`/.. -R`pwd`/../clpr -L.. -L../clpr
 MLLIBS = -lcfloat_lib -lclpr
@@ -22,23 +22,12 @@
 C2INITARGS = ../cfloat_lib.init ../$(cs_subdir)cfloat.c
 
 # The following is needed so that we can use shared libraries on Linux
-MGNUCFLAGS += -DPIC_REG
+CFLAGS += -DPIC_REG
 MLFLAGS += --shared
 
 # The following would be needed to use static libraries on Linux
 # (comment out the lines above first)
 #MLFLAGS += --static
-
-#-----------------------------------------------------------------------------#
-
-# The following lets you add extra flags on the command line, e.g.
-# 	mmake EXTRA_CFLAGS=-O3
-
-MGNUCFLAGS += $(EXTRA_CFLAGS)
-MCFLAGS += $(EXTRA_MCFLAGS)
-MLFLAGS += $(EXTRA_MLFLAGS)
-MLLIBS += $(EXTRA_MLLIBS)
-C2INITFLAGS += $(EXTRA_C2INITFLAGS)
 
 #-----------------------------------------------------------------------------#
 

-- 
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
--------------------------------------------------------------------------