Merge in from trunk r67662 to r64801

[wxWidgets.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index d4a6ae83fd83b07bde2d00992d7b53cbaaa807d2..ce999e2e73b6c0028c2fedfee4a32b5705147664 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -24,18 +24,16 @@ XGETTEXT_ARGS=-C -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -s -j
        $(MSGFMT) -c -o $@ $<
 
 # a PO file must be updated from wxstd.pot to include new translations
-%.po: wxstd.pot
+# (but not manually maintained platform-specific files like msw/it.po)
+$(foreach lang,$(WX_LINGUAS_UPDATE),$(lang).po): wxstd.pot
+
+%.po:
        if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.pot > $@.new && mv $@.new $@; else cp wxstd.pot $@; fi
 
-# note the extra -kAddToPopUp used for Scintilla files: this is a hack to
-# translate the popup menu items
 wxstd.pot:
        touch $@
        find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
        find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
-       find ../contrib/include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
-       find ../contrib/src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.pot
-       find ../contrib/src/stc/scintilla/src -name "*.cxx" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -kAddToPopUp -o wxstd.pot
 
 allpo: force-update
        @-for t in $(WX_LINGUAS_UPDATE); do $(MAKE) $$t.po; done