diff: clpr Mmakefile changes

[Fergus Henderson]

Fix some problems which meant that the CLP(R) stuff wasn't being
tested or installed properly.

tools/test_mercury:
extras/clpr/Mmakefile:
	Fix a bug: when testing and installing the clpr stuff,
	pass down the GRADE, EXTRA_CFLAGS, EXTRA_MCFLAGS variables.

extras/clpr/Mmakefile:
extras/clpr/samples/Mmakefile:
	Delete the `--no-optimize-duplicate-calls' option; this
	is no longer necessary now that we have `impure'.
	Also don't set the grade explicitly, instead just use the
	(less cryptic) `GRADEFLAGS = --use-trail'.

cvs diff extras/clpr/Mmakefile extras/clpr/samples/Mmakefile tools/test_mercury
Index: extras/clpr/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/clpr/Mmakefile,v
retrieving revision 1.11
diff -u -r1.11 Mmakefile
--- 1.11	1998/01/03 11:27:52
+++ Mmakefile	1998/02/08 02:47:03
@@ -4,21 +4,20 @@
 
 -include $(MERCURY_DIR)/Mmake.common
 
-SUBDIR_MMAKE = mmake $(MMAKEFLAGS)
+SUBDIR_MMAKE = mmake $(MMAKEFLAGS) \
+		GRADE=$(GRADE) \
+		EXTRA_MCFLAGS=$(EXTRA_MCFLAGS) \
+		EXTRA_CFLAGS=$(EXTRA_CFLAGS)
 
 #-----------------------------------------------------------------------------#
 
 MC = mmc
 
-# Call me paranoid...
-# (This may be necessary for code using the `unsafe_*' preds in dump.m.)
-MCFLAGS = --no-optimize-duplicate-calls	
-
 # In case the user of the library wants intermodule optimization...
 MCFLAGS += --intermodule-optimization
 
 # We need to use a grade with trailing
-GRADE = asm_fast.gc.tr
+GRADEFLAGS = --use-trail
 
 # Enable C debugging
 MGNUCFLAGS = -g
Index: extras/clpr/samples/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/clpr/samples/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- 1.5	1997/10/07 03:42:31
+++ Mmakefile	1998/02/08 02:49:01
@@ -2,15 +2,11 @@
 
 MAIN_TARGET = all
 
-# Call me paranoid...
-# (This may be necessary for code using the `unsafe_*' preds in dump.m.)
-MCFLAGS = --no-optimize-duplicate-calls	
-
 # tests.m needs type & mode inference
 MCFLAGS += --infer-all
 
 # We need to use a grade with trailing
-GRADE = asm_fast.gc.tr
+GRADEFLAGS = --use-trail
 
 # Enable C debugging
 MGNUCFLAGS = -g
Index: tools/test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.64
diff -u -r1.64 test_mercury
--- 1.64	1998/01/05 00:36:37
+++ test_mercury	1998/02/08 02:45:22
@@ -283,18 +283,39 @@
 		echo "test clpr stuff for grade $grade" 1>&2
 		(cd mercury/extras/clpr &&
 			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake depend	$PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake 		$PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake check	$PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake install	$PARALLEL MMAKEFLAGS=$PARALLEL &&
+			 mmake depend	 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
+			 mmake 		 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
+			 mmake check	 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
+			 mmake install	 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
 			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL) ||
 				status=1
 		echo "test trailed_update stuff for grade $grade" 1>&2
 		(cd mercury/extras/trailed_update &&
 			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake depend	$PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake 		$PARALLEL MMAKEFLAGS=$PARALLEL &&
-			 mmake check	$PARALLEL MMAKEFLAGS=$PARALLEL &&
+			 mmake depend	 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
+			 mmake 		 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
+			 mmake check	 $PARALLEL MMAKEFLAGS=$PARALLEL \
+				GRADE=$grade \
+				EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+				EXTRA_CFLAGS"$TEST_CFLAGS" &&
 			 mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL) ||
 				status=1
 	fi

-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.