From 64672212b4169c723dfa3f9650e9672832716b2a Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Wed, 9 Mar 2016 20:25:14 +0800 Subject: [PATCH] Fix build warning Change-Id: Ib2fc96387897b16a9a91f09a12772aff20d081ad --- Makefile.am | 2 +- configure.ac | 2 +- ism/configs/Makefile.am | 2 +- ism/extras/efl_panel/Makefile.am | 14 ++++---------- ism/src/Makefile.am | 26 +++++++++++++++++--------- ism/src/isf_info_manager.cpp | 1 - ism/src/isf_panel_agent_base.cpp | 1 - ism/src/isf_panel_agent_manager.cpp | 1 - ism/src/scim_debug.h | 2 +- po/{scim => }/Makefile.in.in | 4 ++-- po/{scim => }/POTFILES.in | 0 po/{scim => }/ar.po | 0 po/{scim => }/as.po | 0 po/{scim => }/az.po | 0 po/{scim => }/be_BY.po | 0 po/{scim => }/bg.po | 0 po/{scim => }/bn.po | 0 po/{scim => }/bn_BD.po | 0 po/{scim => }/ca.po | 0 po/{scim => }/cs.po | 0 po/{scim => }/da.po | 0 po/{scim => }/de.po | 0 po/{scim => }/el_GR.po | 0 po/{scim => }/en.po | 0 po/{scim => }/en_PH.po | 0 po/{scim => }/en_US.po | 0 po/{scim => }/es_ES.po | 0 po/{scim => }/es_MX.po | 0 po/{scim => }/es_US.po | 0 po/{scim => }/et.po | 0 po/{scim => }/eu.po | 0 po/{scim => }/fa.po | 0 po/{scim => }/fi.po | 0 po/{scim => }/fr.po | 0 po/{scim => }/fr_CA.po | 0 po/{scim => }/ga.po | 0 po/{scim => }/gl.po | 0 po/{scim => }/gu.po | 0 po/{scim => }/he.po | 0 po/{scim => }/hi.po | 0 po/{scim => }/hr.po | 0 po/{scim => }/hu.po | 0 po/{scim => }/hy.po | 0 po/{scim => }/id.po | 0 po/{scim => }/is.po | 0 po/{scim => }/it_IT.po | 0 po/{scim => }/ja_JP.po | 0 po/{scim => }/ka.po | 0 po/{scim => }/kk.po | 0 po/{scim => }/km.po | 0 po/{scim => }/kn.po | 0 po/{scim => }/ko_KR.po | 0 po/{scim => }/ky_KG.po | 0 po/{scim => }/lo.po | 0 po/{scim => }/lt.po | 0 po/{scim => }/lv.po | 0 po/{scim => }/mg.po | 0 po/{scim => }/mk.po | 0 po/{scim => }/ml.po | 0 po/{scim => }/mn_MN.po | 0 po/{scim => }/mr.po | 0 po/{scim => }/ms.po | 0 po/{scim => }/my_MM.po | 0 po/{scim => }/my_ZG.po | 0 po/{scim => }/nb.po | 0 po/{scim => }/ne.po | 0 po/{scim => }/nl.po | 0 po/{scim => }/or.po | 0 po/{scim => }/pa.po | 0 po/{scim => }/pl.po | 0 po/{scim => }/pl_SP.po | 0 po/{scim => }/pt_BR.po | 0 po/{scim => }/pt_PT.po | 0 po/{scim => }/ro.po | 0 po/{scim => }/ru_RU.po | 0 po/{scim => }/scim.pot | 0 po/{scim => }/si.po | 0 po/{scim => }/sk.po | 0 po/{scim => }/sl.po | 0 po/{scim => }/sq.po | 0 po/{scim => }/sr.po | 0 po/{scim => }/sv.po | 0 po/{scim => }/sw.po | 0 po/{scim => }/ta.po | 0 po/{scim => }/te.po | 0 po/{scim => }/tg_TJ.po | 0 po/{scim => }/th.po | 0 po/{scim => }/tk_TM.po | 0 po/{scim => }/tl.po | 0 po/{scim => }/tr_TR.po | 0 po/{scim => }/uk.po | 0 po/{scim => }/update-po.sh | 2 +- po/{scim => }/ur.po | 0 po/{scim => }/uz.po | 0 po/{scim => }/vi.po | 0 po/{scim => }/xh.po | 0 po/{scim => }/zh_CN.po | 0 po/{scim => }/zh_HK.po | 0 po/{scim => }/zh_SG.po | 0 po/{scim => }/zh_TW.po | 0 po/{scim => }/zu.po | 0 101 files changed, 28 insertions(+), 29 deletions(-) rename po/{scim => }/Makefile.in.in (99%) rename po/{scim => }/POTFILES.in (100%) rename po/{scim => }/ar.po (100%) rename po/{scim => }/as.po (100%) rename po/{scim => }/az.po (100%) rename po/{scim => }/be_BY.po (100%) rename po/{scim => }/bg.po (100%) rename po/{scim => }/bn.po (100%) rename po/{scim => }/bn_BD.po (100%) rename po/{scim => }/ca.po (100%) rename po/{scim => }/cs.po (100%) rename po/{scim => }/da.po (100%) rename po/{scim => }/de.po (100%) rename po/{scim => }/el_GR.po (100%) rename po/{scim => }/en.po (100%) rename po/{scim => }/en_PH.po (100%) rename po/{scim => }/en_US.po (100%) rename po/{scim => }/es_ES.po (100%) rename po/{scim => }/es_MX.po (100%) rename po/{scim => }/es_US.po (100%) rename po/{scim => }/et.po (100%) rename po/{scim => }/eu.po (100%) rename po/{scim => }/fa.po (100%) rename po/{scim => }/fi.po (100%) rename po/{scim => }/fr.po (100%) rename po/{scim => }/fr_CA.po (100%) rename po/{scim => }/ga.po (100%) rename po/{scim => }/gl.po (100%) rename po/{scim => }/gu.po (100%) rename po/{scim => }/he.po (100%) rename po/{scim => }/hi.po (100%) rename po/{scim => }/hr.po (100%) rename po/{scim => }/hu.po (100%) rename po/{scim => }/hy.po (100%) rename po/{scim => }/id.po (100%) rename po/{scim => }/is.po (100%) rename po/{scim => }/it_IT.po (100%) rename po/{scim => }/ja_JP.po (100%) rename po/{scim => }/ka.po (100%) rename po/{scim => }/kk.po (100%) rename po/{scim => }/km.po (100%) rename po/{scim => }/kn.po (100%) rename po/{scim => }/ko_KR.po (100%) rename po/{scim => }/ky_KG.po (100%) rename po/{scim => }/lo.po (100%) rename po/{scim => }/lt.po (100%) rename po/{scim => }/lv.po (100%) rename po/{scim => }/mg.po (100%) rename po/{scim => }/mk.po (100%) rename po/{scim => }/ml.po (100%) rename po/{scim => }/mn_MN.po (100%) rename po/{scim => }/mr.po (100%) rename po/{scim => }/ms.po (100%) rename po/{scim => }/my_MM.po (100%) rename po/{scim => }/my_ZG.po (100%) rename po/{scim => }/nb.po (100%) rename po/{scim => }/ne.po (100%) rename po/{scim => }/nl.po (100%) rename po/{scim => }/or.po (100%) rename po/{scim => }/pa.po (100%) rename po/{scim => }/pl.po (100%) rename po/{scim => }/pl_SP.po (100%) rename po/{scim => }/pt_BR.po (100%) rename po/{scim => }/pt_PT.po (100%) rename po/{scim => }/ro.po (100%) rename po/{scim => }/ru_RU.po (100%) rename po/{scim => }/scim.pot (100%) rename po/{scim => }/si.po (100%) rename po/{scim => }/sk.po (100%) rename po/{scim => }/sl.po (100%) rename po/{scim => }/sq.po (100%) rename po/{scim => }/sr.po (100%) rename po/{scim => }/sv.po (100%) rename po/{scim => }/sw.po (100%) rename po/{scim => }/ta.po (100%) rename po/{scim => }/te.po (100%) rename po/{scim => }/tg_TJ.po (100%) rename po/{scim => }/th.po (100%) rename po/{scim => }/tk_TM.po (100%) rename po/{scim => }/tl.po (100%) rename po/{scim => }/tr_TR.po (100%) rename po/{scim => }/uk.po (100%) rename po/{scim => }/update-po.sh (99%) rename po/{scim => }/ur.po (100%) rename po/{scim => }/uz.po (100%) rename po/{scim => }/vi.po (100%) rename po/{scim => }/xh.po (100%) rename po/{scim => }/zh_CN.po (100%) rename po/{scim => }/zh_HK.po (100%) rename po/{scim => }/zh_SG.po (100%) rename po/{scim => }/zh_TW.po (100%) rename po/{scim => }/zu.po (100%) diff --git a/Makefile.am b/Makefile.am index b42307d..11ba5b1 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 466d3ba..fe7156e 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 6b9eb49..6929c9b 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 34598f9..ef574b3 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 76cc17c..d966457 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 ae150bd..9c8b277 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 5b29aed..65c92c5 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 acc5d2d..400e3fe 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 8cce3c4..081f3c4 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 similarity index 99% rename from po/scim/Makefile.in.in rename to po/Makefile.in.in index 183ecba..cc57094 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 similarity index 100% rename from po/scim/POTFILES.in rename to po/POTFILES.in diff --git a/po/scim/ar.po b/po/ar.po similarity index 100% rename from po/scim/ar.po rename to po/ar.po diff --git a/po/scim/as.po b/po/as.po similarity index 100% rename from po/scim/as.po rename to po/as.po diff --git a/po/scim/az.po b/po/az.po similarity index 100% rename from po/scim/az.po rename to po/az.po diff --git a/po/scim/be_BY.po b/po/be_BY.po similarity index 100% rename from po/scim/be_BY.po rename to po/be_BY.po diff --git a/po/scim/bg.po b/po/bg.po similarity index 100% rename from po/scim/bg.po rename to po/bg.po diff --git a/po/scim/bn.po b/po/bn.po similarity index 100% rename from po/scim/bn.po rename to po/bn.po diff --git a/po/scim/bn_BD.po b/po/bn_BD.po similarity index 100% rename from po/scim/bn_BD.po rename to po/bn_BD.po diff --git a/po/scim/ca.po b/po/ca.po similarity index 100% rename from po/scim/ca.po rename to po/ca.po diff --git a/po/scim/cs.po b/po/cs.po similarity index 100% rename from po/scim/cs.po rename to po/cs.po diff --git a/po/scim/da.po b/po/da.po similarity index 100% rename from po/scim/da.po rename to po/da.po diff --git a/po/scim/de.po b/po/de.po similarity index 100% rename from po/scim/de.po rename to po/de.po diff --git a/po/scim/el_GR.po b/po/el_GR.po similarity index 100% rename from po/scim/el_GR.po rename to po/el_GR.po diff --git a/po/scim/en.po b/po/en.po similarity index 100% rename from po/scim/en.po rename to po/en.po diff --git a/po/scim/en_PH.po b/po/en_PH.po similarity index 100% rename from po/scim/en_PH.po rename to po/en_PH.po diff --git a/po/scim/en_US.po b/po/en_US.po similarity index 100% rename from po/scim/en_US.po rename to po/en_US.po diff --git a/po/scim/es_ES.po b/po/es_ES.po similarity index 100% rename from po/scim/es_ES.po rename to po/es_ES.po diff --git a/po/scim/es_MX.po b/po/es_MX.po similarity index 100% rename from po/scim/es_MX.po rename to po/es_MX.po diff --git a/po/scim/es_US.po b/po/es_US.po similarity index 100% rename from po/scim/es_US.po rename to po/es_US.po diff --git a/po/scim/et.po b/po/et.po similarity index 100% rename from po/scim/et.po rename to po/et.po diff --git a/po/scim/eu.po b/po/eu.po similarity index 100% rename from po/scim/eu.po rename to po/eu.po diff --git a/po/scim/fa.po b/po/fa.po similarity index 100% rename from po/scim/fa.po rename to po/fa.po diff --git a/po/scim/fi.po b/po/fi.po similarity index 100% rename from po/scim/fi.po rename to po/fi.po diff --git a/po/scim/fr.po b/po/fr.po similarity index 100% rename from po/scim/fr.po rename to po/fr.po diff --git a/po/scim/fr_CA.po b/po/fr_CA.po similarity index 100% rename from po/scim/fr_CA.po rename to po/fr_CA.po diff --git a/po/scim/ga.po b/po/ga.po similarity index 100% rename from po/scim/ga.po rename to po/ga.po diff --git a/po/scim/gl.po b/po/gl.po similarity index 100% rename from po/scim/gl.po rename to po/gl.po diff --git a/po/scim/gu.po b/po/gu.po similarity index 100% rename from po/scim/gu.po rename to po/gu.po diff --git a/po/scim/he.po b/po/he.po similarity index 100% rename from po/scim/he.po rename to po/he.po diff --git a/po/scim/hi.po b/po/hi.po similarity index 100% rename from po/scim/hi.po rename to po/hi.po diff --git a/po/scim/hr.po b/po/hr.po similarity index 100% rename from po/scim/hr.po rename to po/hr.po diff --git a/po/scim/hu.po b/po/hu.po similarity index 100% rename from po/scim/hu.po rename to po/hu.po diff --git a/po/scim/hy.po b/po/hy.po similarity index 100% rename from po/scim/hy.po rename to po/hy.po diff --git a/po/scim/id.po b/po/id.po similarity index 100% rename from po/scim/id.po rename to po/id.po diff --git a/po/scim/is.po b/po/is.po similarity index 100% rename from po/scim/is.po rename to po/is.po diff --git a/po/scim/it_IT.po b/po/it_IT.po similarity index 100% rename from po/scim/it_IT.po rename to po/it_IT.po diff --git a/po/scim/ja_JP.po b/po/ja_JP.po similarity index 100% rename from po/scim/ja_JP.po rename to po/ja_JP.po diff --git a/po/scim/ka.po b/po/ka.po similarity index 100% rename from po/scim/ka.po rename to po/ka.po diff --git a/po/scim/kk.po b/po/kk.po similarity index 100% rename from po/scim/kk.po rename to po/kk.po diff --git a/po/scim/km.po b/po/km.po similarity index 100% rename from po/scim/km.po rename to po/km.po diff --git a/po/scim/kn.po b/po/kn.po similarity index 100% rename from po/scim/kn.po rename to po/kn.po diff --git a/po/scim/ko_KR.po b/po/ko_KR.po similarity index 100% rename from po/scim/ko_KR.po rename to po/ko_KR.po diff --git a/po/scim/ky_KG.po b/po/ky_KG.po similarity index 100% rename from po/scim/ky_KG.po rename to po/ky_KG.po diff --git a/po/scim/lo.po b/po/lo.po similarity index 100% rename from po/scim/lo.po rename to po/lo.po diff --git a/po/scim/lt.po b/po/lt.po similarity index 100% rename from po/scim/lt.po rename to po/lt.po diff --git a/po/scim/lv.po b/po/lv.po similarity index 100% rename from po/scim/lv.po rename to po/lv.po diff --git a/po/scim/mg.po b/po/mg.po similarity index 100% rename from po/scim/mg.po rename to po/mg.po diff --git a/po/scim/mk.po b/po/mk.po similarity index 100% rename from po/scim/mk.po rename to po/mk.po diff --git a/po/scim/ml.po b/po/ml.po similarity index 100% rename from po/scim/ml.po rename to po/ml.po diff --git a/po/scim/mn_MN.po b/po/mn_MN.po similarity index 100% rename from po/scim/mn_MN.po rename to po/mn_MN.po diff --git a/po/scim/mr.po b/po/mr.po similarity index 100% rename from po/scim/mr.po rename to po/mr.po diff --git a/po/scim/ms.po b/po/ms.po similarity index 100% rename from po/scim/ms.po rename to po/ms.po diff --git a/po/scim/my_MM.po b/po/my_MM.po similarity index 100% rename from po/scim/my_MM.po rename to po/my_MM.po diff --git a/po/scim/my_ZG.po b/po/my_ZG.po similarity index 100% rename from po/scim/my_ZG.po rename to po/my_ZG.po diff --git a/po/scim/nb.po b/po/nb.po similarity index 100% rename from po/scim/nb.po rename to po/nb.po diff --git a/po/scim/ne.po b/po/ne.po similarity index 100% rename from po/scim/ne.po rename to po/ne.po diff --git a/po/scim/nl.po b/po/nl.po similarity index 100% rename from po/scim/nl.po rename to po/nl.po diff --git a/po/scim/or.po b/po/or.po similarity index 100% rename from po/scim/or.po rename to po/or.po diff --git a/po/scim/pa.po b/po/pa.po similarity index 100% rename from po/scim/pa.po rename to po/pa.po diff --git a/po/scim/pl.po b/po/pl.po similarity index 100% rename from po/scim/pl.po rename to po/pl.po diff --git a/po/scim/pl_SP.po b/po/pl_SP.po similarity index 100% rename from po/scim/pl_SP.po rename to po/pl_SP.po diff --git a/po/scim/pt_BR.po b/po/pt_BR.po similarity index 100% rename from po/scim/pt_BR.po rename to po/pt_BR.po diff --git a/po/scim/pt_PT.po b/po/pt_PT.po similarity index 100% rename from po/scim/pt_PT.po rename to po/pt_PT.po diff --git a/po/scim/ro.po b/po/ro.po similarity index 100% rename from po/scim/ro.po rename to po/ro.po diff --git a/po/scim/ru_RU.po b/po/ru_RU.po similarity index 100% rename from po/scim/ru_RU.po rename to po/ru_RU.po diff --git a/po/scim/scim.pot b/po/scim.pot similarity index 100% rename from po/scim/scim.pot rename to po/scim.pot diff --git a/po/scim/si.po b/po/si.po similarity index 100% rename from po/scim/si.po rename to po/si.po diff --git a/po/scim/sk.po b/po/sk.po similarity index 100% rename from po/scim/sk.po rename to po/sk.po diff --git a/po/scim/sl.po b/po/sl.po similarity index 100% rename from po/scim/sl.po rename to po/sl.po diff --git a/po/scim/sq.po b/po/sq.po similarity index 100% rename from po/scim/sq.po rename to po/sq.po diff --git a/po/scim/sr.po b/po/sr.po similarity index 100% rename from po/scim/sr.po rename to po/sr.po diff --git a/po/scim/sv.po b/po/sv.po similarity index 100% rename from po/scim/sv.po rename to po/sv.po diff --git a/po/scim/sw.po b/po/sw.po similarity index 100% rename from po/scim/sw.po rename to po/sw.po diff --git a/po/scim/ta.po b/po/ta.po similarity index 100% rename from po/scim/ta.po rename to po/ta.po diff --git a/po/scim/te.po b/po/te.po similarity index 100% rename from po/scim/te.po rename to po/te.po diff --git a/po/scim/tg_TJ.po b/po/tg_TJ.po similarity index 100% rename from po/scim/tg_TJ.po rename to po/tg_TJ.po diff --git a/po/scim/th.po b/po/th.po similarity index 100% rename from po/scim/th.po rename to po/th.po diff --git a/po/scim/tk_TM.po b/po/tk_TM.po similarity index 100% rename from po/scim/tk_TM.po rename to po/tk_TM.po diff --git a/po/scim/tl.po b/po/tl.po similarity index 100% rename from po/scim/tl.po rename to po/tl.po diff --git a/po/scim/tr_TR.po b/po/tr_TR.po similarity index 100% rename from po/scim/tr_TR.po rename to po/tr_TR.po diff --git a/po/scim/uk.po b/po/uk.po similarity index 100% rename from po/scim/uk.po rename to po/uk.po diff --git a/po/scim/update-po.sh b/po/update-po.sh similarity index 99% rename from po/scim/update-po.sh rename to po/update-po.sh index b234b4b..5c2c214 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 similarity index 100% rename from po/scim/ur.po rename to po/ur.po diff --git a/po/scim/uz.po b/po/uz.po similarity index 100% rename from po/scim/uz.po rename to po/uz.po diff --git a/po/scim/vi.po b/po/vi.po similarity index 100% rename from po/scim/vi.po rename to po/vi.po diff --git a/po/scim/xh.po b/po/xh.po similarity index 100% rename from po/scim/xh.po rename to po/xh.po diff --git a/po/scim/zh_CN.po b/po/zh_CN.po similarity index 100% rename from po/scim/zh_CN.po rename to po/zh_CN.po diff --git a/po/scim/zh_HK.po b/po/zh_HK.po similarity index 100% rename from po/scim/zh_HK.po rename to po/zh_HK.po diff --git a/po/scim/zh_SG.po b/po/zh_SG.po similarity index 100% rename from po/scim/zh_SG.po rename to po/zh_SG.po diff --git a/po/scim/zh_TW.po b/po/zh_TW.po similarity index 100% rename from po/scim/zh_TW.po rename to po/zh_TW.po diff --git a/po/scim/zu.po b/po/zu.po similarity index 100% rename from po/scim/zu.po rename to po/zu.po -- 2.7.4