aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 19:11:01 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 19:11:01 +0000
commit720a81d58c51ae171259bc9f4f2237400dfcb7cc (patch)
treeca6614d6c9df8648b999b642ef5b9a1cb8d17a7e
parentmove ecore_input_evas out of ecore_input. (diff)
downloadefl-720a81d58c51ae171259bc9f4f2237400dfcb7cc.tar.gz
move ecore_imf_evas out of ecore_imf.
SVN revision: 82837
-rw-r--r--m4/efl.m46
-rw-r--r--src/Makefile.am3
-rw-r--r--src/Makefile_Ecore_IMF.am (renamed from src/Makefile_Ecore_Imf.am)20
-rw-r--r--src/Makefile_Ecore_IMF_Evas.am15
-rw-r--r--src/lib/ecore_imf_evas/Ecore_IMF_Evas.h (renamed from src/lib/ecore_imf/Ecore_IMF_Evas.h)0
-rw-r--r--src/lib/ecore_imf_evas/ecore_imf_evas.c (renamed from src/lib/ecore_imf/ecore_imf_evas.c)0
6 files changed, 21 insertions, 23 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index d1765ef716..eaa9f29a05 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -30,9 +30,6 @@ case "m4_defn([DOWNOTHER])" in
ethumb_client)
depname="ethumb_client"
;;
- ecore_imf_evas)
- libdirname="ecore_imf"
- ;;
esac
requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
@@ -200,9 +197,6 @@ case "m4_defn([DOWN])" in
edbus)
libname="edbus2"
;;
- ecore_imf_evas)
- libdirname="ecore_imf"
- ;;
esac
m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}"
diff --git a/src/Makefile.am b/src/Makefile.am
index 7629cae236..da4a6eb1e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,8 @@ include Makefile_Ecore_Wayland.am
include Makefile_Ecore_Win32.am
include Makefile_Ecore_WinCE.am
include Makefile_Ecore_X.am
-include Makefile_Ecore_Imf.am
+include Makefile_Ecore_IMF.am
+include Makefile_Ecore_IMF_Evas.am
include Makefile_Ecore_Evas.am
include Makefile_Ecore_Audio.am
include Makefile_Embryo.am
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_IMF.am
index 8bfe6cb848..783181de05 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_IMF.am
@@ -1,14 +1,13 @@
### Library
-lib_LTLIBRARIES += \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_imf/libecore_imf_evas.la
-
-installed_ecoreimfmainheadersdir = $(includedir)/ecore-@VMAJ@
+installed_ecoreimfmainheadersdir = $(includedir)/ecore-imf-@VMAJ@
dist_installed_ecoreimfmainheaders_DATA = \
lib/ecore_imf/Ecore_IMF.h
+lib_LTLIBRARIES += \
+lib/ecore_imf/libecore_imf.la
+
lib_ecore_imf_libecore_imf_la_SOURCES = \
lib/ecore_imf/ecore_imf.c \
lib/ecore_imf/ecore_imf_context.c \
@@ -25,17 +24,6 @@ lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@
lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@
-dist_installed_ecoreimfevasmainheaders_DATA = \
-lib/ecore_imf/Ecore_IMF_Evas.h
-
-lib_ecore_imf_libecore_imf_evas_la_SOURCES = lib/ecore_imf/ecore_imf_evas.c
-lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
-lib_ecore_imf_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
-lib_ecore_imf_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
-lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-
-
### Modules
# Ibus
diff --git a/src/Makefile_Ecore_IMF_Evas.am b/src/Makefile_Ecore_IMF_Evas.am
new file mode 100644
index 0000000000..bd5756b6e1
--- /dev/null
+++ b/src/Makefile_Ecore_IMF_Evas.am
@@ -0,0 +1,15 @@
+
+### Library
+
+installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-imf-evas-@VMAJ@
+dist_installed_ecoreimfevasmainheaders_DATA = \
+lib/ecore_imf_evas/Ecore_IMF_Evas.h
+
+lib_LTLIBRARIES += \
+lib/ecore_imf_evas/libecore_imf_evas.la
+
+lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c
+lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
+lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
+lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
+lib_ecore_imf_evas_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/lib/ecore_imf/Ecore_IMF_Evas.h b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
index b6c4fc206b..b6c4fc206b 100644
--- a/src/lib/ecore_imf/Ecore_IMF_Evas.h
+++ b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
diff --git a/src/lib/ecore_imf/ecore_imf_evas.c b/src/lib/ecore_imf_evas/ecore_imf_evas.c
index 50339624e2..50339624e2 100644
--- a/src/lib/ecore_imf/ecore_imf_evas.c
+++ b/src/lib/ecore_imf_evas/ecore_imf_evas.c