use correct signature for callback

[wxWidgets.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index 28b84eb07874a45c93f3f53dc450ba4f919e5f70..d305436a8611e17ad8bd80540eac0667af5b81b3 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,13 +1,14 @@
-# this is the makefile for generating wxstd.po message catalog file and
+# this is the makefile for generating wxstd.pot message catalog file and
 # building lang.mo files from the translated lang.po catalogs
 
-# this makefile may be invoked to build either wxstd.po or any lang.mo
+# this makefile may be invoked to build either wxstd.pot or any lang.mo
 
 # Autodetect the languages we support.  Currently this relies on make
 # being called with this dir as the cwd, but if we generate this file
 # with configure an explicit path should be specified -- RL.
 
-WX_LINGUAS := `ls *.po 2> /dev/null | sed -n 's/\(wxstd\)\?\.po//p'`
+WX_LINGUAS := $(shell ls *.po */*.po 2> /dev/null | sed 's/wxstd.pot//g' | sed 's/.po//g')
+WX_LINGUAS_UPDATE := $(shell ls *.po 2> /dev/null | sed 's/wxstd.pot//g' | sed 's/.po//g')
 
 # the programs we use (TODO: use configure to detect them)
 MSGFMT=msgfmt --verbose
@@ -16,33 +17,39 @@ XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers
-XGETTEXT_ARGS=-C -k_ -kwxGetTranslation -kwxTRANSLATE -s -j
+XGETTEXT_ARGS=-C -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -s -j
 
 # implicit rules
 %.mo: %.po
        $(MSGFMT) -c -o $@ $<
 
-# a PO file must be updated from wxstd.po to include new translations
-%.po: wxstd.po
-       if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.po > $@.new && mv $@.new $@; else cp wxstd.po $@; fi
+# a PO file must be updated from wxstd.pot to include new translations
+# (but not manually maintained platform-specific files like msw/it.po)
+$(foreach lang,$(WX_LINGUAS_UPDATE),$(lang).po): wxstd.pot
 
-wxstd.po:
+%.po:
+       if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.pot > $@.new && mv $@.new $@; else cp wxstd.pot $@; fi
+
+wxstd.pot:
        touch $@
-       find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
-       find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
-       find ../contrib/include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
-       find ../contrib/src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
+       find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
+       find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
 
 allpo: force-update
-       @-for t in $(WX_LINGUAS); do $(MAKE) $$t.po; done
+       @-for t in $(WX_LINGUAS_UPDATE); do $(MAKE) $$t.po; done
 
 allmo:
        @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done
 
 force-update:
-       $(RM) wxstd.po
+       $(RM) wxstd.pot
+
+check:
+       @for t in $(WX_LINGUAS); do \
+           $(MSGFMT) -c -o /dev/null $$t.po 2>/dev/null || echo "$$t.po is BROKEN."; \
+       done
 
-# print out the percentage of the trsnalted strings
+# print out the percentage of the translated strings
 stats: FORCE
        @for i in $(WX_LINGUAS); do \
                x=`$(MSGFMT) -o /dev/null "$$i.po" 2>&1 | sed -e 's/[,\.]//g' \