Commit 6378008a445cde64c0bd82fbab450bd9dba627b1
Committed by
Tom Rini
Tom Rini
1 parent
7424145f30
Exists in
master
and in
49 other branches
kbuild: abolish "depend" target
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 <yamada.m@jp.panasonic.com>
Showing 1 changed file with 15 additions and 12 deletions Side-by-side Diff
Makefile
| ... | ... | @@ -939,7 +939,7 @@ |
| 939 | 939 | # Error messages still appears in the original language |
| 940 | 940 | |
| 941 | 941 | PHONY += $(u-boot-dirs) |
| 942 | -$(u-boot-dirs): depend prepare scripts | |
| 942 | +$(u-boot-dirs): prepare scripts | |
| 943 | 943 | $(Q)$(MAKE) $(build)=$@ |
| 944 | 944 | |
| 945 | 945 | tools: prepare |
| ... | ... | @@ -988,7 +988,8 @@ |
| 988 | 988 | |
| 989 | 989 | archprepare: prepare1 scripts_basic |
| 990 | 990 | |
| 991 | -prepare0: archprepare FORCE | |
| 991 | +prepare0: archprepare FORCE include/generated/generic-asm-offsets.h \ | |
| 992 | + include/generated/asm-offsets.h | |
| 992 | 993 | @: |
| 993 | 994 | |
| 994 | 995 | # All the preparing.. |
| 995 | 996 | |
| 996 | 997 | |
| 997 | 998 | |
| 998 | 999 | |
| ... | ... | @@ -1038,26 +1039,28 @@ |
| 1038 | 1039 | include/autoconf.mk: include/config.h |
| 1039 | 1040 | $(call cmd,autoconf) |
| 1040 | 1041 | |
| 1041 | -u-boot.lds: $(LDSCRIPT) depend prepare | |
| 1042 | +# --------------------------------------------------------------------------- | |
| 1043 | + | |
| 1044 | +PHONY += depend dep | |
| 1045 | +depend dep: | |
| 1046 | + @echo '*** Warning: make $@ is unnecessary now.' | |
| 1047 | + | |
| 1048 | +# --------------------------------------------------------------------------- | |
| 1049 | + | |
| 1050 | +u-boot.lds: $(LDSCRIPT) prepare | |
| 1042 | 1051 | $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@ |
| 1043 | 1052 | |
| 1044 | -nand_spl: depend prepare | |
| 1053 | +nand_spl: prepare | |
| 1045 | 1054 | $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all |
| 1046 | 1055 | |
| 1047 | 1056 | u-boot-nand.bin: nand_spl u-boot.bin |
| 1048 | 1057 | cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin |
| 1049 | 1058 | |
| 1050 | -spl/u-boot-spl.bin: tools depend prepare | |
| 1059 | +spl/u-boot-spl.bin: tools prepare | |
| 1051 | 1060 | $(MAKE) obj=spl -f $(srctree)/spl/Makefile all |
| 1052 | 1061 | |
| 1053 | -tpl/u-boot-tpl.bin: tools depend prepare | |
| 1062 | +tpl/u-boot-tpl.bin: tools prepare | |
| 1054 | 1063 | $(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y |
| 1055 | - | |
| 1056 | -# Explicitly make _depend in subdirs containing multiple targets to prevent | |
| 1057 | -# parallel sub-makes creating .depend files simultaneously. | |
| 1058 | -depend dep: \ | |
| 1059 | - include/generated/generic-asm-offsets.h \ | |
| 1060 | - include/generated/asm-offsets.h | |
| 1061 | 1064 | |
| 1062 | 1065 | TAG_SUBDIRS := $(u-boot-dirs) include |
| 1063 | 1066 |