X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c54ea1d798dfb519d7b81793df0a8e58105d09fc..6804503b9bd057fae67294bb8ca95c9f10e00194:/po/makefile

diff --git a/po/makefile b/po/makefile
index 4185d93e0..bb8118c77 100644
--- a/po/makefile
+++ b/po/makefile
@@ -14,7 +14,8 @@ SUBDIR=po
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-DOMAINS = $(notdir $(wildcard $(PO_DOMAINS)/*))
+CATALOGS := $(addsuffix .gmo,$(shell cat LINGUAS))
+DOMAINS := $(notdir $(wildcard $(PO_DOMAINS)/*))
 POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS)))
 
 # Construct a list of all mo files for all domains under $(PO_DOMAINS)
@@ -23,11 +24,12 @@ MOFILES := $(foreach D,$(DOMAINS),$(addprefix $(PO_DOMAINS)/$(D)/,$(MOFILES)))
 LANG_POFILES := $(patsubst %.mo,%.po,$(MOFILES))
 LINGUAS := $(patsubst %.gmo,%,$(CATALOGS))
 
-GETDOMAIN = $(filter $(DOMAINS),$(subst /, ,$(1)))
+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 : 
-	echo Generating POT file $@
+$(POTFILES) : $(PO)/%.pot :
+	printf "%s " "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
@@ -39,25 +41,37 @@ $(POTFILES) : $(PO)/%.pot :
 	rm -f $(PO)/POTFILES_$*.in
 	$(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
 
-$(PO)/$(PACKAGE)-all.pot: $(POTFILES)
+$(PACKAGE)-all.pot: $(POTFILES)
 	$(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
 
 # 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 : $(PO)/$(PACKAGE)-all.pot
-	echo Generating $@
+$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot
+	printf "%s " "Generating $@"
 	echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
 	$(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
 
-$(MOFILES) : %.mo : %.po
-	echo Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
+$(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
+	printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
 	$(GMSGFMT) --statistics -o $@ $<
 	mkdir -p $(LOCALE)/$(notdir $*)/LC_MESSAGES/
 	cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
 
-binary: $(POTFILES) $(PO)/$(PACKAGE)-all.pot $(MOFILES)
+stats:
+	for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+
+binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
+
+.PHONY: update-po
+update-po: $(PACKAGE)-all.pot
+	for lang in ${LINGUAS}; do\
+	echo "Updating $$lang.po"; \
+	$(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \
+	cmp $$lang.new.po $$lang.po || cp $$lang.new.po $$lang.po; \
+	rm -f $$lang.new.po; \
+	done
 
 clean: clean/local
 clean/local:
@@ -68,3 +82,5 @@ The_DFiles = $(wildcard $(PO)/*.d)
 ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)
 endif
+
+.NOTPARALLEL: