mac cleanup, cgcolor changes

[wxWidgets.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index fdfbb89490df8d63f4ba358497f56fc4e00c62eb..d4a6ae83fd83b07bde2d00992d7b53cbaaa807d2 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
 
 # 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.
 
 
 # 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
 
 # the programs we use (TODO: use configure to detect them)
 MSGFMT=msgfmt --verbose


@@ -16,45 +17,50 @@ XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers
 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
 
 # implicit rules
 %.mo: %.po

-       $(MSGFMT) -o $@ $<
+       $(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
+%.po: wxstd.pot
+       if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.pot > $@.new && mv $@.new $@; else cp wxstd.pot $@; fi

 
 

-wxstd.po:
+# note the extra -kAddToPopUp used for Scintilla files: this is a hack to
+# translate the popup menu items
+wxstd.pot:

        touch $@
        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
+       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
 
 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:
 
 allmo:
        @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done
 
 force-update:

-       $(RM) wxstd.po
+       $(RM) wxstd.pot

 
 

-# print out the percentage of the trsnalted strings
-stats:
+# 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' \
        @for i in $(WX_LINGUAS); do \
                x=`$(MSGFMT) -o /dev/null "$$i.po" 2>&1 | sed -e 's/[,\.]//g' \

-                       -e 's/\([0-9]\+\) translated messages/TR=\1/' \
-                       -e 's/\([0-9]\+\) fuzzy translations/FZ=\1/' \
-                       -e 's/\([0-9]\+\) untranslated messages/UT=\1/'`; \
+                       -e 's/\([0-9]\+\) translated messages\?/TR=\1/' \
+                       -e 's/\([0-9]\+\) fuzzy translations\?/FZ=\1/' \
+                       -e 's/\([0-9]\+\) untranslated messages\?/UT=\1/'`; \

                TR=0 FZ=0 UT=0; \
                eval $$x; \
                TOTAL=`expr $$TR + $$FZ + $$UT`; \
                echo "$$i.po `expr 100 "*" $$TR / $$TOTAL`% of $$TOTAL strings"; \
        done
 
                TR=0 FZ=0 UT=0; \
                eval $$x; \
                TOTAL=`expr $$TR + $$FZ + $$UT`; \
                echo "$$i.po `expr 100 "*" $$TR / $$TOTAL`% of $$TOTAL strings"; \
        done
 

-.PHONY: allpo allmo force-update percentage
+FORCE:
+
+.PHONY: allpo allmo force-update percentage FORCE

 
 # $Id$
 
 # $Id$