diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-02-08 00:05:52 -0500 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-02-09 04:43:58 -0500 |
commit | d75f4c683f817ef61c9ae634886e7ebc3133c002 (patch) | |
tree | 568d266eddbadcd91c7e5358ba7b91f8561da631 | |
parent | a3eadd7cb00f39f6fd4bbaf414dfde547b8c0899 (diff) |
kbuild: silence CHK/UPD messages according to $(quiet)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | init/Makefile | 4 | ||||
-rw-r--r-- | scripts/Kbuild.include | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/init/Makefile b/init/Makefile index 633392f5cdee..c5f157ce293e 100644 --- a/init/Makefile +++ b/init/Makefile | |||
@@ -27,7 +27,9 @@ $(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 | quiet_chk_compile.h = echo ' CHK $@' | ||
31 | silent_chk_compile.h = : | ||
30 | include/linux/compile.h: FORCE | 32 | include/linux/compile.h: FORCE |
31 | @echo ' CHK $@' | 33 | @$($(quiet)chk_compile.h) |
32 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ | 34 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ |
33 | "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" | 35 | "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" |
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b96ea8d6a5ed..da3559ea92e0 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
@@ -39,15 +39,19 @@ 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 | quiet_chk_filechk = echo ' CHK $@' | ||
43 | silent_chk_filechk = : | ||
44 | quiet_upd_filechk = echo ' UPD $@' | ||
45 | silent_upd_filechk = : | ||
42 | define filechk | 46 | define filechk |
43 | $(Q)set -e; \ | 47 | $(Q)set -e; \ |
44 | echo ' CHK $@'; \ | 48 | $($(quiet)chk_filechk); \ |
45 | mkdir -p $(dir $@); \ | 49 | mkdir -p $(dir $@); \ |
46 | $(filechk_$(1)) < $< > $@.tmp; \ | 50 | $(filechk_$(1)) < $< > $@.tmp; \ |
47 | if [ -r $@ ] && cmp -s $@ $@.tmp; then \ | 51 | if [ -r $@ ] && cmp -s $@ $@.tmp; then \ |
48 | rm -f $@.tmp; \ | 52 | rm -f $@.tmp; \ |
49 | else \ | 53 | else \ |
50 | echo ' UPD $@'; \ | 54 | $($(quiet)upd_filechk); \ |
51 | mv -f $@.tmp $@; \ | 55 | mv -f $@.tmp $@; \ |
52 | fi | 56 | fi |
53 | endef | 57 | endef |