This commit moves include/generated/{generic-asm-offsets.h, asm-offsets.h}
from "depend" targets to "prepare" targets and deletes "depend" targets.
Signed-off-by: Masahiro Yamada <yamad...@jp.panasonic.com>
---
Makefile | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 3d98b04..fb6cf8e 100644
--- a/Makefile
+++ b/Makefile
@@ -940,7 +940,7 @@ $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
# Error messages still appears in the original language
PHONY += $(u-boot-dirs)
-$(u-boot-dirs): depend prepare scripts
+$(u-boot-dirs): prepare scripts
$(Q)$(MAKE) $(build)=$@
tools: prepare
@@ -989,7 +989,8 @@ prepare1: prepare2 $(version_h) $(timestamp_h)
archprepare: prepare1 scripts_basic
-prepare0: archprepare FORCE
+prepare0: archprepare FORCE include/generated/generic-asm-offsets.h \
+ include/generated/asm-offsets.h
@:
# All the preparing..
@@ -1039,27 +1040,29 @@ quiet_cmd_autoconf = GEN $@
include/autoconf.mk: include/config.h
$(call cmd,autoconf)
-u-boot.lds: $(LDSCRIPT) depend prepare
+# ---------------------------------------------------------------------------
+
+PHONY += depend dep
+depend dep:
+ @echo '*** Warning: make $@ is unnecessary now.'
+
+# ---------------------------------------------------------------------------
+
+u-boot.lds: $(LDSCRIPT) prepare
$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$<
>$@
-nand_spl: depend prepare
+nand_spl: prepare
$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
u-boot-nand.bin: nand_spl u-boot.bin
cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
-spl/u-boot-spl.bin: tools depend prepare
+spl/u-boot-spl.bin: tools prepare
$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
-tpl/u-boot-tpl.bin: tools depend prepare
+tpl/u-boot-tpl.bin: tools prepare
$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all
CONFIG_TPL_BUILD=y
-# Explicitly make _depend in subdirs containing multiple targets to prevent
-# parallel sub-makes creating .depend files simultaneously.
-depend dep: \
- include/generated/generic-asm-offsets.h \
- include/generated/asm-offsets.h
-
TAG_SUBDIRS := $(u-boot-dirs) include
FIND := find
--
1.8.3.2
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
