[m-rev.] diff: Mmakefile tweaks for grade java

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

Some Mmakefile tweaks for grade java.

boehm_gc/Mmakefile:
browser/Mmakefile:
trace/Mmakefile:
	Don't try to build the boehm_gc, browser, or trace directories
	in grade java.

compiler/Mmakefile:
profiler/Mmakefile:
deep_profiler/Mmakefile:
	Avoid dependencies on *.$A files in grade java.

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: boehm_gc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Mmakefile,v
retrieving revision 1.25
diff -u -d -r1.25 Mmakefile
--- boehm_gc/Mmakefile	7 May 2003 02:21:54 -0000	1.25
+++ boehm_gc/Mmakefile	9 Dec 2003 05:41:37 -0000
@@ -19,6 +19,15 @@
 #-----------------------------------------------------------------------------#
 
 .PHONY: lib$(GC_GRADE)
+
+ifneq ("$(filter il% java%,$(GRADE))","")        
+
+# no need to build a garbage collector for the .NET or Java backends.
+
+lib$(GC_GRADE):
+
+else
+
 lib$(GC_GRADE): submake
 
 lib$(GC_GRADE).$A: submake
@@ -27,6 +36,8 @@
 
 lib$(GC_GRADE).dll: submake
 
+endif
+
 MMAKEFLAGS=
 
 #	We need to export MAKEFLAGS="" to avoid passing the `-r' (suppress
@@ -128,9 +139,9 @@
 	-[ -d $(INSTALL_MERC_GC_LIB_DIR) ] || \
 		mkdir -p $(INSTALL_MERC_GC_LIB_DIR)
 
-ifeq ($(findstring il,$(GRADE)),il)        
+ifneq ("$(filter il% java%,$(GRADE))","")        
 
-# no need to build a garbage collector for the .NET backend.
+# no need to build a garbage collector for the .NET or Java backends.
 
 .PHONY: install_headers
 install_headers:
Index: browser/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/Mmakefile,v
retrieving revision 1.32
diff -u -d -r1.32 Mmakefile
--- browser/Mmakefile	5 Nov 2003 08:05:55 -0000	1.32
+++ browser/Mmakefile	9 Dec 2003 14:34:27 -0000
@@ -177,9 +177,9 @@
 	[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
 	[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
 
-ifeq ($(findstring il,$(GRADE)),il)                                     
+ifneq ("$(filter il% java%,$(GRADE))","")
 
-# there is no browser in the .NET backend
+# there is no browser in the .NET and Java backends
 
 .PHONY: install_init
 install_init: 
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.76
diff -u -d -r1.76 Mmakefile
--- compiler/Mmakefile	19 May 2003 09:22:39 -0000	1.76
+++ compiler/Mmakefile	9 Dec 2003 14:32:30 -0000
@@ -219,7 +219,7 @@
 # (We used to just build mlds_to_gcc.err, but that caused bootstrapping problems
 # with the source distribution; using the .c files is little more robust.)
 
-ifneq ($(findstring il,$(GRADE)),il)        
+ifeq ("$(filter il% java%,$(GRADE))","")
 
 .PHONY: depend
 depend:		mlds_to_gcc.depend
Index: deep_profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/deep_profiler/Mmakefile,v
retrieving revision 1.9
diff -u -d -r1.9 Mmakefile
--- deep_profiler/Mmakefile	15 Feb 2003 23:59:41 -0000	1.9
+++ deep_profiler/Mmakefile	9 Dec 2003 14:49:12 -0000
@@ -52,7 +52,7 @@
 # Add some additional dependencies, so that Mmake knows to remake the
 # profiler if one of the libraries changes.
 
-ifneq ($(findstring il,$(GRADE)),il)        
+ifeq ("$(filter il% java%,$(GRADE))","")
 mdprof_cgi:	$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mdprof_cgi:	$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 mdprof_test:	$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
Index: profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/profiler/Mmakefile,v
retrieving revision 1.24
diff -u -d -r1.24 Mmakefile
--- profiler/Mmakefile	19 Feb 2003 06:31:22 -0000	1.24
+++ profiler/Mmakefile	9 Dec 2003 14:50:41 -0000
@@ -35,7 +35,7 @@
 # Add some additional dependencies, so that Mmake knows to remake the
 # profiler if one of the libraries changes.
 
-ifneq ($(findstring il,$(GRADE)),il)        
+ifeq ("$(filter il% java%,$(GRADE))","")        
 mercury_profile: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mercury_profile: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 # XXX Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.37
diff -u -d -u -r1.37 Mmakefile
--- trace/Mmakefile	13 Feb 2003 08:28:43 -0000	1.37
+++ trace/Mmakefile	9 Dec 2003 14:56:56 -0000
@@ -125,8 +125,8 @@
 #-----------------------------------------------------------------------------#
 
 .PHONY: trace
-ifeq ($(findstring il,$(GRADE)),il)        
-# there is no tracing in the .NET backend
+ifneq ("$(filter il% java%,$(GRADE))","")        
+# there is no tracing in the .NET and Java backends
 trace:
 else
 trace: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
@@ -162,9 +162,9 @@
 .PHONY: install
 install: install_headers install_lib
 
-ifeq ($(findstring il,$(GRADE)),il)        
+ifneq ("$(filter il% java%,$(GRADE))","")        
 
-# there is no tracing in the .NET backend
+# there is no tracing in the .NET and Java backends
 
 .PHONY: install_headers
 install_headers:

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