Fix build warning

Change-Id: Ib2fc96387897b16a9a91f09a12772aff20d081ad

101 files changed, 28 insertions, 29 deletions

diff --git a/Makefile.am b/Makefile.am
index b42307da..11ba5b11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST		= config.rpath \
 			  intltool-update.in
 
 AUTOMAKE_OPTIONS 	= gnu
-SUBDIRS 		= ism/src ism/utils ism/modules ism/configs po/scim ism/extras ism/data ism/demos
+SUBDIRS 		= ism/src ism/utils ism/modules ism/configs po ism/extras ism/data ism/demos
 
 MAINTAINERCLEANFILES 	= Makefile.in \
 			  aclocal.m4 \
diff --git a/configure.ac b/configure.ac
index 466d3ba4..fe7156e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,7 +780,7 @@ AC_SUBST(RO_PACKAGES_DIR)
 ###########################################################
 AC_SUBST(ac_aux_dir)
 AC_CONFIG_FILES([Makefile
-                 po/scim/Makefile.in
+                 po/Makefile.in
                  ism/src/Makefile
                  ism/src/scim_types.h
                  ism/utils/Makefile
diff --git a/ism/configs/Makefile.am b/ism/configs/Makefile.am
index 6b9eb490..6929c9b0 100644
--- a/ism/configs/Makefile.am
+++ b/ism/configs/Makefile.am
@@ -5,7 +5,7 @@ CLEANFILES  = *.bak
 if SCIM_BUILD_CONFIG_SIMPLE
 configdir   = $(sysconfdir)/scim
 config_DATA = config global
-config_source_data = $(foreach file, $(config_DATA), $(srcdir)/$(file))
+config_source_data = $(srcdir)/config $(srcdir)/global
 endif
 
 EXTRA_DIST  = $(config_DATA)
diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index 34598f9b..ef574b31 100644
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -26,9 +26,7 @@ endif
 bin_PROGRAMS           = $(CONFIG_SCIM_PANEL_EFL)
 
 isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
-                         isf_panel_utility.cpp \
-                         $(top_builddir)/ism/src/isf_pkg.cpp \
-                         $(top_builddir)/ism/src/privilege_checker.cpp
+                         isf_panel_utility.cpp
 
 isf_panel_efl_CXXFLAGS = @ECOREX_CFLAGS@ \
                          @EDJE_CFLAGS@ \
@@ -41,11 +39,8 @@ isf_panel_efl_CXXFLAGS = @ECOREX_CFLAGS@ \
                          @EDBUS_CFLAGS@ \
                          @BLUETOOTH_CFLAGS@ \
                          @FEEDBACK_CFLAGS@ \
-                         @PACKAGE_MANAGER_CFLAGS@ \
-                         @PKGMGR_INFO_CFLAGS@ \
                          @APP_CONTROL_CFLAGS@ \
                          @WAYLAND_CFLAGS@ \
-                         @CYNARA_CFLAGS@ \
                          -fPIE
 
 isf_panel_efl_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
@@ -60,12 +55,11 @@ isf_panel_efl_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
                          @EDBUS_LIBS@ \
                          @BLUETOOTH_LIBS@ \
                          @FEEDBACK_LIBS@ \
-                         @PACKAGE_MANAGER_LIBS@ \
-                         @PKGMGR_INFO_LIBS@ \
                          @APP_CONTROL_LIBS@ \
                          @WAYLAND_LIBS@ \
-                         @CYNARA_LIBS@ \
                          -pie
 
-isf_panel_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
+isf_panel_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la \
+                         $(top_builddir)/ism/src/libisf_pkg.la \
+                         $(top_builddir)/ism/src/libprivilege_checker.la
 
diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index 76cc17cb..d966457e 100644
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -97,11 +97,19 @@ libsciminclude_HEADERS 	= scim.h \
 			  isf_panel_agent_base.h \
 			  isf_panel_agent_module.h
 
-noinst_LTLIBRARIES	= libltdlc.la
+noinst_LTLIBRARIES	= libltdlc.la libprivilege_checker.la libisf_pkg.la
 
 libltdlc_la_SOURCES	= ltdl.cpp
 libltdlc_la_LIBADD	= $(LIBADD_DL)
 
+libprivilege_checker_la_SOURCES	= privilege_checker.cpp
+libprivilege_checker_la_CXXFLAGS = @DLOG_CFLAGS@ @CYNARA_CFLAGS@
+libprivilege_checker_la_LIBADD	= @DLOG_LIBS@ @CYNARA_LIBS@
+
+libisf_pkg_la_SOURCES	= isf_pkg.cpp
+libisf_pkg_la_CXXFLAGS =  @DLOG_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @PACKAGE_MANAGER_CFLAGS@
+libisf_pkg_la_LIBADD	= @DLOG_LIBS@ @PKGMGR_INFO_LIBS@  @PACKAGE_MANAGER_LIBS@
+
 if SCIM_LD_VERSION_SCRIPT
 LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
 endif
@@ -171,10 +179,10 @@ libscim@SCIM_EPOCH@_la_LIBADD	= libltdlc.la
 
 bin_PROGRAMS		= scim isf-log
 
-scim_SOURCES	 	= scim.cpp isf_pkg.cpp
-scim_CXXFLAGS		= @ECORE_CFLAGS@ @ECORE_IPC_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE
-scim_LDADD		= libscim@SCIM_EPOCH@.la
-scim_LDFLAGS		= @LTLIBINTL@ @ECORE_LIBS@ @ECORE_IPC_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie
+scim_SOURCES	 	= scim.cpp
+scim_CXXFLAGS		= @ECORE_CFLAGS@ @ECORE_IPC_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE
+scim_LDADD		= libscim@SCIM_EPOCH@.la libisf_pkg.la
+scim_LDFLAGS		= @LTLIBINTL@ @ECORE_LIBS@ @ECORE_IPC_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie
 
 isf_log_SOURCES	 	= isf_log.cpp
 isf_log_LDADD		= libscim@SCIM_EPOCH@.la
@@ -189,10 +197,10 @@ endif
 libexecdir		= $(libdir)/scim@SCIM_EPOCH@
 libexec_PROGRAMS        = scim-launcher scim-helper-launcher
 
-scim_launcher_SOURCES 	= scim_launcher.cpp isf_pkg.cpp
-scim_launcher_LDADD	= libscim@SCIM_EPOCH@.la
-scim_launcher_CXXFLAGS  = @VCONF_CFLAGS@ @PKGMGR_INFO_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE
-scim_launcher_LDFLAGS	= @LTLIBINTL@ @VCONF_LIBS@ @PKGMGR_INFO_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie
+scim_launcher_SOURCES 	= scim_launcher.cpp
+scim_launcher_LDADD	= libscim@SCIM_EPOCH@.la libisf_pkg.la
+scim_launcher_CXXFLAGS  = @VCONF_CFLAGS@ @DLOG_CFLAGS@ @TZPLATFORM_CONFIG_CFLAGS@ -fPIE
+scim_launcher_LDFLAGS	= @LTLIBINTL@ @VCONF_LIBS@ @DLOG_LIBS@ @TZPLATFORM_CONFIG_LIBS@ -pie
 
 scim_helper_launcher_SOURCES 	= scim_helper_launcher.cpp
 scim_helper_launcher_CXXFLAGS	= -fPIE
diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp
index ae150bd7..9c8b277a 100644
--- a/ism/src/isf_info_manager.cpp
+++ b/ism/src/isf_info_manager.cpp
@@ -65,7 +65,6 @@
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
-#include "privilege_checker.h"
 #include "isf_panel_agent_manager.h"
 
 #ifdef LOG_TAG
diff --git a/ism/src/isf_panel_agent_base.cpp b/ism/src/isf_panel_agent_base.cpp
index 5b29aed9..65c92c5e 100644
--- a/ism/src/isf_panel_agent_base.cpp
+++ b/ism/src/isf_panel_agent_base.cpp
@@ -47,7 +47,6 @@
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
-#include "privilege_checker.h"
 
 #ifdef LOG_TAG
 # undef LOG_TAG
diff --git a/ism/src/isf_panel_agent_manager.cpp b/ism/src/isf_panel_agent_manager.cpp
index acc5d2de..400e3fec 100644
--- a/ism/src/isf_panel_agent_manager.cpp
+++ b/ism/src/isf_panel_agent_manager.cpp
@@ -48,7 +48,6 @@
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
-#include "privilege_checker.h"
 
 #ifdef LOG_TAG
 # undef LOG_TAG
diff --git a/ism/src/scim_debug.h b/ism/src/scim_debug.h
index 8cce3c49..081f3c40 100644
--- a/ism/src/scim_debug.h
+++ b/ism/src/scim_debug.h
@@ -45,7 +45,7 @@ namespace scim {
  * @name The mask for debug messages filtering.
  * @{
  */
-#define SCIM_DEBUG_AllMask          (~0) /**< Show all messages. */
+#define SCIM_DEBUG_AllMask          (0xffffffff) /**< Show all messages. */
 #define SCIM_DEBUG_MainMask         1    /**< Show messages of main application. */
 #define SCIM_DEBUG_ConfigMask       2    /**< Show messages of Config objects */
 #define SCIM_DEBUG_IMEngineMask     4    /**< Show messages of IMEngine objects */
diff --git a/po/scim/Makefile.in.in b/po/Makefile.in.in
index 183ecba6..cc57094f 100755
--- a/po/scim/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -246,8 +246,8 @@ POTFILES: POTFILES.in
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
-Makefile: Makefile.in.in ../../config.status POTFILES
-	cd ../.. \
+Makefile: Makefile.in.in ../config.status POTFILES
+	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
diff --git a/po/scim/POTFILES.in b/po/POTFILES.in
index a978dcc1..a978dcc1 100755
--- a/po/scim/POTFILES.in
+++ b/po/POTFILES.in
diff --git a/po/scim/ar.po b/po/ar.po
index a156a004..a156a004 100644
--- a/po/scim/ar.po
+++ b/po/ar.po
diff --git a/po/scim/as.po b/po/as.po
index 6550e818..6550e818 100644
--- a/po/scim/as.po
+++ b/po/as.po
diff --git a/po/scim/az.po b/po/az.po
index 70475f56..70475f56 100644
--- a/po/scim/az.po
+++ b/po/az.po
diff --git a/po/scim/be_BY.po b/po/be_BY.po
index ce696e6c..ce696e6c 100644
--- a/po/scim/be_BY.po
+++ b/po/be_BY.po
diff --git a/po/scim/bg.po b/po/bg.po
index 853d13a9..853d13a9 100644
--- a/po/scim/bg.po
+++ b/po/bg.po
diff --git a/po/scim/bn.po b/po/bn.po
index 6e4076ed..6e4076ed 100644
--- a/po/scim/bn.po
+++ b/po/bn.po
diff --git a/po/scim/bn_BD.po b/po/bn_BD.po
index c1aa611f..c1aa611f 100644
--- a/po/scim/bn_BD.po
+++ b/po/bn_BD.po
diff --git a/po/scim/ca.po b/po/ca.po
index 6de8231d..6de8231d 100644
--- a/po/scim/ca.po
+++ b/po/ca.po
diff --git a/po/scim/cs.po b/po/cs.po
index 0f5ee13d..0f5ee13d 100644
--- a/po/scim/cs.po
+++ b/po/cs.po
diff --git a/po/scim/da.po b/po/da.po
index 7b78fa97..7b78fa97 100644
--- a/po/scim/da.po
+++ b/po/da.po
diff --git a/po/scim/de.po b/po/de.po
index 33c68e85..33c68e85 100644
--- a/po/scim/de.po
+++ b/po/de.po
diff --git a/po/scim/el_GR.po b/po/el_GR.po
index 3fba3ad1..3fba3ad1 100644
--- a/po/scim/el_GR.po
+++ b/po/el_GR.po
diff --git a/po/scim/en.po b/po/en.po
index f1826378..f1826378 100644
--- a/po/scim/en.po
+++ b/po/en.po
diff --git a/po/scim/en_PH.po b/po/en_PH.po
index f1826378..f1826378 100644
--- a/po/scim/en_PH.po
+++ b/po/en_PH.po
diff --git a/po/scim/en_US.po b/po/en_US.po
index 431b950f..431b950f 100644
--- a/po/scim/en_US.po
+++ b/po/en_US.po
diff --git a/po/scim/es_ES.po b/po/es_ES.po
index 8671b2e4..8671b2e4 100644
--- a/po/scim/es_ES.po
+++ b/po/es_ES.po
diff --git a/po/scim/es_MX.po b/po/es_MX.po
index 1c2bc8ea..1c2bc8ea 100644
--- a/po/scim/es_MX.po
+++ b/po/es_MX.po
diff --git a/po/scim/es_US.po b/po/es_US.po
index b7c2c837..b7c2c837 100644
--- a/po/scim/es_US.po
+++ b/po/es_US.po
diff --git a/po/scim/et.po b/po/et.po
index f926facf..f926facf 100644
--- a/po/scim/et.po
+++ b/po/et.po
diff --git a/po/scim/eu.po b/po/eu.po
index d570d365..d570d365 100644
--- a/po/scim/eu.po
+++ b/po/eu.po
diff --git a/po/scim/fa.po b/po/fa.po
index e61fd8f4..e61fd8f4 100644
--- a/po/scim/fa.po
+++ b/po/fa.po
diff --git a/po/scim/fi.po b/po/fi.po
index b1667c9e..b1667c9e 100644
--- a/po/scim/fi.po
+++ b/po/fi.po
diff --git a/po/scim/fr.po b/po/fr.po
index 03db0186..03db0186 100644
--- a/po/scim/fr.po
+++ b/po/fr.po
diff --git a/po/scim/fr_CA.po b/po/fr_CA.po
index e908b4d7..e908b4d7 100644
--- a/po/scim/fr_CA.po
+++ b/po/fr_CA.po
diff --git a/po/scim/ga.po b/po/ga.po
index d00f4189..d00f4189 100644
--- a/po/scim/ga.po
+++ b/po/ga.po
diff --git a/po/scim/gl.po b/po/gl.po
index 5ef8026c..5ef8026c 100644
--- a/po/scim/gl.po
+++ b/po/gl.po
diff --git a/po/scim/gu.po b/po/gu.po
index 606d2b27..606d2b27 100644
--- a/po/scim/gu.po
+++ b/po/gu.po
diff --git a/po/scim/he.po b/po/he.po
index 5b7d4fc6..5b7d4fc6 100644
--- a/po/scim/he.po
+++ b/po/he.po
diff --git a/po/scim/hi.po b/po/hi.po
index 7df94b4a..7df94b4a 100644
--- a/po/scim/hi.po
+++ b/po/hi.po
diff --git a/po/scim/hr.po b/po/hr.po
index 4d769a10..4d769a10 100644
--- a/po/scim/hr.po
+++ b/po/hr.po
diff --git a/po/scim/hu.po b/po/hu.po
index 0f317963..0f317963 100644
--- a/po/scim/hu.po
+++ b/po/hu.po
diff --git a/po/scim/hy.po b/po/hy.po
index 9a19fc7f..9a19fc7f 100644
--- a/po/scim/hy.po
+++ b/po/hy.po
diff --git a/po/scim/id.po b/po/id.po
index 187d22e9..187d22e9 100644
--- a/po/scim/id.po
+++ b/po/id.po
diff --git a/po/scim/is.po b/po/is.po
index 31ca57a5..31ca57a5 100644
--- a/po/scim/is.po
+++ b/po/is.po
diff --git a/po/scim/it_IT.po b/po/it_IT.po
index 5d04fc21..5d04fc21 100644
--- a/po/scim/it_IT.po
+++ b/po/it_IT.po
diff --git a/po/scim/ja_JP.po b/po/ja_JP.po
index 12d2d108..12d2d108 100644
--- a/po/scim/ja_JP.po
+++ b/po/ja_JP.po
diff --git a/po/scim/ka.po b/po/ka.po
index 40d0c71c..40d0c71c 100644
--- a/po/scim/ka.po
+++ b/po/ka.po
diff --git a/po/scim/kk.po b/po/kk.po
index 48d19825..48d19825 100644
--- a/po/scim/kk.po
+++ b/po/kk.po
diff --git a/po/scim/km.po b/po/km.po
index d4473166..d4473166 100644
--- a/po/scim/km.po
+++ b/po/km.po
diff --git a/po/scim/kn.po b/po/kn.po
index 575d8de0..575d8de0 100644
--- a/po/scim/kn.po
+++ b/po/kn.po
diff --git a/po/scim/ko_KR.po b/po/ko_KR.po
index d76fd052..d76fd052 100644
--- a/po/scim/ko_KR.po
+++ b/po/ko_KR.po
diff --git a/po/scim/ky_KG.po b/po/ky_KG.po
index 31bfd865..31bfd865 100644
--- a/po/scim/ky_KG.po
+++ b/po/ky_KG.po
diff --git a/po/scim/lo.po b/po/lo.po
index d9358eb7..d9358eb7 100644
--- a/po/scim/lo.po
+++ b/po/lo.po
diff --git a/po/scim/lt.po b/po/lt.po
index 8cc68843..8cc68843 100644
--- a/po/scim/lt.po
+++ b/po/lt.po
diff --git a/po/scim/lv.po b/po/lv.po
index 08780e8d..08780e8d 100644
--- a/po/scim/lv.po
+++ b/po/lv.po
diff --git a/po/scim/mg.po b/po/mg.po
index 02a716c1..02a716c1 100644
--- a/po/scim/mg.po
+++ b/po/mg.po
diff --git a/po/scim/mk.po b/po/mk.po
index 40f676fd..40f676fd 100644
--- a/po/scim/mk.po
+++ b/po/mk.po
diff --git a/po/scim/ml.po b/po/ml.po
index b25977ab..b25977ab 100644
--- a/po/scim/ml.po
+++ b/po/ml.po
diff --git a/po/scim/mn_MN.po b/po/mn_MN.po
index 29fcc893..29fcc893 100644
--- a/po/scim/mn_MN.po
+++ b/po/mn_MN.po
diff --git a/po/scim/mr.po b/po/mr.po
index 3de31851..3de31851 100644
--- a/po/scim/mr.po
+++ b/po/mr.po
diff --git a/po/scim/ms.po b/po/ms.po
index c33a93b1..c33a93b1 100644
--- a/po/scim/ms.po
+++ b/po/ms.po
diff --git a/po/scim/my_MM.po b/po/my_MM.po
index eb5232a0..eb5232a0 100644
--- a/po/scim/my_MM.po
+++ b/po/my_MM.po
diff --git a/po/scim/my_ZG.po b/po/my_ZG.po
index a5433932..a5433932 100644
--- a/po/scim/my_ZG.po
+++ b/po/my_ZG.po
diff --git a/po/scim/nb.po b/po/nb.po
index 08850589..08850589 100644
--- a/po/scim/nb.po
+++ b/po/nb.po
diff --git a/po/scim/ne.po b/po/ne.po
index e43bf645..e43bf645 100644
--- a/po/scim/ne.po
+++ b/po/ne.po
diff --git a/po/scim/nl.po b/po/nl.po
index d66f2fee..d66f2fee 100644
--- a/po/scim/nl.po
+++ b/po/nl.po
diff --git a/po/scim/or.po b/po/or.po
index 41219026..41219026 100644
--- a/po/scim/or.po
+++ b/po/or.po
diff --git a/po/scim/pa.po b/po/pa.po
index e1285693..e1285693 100644
--- a/po/scim/pa.po
+++ b/po/pa.po
diff --git a/po/scim/pl.po b/po/pl.po
index a9d6a842..a9d6a842 100644
--- a/po/scim/pl.po
+++ b/po/pl.po
diff --git a/po/scim/pl_SP.po b/po/pl_SP.po
index 8899002a..8899002a 100644
--- a/po/scim/pl_SP.po
+++ b/po/pl_SP.po
diff --git a/po/scim/pt_BR.po b/po/pt_BR.po
index cd279d48..cd279d48 100644
--- a/po/scim/pt_BR.po
+++ b/po/pt_BR.po
diff --git a/po/scim/pt_PT.po b/po/pt_PT.po
index fbb769c2..fbb769c2 100644
--- a/po/scim/pt_PT.po
+++ b/po/pt_PT.po
diff --git a/po/scim/ro.po b/po/ro.po
index b2b3f7c4..b2b3f7c4 100644
--- a/po/scim/ro.po
+++ b/po/ro.po
diff --git a/po/scim/ru_RU.po b/po/ru_RU.po
index 79d7e467..79d7e467 100644
--- a/po/scim/ru_RU.po
+++ b/po/ru_RU.po
diff --git a/po/scim/scim.pot b/po/scim.pot
index 2edc5c46..2edc5c46 100644
--- a/po/scim/scim.pot
+++ b/po/scim.pot
diff --git a/po/scim/si.po b/po/si.po
index 4226b24e..4226b24e 100644
--- a/po/scim/si.po
+++ b/po/si.po
diff --git a/po/scim/sk.po b/po/sk.po
index acbbf8fd..acbbf8fd 100644
--- a/po/scim/sk.po
+++ b/po/sk.po
diff --git a/po/scim/sl.po b/po/sl.po
index b6b82365..b6b82365 100644
--- a/po/scim/sl.po
+++ b/po/sl.po
diff --git a/po/scim/sq.po b/po/sq.po
index 6e00b316..6e00b316 100644
--- a/po/scim/sq.po
+++ b/po/sq.po
diff --git a/po/scim/sr.po b/po/sr.po
index d94b132a..d94b132a 100644
--- a/po/scim/sr.po
+++ b/po/sr.po
diff --git a/po/scim/sv.po b/po/sv.po
index 347ade8b..347ade8b 100644
--- a/po/scim/sv.po
+++ b/po/sv.po
diff --git a/po/scim/sw.po b/po/sw.po
index 446a7272..446a7272 100644
--- a/po/scim/sw.po
+++ b/po/sw.po
diff --git a/po/scim/ta.po b/po/ta.po
index 39ba25b2..39ba25b2 100644
--- a/po/scim/ta.po
+++ b/po/ta.po
diff --git a/po/scim/te.po b/po/te.po
index c4f86927..c4f86927 100644
--- a/po/scim/te.po
+++ b/po/te.po
diff --git a/po/scim/tg_TJ.po b/po/tg_TJ.po
index 6f09d5cc..6f09d5cc 100644
--- a/po/scim/tg_TJ.po
+++ b/po/tg_TJ.po
diff --git a/po/scim/th.po b/po/th.po
index 29afe72b..29afe72b 100644
--- a/po/scim/th.po
+++ b/po/th.po
diff --git a/po/scim/tk_TM.po b/po/tk_TM.po
index b21f78cc..b21f78cc 100644
--- a/po/scim/tk_TM.po
+++ b/po/tk_TM.po
diff --git a/po/scim/tl.po b/po/tl.po
index 7416cd47..7416cd47 100644
--- a/po/scim/tl.po
+++ b/po/tl.po
diff --git a/po/scim/tr_TR.po b/po/tr_TR.po
index b813fab1..b813fab1 100644
--- a/po/scim/tr_TR.po
+++ b/po/tr_TR.po
diff --git a/po/scim/uk.po b/po/uk.po
index ce6526ff..ce6526ff 100644
--- a/po/scim/uk.po
+++ b/po/uk.po
diff --git a/po/scim/update-po.sh b/po/update-po.sh
index b234b4b5..5c2c2148 100755
--- a/po/scim/update-po.sh
+++ b/po/update-po.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PACKAGE=scim
-SRCROOT=../..
+SRCROOT=..
 POTFILES=POTFILES.in
 
 ALL_LINGUAS="ar as az be_BY bg bn bn_BD ca cs da de el_GR en en_PH en_US es_ES es_MX es_US et eu fa fi fr fr_CA ga gl gu he hi hr hu hy id is it_IT ja_JP ka kk km kn ko_KR ky_KG lo lt lv mg mk ml mn_MN mr ms my_MM my_ZG nb ne nl or pa pl pl_SP pt_BR pt_PT ro ru_RU si sk sl sq sr sv sw ta te tg_TJ th tk_TM tl tr_TR uk ur uz vi xh zh_CN zh_HK zh_TW zh_TW zu"
diff --git a/po/scim/ur.po b/po/ur.po
index 142137f2..142137f2 100644
--- a/po/scim/ur.po
+++ b/po/ur.po
diff --git a/po/scim/uz.po b/po/uz.po
index 1880727c..1880727c 100644
--- a/po/scim/uz.po
+++ b/po/uz.po
diff --git a/po/scim/vi.po b/po/vi.po
index fc358bff..fc358bff 100644
--- a/po/scim/vi.po
+++ b/po/vi.po
diff --git a/po/scim/xh.po b/po/xh.po
index 1a7c95b3..1a7c95b3 100644
--- a/po/scim/xh.po
+++ b/po/xh.po
diff --git a/po/scim/zh_CN.po b/po/zh_CN.po
index 48a09289..48a09289 100644
--- a/po/scim/zh_CN.po
+++ b/po/zh_CN.po
diff --git a/po/scim/zh_HK.po b/po/zh_HK.po
index 93945d42..93945d42 100644
--- a/po/scim/zh_HK.po
+++ b/po/zh_HK.po
diff --git a/po/scim/zh_SG.po b/po/zh_SG.po
index 29114669..29114669 100644
--- a/po/scim/zh_SG.po
+++ b/po/zh_SG.po
diff --git a/po/scim/zh_TW.po b/po/zh_TW.po
index bb2daae5..bb2daae5 100644
--- a/po/scim/zh_TW.po
+++ b/po/zh_TW.po
diff --git a/po/scim/zu.po b/po/zu.po
index b90ba270..b90ba270 100644
--- a/po/scim/zu.po
+++ b/po/zu.po