aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 12:22:23 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 12:22:23 -0500
commitcc13e442952a347f7e217eeaee4778485394f1be (patch)
treee096a99542981c952e22880937d09c5bed4d4c96
parent0faa90880331386ac86ca78d52692c7a94051eab (diff)
parentfab1e310d3f97bb9403ac68e181fd3e654a755c7 (diff)
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
27# mkcompile_h will make sure to only update the 27# mkcompile_h will make sure to only update the
28# actual file if its content has changed. 28# actual file if its content has changed.
29 29
30 chk_compile.h = :
30 quiet_chk_compile.h = echo ' CHK $@' 31 quiet_chk_compile.h = echo ' CHK $@'
31silent_chk_compile.h = : 32silent_chk_compile.h = :
32include/linux/compile.h: FORCE 33include/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)
39# - If they are equal no change, and no timestamp update 39# - If they are equal no change, and no timestamp update
40# - stdin is piped in from the first prerequisite ($<) so one has 40# - stdin is piped in from the first prerequisite ($<) so one has
41# to specify a valid file as first prerequisite (often the kbuild file) 41# to specify a valid file as first prerequisite (often the kbuild file)
42 chk_filechk = :
42 quiet_chk_filechk = echo ' CHK $@' 43 quiet_chk_filechk = echo ' CHK $@'
43silent_chk_filechk = : 44silent_chk_filechk = :
45 upd_filechk = :
44 quiet_upd_filechk = echo ' UPD $@' 46 quiet_upd_filechk = echo ' UPD $@'
45silent_upd_filechk = : 47silent_upd_filechk = :
48
46define filechk 49define filechk
47 $(Q)set -e; \ 50 $(Q)set -e; \
48 $($(quiet)chk_filechk); \ 51 $($(quiet)chk_filechk); \