Martin L Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80130?usp=email )
Change subject: Makefile: Finish switch to Makefile.mak from .inc ......................................................................
Makefile: Finish switch to Makefile.mak from .inc
Remove include of Makefile.inc files - they're gone.
Signed-off-by: Martin Roth gaumless@gmail.com Change-Id: If0dbc7ed204047b5575b303f57f6cf607f688ad9 --- M Makefile 1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/80130/1
diff --git a/Makefile b/Makefile index fad7f44..960358c 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ # 2. When no $(obj)/util/kconfig/Makefile.real exists and we're building tools # 3. when make config (in any flavour) is run # 4. when make distclean is run -# Don't waste time on reading all Makefile.incs in these cases +# Don't waste time on reading all Makefiles in these cases ifeq ($(strip $(HAVE_DOTCONFIG)),) NOCOMPILE:=1 endif @@ -157,6 +157,7 @@ include $(TOPLEVEL)/payloads/Makefile.mak include $(TOPLEVEL)/util/testing/Makefile.mak -include $(TOPLEVEL)/site-local/Makefile.mak +# Keep the site-local/Makefile.inc for backwards compatibility -include $(TOPLEVEL)/site-local/Makefile.inc include $(TOPLEVEL)/tests/Makefile.mak printall real-all: @@ -277,7 +278,7 @@ $(subst .$(1),,\ $(filter %.ads %.adb,$(2)))))))))
-# Clean -y variables, include Makefile.mak & Makefile.inc +# Clean -y variables, include Makefile.mak # Add paths to files in X-y to X-srcs # Add subdirs-y to subdirs includemakefiles= \ @@ -296,14 +297,11 @@
# For each path in $(subdirs) call includemakefiles # Repeat until subdirs is empty -# TODO: Remove Makefile.inc support evaluate_subdirs= \ $(eval cursubdirs:=$(subdirs)) \ $(eval subdirs:=) \ $(foreach dir,$(cursubdirs), \ $(eval $(call includemakefiles,$(dir)/Makefile.mak))) \ - $(foreach dir,$(cursubdirs), \ - $(eval $(call includemakefiles,$(dir)/Makefile.inc))) \ $(if $(subdirs),$(eval $(call evaluate_subdirs)))
# collect all object files eligible for building