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 \
###########################################################
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
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)
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@ \
@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) \
@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
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
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
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
#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
#include "scim_private.h"
#include "scim.h"
#include "scim_stl_map.h"
-#include "privilege_checker.h"
#ifdef LOG_TAG
# undef LOG_TAG
#include "scim_private.h"
#include "scim.h"
#include "scim_stl_map.h"
-#include "privilege_checker.h"
#ifdef LOG_TAG
# undef LOG_TAG
* @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 */
&& 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
#!/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"
projects / platform / core / uifw / isf.git / commitdiff