summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-01-18 06:48:33 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-01-18 06:48:33 +0000
commitfaf0150036689985ecea64e78f2637093857cd7b (patch)
treec73207e736ba2d380094d9b6c51e921578d2d26e /Makefile
parentf5722759b8fd2ae65042fe6f87908e3569dbfdf0 (diff)
Simplify subdirectory makefiles, and be more robust by checking that they define the appropriate variables.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@93714 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7941f106f..cb964ce26 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ help:
help-hidden: help
@echo "Debugging variables:"
- @echo " DEBUGMAKE=1: enable some Makefile logging [default=0]"
+ @echo " DEBUGMAKE=1: enable some Makefile logging [default=]"
+ @echo " =2: enable more Makefile logging"
@echo
@echo "Debugging targets:"
@echo " make-print-FOO: print information on the variable 'FOO'"
@@ -201,7 +202,8 @@ endef
###
# Include child makefile fragments
-$(foreach subdir,$(SubDirs),$(eval include $(subdir)/Makefile.mk))
+Dir := .
+include make/subdir.mk
###
# Determine the actual inputs for an optimized library.
@@ -223,3 +225,8 @@ endef
$(foreach config,$(Configs), \
$(foreach arch,$(Archs), \
$(eval $(call Final_CNA_template,$(config),$(arch)))))
+
+ifneq ($(DEBUGMAKE),)
+ $(info MAKE: Done processing Makefile)
+ $(info )
+endif