Skip to content

Commit

Permalink
po/Makefile: Fix *.mo generation for out-of-tree builds (regression)
Browse files Browse the repository at this point in the history
Commit f847565 added a wildcard search
for *.po files. This search found no files for out of tree builds, so
those builds no longer created and installed *.mo files.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information
stweil authored and Anthony Liguori committed Jul 23, 2013
1 parent 18e12d4 commit 00134a6
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions po/Makefile
@@ -1,15 +1,18 @@
# 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=..

-include ../config-host.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'"
Expand All @@ -30,12 +33,12 @@ install: $(OBJS)
done

%.mo: %.po
@msgfmt -o $@ $(SRC_PATH)/po/`basename $@ .mo`.po
@msgfmt -o $@ $<

messages.po: $(SRC_PATH)/ui/gtk.c
$(PO_PATH)/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
$(PO_PATH)/%.po: $(PO_PATH)/messages.po
@msgmerge $@ $< > $@.bak && mv $@.bak $@

.PHONY: clean all

0 comments on commit 00134a6

Please sign in to comment.