Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[mirror_qemu.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index a6ab4825fa9bd9dff531a0660c696cde89a56c73..cc630363dedfbe3bdab323ebe492fa533c02c29c 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -4,7 +4,16 @@
 # Set SRC_PATH for in-tree builds without configuration.
 SRC_PATH=..
 
+# The default target must come before any include statements.
+all:
+
+.PHONY:        all build clean install update
+
+%.mo: %.po
+       $(call quiet-command, msgfmt -o $@ $<,"GEN","$@")
+
 -include ../config-host.mak
+include $(SRC_PATH)/rules.mak
 
 PO_PATH=$(SRC_PATH)/po
 
@@ -23,7 +32,7 @@ update: $(SRCS)
 build: $(OBJS)
 
 clean:
-       $(RM) $(OBJS)
+       rm -f $(OBJS)
 
 install: $(OBJS)
        for obj in $(OBJS); do \
@@ -32,17 +41,12 @@ install: $(OBJS)
            $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
        done
 
-%.mo: %.po
-       @msgfmt -o $@ $<
-
 $(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
-       @cd $(SRC_PATH) && \
-        (xgettext -o - --from-code=UTF-8 --foreign-user \
+       $(call quiet-command, ( cd $(SRC_PATH) && \
+          xgettext -o - --from-code=UTF-8 --foreign-user \
            --package-name=QEMU --package-version=$(VERSION) \
            --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
-         sed -e s/CHARSET/UTF-8/) >$@
+         sed -e s/CHARSET/UTF-8/) >$@,"GEN","$@")
 
 $(PO_PATH)/%.po: $(PO_PATH)/messages.po
-       @msgmerge $@ $< > $@.bak && mv $@.bak $@
-
-.PHONY: clean all
+       $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$@")