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 2c5b2027304c9950f71db311113f4f98236a99fc..cc630363dedfbe3bdab323ebe492fa533c02c29c 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,15 +1,27 @@
 # This makefile is very special as it's meant to build as part of the build
 # process and also within the source tree to update the translation files.
 
-VERSION=$(shell cat ../VERSION)
-SRCS=$(filter-out messages.po,$(wildcard *.po))
-OBJS=$(patsubst %.po,%.mo,$(SRCS))
-
+# 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
 
-vpath %.po $(SRC_PATH)/po
+PO_PATH=$(SRC_PATH)/po
+
+VERSION=$(shell cat $(SRC_PATH)/VERSION)
+SRCS=$(filter-out $(PO_PATH)/messages.po,$(wildcard $(PO_PATH)/*.po))
+OBJS=$(patsubst $(PO_PATH)/%.po,%.mo,$(SRCS))
+
+vpath %.po $(PO_PATH)
 
 all:
        @echo "Use 'make update' to update translation files or use 'make build'"
@@ -20,7 +32,7 @@ update: $(SRCS)
 build: $(OBJS)
 
 clean:
-       $(RM) $(OBJS)
+       rm -f $(OBJS)
 
 install: $(OBJS)
        for obj in $(OBJS); do \
@@ -29,13 +41,12 @@ install: $(OBJS)
            $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
        done
 
-%.mo: %.po
-       @msgfmt -o $@ $(SRC_PATH)/po/`basename $@ .mo`.po
-
-messages.po: $(SRC_PATH)/ui/gtk.c
-       @xgettext -o $@ --foreign-user --package-name=QEMU --package-version=$(VERSION) --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
-
-%.po: messages.po
-       @msgmerge $@ $< > $@.bak && mv $@.bak $@
+$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
+       $(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/) >$@,"GEN","$@")
 
-.PHONY: clean all
+$(PO_PATH)/%.po: $(PO_PATH)/messages.po
+       $(call quiet-command, msgmerge -q $@ $< > $@.bak && mv $@.bak $@,"GEN","$@")