fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index e20bdcfdf984bdb7858d713b1330c9f59b171233..36f5b70aa559ed9ba58e6992968365ec35fc88d5 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -3,21 +3,46 @@
 
 # this makefile may be invoked to build either wxstd.po 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'`
+
 # the programs we use (TODO: use configure to detect them)
-MSGFMT=msgfmt
+MSGFMT=msgfmt --verbose
+MSGMERGE=msgmerge
 XGETTEXT=xgettext
 XARGS=xargs
 
+# common xgettext args: C++ syntax, use the specified macro names as markers
+XGETTEXT_ARGS=-C -k_ -kwxGetTranslation -kwxTRANSLATE -s -j
+
 # implicit rules
 %.mo: %.po
        $(MSGFMT) -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
+
+wxstd.po:
+       touch $@
+       find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
+       find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
 
-wxstd.po: FORCE
-       find ../include -name "*.h" | $(XARGS) $(XGETTEXT) -C -k_ -j -o wxstd.po
-       find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) -C -k_ -j -o wxstd.po
+allpo: force-update
+       @-for t in $(WX_LINGUAS); do $(MAKE) $$t.po; done
+
+allmo:
+       @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done
+
+force-update:
+       $(RM) wxstd.po
 
 # targets depending on this one will be always remade
 FORCE:
 
+.PHONY: allpo allmo force-update
+
 # $Id$