mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-08 18:34:00 +00:00
Some Mmakefile tweaks for grade java.
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.
This commit is contained in:
@@ -19,6 +19,15 @@ include $(MERCURY_DIR)/Mmake.common
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
.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).so: submake
|
||||
|
||||
lib$(GC_GRADE).dll: submake
|
||||
|
||||
endif
|
||||
|
||||
MMAKEFLAGS=
|
||||
|
||||
# We need to export MAKEFLAGS="" to avoid passing the `-r' (suppress
|
||||
@@ -128,9 +139,9 @@ install_dirs:
|
||||
-[ -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:
|
||||
|
||||
@@ -177,9 +177,9 @@ install_dirs:
|
||||
[ -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:
|
||||
|
||||
@@ -219,7 +219,7 @@ mercury_compile_init.$O: $(MC_PROG)_init.$O
|
||||
# (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
|
||||
|
||||
@@ -52,7 +52,7 @@ all: mdprof_cgi mdprof_test
|
||||
# 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
|
||||
|
||||
@@ -35,7 +35,7 @@ all : mercury_profile
|
||||
# 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#-----------------------------------------------------------------------------#
|
||||
# Copyright (C) 1998-2002 The University of Melbourne.
|
||||
# Copyright (C) 1998-2003 The University of Melbourne.
|
||||
# This file may only be copied under the terms of the GNU General
|
||||
# Public License - see the file COPYING in the Mercury distribution.
|
||||
#-----------------------------------------------------------------------------#
|
||||
@@ -125,8 +125,8 @@ $(OBJS) $(PIC_OBJS): $(HDRS) $(RUNTIME_HDRS)
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
.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 @@ tags: $(CFILES) $(HDRS)
|
||||
.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:
|
||||
|
||||
Reference in New Issue
Block a user