diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:36:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:36:42 -0700 |
| commit | ad5e1b0f5d913d2c8bddfba81049cc07228da1a6 (patch) | |
| tree | 97deddb681735de8980e56f2153b6a3ec02d8d88 | |
| parent | 6f97b220f414e3599ea5374905ba6d0dc47d63b0 (diff) | |
| parent | 4217516e52949e6550ff01d57f92b9b24ce04be1 (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/Makefile | 5 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index b2b6366bba51..83966e94cc32 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 32e8c5a227c3..fa1a7d565903 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 \ |