updated to use msgmerge

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

diff --git a/locale/Makefile b/locale/Makefile
index e20bdcfdf984bdb7858d713b1330c9f59b171233..75deb8923e86971500ce4d56d359ae9a80ceae17 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -5,17 +5,24 @@
 
 # the programs we use (TODO: use configure to detect them)
 MSGFMT=msgfmt
+MSGMERGE=msgmerge
 XGETTEXT=xgettext
 XARGS=xargs
 
+# common xgettext args: C++ syntax, use the specified macro names as markers
+XGETTEXT_ARGS=-C -k_ -kwxTRANSLATE -s
+
 # 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: 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
+wxstd.po:
+       find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
+       find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
 
 # targets depending on this one will be always remade
 FORCE: