* configure.ac: 0.12.0

[hildon] / po / Makefile.in

diff --git a/po/Makefile.in b/po/Makefile.in
index aa2f848..08ca523 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -59,8 +59,6 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DOXYGEN_FOUND = @DOXYGEN_FOUND@
@@ -96,6 +94,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
+LIBMB_CFLAGS = @LIBMB_CFLAGS@
+LIBMB_LIBS = @LIBMB_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -336,10 +336,10 @@ all: $(foreach mo,$(languages),$(mo).mo)
 
 merge:
        for mo in $(languages); do \
-               xgettext -fPOTFILES --foreign-user -C -o$$mo.pot -k_; \
-               msgmerge -v $$mo.po $$mo.pot >messages.tmp; \
+               echo "Merging $$mo..."; \
+               msgmerge -v $$mo.po hildon-libs.pot >messages.tmp; \
                mv messages.tmp $$mo.po; \
-               rm $$mo.pot; \
+               msgfmt --statistics $$mo.po -o /dev/null; \
        done
 
 install-data-local: all