summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 18:59:28 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 18:59:28 +0000
commitc4e163fe4aa004adc56bea7709b49f807ff9b6c9 (patch)
treecfa0ab1cf173761e2e70fe2dd9d74182412f481b
parentd97c63e4c69d0a8c3cb29b22927b5b53c7bf46c4 (diff)
move ecore_input_evas out of ecore_input.
we don't need this mess anymore :-P SVN revision: 82836
-rw-r--r--m4/efl.m46
-rw-r--r--pc/ecore-input-evas.pc.in2
-rw-r--r--pc/ecore-input.pc.in2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile_Ecore_Input.am18
-rw-r--r--src/Makefile_Ecore_Input_Evas.am18
-rw-r--r--src/lib/ecore_input_evas/Ecore_Input_Evas.h (renamed from src/lib/ecore_input/Ecore_Input_Evas.h)0
-rw-r--r--src/lib/ecore_input_evas/ecore_input_evas.c (renamed from src/lib/ecore_input/ecore_input_evas.c)0
8 files changed, 23 insertions, 24 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index ec324364ac..d1765ef716 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_input_evas)
34 libdirname="ecore_input"
35 ;;
36 ecore_imf_evas) 33 ecore_imf_evas)
37 libdirname="ecore_imf" 34 libdirname="ecore_imf"
38 ;; 35 ;;
@@ -203,9 +200,6 @@ case "m4_defn([DOWN])" in
203 edbus) 200 edbus)
204 libname="edbus2" 201 libname="edbus2"
205 ;; 202 ;;
206 ecore_input_evas)
207 libdirname="ecore_input"
208 ;;
209 ecore_imf_evas) 203 ecore_imf_evas)
210 libdirname="ecore_imf" 204 libdirname="ecore_imf"
211 ;; 205 ;;
diff --git a/pc/ecore-input-evas.pc.in b/pc/ecore-input-evas.pc.in
index 39912d32d2..53b1e299e8 100644
--- a/pc/ecore-input-evas.pc.in
+++ b/pc/ecore-input-evas.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_input_evas@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_input_evas 10Libs: -L${libdir} -lecore_input_evas
11Libs.private: @requirements_libs_ecore_input_evas@ 11Libs.private: @requirements_libs_ecore_input_evas@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-input-evas-@VMAJ@
diff --git a/pc/ecore-input.pc.in b/pc/ecore-input.pc.in
index 4fc5d86f48..d445ced8b8 100644
--- a/pc/ecore-input.pc.in
+++ b/pc/ecore-input.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_input@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore_input 10Libs: -L${libdir} -lecore_input
11Libs.private: @requirements_libs_ecore_input@ 11Libs.private: @requirements_libs_ecore_input@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-input-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index e286b92fb9..7629cae236 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,7 @@ include Makefile_Ecore_Con.am
25include Makefile_Ecore_Ipc.am 25include Makefile_Ecore_Ipc.am
26include Makefile_Ecore_File.am 26include Makefile_Ecore_File.am
27include Makefile_Ecore_Input.am 27include Makefile_Ecore_Input.am
28include Makefile_Ecore_Input_Evas.am
28include Makefile_Ecore_Cocoa.am 29include Makefile_Ecore_Cocoa.am
29include Makefile_Ecore_FB.am 30include Makefile_Ecore_FB.am
30include Makefile_Ecore_Psl1ght.am 31include Makefile_Ecore_Psl1ght.am
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index d07a895d5a..3ce4dd16a3 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -2,10 +2,9 @@
2### Library 2### Library
3 3
4lib_LTLIBRARIES += \ 4lib_LTLIBRARIES += \
5lib/ecore_input/libecore_input.la \ 5lib/ecore_input/libecore_input.la
6lib/ecore_input/libecore_input_evas.la
7 6
8installed_ecoreinputmainheadersdir = $(includedir)/ecore-@VMAJ@ 7installed_ecoreinputmainheadersdir = $(includedir)/ecore-input-@VMAJ@
9dist_installed_ecoreinputmainheaders_DATA = \ 8dist_installed_ecoreinputmainheaders_DATA = \
10lib/ecore_input/Ecore_Input.h 9lib/ecore_input/Ecore_Input.h
11 10
@@ -19,16 +18,3 @@ lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@
19lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@ 18lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
20lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@ 19lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
21lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 20lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
22
23installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@
24dist_installed_ecoreinputevasmainheaders_DATA = \
25lib/ecore_input/Ecore_Input_Evas.h
26
27lib_ecore_input_libecore_input_evas_la_SOURCES = \
28lib/ecore_input/ecore_input_evas.c \
29lib/ecore_input/ecore_input_evas_private.h
30
31lib_ecore_input_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@
32lib_ecore_input_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
33lib_ecore_input_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
34lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input_Evas.am b/src/Makefile_Ecore_Input_Evas.am
new file mode 100644
index 0000000000..91749bb5ee
--- /dev/null
+++ b/src/Makefile_Ecore_Input_Evas.am
@@ -0,0 +1,18 @@
1
2### Library
3
4lib_LTLIBRARIES += \
5lib/ecore_input_evas/libecore_input_evas.la
6
7installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-input-evas-@VMAJ@
8dist_installed_ecoreinputevasmainheaders_DATA = \
9lib/ecore_input_evas/Ecore_Input_Evas.h
10
11lib_ecore_input_evas_libecore_input_evas_la_SOURCES = \
12lib/ecore_input_evas/ecore_input_evas.c \
13lib/ecore_input_evas/ecore_input_evas_private.h
14
15lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@
16lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
17lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
18lib_ecore_input_evas_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/lib/ecore_input/Ecore_Input_Evas.h b/src/lib/ecore_input_evas/Ecore_Input_Evas.h
index c97274eb0b..c97274eb0b 100644
--- a/src/lib/ecore_input/Ecore_Input_Evas.h
+++ b/src/lib/ecore_input_evas/Ecore_Input_Evas.h
diff --git a/src/lib/ecore_input/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c
index 1f5b38e03c..1f5b38e03c 100644
--- a/src/lib/ecore_input/ecore_input_evas.c
+++ b/src/lib/ecore_input_evas/ecore_input_evas.c