aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-25 15:36:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-25 15:36:42 -0400
commitad5e1b0f5d913d2c8bddfba81049cc07228da1a6 (patch)
tree97deddb681735de8980e56f2153b6a3ec02d8d88
parent6f97b220f414e3599ea5374905ba6d0dc47d63b0 (diff)
parent4217516e52949e6550ff01d57f92b9b24ce04be1 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kconfig: fix broken target update-po-config kbuild: silence documentation GEN xml messages according to $(quiet)
-rw-r--r--Documentation/DocBook/Makefile5
-rw-r--r--scripts/kconfig/Makefile4
2 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index b2b6366bba5..83966e94cc3 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -187,8 +187,11 @@ quiet_cmd_fig2png = FIG2PNG $@
187 187
188### 188###
189# Rule to convert a .c file to inline XML documentation 189# Rule to convert a .c file to inline XML documentation
190 gen_xml = :
191 quiet_gen_xml = echo ' GEN $@'
192silent_gen_xml = :
190%.xml: %.c 193%.xml: %.c
191 @echo ' GEN $@' 194 @$($(quiet)gen_xml)
192 @( \ 195 @( \
193 echo "<programlisting>"; \ 196 echo "<programlisting>"; \
194 expand --tabs=8 < $< | \ 197 expand --tabs=8 < $< | \
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 32e8c5a227c..fa1a7d56590 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -36,10 +36,10 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
36 --output $(obj)/config.pot 36 --output $(obj)/config.pot
37 $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot 37 $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
38 $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch 38 $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
39 $(Q)(for i in `ls arch/`; \ 39 $(Q)(for i in `ls arch/*/Kconfig`; \
40 do \ 40 do \
41 echo " GEN $$i"; \ 41 echo " GEN $$i"; \
42 $(obj)/kxgettext arch/$$i/Kconfig \ 42 $(obj)/kxgettext $$i \
43 >> $(obj)/config.pot; \ 43 >> $(obj)/config.pot; \
44 done ) 44 done )
45 $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ 45 $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \