[m-rev.] diff: using `mmc --make' with mmake

[Simon Taylor]

On 02-May-2002, Ralph Becket <rafe at cs.mu.OZ.AU> wrote:
> Simon Taylor, Thursday,  2 May 2002:
> > 
> > Estimated hours taken: 2.5
> > Branches: main
> > 
> > Allow `mmc --make' to be used with Mmake.
> > 
> > scripts/mmake.in:
> > 	Add an option `--use-mmc-make', which tells mmake
> > 	to use `mmc --make' to build Mercury targets.
> > 
> > scripts/Mmake.vars.in:
> > 	Add a variable MC_MAKE_FILES, which should contain
> > 	files (e.g. generated header files) which should be
> > 	build with `mmc --make'.
> 
> Can I suggest MC_BUILD_FILES instead?

Estimated hours taken: 0.1
Branches: main

scripts/mmake.in:
scripts/Mmake.vars.in:
scripts/Mmake.rules:
	s/MC_MAKE_FILES/MC_BUILD_FILES/ as suggested by rafe.

Index: Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.119
diff -u -u -r1.119 Mmake.rules
--- Mmake.rules	1 May 2002 17:13:21 -0000	1.119
+++ Mmake.rules	2 May 2002 05:50:12 -0000
@@ -434,8 +434,8 @@
 ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 
 # Always attempt to rebuild these files, even if they exist.
-.PHONY: $(ALL_MC_MAKE_FILES) *.err
-$(ALL_MC_MAKE_FILES) %.err:
+.PHONY: $(ALL_MC_BUILD_FILES) *.err
+$(ALL_MC_BUILD_FILES) %.err:
 	$(MCM) $(ALL_GRADEFLAGS) $(ALL_MC_MAKE_FLAGS) $@
 
 # If we don't know how to make the file, try using `mmc --make'.
Index: Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.68
diff -u -u -r1.68 Mmake.vars.in
--- Mmake.vars.in	1 May 2002 17:13:21 -0000	1.68
+++ Mmake.vars.in	2 May 2002 05:50:40 -0000
@@ -62,16 +62,16 @@
 # Files which should be built using `mmc --make' rather than `make'
 # when `--use-mmc-make' is passed on the mmake command line.
 # XXX Once `mmc --make' allows library installation we should add
-# %.depend and %.install to the list below
+# %.install to the list below
 #
-ALL_MC_MAKE_FILES = $(MERCURY_MAIN_MODULES:%=%$(EXT_FOR_EXE)) \
+ALL_MC_BUILD_FILES = $(MERCURY_MAIN_MODULES:%=%$(EXT_FOR_EXE)) \
 			$(MERCURY_MAIN_MODULES:%=lib%.$A) \
 			$(MERCURY_MAIN_MODULES:%=lib%.so) \
 			$(MERCURY_MAIN_MODULES:%=%.clean) \
 			$(MERCURY_MAIN_MODULES:%=%.realclean) \
 			$(MERCURY_MAIN_MODULES:%=%.depend) \
-			$(MC_MAKE_FILES)
-MC_MAKE_FILES =
+			$(MC_BUILD_FILES)
+MC_BUILD_FILES =
 
 #-----------------------------------------------------------------------------#
 #-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------