summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 09:22:23 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 09:22:23 -0800
commitcc13e442952a347f7e217eeaee4778485394f1be (patch)
treee096a99542981c952e22880937d09c5bed4d4c96
parent0faa90880331386ac86ca78d52692c7a94051eab (diff)
parentfab1e310d3f97bb9403ac68e181fd3e654a755c7 (diff)
downloadlinux-stable-cc13e442952a347f7e217eeaee4778485394f1be.tar.gz
linux-stable-cc13e442952a347f7e217eeaee4778485394f1be.tar.bz2
linux-stable-cc13e442952a347f7e217eeaee4778485394f1be.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: fix make V=1
-rw-r--r--init/Makefile1
-rw-r--r--scripts/Kbuild.include3
2 files changed, 4 insertions, 0 deletions
diff --git a/init/Makefile b/init/Makefile
index c5f157ce293e..4a243df426f7 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -27,6 +27,7 @@ $(obj)/version.o: include/linux/compile.h
# mkcompile_h will make sure to only update the
# actual file if its content has changed.
+ chk_compile.h = :
quiet_chk_compile.h = echo ' CHK $@'
silent_chk_compile.h = :
include/linux/compile.h: FORCE
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index da3559ea92e0..d64e6badc942 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -39,10 +39,13 @@ escsq = $(subst $(squote),'\$(squote)',$1)
# - If they are equal no change, and no timestamp update
# - stdin is piped in from the first prerequisite ($<) so one has
# to specify a valid file as first prerequisite (often the kbuild file)
+ chk_filechk = :
quiet_chk_filechk = echo ' CHK $@'
silent_chk_filechk = :
+ upd_filechk = :
quiet_upd_filechk = echo ' UPD $@'
silent_upd_filechk = :
+
define filechk
$(Q)set -e; \
$($(quiet)chk_filechk); \