tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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)

Linus Torvalds ad5e1b0f 6f97b220

+6 -3
+4 -1
Documentation/DocBook/Makefile
··· 187 187 188 188 ### 189 189 # Rule to convert a .c file to inline XML documentation 190 + gen_xml = : 191 + quiet_gen_xml = echo ' GEN $@' 192 + silent_gen_xml = : 190 193 %.xml: %.c 191 - @echo ' GEN $@' 194 + @$($(quiet)gen_xml) 192 195 @( \ 193 196 echo "<programlisting>"; \ 194 197 expand --tabs=8 < $< | \
+2 -2
scripts/kconfig/Makefile
··· 36 36 --output $(obj)/config.pot 37 37 $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot 38 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 40 do \ 41 41 echo " GEN $$i"; \ 42 - $(obj)/kxgettext arch/$$i/Kconfig \ 42 + $(obj)/kxgettext $$i \ 43 43 >> $(obj)/config.pot; \ 44 44 done ) 45 45 $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \