summaryrefslogtreecommitdiff
path: root/po/makefile
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-05-22 16:07:49 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-05-22 16:07:49 +0200
commit800694cbf33e206935dc9e6e8fa6e9a036b8efad (patch)
tree1557d96ee0f463a020b11604146be66fb9809a31 /po/makefile
parent6c0c0387e616f8d04f00916fbd1fe899acd265cd (diff)
parent1351329e376a8dbe7780693693d0f3db0ec749fa (diff)
merged (and resolved a bunch of conflicts) of the debian-sid branch
Diffstat (limited to 'po/makefile')
-rw-r--r--po/makefile44
1 files changed, 16 insertions, 28 deletions
diff --git a/po/makefile b/po/makefile
index 81dd362a2..ebf6c06d0 100644
--- a/po/makefile
+++ b/po/makefile
@@ -29,7 +29,7 @@ GETDOMAIN = $(word 1,$(subst /, ,$(1)))
# Generate the list of files from the bits the other make files dropped
# and produce the .pot file.
$(POTFILES) : $(PO)/%.pot :
- printf "%s " "Generating POT file $@"
+ echo "Generating POT file $@"
echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
# From sh source
cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot
@@ -45,31 +45,14 @@ $(POTFILES) : $(PO)/%.pot :
rm -f $(PO)/domains/$*/*.pot
cp $@ $(PO)/domains/$*
-$(PACKAGE)-all.pot:
- # we create our partial pot files without a header to avoid
- # changing dates in *.mo files, but we want a header for our
- # master-pot file, so we use a dummy pot with nothing but the
- # header
- $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign \
- --language=c -o $(PO)/$(PACKAGE)-dummy.pot --force-po \
- --package-name=$(PACKAGE) --package-version=$(VERSION) \
- --msgid-bugs-address=deity@lists.debian.org /dev/null
- make $(POTFILES)
- $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$@
- rm -f $(PO)/$(PACKAGE)-dummy.pot
-
# Filter the complete translation with the domain specific file to produce
# only the subtext needed for this domain
# We cannot express the dependencies required for this directly with a pattern
# rule, so we use the .d hack.
-$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot
+$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(POTFILES)
printf "%s " "Generating $@"
echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
- # thanks powerpc for segfaulting in msgmerge in the first run
- # (but not the second) - the part "||.." should get removed
- # once powerpc is a bit more stable
- $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ || \
- $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
+ $(MSGMERGE) --no-location $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
$(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
@@ -78,9 +61,18 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
stats:
- for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+ for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
-binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
+binary: $(POTFILES) $(MOFILES)
+
+$(PACKAGE)-all.pot: $(POTFILES)
+ # we create our partial pot files without a header to avoid changing dates in *.mo files,
+ # but we want a header for our master-pot file, so we use a dummy pot with nothing but the header
+ $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \
+ -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name='$(PACKAGE)' \
+ --package-version='$(PACKAGE_VERSION)' --msgid-bugs-address='$(PACKAGE_MAIL)' /dev/null
+ $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot
+ rm -f $(PO)/$(PACKAGE)-dummy.pot
.PHONY: update-po
update-po: $(PACKAGE)-all.pot
@@ -91,12 +83,8 @@ update-po: $(PACKAGE)-all.pot
rm -f $$lang.new.po; \
done
-check-pot-deps:
- echo $(PACKAGE)-all.pot : $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/*/*.srclist))) >> $(PO)/apt-all.d
- make $(PACKAGE)-all.pot
-
-clean: check-pot-deps clean/local
-clean/local: update-po
+clean: clean/local
+clean/local:
rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d
# Include the dependencies that are available