merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

locale/.cvsignore

@@ -0,0 +1 @@
+*.mo

locale/Makefile

@@ -3,6 +3,12 @@
 
 # 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
 MSGMERGE=msgmerge
@@ -10,7 +16,7 @@ XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers
-XGETTEXT_ARGS=-C -k_ -kwxTRANSLATE -s
+XGETTEXT_ARGS=-C -k_ -kwxGetTranslation -kwxTRANSLATE -s -j
 
 # implicit rules
 %.mo: %.po
@@ -21,10 +27,22 @@ XGETTEXT_ARGS=-C -k_ -kwxTRANSLATE -s
 	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
 
+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$