lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

Browse Source 
* 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)
This commit is contained in:
Linus Torvalds
2008-04-25 12:36:42 -07:00
parent 6f97b220f4 4217516e52
commit ad5e1b0f5d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/DocBook/Makefile
View File

@@ -187,8 +187,11 @@ quiet_cmd_fig2png = FIG2PNG $@
### ###
# Rule to convert a .c file to inline XML documentation # Rule to convert a .c file to inline XML documentation
gen_xml = :
quiet_gen_xml = echo ' GEN $@'
silent_gen_xml = :
%.xml: %.c %.xml: %.c
@echo ' GEN $@' @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>"; \ echo "<programlisting>"; \
expand --tabs=8 < $< | \ expand --tabs=8 < $< | \

4
scripts/kconfig/Makefile
View File

@@ -36,10 +36,10 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
--output $(obj)/config.pot --output $(obj)/config.pot
$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
$(Q)(for i in `ls arch/`; \ $(Q)(for i in `ls arch/*/Kconfig`; \
do \ do \
echo " GEN $$i"; \ echo " GEN $$i"; \
$(obj)/kxgettext arch/$$i/Kconfig \ $(obj)/kxgettext $$i \
>> $(obj)/config.pot; \ >> $(obj)/config.pot; \
done ) done )
$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \