Remove elementary dependency in libscim.so

Change-Id: Ib08df478a334c67378be2c3c5f98174598c7c249

diff --git a/configure.ac b/configure.ac
index 1af545f0102ff36d0449729c186dc66ebe2c78b7..a041efd1e38655262d04cfd49b978a62a5dc52e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -220,8 +220,11 @@ PKG_CHECK_MODULES(ECORE, [ecore])
 # Check ECORE_IPC library
 PKG_CHECK_MODULES(ECORE_IPC, [ecore-ipc])
 
+# Check ELEMENTARY library
+PKG_CHECK_MODULES(ELEMENTARY, [elementary edje])
+
 # Check EFL library
-PKG_CHECK_MODULES(EFL, [elementary evas ecore ecore-evas ecore-file edje ecore-input ecore-imf],
+PKG_CHECK_MODULES(EFL, [eina evas ecore ecore-evas ecore-file ecore-input ecore-imf],
                   [ISF_HAS_EFL=yes],
                   [ISF_HAS_EFL=no])
 

diff --git a/ism/demos/Makefile.am b/ism/demos/Makefile.am
index e0e9f7f139ab7049a38eb913b70729f1af77fa04..cebaa98c6f8d98937f87c04b6f84c8b108f18804 100644 (file)
--- a/ism/demos/Makefile.am
+++ b/ism/demos/Makefile.am
@@ -44,6 +44,7 @@ isf_demo_efl_SOURCES  = isf_demo_efl.cpp \
 
 isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
                         @ECOREX_CFLAGS@ \
+                        @ELEMENTARY_CFLAGS@ \
                         @APPCORE_EFL_CFLAGS@ \
                         @VCONF_CFLAGS@ \
                         @PRIVILEGE_CONTROL_CFLAGS@ \
@@ -54,6 +55,7 @@ isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
 
 isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                         @ECOREX_LIBS@ \
+                        @ELEMENTARY_LIBS@ \
                         @VCONF_LIBS@ \
                         @APPCORE_EFL_LIBS@ \
                         @PRIVILEGE_CONTROL_LIBS@ \

diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index 2318754c3c9d08dd70e14cd96a3ee8fed8a2f490..74943b1663788cc860b718f43f4087cfe25c0115 100644 (file)
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -30,6 +30,7 @@ isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
 
 isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
                          @ECOREX_CFLAGS@ \
+                         @ELEMENTARY_CFLAGS@ \
                          @EFL_EXTENSION_CFLAGS@ \
                          @VCONF_CFLAGS@ \
                          @X11_CFLAGS@ \
@@ -48,6 +49,7 @@ isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
 
 isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                          @ECOREX_LIBS@ \
+                         @ELEMENTARY_LIBS@ \
                          @EFL_EXTENSION_LIBS@ \
                          @VCONF_LIBS@ \
                          @X11_LIBS@ \

diff --git a/ism/extras/kbd_mode_changer/Makefile.am b/ism/extras/kbd_mode_changer/Makefile.am
index 5f7a9ce9cf393c65e274112438f79364eae3e944..1b2ae28353bf413ec4b0d5a3be0eb5e3307f42cc 100644 (file)
--- a/ism/extras/kbd_mode_changer/Makefile.am
+++ b/ism/extras/kbd_mode_changer/Makefile.am
@@ -31,11 +31,13 @@ appexec_PROGRAMS      = $(ISF_KBD_MODE_CHANGER)
 isf_kbd_mode_changer_SOURCES  = main.cpp
 
 isf_kbd_mode_changer_CXXFLAGS = @EFL_CFLAGS@ \
+                                @ELEMENTARY_CFLAGS@ \
                                 @DLOG_CFLAGS@ \
                                 @APPFW_CFLAGS@ \
                                 -fPIE
 
 isf_kbd_mode_changer_LDFLAGS  = @EFL_LIBS@ -rpath $(libdir)\
+                                @ELEMENTARY_LIBS@ \
                                 @DLOG_LIBS@ \
                                 @APPFW_LIBS@ \
                                 -pie

diff --git a/ism/src/scim_setup_module_efl.h b/ism/src/scim_setup_module_efl.h
index 888a892cdc80fb2f89091d813ed7de413051b42d..08f0209dfb3cfe7ebfe10d5ed64b54efc7a4d855 100644 (file)
--- a/ism/src/scim_setup_module_efl.h
+++ b/ism/src/scim_setup_module_efl.h
@@ -28,7 +28,7 @@
 #define __SCIM_SETUP_MODULE_EFL_H
 
 
-#include <Elementary.h>
+#include <Evas.h>
 #include <string.h>
 
 using namespace scim;