diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-05-29 01:33:03 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-06-09 18:20:20 -0400 |
| commit | 9815594a780404810c2a6280de1a268dcfcb0729 (patch) | |
| tree | a2af2bc0ca17be08bbba0b1aafb23a623d573522 | |
| parent | 356db564fbdfb1aa82f9c1c842947c1e0127d12f (diff) | |
kbuild: create include/config directory in scripts/kconfig/Makefile
The directory include/config is used only for
silentoldconfig, localmodconfig, localyesconfig.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 4 |
2 files changed, 2 insertions, 4 deletions
| @@ -533,11 +533,9 @@ include $(srctree)/arch/$(SRCARCH)/Makefile | |||
| 533 | export KBUILD_DEFCONFIG KBUILD_KCONFIG | 533 | export KBUILD_DEFCONFIG KBUILD_KCONFIG |
| 534 | 534 | ||
| 535 | config: scripts_basic outputmakefile FORCE | 535 | config: scripts_basic outputmakefile FORCE |
| 536 | $(Q)mkdir -p include/config | ||
| 537 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ | 536 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ |
| 538 | 537 | ||
| 539 | %config: scripts_basic outputmakefile FORCE | 538 | %config: scripts_basic outputmakefile FORCE |
| 540 | $(Q)mkdir -p include/config | ||
| 541 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ | 539 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ |
| 542 | 540 | ||
| 543 | else | 541 | else |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 844bc9da08da..573ff3f1f533 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -33,11 +33,11 @@ oldconfig: $(obj)/conf | |||
| 33 | $< --$@ $(Kconfig) | 33 | $< --$@ $(Kconfig) |
| 34 | 34 | ||
| 35 | silentoldconfig: $(obj)/conf | 35 | silentoldconfig: $(obj)/conf |
| 36 | $(Q)mkdir -p include/generated | 36 | $(Q)mkdir -p include/config include/generated |
| 37 | $< --$@ $(Kconfig) | 37 | $< --$@ $(Kconfig) |
| 38 | 38 | ||
| 39 | localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | 39 | localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf |
| 40 | $(Q)mkdir -p include/generated | 40 | $(Q)mkdir -p include/config include/generated |
| 41 | $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config | 41 | $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config |
| 42 | $(Q)if [ -f .config ]; then \ | 42 | $(Q)if [ -f .config ]; then \ |
| 43 | cmp -s .tmp.config .config || \ | 43 | cmp -s .tmp.config .config || \ |
