aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2003-08-31 04:25:40 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-08-31 04:25:40 -0700
commitb0c15cba55b1e2a870c6a60d4522b150c9dd04f0 (patch)
treecae27ff0eb93d981750196092aa340c9661cc36e /scripts
parent32dfc7561af935e2076708e9da24e1d1af4cb142 (diff)
downloadhistory-b0c15cba55b1e2a870c6a60d4522b150c9dd04f0.tar.gz
[PATCH] .config checks updated
From: Sam Ravnborg <sam@ravnborg.org> When building a kernel right after 'make mrproper' resulted in a very short run, and no sign that .config was missing. This has been fixed by adding a new rule for .config in the top-level Makefile, and a new target 'silentoldconfig' in scripts/kconfig/Makefile. Cleaned up a bit in scripts/kconfig/Makefile
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/Makefile45
1 files changed, 24 insertions, 21 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ba0978d5cf0d6..2189c334ad37d 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -2,40 +2,43 @@
# Kernel configuration targets
# These targets are used from top-level makefile
-.PHONY: oldconfig xconfig gconfig menuconfig config
+.PHONY: oldconfig xconfig gconfig menuconfig config silentoldconfig
-xconfig: scripts/kconfig/qconf
- ./scripts/kconfig/qconf arch/$(ARCH)/Kconfig
+xconfig: $(obj)/qconf
+ $< arch/$(ARCH)/Kconfig
-gconfig: scripts/kconfig/gconf
- ./scripts/kconfig/gconf arch/$(ARCH)/Kconfig
+gconfig: $(obj)/gconf
+ ./$< arch/$(ARCH)/Kconfig
-menuconfig: scripts/kconfig/mconf
+menuconfig: $(obj)/mconf
$(Q)$(MAKE) $(build)=scripts/lxdialog
- ./scripts/kconfig/mconf arch/$(ARCH)/Kconfig
+ $< arch/$(ARCH)/Kconfig
-config: scripts/kconfig/conf
- ./scripts/kconfig/conf arch/$(ARCH)/Kconfig
+config: $(obj)/conf
+ $< arch/$(ARCH)/Kconfig
-oldconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -o arch/$(ARCH)/Kconfig
+oldconfig: $(obj)/conf
+ $< -o arch/$(ARCH)/Kconfig
+
+silentoldconfig: $(obj)/conf
+ $< -s arch/$(ARCH)/Kconfig
.PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
-randconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -r arch/$(ARCH)/Kconfig
+randconfig: $(obj)/conf
+ $< -r arch/$(ARCH)/Kconfig
-allyesconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -y arch/$(ARCH)/Kconfig
+allyesconfig: $(obj)/conf
+ $< -y arch/$(ARCH)/Kconfig
-allnoconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -n arch/$(ARCH)/Kconfig
+allnoconfig: $(obj)/conf
+ $< -n arch/$(ARCH)/Kconfig
-allmodconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -m arch/$(ARCH)/Kconfig
+allmodconfig: $(obj)/conf
+ $< -m arch/$(ARCH)/Kconfig
-defconfig: scripts/kconfig/conf
- ./scripts/kconfig/conf -d arch/$(ARCH)/Kconfig
+defconfig: $(obj)/conf
+ $< -d arch/$(ARCH)/Kconfig
# Help text used by make help
help: