Commit 4f1c1008 authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: remove meaningless prepare2 target

There is no build order among the following:
  prepare3
  outputmakefile
  asm-generic
  $(version_h)
  $(autoksyms_h)
  include/generated/utsrelease.h

It is meaningless to insert the prepare2 target between the first
three and the last three.

The comment says, "prepare2 creates a makefile if using a separate
output directory." Let me explain it more precisely. The prepare
targets cannot be executed without the .config file. Because the
configuration targets depend on the outputmakefile target, the
generated makefile is already there before the parepare2 is run.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent b79c6aa6
...@@ -1062,7 +1062,7 @@ scripts: scripts_basic scripts_dtc ...@@ -1062,7 +1062,7 @@ scripts: scripts_basic scripts_dtc
# archprepare is used in arch Makefiles and when processed asm symlink, # archprepare is used in arch Makefiles and when processed asm symlink,
# version.h and scripts_basic is processed / created. # version.h and scripts_basic is processed / created.
PHONY += prepare archprepare prepare1 prepare2 prepare3 PHONY += prepare archprepare prepare1 prepare3
# prepare3 is used to check if we are building in a separate output directory, # prepare3 is used to check if we are building in a separate output directory,
# and if so do: # and if so do:
...@@ -1077,12 +1077,8 @@ ifneq ($(KBUILD_SRC),) ...@@ -1077,12 +1077,8 @@ ifneq ($(KBUILD_SRC),)
fi; fi;
endif endif
# prepare2 creates a makefile if using a separate output directory. prepare1: prepare3 outputmakefile asm-generic $(version_h) $(autoksyms_h) \
# From this point forward, .config has been reprocessed, so any rules include/generated/utsrelease.h
# that need to depend on updated CONFIG_* values can be checked here.
prepare2: prepare3 outputmakefile asm-generic
prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
$(cmd_crmodverdir) $(cmd_crmodverdir)
archprepare: archheaders archscripts prepare1 scripts archprepare: archheaders archscripts prepare1 scripts
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment