Start actively using --generate-dependencies-ints.

configure.ac:
    Require the installed compiler to support both the option,
    and the Mmake rules that invoke it.

compiler/Mmakefile:
library/Mmakefile:
mdbcomp/Mmakefile:
mfilterjavac/Mmakefile:
ssdb/Mmakefile:
    Get the mmake depend to depend on prog.depend_ints, not prog.depend,

    Give the prog.depend_ints targets themselves the same prerequisites
    as the existing prog.depend targets.

    In mfilterjavac/Mmakefile, fix what looks like an old problem
    by making the depend target a prerequisite of the check and ints targets.
This commit is contained in:
Zoltan Somogyi
2023-10-20 20:11:45 +11:00
parent db9d91713a
commit f9c185e5e8
6 changed files with 24 additions and 18 deletions

View File

@@ -31,7 +31,8 @@ ALL_MODULES = mfilterjavac
MAIN_TARGET=all
MERCURY_MAIN_MODULES=$(ALL_MODULES)
DEPEND=$(patsubst %,%.depend,$(ALL_MODULES))
DEPENDS=$(patsubst %,%.depends,$(ALL_MODULES))
DEPEND_INTS=$(patsubst %,%.depend_ints,$(ALL_MODULES))
PDBS=$(patsubst %,%.pdb,$(ALL_MODULES))
VPATH = $(LIBRARY_DIR) $(SSDB_DIR)
@@ -61,9 +62,10 @@ endif
nothing:
.PHONY: depend
depend: $(DEPEND)
depend: $(DEPEND_INTS)
$(DEPEND): MFILTERJAVAC_FLAGS
$(DEPENDS): MFILTERJAVAC_FLAGS
$(DEPEND_INTS): MFILTERJAVAC_FLAGS
.PHONY: all
all: $(ALL_MODULES) $(TAGS_FILE_EXISTS)
@@ -84,10 +86,10 @@ $(cs_subdir)mfilterjavac.c: $(UTIL_DIR)/mkinit$(EXT_FOR_EXE)
#-----------------------------------------------------------------------------#
.PHONY: check
check: DEPEND=$(patsubst %,%.check,$(ALL_MODULES))
check: depend $(patsubst %,%.check,$(ALL_MODULES))
.PHONY: ints
ints: DEPEND=$(patsubst %,%.ints,$(ALL_MODULES))
ints: depend $(patsubst %,%.ints,$(ALL_MODULES))
#-----------------------------------------------------------------------------#