Messages in this thread Patch in this message | | | Date | Fri, 25 Apr 2008 21:20:02 +0200 | From | Sam Ravnborg <> | Subject | Re: [GIT PULL] kbuild patches for merge window |
| |
Hi Linus.
Forgot two patches which I applied on top of the others.
> Pull from: > > master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git >
Sam
Mike Frysinger (1): kbuild: silence documentation GEN xml messages according to $(quiet)
Sam Ravnborg (1): kconfig: fix broken target update-po-config
Documentation/DocBook/Makefile | 5 ++++- scripts/kconfig/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index b2b6366..83966e9 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -187,8 +187,11 @@ quiet_cmd_fig2png = FIG2PNG $@ ### # Rule to convert a .c file to inline XML documentation + gen_xml = : + quiet_gen_xml = echo ' GEN $@' +silent_gen_xml = : %.xml: %.c - @echo ' GEN $@' + @$($(quiet)gen_xml) @( \ echo "<programlisting>"; \ expand --tabs=8 < $< | \ diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 32e8c5a..fa1a7d5 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -36,10 +36,10 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h --output $(obj)/config.pot $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch - $(Q)(for i in `ls arch/`; \ + $(Q)(for i in `ls arch/*/Kconfig`; \ do \ echo " GEN $$i"; \ - $(obj)/kxgettext arch/$$i/Kconfig \ + $(obj)/kxgettext $$i \ >> $(obj)/config.pot; \ done ) $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
| |