[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/11] po: fix conflict with %.mo rule in rules.mak
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/11] po: fix conflict with %.mo rule in rules.mak |
Date: |
Fri, 26 Sep 2014 16:38:09 +0200 |
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 \
--
2.1.0
- [Qemu-devel] [PULL 00/11] KVM (and more) patches for 2014-09-26, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 01/11] pit: fix pit interrupt can't inject into vm after migration, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 02/11] Introduce cpu_clean_all_dirty, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 04/11] kvmclock: Ensure time in migration never goes backward, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 03/11] kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 05/11] hw/dma/i8257: Silence phony error message, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 06/11] target-i386: update fp status fix, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 08/11] serial: check if backed by a physical serial port at realize time, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 07/11] serial: reset state at startup, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 10/11] po: fix conflict with %.mo rule in rules.mak,
Paolo Bonzini <=
- [Qemu-devel] [PULL 09/11] kvmvapic: fix migration when VM paused and when not running Windows, Paolo Bonzini, 2014/09/26
- [Qemu-devel] [PULL 11/11] kvm/valgrind: don't mark memory as initialized, Paolo Bonzini, 2014/09/26
- Re: [Qemu-devel] [PULL 00/11] KVM (and more) patches for 2014-09-26, Peter Maydell, 2014/09/26