Pass the makefile name along in recursive invocations

This commit is contained in:
Andrei Alexandrescu 2015-05-20 20:03:50 -07:00
parent e37dcde166
commit e01c8d24d3

View file

@ -388,7 +388,7 @@ unittest/%.run : $(ROOT)/unittest/test_runner
# Target for quickly unittesting all modules and packages within a package,
# transitively. For example: "make std/algorithm.test"
%.test : $(LIB)
$(MAKE) $(addsuffix .test,$(patsubst %.d,%,$(wildcard $*/*)))
$(MAKE) -f $(MAKEFILE) $(addsuffix .test,$(patsubst %.d,%,$(wildcard $*/*)))
################################################################################
# More stuff
@ -479,7 +479,7 @@ rsync-prerelease : html
html_consolidated :
$(DDOC) -Df$(DOCSRC)/std_consolidated_header.html $(DOCSRC)/std_consolidated_header.dd
$(DDOC) -Df$(DOCSRC)/std_consolidated_footer.html $(DOCSRC)/std_consolidated_footer.dd
$(MAKE) DOC_OUTPUT_DIR=$(BIGDOC_OUTPUT_DIR) STDDOC=$(BIGSTDDOC) html -j 8
$(MAKE) -f $(MAKEFILE) DOC_OUTPUT_DIR=$(BIGDOC_OUTPUT_DIR) STDDOC=$(BIGSTDDOC) html -j 8
cat $(DOCSRC)/std_consolidated_header.html $(BIGHTMLS) \
$(DOCSRC)/std_consolidated_footer.html > $(DOC_OUTPUT_DIR)/std_consolidated.html