diff options
| author | Michal Marek <mmarek@suse.cz> | 2015-04-08 05:11:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2015-04-08 07:05:41 -0400 |
| commit | 1cba0c305758c3c1786ecaceb03e142c95a4edc9 (patch) | |
| tree | 3a3d7651636c88fe13f3f6682cb6fc541ed00d2e | |
| parent | 63a91033d52e64a22e571fe84924c0b7f21c280d (diff) | |
kconfig: Simplify Makefile
Use a single rule for targets handled directly by the conf program.
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/kconfig/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index cb2cf548c45c..1f5e45355731 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Kernel configuration targets | 2 | # Kernel configuration targets |
| 3 | # These targets are used from top-level makefile | 3 | # These targets are used from top-level makefile |
| 4 | 4 | ||
| 5 | PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ | 5 | PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \ |
| 6 | localmodconfig localyesconfig | 6 | localmodconfig localyesconfig |
| 7 | 7 | ||
| 8 | ifdef KBUILD_KCONFIG | 8 | ifdef KBUILD_KCONFIG |
| @@ -29,9 +29,6 @@ config: $(obj)/conf | |||
| 29 | nconfig: $(obj)/nconf | 29 | nconfig: $(obj)/nconf |
| 30 | $< $(Kconfig) | 30 | $< $(Kconfig) |
| 31 | 31 | ||
| 32 | oldconfig: $(obj)/conf | ||
| 33 | $< --$@ $(Kconfig) | ||
| 34 | |||
| 35 | silentoldconfig: $(obj)/conf | 32 | silentoldconfig: $(obj)/conf |
| 36 | $(Q)mkdir -p include/config include/generated | 33 | $(Q)mkdir -p include/config include/generated |
| 37 | $< --$@ $(Kconfig) | 34 | $< --$@ $(Kconfig) |
| @@ -74,21 +71,20 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h | |||
| 74 | --output $(obj)/linux.pot | 71 | --output $(obj)/linux.pot |
| 75 | $(Q)rm -f $(obj)/config.pot | 72 | $(Q)rm -f $(obj)/config.pot |
| 76 | 73 | ||
| 77 | PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig | 74 | # These targets map 1:1 to the commandline options of 'conf' |
| 75 | simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ | ||
| 76 | alldefconfig randconfig listnewconfig olddefconfig | ||
| 77 | PHONY += $(simple-targets) | ||
| 78 | 78 | ||
| 79 | allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf | 79 | $(simple-targets): $(obj)/conf |
| 80 | $< --$@ $(Kconfig) | 80 | $< --$@ $(Kconfig) |
| 81 | 81 | ||
| 82 | PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig | 82 | PHONY += oldnoconfig savedefconfig defconfig |
| 83 | |||
| 84 | listnewconfig olddefconfig: $(obj)/conf | ||
| 85 | $< --$@ $(Kconfig) | ||
| 86 | 83 | ||
| 87 | # oldnoconfig is an alias of olddefconfig, because people already are dependent | 84 | # oldnoconfig is an alias of olddefconfig, because people already are dependent |
| 88 | # on its behavior(sets new symbols to their default value but not 'n') with the | 85 | # on its behavior(sets new symbols to their default value but not 'n') with the |
| 89 | # counter-intuitive name. | 86 | # counter-intuitive name. |
| 90 | oldnoconfig: $(obj)/conf | 87 | oldnoconfig: olddefconfig |
| 91 | $< --olddefconfig $(Kconfig) | ||
| 92 | 88 | ||
| 93 | savedefconfig: $(obj)/conf | 89 | savedefconfig: $(obj)/conf |
| 94 | $< --$@=defconfig $(Kconfig) | 90 | $< --$@=defconfig $(Kconfig) |