summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile_Ecore_Imf.am56
-rw-r--r--src/lib/ecore_imf/ecore_imf_module.c8
-rw-r--r--src/modules/ecore_imf/ibus/ibus_imcontext.c (renamed from src/modules/ecore/immodules/ibus/ibus_imcontext.c)0
-rw-r--r--src/modules/ecore_imf/ibus/ibus_imcontext.h (renamed from src/modules/ecore/immodules/ibus/ibus_imcontext.h)0
-rw-r--r--src/modules/ecore_imf/ibus/ibus_module.c (renamed from src/modules/ecore/immodules/ibus/ibus_module.c)0
-rw-r--r--src/modules/ecore_imf/scim/scim_imcontext.cpp (renamed from src/modules/ecore/immodules/scim/scim_imcontext.cpp)0
-rw-r--r--src/modules/ecore_imf/scim/scim_imcontext.h (renamed from src/modules/ecore/immodules/scim/scim_imcontext.h)0
-rw-r--r--src/modules/ecore_imf/scim/scim_module.cpp (renamed from src/modules/ecore/immodules/scim/scim_module.cpp)0
-rw-r--r--src/modules/ecore_imf/xim/ecore_imf_xim.c (renamed from src/modules/ecore/immodules/xim/ecore_imf_xim.c)0
9 files changed, 32 insertions, 32 deletions
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 9be2846df9..79fcfdab74 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -73,13 +73,13 @@ lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
73# Ibus 73# Ibus
74 74
75if BUILD_ECORE_IMF_IBUS 75if BUILD_ECORE_IMF_IBUS
76ecoreimfibuspkgdir = $(libdir)/ecore/immodules 76ecoreimfibuspkgdir = $(libdir)/ecore_imf
77ecoreimfibuspkg_LTLIBRARIES = modules/ecore/immodules/ibus/ibus.la 77ecoreimfibuspkg_LTLIBRARIES = modules/ecore_imf/ibus/ibus.la
78modules_ecore_immodules_ibus_ibus_la_SOURCES = \ 78modules_ecore_imf_ibus_ibus_la_SOURCES = \
79modules/ecore/immodules/ibus/ibus_module.c \ 79modules/ecore_imf/ibus/ibus_module.c \
80modules/ecore/immodules/ibus/ibus_imcontext.c \ 80modules/ecore_imf/ibus/ibus_imcontext.c \
81modules/ecore/immodules/ibus/ibus_imcontext.h 81modules/ecore_imf/ibus/ibus_imcontext.h
82modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \ 82modules_ecore_imf_ibus_ibus_la_CPPFLAGS = \
83-I$(top_srcdir)/src/lib/eina \ 83-I$(top_srcdir)/src/lib/eina \
84-I$(top_builddir)/src/lib/eina \ 84-I$(top_builddir)/src/lib/eina \
85-I$(top_srcdir)/src/lib/eo \ 85-I$(top_srcdir)/src/lib/eo \
@@ -93,7 +93,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
93@ECORE_IMF_CFLAGS@ \ 93@ECORE_IMF_CFLAGS@ \
94@EFL_COV_CFLAGS@ \ 94@EFL_COV_CFLAGS@ \
95@IBUS_CFLAGS@ 95@IBUS_CFLAGS@
96modules_ecore_immodules_ibus_ibus_la_LIBADD = \ 96modules_ecore_imf_ibus_ibus_la_LIBADD = \
97lib/ecore_evas/libecore_evas.la \ 97lib/ecore_evas/libecore_evas.la \
98lib/ecore_imf/libecore_imf.la \ 98lib/ecore_imf/libecore_imf.la \
99lib/ecore_x/libecore_x.la \ 99lib/ecore_x/libecore_x.la \
@@ -102,20 +102,20 @@ lib/eo/libeo.la \
102lib/eina/libeina.la \ 102lib/eina/libeina.la \
103@IBUS_LIBS@ \ 103@IBUS_LIBS@ \
104@EFL_COV_LIBS@ 104@EFL_COV_LIBS@
105modules_ecore_immodules_ibus_ibus_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 105modules_ecore_imf_ibus_ibus_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
106modules_ecore_immodules_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static 106modules_ecore_imf_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static
107endif 107endif
108 108
109# Scim 109# Scim
110 110
111if BUILD_ECORE_IMF_SCIM 111if BUILD_ECORE_IMF_SCIM
112ecoreimfscimpkgdir = $(libdir)/ecore/immodules 112ecoreimfscimpkgdir = $(libdir)/ecore_imf
113ecoreimfscimpkg_LTLIBRARIES = modules/ecore/immodules/scim/scim.la 113ecoreimfscimpkg_LTLIBRARIES = modules/ecore_imf/scim/scim.la
114modules_ecore_immodules_scim_scim_la_SOURCES = \ 114modules_ecore_imf_scim_scim_la_SOURCES = \
115modules/ecore/immodules/scim/scim_module.cpp \ 115modules/ecore_imf/scim/scim_module.cpp \
116modules/ecore/immodules/scim/scim_imcontext.cpp \ 116modules/ecore_imf/scim/scim_imcontext.cpp \
117modules/ecore/immodules/scim/scim_imcontext.h 117modules/ecore_imf/scim/scim_imcontext.h
118modules_ecore_immodules_scim_scim_la_CPPFLAGS = \ 118modules_ecore_imf_scim_scim_la_CPPFLAGS = \
119-I$(top_srcdir)/src/lib/eina \ 119-I$(top_srcdir)/src/lib/eina \
120-I$(top_builddir)/src/lib/eina \ 120-I$(top_builddir)/src/lib/eina \
121-I$(top_srcdir)/src/lib/eo \ 121-I$(top_srcdir)/src/lib/eo \
@@ -129,7 +129,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
129@ECORE_IMF_CFLAGS@ \ 129@ECORE_IMF_CFLAGS@ \
130@EFL_COV_CFLAGS@ \ 130@EFL_COV_CFLAGS@ \
131@SCIM_CFLAGS@ 131@SCIM_CFLAGS@
132modules_ecore_immodules_scim_scim_la_LIBADD = \ 132modules_ecore_imf_scim_scim_la_LIBADD = \
133lib/ecore_evas/libecore_evas.la \ 133lib/ecore_evas/libecore_evas.la \
134lib/ecore_imf/libecore_imf.la \ 134lib/ecore_imf/libecore_imf.la \
135lib/ecore_x/libecore_x.la \ 135lib/ecore_x/libecore_x.la \
@@ -138,18 +138,18 @@ lib/eo/libeo.la \
138lib/eina/libeina.la \ 138lib/eina/libeina.la \
139@SCIM_LIBS@ \ 139@SCIM_LIBS@ \
140@EFL_COV_LIBS@ 140@EFL_COV_LIBS@
141modules_ecore_immodules_scim_scim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 141modules_ecore_imf_scim_scim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
142modules_ecore_immodules_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static 142modules_ecore_imf_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static
143endif 143endif
144 144
145# Xim 145# Xim
146 146
147if BUILD_ECORE_IMF_XIM 147if BUILD_ECORE_IMF_XIM
148ecoreimfximpkgdir = $(libdir)/ecore/immodules 148ecoreimfximpkgdir = $(libdir)/ecore_imf
149ecoreimfximpkg_LTLIBRARIES = modules/ecore/immodules/xim/xim.la 149ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/xim.la
150modules_ecore_immodules_xim_xim_la_SOURCES = \ 150modules_ecore_imf_xim_xim_la_SOURCES = \
151modules/ecore/immodules/xim/ecore_imf_xim.c 151modules/ecore_imf/xim/ecore_imf_xim.c
152modules_ecore_immodules_xim_xim_la_CPPFLAGS = \ 152modules_ecore_imf_xim_xim_la_CPPFLAGS = \
153-I$(top_srcdir)/src/lib/eina \ 153-I$(top_srcdir)/src/lib/eina \
154-I$(top_builddir)/src/lib/eina \ 154-I$(top_builddir)/src/lib/eina \
155-I$(top_srcdir)/src/lib/eo \ 155-I$(top_srcdir)/src/lib/eo \
@@ -160,13 +160,13 @@ modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
160-I$(top_srcdir)/src/lib/ecore_imf \ 160-I$(top_srcdir)/src/lib/ecore_imf \
161@ECORE_IMF_CFLAGS@ \ 161@ECORE_IMF_CFLAGS@ \
162@EFL_COV_CFLAGS@ 162@EFL_COV_CFLAGS@
163modules_ecore_immodules_xim_xim_la_LIBADD = \ 163modules_ecore_imf_xim_xim_la_LIBADD = \
164lib/ecore_imf/libecore_imf.la \ 164lib/ecore_imf/libecore_imf.la \
165lib/ecore_x/libecore_x.la \ 165lib/ecore_x/libecore_x.la \
166lib/ecore/libecore.la \ 166lib/ecore/libecore.la \
167lib/eo/libeo.la \ 167lib/eo/libeo.la \
168lib/eina/libeina.la \ 168lib/eina/libeina.la \
169@EFL_COV_LIBS@ 169@EFL_COV_LIBS@
170modules_ecore_immodules_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 170modules_ecore_imf_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
171modules_ecore_immodules_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static 171modules_ecore_imf_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static
172endif 172endif
diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index bf8cf6b731..9df95a7130 100644
--- a/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
@@ -40,7 +40,7 @@ ecore_imf_module_init(void)
40 if (getenv("EFL_RUN_IN_TREE")) 40 if (getenv("EFL_RUN_IN_TREE"))
41 { 41 {
42 struct stat st; 42 struct stat st;
43 snprintf(buf, sizeof(buf), "%s/src/modules/ecore/immodules", 43 snprintf(buf, sizeof(buf), "%s/src/modules/ecore_imf",
44 PACKAGE_BUILD_DIR); 44 PACKAGE_BUILD_DIR);
45 if (stat(buf, &st) == 0) 45 if (stat(buf, &st) == 0)
46 { 46 {
@@ -60,7 +60,7 @@ ecore_imf_module_init(void)
60 for (itr = built_modules; *itr != NULL; itr++) 60 for (itr = built_modules; *itr != NULL; itr++)
61 { 61 {
62 snprintf(buf, sizeof(buf), 62 snprintf(buf, sizeof(buf),
63 "%s/src/modules/ecore/immodules/%s/.libs", 63 "%s/src/modules/ecore_imf/%s/.libs",
64 PACKAGE_BUILD_DIR, *itr); 64 PACKAGE_BUILD_DIR, *itr);
65 module_list = eina_module_list_get(module_list, buf, 65 module_list = eina_module_list_get(module_list, buf,
66 EINA_FALSE, NULL, NULL); 66 EINA_FALSE, NULL, NULL);
@@ -72,10 +72,10 @@ ecore_imf_module_init(void)
72 } 72 }
73 } 73 }
74 74
75 snprintf(buf, sizeof(buf), "%s/ecore/immodules", eina_prefix_lib_get(pfx)); 75 snprintf(buf, sizeof(buf), "%s/ecore_imf", eina_prefix_lib_get(pfx));
76 76
77 module_list = eina_module_list_get(NULL, buf, 0, NULL, NULL); 77 module_list = eina_module_list_get(NULL, buf, 0, NULL, NULL);
78 homedir = eina_module_environment_path_get("HOME", "/.ecore/immodules"); 78 homedir = eina_module_environment_path_get("HOME", "/.ecore_imf");
79 if (homedir) 79 if (homedir)
80 { 80 {
81 module_list = eina_module_list_get(module_list, homedir, 0, NULL, NULL); 81 module_list = eina_module_list_get(module_list, homedir, 0, NULL, NULL);
diff --git a/src/modules/ecore/immodules/ibus/ibus_imcontext.c b/src/modules/ecore_imf/ibus/ibus_imcontext.c
index 02f4fce9c1..02f4fce9c1 100644
--- a/src/modules/ecore/immodules/ibus/ibus_imcontext.c
+++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c
diff --git a/src/modules/ecore/immodules/ibus/ibus_imcontext.h b/src/modules/ecore_imf/ibus/ibus_imcontext.h
index ce5c075c3f..ce5c075c3f 100644
--- a/src/modules/ecore/immodules/ibus/ibus_imcontext.h
+++ b/src/modules/ecore_imf/ibus/ibus_imcontext.h
diff --git a/src/modules/ecore/immodules/ibus/ibus_module.c b/src/modules/ecore_imf/ibus/ibus_module.c
index 8ac1bf35bc..8ac1bf35bc 100644
--- a/src/modules/ecore/immodules/ibus/ibus_module.c
+++ b/src/modules/ecore_imf/ibus/ibus_module.c
diff --git a/src/modules/ecore/immodules/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp
index 80fd295ff7..80fd295ff7 100644
--- a/src/modules/ecore/immodules/scim/scim_imcontext.cpp
+++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp
diff --git a/src/modules/ecore/immodules/scim/scim_imcontext.h b/src/modules/ecore_imf/scim/scim_imcontext.h
index 72533e245d..72533e245d 100644
--- a/src/modules/ecore/immodules/scim/scim_imcontext.h
+++ b/src/modules/ecore_imf/scim/scim_imcontext.h
diff --git a/src/modules/ecore/immodules/scim/scim_module.cpp b/src/modules/ecore_imf/scim/scim_module.cpp
index d77fb11f3a..d77fb11f3a 100644
--- a/src/modules/ecore/immodules/scim/scim_module.cpp
+++ b/src/modules/ecore_imf/scim/scim_module.cpp
diff --git a/src/modules/ecore/immodules/xim/ecore_imf_xim.c b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index a115b90647..a115b90647 100644
--- a/src/modules/ecore/immodules/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c