cvs diff: EXTRA_* flags

[Tyson Richard DOWD]

Okay, here we go again. Fergus, is this what you intended?

===================================================================

Estimated hours taken: 1

Use EXTRA_* environment variables for setting flags.

doc/user_guide.texi:
	Document that EXTRA_* variables can be used for setting flags
	when mmake is being used.

scripts/Mmake.vars.in:
	Set *FLAGS variables according to EXTRA_*FLAGS.

Index: doc/user_guide.texi
===================================================================
RCS file: /home/staff/zs/imp/mercury/doc/user_guide.texi,v
retrieving revision 1.82
diff -u -r1.82 user_guide.texi
--- user_guide.texi	1997/02/01 08:38:31	1.82
+++ user_guide.texi	1997/03/17 01:06:21
@@ -1844,6 +1844,41 @@
 There should be little need to use these, because the default
 values will generally work fine.
 
+ at section Mmake variables
+
+The @samp{mmake} tool allows environment options to be set so
+that extra flags can be passed to the tools that it invokes. 
+These variables are:
+
+ at table @code
+
+ at item EXTRA_MCFLAGS
+Flags to pass to @samp{mc}.
+
+ at sp 1
+ at item EXTRA_MGNUCFLAGS
+Flags to pass to @samp{mgnuc}.
+
+ at sp 1
+ at item EXTRA_CFLAGS
+Flags to pass to @samp{mgnuc} and to any other invocation of the C
+compiler.
+
+ at sp 1
+ at item EXTRA_MLFLAGS
+Flags to pass to @samp{ml}.
+
+ at end table
+
+Other EXTRA_* flags exist, which set MNCFLAGS, MNLFLAGS, MNPFLAGS,
+MSCFLAGS, MSLFLAGS and MSPFLAGS respectively, however it is not expected 
+that they will be often needed. 
+
+ at section Other variables
+
+The following variables can be used without @samp{mmake} - the scripts such
+as @samp{mc}, @samp{ml} and @samp{mgnuc} directly interpret these variables.
+
 @table @code
 @item MERCURY_DEFAULT_GRADE
 The default grade to use if no @samp{--grade} option is specified.
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.5
diff -u -r1.5 Mmake.vars.in
--- Mmake.vars.in	1996/09/11 08:58:16	1.5
+++ Mmake.vars.in	1997/03/17 00:34:55
@@ -29,7 +29,7 @@
 MCI		= $(MC) --make-interface
 MCSI		= $(MC) --make-short-interface
 MCOI		= $(MC) --make-optimization-interface
-MCFLAGS		=
+MCFLAGS		= $(EXTRA_MCFLAGS)
 MCIFLAGS	= $(MCFLAGS)
 MCSIFLAGS	= $(MCFLAGS)
 MCOIFLAGS	= $(MCFLAGS)
@@ -42,27 +42,27 @@
 # the options which should be passed to them.
 #
 MOD2C		= mod2c
-MOD2CFLAGS	= 
+MOD2CFLAGS	= $(EXTRA_MOD2CFLAGS)
 MOD2H		= mod2h
-MOD2HFLAGS	= 
+MOD2HFLAGS	= $(EXTRA_MOD2HFLAGS)
 C2INIT		= c2init
-C2INITFLAGS	=
+C2INITFLAGS	= $(EXTRA_C2INITFLAGS)
 MGNUC		= mgnuc
-MGNUCFLAGS	=
+MGNUCFLAGS	= $(EXTRA_MGNUCFLAGS) $(EXTRA_CFLAGS) 
 ML		= ml
-MLFLAGS		=
+MLFLAGS		= $(EXTRA_MLFLAGS)
 MNC		= mnc
-MNCFLAGS	=
+MNCFLAGS	= $(EXTRA_MNCFLAGS)
 MNL		= mnl
-MNLFLAGS	=
+MNLFLAGS	= $(EXTRA_MNLFLAGS)
 MNP		= mnp
-MNPFLAGS	=
+MNPFLAGS	= $(EXTRA_MNPFLAGS)
 MSC		= msc
-MSCFLAGS	=
+MSCFLAGS	= $(EXTRA_MSCFLAGS)
 MSL		= msl
-MSLFLAGS	=
+MSLFLAGS	= $(EXTRA_MSLFLAGS)
 MSP		= msp
-MSPFLAGS	=
+MSPFLAGS	= $(EXTRA_MSPFLAGS)
 
 # $(CFLAGS_FOR_PIC) is passed to the C compiler when creating `.pic_o' files
 # (We use `.pic_o' as the extension for `.o' files that must have


-- 
       Tyson Dowd           # "Well, let's just say, 'if your VCR is
                            #  still blinking 12:00, you don't
     trd at cs.mu.oz.au        #  want Linux'". 
http://www.cs.mu.oz.au/~trd #  --Bruce Perens, Debian's Fearless Leader