From c4e163fe4aa004adc56bea7709b49f807ff9b6c9 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Tue, 15 Jan 2013 18:59:28 +0000 Subject: [PATCH] move ecore_input_evas out of ecore_input. we don't need this mess anymore :-P SVN revision: 82836 --- m4/efl.m4 | 6 ------ pc/ecore-input-evas.pc.in | 2 +- pc/ecore-input.pc.in | 2 +- src/Makefile.am | 1 + src/Makefile_Ecore_Input.am | 18 ++---------------- src/Makefile_Ecore_Input_Evas.am | 18 ++++++++++++++++++ .../Ecore_Input_Evas.h | 0 .../ecore_input_evas.c | 0 8 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 src/Makefile_Ecore_Input_Evas.am rename src/lib/{ecore_input => ecore_input_evas}/Ecore_Input_Evas.h (100%) rename src/lib/{ecore_input => ecore_input_evas}/ecore_input_evas.c (100%) 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 ethumb_client) depname="ethumb_client" ;; - ecore_input_evas) - libdirname="ecore_input" - ;; ecore_imf_evas) libdirname="ecore_imf" ;; @@ -203,9 +200,6 @@ case "m4_defn([DOWN])" in edbus) libname="edbus2" ;; - ecore_input_evas) - libdirname="ecore_input" - ;; ecore_imf_evas) libdirname="ecore_imf" ;; 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@ Version: @VERSION@ Libs: -L${libdir} -lecore_input_evas Libs.private: @requirements_libs_ecore_input_evas@ -Cflags: -I${includedir}/ecore-@VMAJ@ +Cflags: -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@ Version: @VERSION@ Libs: -L${libdir} -lecore_input Libs.private: @requirements_libs_ecore_input@ -Cflags: -I${includedir}/ecore-@VMAJ@ +Cflags: -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 include Makefile_Ecore_Ipc.am include Makefile_Ecore_File.am include Makefile_Ecore_Input.am +include Makefile_Ecore_Input_Evas.am include Makefile_Ecore_Cocoa.am include Makefile_Ecore_FB.am include 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 @@ ### Library lib_LTLIBRARIES += \ -lib/ecore_input/libecore_input.la \ -lib/ecore_input/libecore_input_evas.la +lib/ecore_input/libecore_input.la -installed_ecoreinputmainheadersdir = $(includedir)/ecore-@VMAJ@ +installed_ecoreinputmainheadersdir = $(includedir)/ecore-input-@VMAJ@ dist_installed_ecoreinputmainheaders_DATA = \ lib/ecore_input/Ecore_Input.h @@ -19,16 +18,3 @@ lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@ lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@ lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@ lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ - -installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@ -dist_installed_ecoreinputevasmainheaders_DATA = \ -lib/ecore_input/Ecore_Input_Evas.h - -lib_ecore_input_libecore_input_evas_la_SOURCES = \ -lib/ecore_input/ecore_input_evas.c \ -lib/ecore_input/ecore_input_evas_private.h - -lib_ecore_input_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@ -lib_ecore_input_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@ -lib_ecore_input_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@ -lib_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 @@ + +### Library + +lib_LTLIBRARIES += \ +lib/ecore_input_evas/libecore_input_evas.la + +installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-input-evas-@VMAJ@ +dist_installed_ecoreinputevasmainheaders_DATA = \ +lib/ecore_input_evas/Ecore_Input_Evas.h + +lib_ecore_input_evas_libecore_input_evas_la_SOURCES = \ +lib/ecore_input_evas/ecore_input_evas.c \ +lib/ecore_input_evas/ecore_input_evas_private.h + +lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@ +lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@ +lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@ +lib_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 similarity index 100% rename from src/lib/ecore_input/Ecore_Input_Evas.h rename to 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 similarity index 100% rename from src/lib/ecore_input/ecore_input_evas.c rename to src/lib/ecore_input_evas/ecore_input_evas.c