summaryrefslogtreecommitdiff
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
parentc4e163fe4aa004adc56bea7709b49f807ff9b6c9 (diff)
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 d1765ef..eaa9f29 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -30,9 +30,6 @@ case "m4_defn([DOWNOTHER])" in
30 ethumb_client) 30 ethumb_client)
31 depname="ethumb_client" 31 depname="ethumb_client"
32 ;; 32 ;;
33 ecore_imf_evas)
34 libdirname="ecore_imf"
35 ;;
36esac 33esac
37requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 34requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
38requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}" 35requirements_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
200 edbus) 197 edbus)
201 libname="edbus2" 198 libname="edbus2"
202 ;; 199 ;;
203 ecore_imf_evas)
204 libdirname="ecore_imf"
205 ;;
206esac 200esac
207 201
208m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}" 202m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}"
diff --git a/src/Makefile.am b/src/Makefile.am
index 7629cae..da4a6eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,8 @@ include Makefile_Ecore_Wayland.am
34include Makefile_Ecore_Win32.am 34include Makefile_Ecore_Win32.am
35include Makefile_Ecore_WinCE.am 35include Makefile_Ecore_WinCE.am
36include Makefile_Ecore_X.am 36include Makefile_Ecore_X.am
37include Makefile_Ecore_Imf.am 37include Makefile_Ecore_IMF.am
38include Makefile_Ecore_IMF_Evas.am
38include Makefile_Ecore_Evas.am 39include Makefile_Ecore_Evas.am
39include Makefile_Ecore_Audio.am 40include Makefile_Ecore_Audio.am
40include Makefile_Embryo.am 41include Makefile_Embryo.am
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_IMF.am
index 8bfe6cb..783181d 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_IMF.am
@@ -1,14 +1,13 @@
1 1
2### Library 2### Library
3 3
4lib_LTLIBRARIES += \ 4installed_ecoreimfmainheadersdir = $(includedir)/ecore-imf-@VMAJ@
5lib/ecore_imf/libecore_imf.la \
6lib/ecore_imf/libecore_imf_evas.la
7
8installed_ecoreimfmainheadersdir = $(includedir)/ecore-@VMAJ@
9dist_installed_ecoreimfmainheaders_DATA = \ 5dist_installed_ecoreimfmainheaders_DATA = \
10lib/ecore_imf/Ecore_IMF.h 6lib/ecore_imf/Ecore_IMF.h
11 7
8lib_LTLIBRARIES += \
9lib/ecore_imf/libecore_imf.la
10
12lib_ecore_imf_libecore_imf_la_SOURCES = \ 11lib_ecore_imf_libecore_imf_la_SOURCES = \
13lib/ecore_imf/ecore_imf.c \ 12lib/ecore_imf/ecore_imf.c \
14lib/ecore_imf/ecore_imf_context.c \ 13lib/ecore_imf/ecore_imf_context.c \
@@ -25,17 +24,6 @@ lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
25lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@ 24lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@
26lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 25lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
27 26
28installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@
29dist_installed_ecoreimfevasmainheaders_DATA = \
30lib/ecore_imf/Ecore_IMF_Evas.h
31
32lib_ecore_imf_libecore_imf_evas_la_SOURCES = lib/ecore_imf/ecore_imf_evas.c
33lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
34lib_ecore_imf_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
35lib_ecore_imf_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
36lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
37
38
39### Modules 27### Modules
40 28
41# Ibus 29# Ibus
diff --git a/src/Makefile_Ecore_IMF_Evas.am b/src/Makefile_Ecore_IMF_Evas.am
new file mode 100644
index 0000000..bd5756b
--- /dev/null
+++ b/src/Makefile_Ecore_IMF_Evas.am
@@ -0,0 +1,15 @@
1
2### Library
3
4installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-imf-evas-@VMAJ@
5dist_installed_ecoreimfevasmainheaders_DATA = \
6lib/ecore_imf_evas/Ecore_IMF_Evas.h
7
8lib_LTLIBRARIES += \
9lib/ecore_imf_evas/libecore_imf_evas.la
10
11lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c
12lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
13lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
14lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
15lib_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 b6c4fc2..b6c4fc2 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 5033962..5033962 100644
--- a/src/lib/ecore_imf/ecore_imf_evas.c
+++ b/src/lib/ecore_imf_evas/ecore_imf_evas.c