Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

[apt.git] / po / makefile

diff --git a/po/makefile b/po/makefile
index 4185d93e02d59ec18102f76c285cfce531be304f..5a3c7fb678552de44bb2cc07a610c09e1e4ebeb0 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -14,7 +14,8 @@ SUBDIR=po
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 # 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)
 POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS)))
 
 # Construct a list of all mo files for all domains under $(PO_DOMAINS)


@@ -23,41 +24,70 @@ MOFILES := $(foreach D,$(DOMAINS),$(addprefix $(PO_DOMAINS)/$(D)/,$(MOFILES)))
 LANG_POFILES := $(patsubst %.mo,%.po,$(MOFILES))
 LINGUAS := $(patsubst %.gmo,%,$(CATALOGS))
 
 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.
 # 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 $@
-       echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
+$(POTFILES) : $(PO)/%.pot :
+       echo "Generating POT file $@"
+       echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d.tmp
+       cmp --silent $@.d.tmp $@.d || mv $@.d.tmp $@.d

 # From sh source
 # From sh source

-       cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot
+       cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot.tmp
+       cmp --silent $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot || \
+               mv $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot

 # From C/C++ source
        cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in
        $(XGETTEXT) --default-domain=$* --directory=$(BASE) \
          --add-comments --foreign --keyword=_ --keyword=N_ \
 # From C/C++ source
        cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in
        $(XGETTEXT) --default-domain=$* --directory=$(BASE) \
          --add-comments --foreign --keyword=_ --keyword=N_ \

-         --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
+         --keyword=P_:1,2 \
+         --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp
+       cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \
+               mv $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot

        rm -f $(PO)/POTFILES_$*.in
        rm -f $(PO)/POTFILES_$*.in

-       $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
-
-$(PO)/$(PACKAGE)-all.pot: $(POTFILES)
-       $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
+       $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@.tmp
+       cmp --silent $@ $@.tmp || mv $@.tmp $@
+       # copy into the domain dirs to make rosetta happy
+       rm -f $(PO)/domains/$*/*.pot
+       cp $@ $(PO)/domains/$*

 
 # 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.
 
 # 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 : $(POTFILES)
+       printf "%s " "Generating $@"

        echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
        echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d

-       $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
+       $(MSGMERGE) --no-location $(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
 
        $(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 --output-file=/dev/null --statistics $$i; done
+
+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
+       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:
 
 clean: clean/local
 clean/local:


@@ -68,3 +98,6 @@ The_DFiles = $(wildcard $(PO)/*.d)
 ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)
 endif
 ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)
 endif

+
+# otherwise the output is completely screwed
+.NOTPARALLEL: