From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW4TP-0003je-8c for qemu-devel@nongnu.org; Mon, 22 Sep 2014 10:20:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XW4TF-0004ht-CV for qemu-devel@nongnu.org; Mon, 22 Sep 2014 10:20:14 -0400 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:42156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW4TF-0004XY-78 for qemu-devel@nongnu.org; Mon, 22 Sep 2014 10:20:05 -0400 Received: by mail-wg0-f44.google.com with SMTP id z12so2779980wgg.15 for ; Mon, 22 Sep 2014 07:19:59 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 22 Sep 2014 16:19:54 +0200 Message-Id: <1411395594-884-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] po: fix conflict with %.mo rule in rules.mak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com 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 Signed-off-by: Paolo Bonzini --- 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