diff --git a/Makefile.lib b/Makefile.lib index 503ffe7e2..a131be755 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -19,6 +19,7 @@ ifdef MAKE_COLOR INFO_COLOR = $(shell tput setaf 5) CC_COLOR = $(shell tput setaf 6) LD_COLOR = $(shell tput setaf 2) + PO_COLOR = $(shell tput setaf 6) LINK_COLOR = $(shell tput bold;tput setaf 4) INSTALL_COLOR = $(shell tput setaf 3) END_COLOR = $(shell tput sgr0) @@ -29,6 +30,7 @@ endif ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1)) cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1)) mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1)) +ecmd = @$(if $($(mquiet)cmd_$(1)),printf "%-38s " $($(mquiet)cmd_$(1)) &&) $(cmd_$(1)) quiet_cmd_compile = ' [$(CC_COLOR)CC$(END_COLOR)] $(RELPATH)$@' masq_cmd_compile = $(COMPILE) -c $< diff --git a/po/Makefile b/po/Makefile index b1b3cd5b2..9e2b530c5 100644 --- a/po/Makefile +++ b/po/Makefile @@ -11,14 +11,16 @@ MSGMERGE = msgmerge # xgettext) POTFILES_ABS_LIST = potfiles.list +quiet_cmd_gmsgfmt = ' [$(PO_COLOR)GMSGFMT$(END_COLOR)] $(RELPATH)$(@)' + cmd_gmsgfmt = rm -f -- "$@" && $(GMSGFMT) --statistics -o "$@" -- "$<" + # Distributed elinks-*.tar.gz packages include po/*.gmo files, so that # users can install ELinks even if they don't have a msgfmt program. # However, if srcdir != builddir, then this Makefile ignores the *.gmo # files in the srcdir and builds new ones in the builddir. -%.gmo: $(srcdir)/%.po - @rm -f -- "$@" && printf "%s: " "$*" \ - && $(GMSGFMT) --statistics -o "$@" -- "$<" +%.gmo: $(srcdir)%.po + $(call ecmd,gmsgfmt) ### The default rule