Change the path of immodule according to the upgrade of EFL 1.12

Change-Id: I0cd0ca4087d8c78c21453774a6e9c128021d0d47

diff --git a/configure.ac b/configure.ac
index f4b8429021054f69ba6d2125fb950f07e5628ca0..cfb3e918d8fe0fb4bc3f447ac37c932294632484 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ if test "$ISF_HAS_EFL" = "yes"; then
   if test -z "$EFL_LIBDIR)"; then
     EFL_LIBDIR="$libdir"
   fi
-  EFL_IM_MODULEDIR=$EFL_LIBDIR/ecore/immodules
+  EFL_IM_MODULEDIR=$EFL_LIBDIR/ecore_imf/modules/isf/v-1.12
   AC_SUBST(EFL_LIBDIR)
   AC_SUBST(EFL_IM_MODULEDIR)
 fi

diff --git a/ism/extras/efl_immodule/Makefile.am b/ism/extras/efl_immodule/Makefile.am
index dae8f1d8ed2d64e21a1fd89a50ae45e0e2dd81da..b56a282bd23a24eb7e4d330c76c2361f601ff36a 100644 (file)
--- a/ism/extras/efl_immodule/Makefile.am
+++ b/ism/extras/efl_immodule/Makefile.am
@@ -19,36 +19,36 @@ INCLUDES       = -I$(top_builddir) \
                  @ISF_BUILDING_DLL@
 
 if ISF_BUILD_EFL_IMMODULE
-CONFIG_EFL_IMMODULE = libisf-imf-module.la
+CONFIG_EFL_IMMODULE = module.la
 endif
 
-noinst_HEADERS             = isf_imf_context.h  \
-                             isf_imf_control_ui.h \
-                             isf_imf_control.h
-
-moduledir                  = @EFL_IM_MODULEDIR@
-module_LTLIBRARIES         = $(CONFIG_EFL_IMMODULE)
-
-libisf_imf_module_la_SOURCES  = isf_imf_module.cpp \
-                                isf_imf_context.cpp \
-                                isf_imf_control_ui.cpp \
-                                isf_imf_control.cpp
-
-libisf_imf_module_la_CXXFLAGS = @EFL_CFLAGS@ \
-                                @ECOREX_CFLAGS@ \
-                                @UTILX_CFLAGS@ \
-                                @VCONF_CFLAGS@ \
-                                @DLOG_CFLAGS@
-
-libisf_imf_module_la_LDFLAGS  = -rpath $(moduledir) \
-                                -avoid-version \
-                                -module
-
-libisf_imf_module_la_LIBADD  =  -lstdc++ \
-                                $(LD_VERSION_SCRIPT_OPTION) \
-                                @EFL_LIBS@ \
-                                @ECOREX_LIBS@ \
-                                @UTILX_LIBS@ \
-                                @VCONF_LIBS@ \
-                                @DLOG_LIBS@ \
-                                $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
+noinst_HEADERS     = isf_imf_context.h  \
+                     isf_imf_control_ui.h \
+                     isf_imf_control.h
+
+moduledir          = @EFL_IM_MODULEDIR@
+module_LTLIBRARIES = $(CONFIG_EFL_IMMODULE)
+
+module_la_SOURCES  = isf_imf_module.cpp \
+                     isf_imf_context.cpp \
+                     isf_imf_control_ui.cpp \
+                     isf_imf_control.cpp
+
+module_la_CXXFLAGS = @EFL_CFLAGS@ \
+                     @ECOREX_CFLAGS@ \
+                     @UTILX_CFLAGS@ \
+                     @VCONF_CFLAGS@ \
+                     @DLOG_CFLAGS@
+
+module_la_LDFLAGS  = -rpath $(moduledir) \
+                     -avoid-version \
+                     -module
+
+module_la_LIBADD   = -lstdc++ \
+                     $(LD_VERSION_SCRIPT_OPTION) \
+                     @EFL_LIBS@ \
+                     @ECOREX_LIBS@ \
+                     @UTILX_LIBS@ \
+                     @VCONF_LIBS@ \
+                     @DLOG_LIBS@ \
+                     $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la

diff --git a/packaging/isf.spec b/packaging/isf.spec
index bc0d0ecd4d0feb1ada497632669acbce36b24ef7..88b3c980a989c442ae93e19e076bb55ceb192e83 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -174,7 +174,7 @@ cat scim.lang > isf.lang
 %else
 %{_optexecdir}/isf-demo-efl
 %{_bindir}/isf-panel-efl
-%{_libdir}/*/immodules/*.so
+%{_libdir}/ecore_imf/modules/*/*/*.so
 %endif
 %{_bindir}/scim
 %{_bindir}/isf-log