Commit ad5e1b0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
parents 6f97b220 4217516e

Documentation/DocBook/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -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 < $< |     \

scripts/kconfig/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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 \