[Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak

[Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak

[Paolo Bonzini]

po/Makefile includes rules.mak to use the nice quiet-command macro.
However, this also brings in a %.mo rule that breaks "make build".
Put our own rule before the include, so that it has precedence.

Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 po/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index 1ab241a..b271f79 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -9,6 +9,9 @@ all:
 
 .PHONY:	all build clean install update
 
+%.mo: %.po
+	$(call quiet-command, msgfmt -o $@ $<, "  GEN   $@")
+
 -include ../config-host.mak
 include $(SRC_PATH)/rules.mak
 
@@ -38,9 +41,6 @@ install: $(OBJS)
 	    $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
 	done
 
-%.mo: %.po
-	$(call quiet-command, msgfmt -o $@ $<, "  GEN   $@")
-
 $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
 	$(call quiet-command, ( cd $(SRC_PATH) && \
           xgettext -o - --from-code=UTF-8 --foreign-user \
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak

[Christian Borntraeger]

On 09/22/2014 04:19 PM, Paolo Bonzini wrote:
> po/Makefile includes rules.mak to use the nice quiet-command macro.
> However, this also brings in a %.mo rule that breaks "make build".
> Put our own rule before the include, so that it has precedence.
> 
> Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
>  po/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/po/Makefile b/po/Makefile
> index 1ab241a..b271f79 100644
> --- a/po/Makefile
> +++ b/po/Makefile
> @@ -9,6 +9,9 @@ all:
> 
>  .PHONY:	all build clean install update
> 
> +%.mo: %.po
> +	$(call quiet-command, msgfmt -o $@ $<, "  GEN   $@")
> +
>  -include ../config-host.mak
>  include $(SRC_PATH)/rules.mak
> 
> @@ -38,9 +41,6 @@ install: $(OBJS)
>  	    $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
>  	done
> 
> -%.mo: %.po
> -	$(call quiet-command, msgfmt -o $@ $<, "  GEN   $@")
> -
>  $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
>  	$(call quiet-command, ( cd $(SRC_PATH) && \
>            xgettext -o - --from-code=UTF-8 --foreign-user \
> 

Re: [Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

On Mon, Sep 22, 2014 at 04:19:54PM +0200, Paolo Bonzini wrote:
> po/Makefile includes rules.mak to use the nice quiet-command macro.
> However, this also brings in a %.mo rule that breaks "make build".
> Put our own rule before the include, so that it has precedence.
> 
> Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  po/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Nice, thanks!  I was hitting this with "make install" yesterday.

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]