Move efl interfaces from evas to efl directory

You may need to remove your installed directory to avoid conflicts

src/Makefile_Efl.am

@@ -5,6 +5,11 @@ efl_eolian_legacy_files = \
 	lib/efl/interfaces/efl_image.eo \
 	lib/efl/interfaces/efl_image_animated.eo \
 	lib/efl/interfaces/efl_input_device.eo \
+        lib/efl/interfaces/efl_ui_draggable.eo \
+        lib/efl/interfaces/efl_ui_clickable.eo \
+        lib/efl/interfaces/efl_ui_scrollable.eo \
+        lib/efl/interfaces/efl_ui_selectable.eo \
+        lib/efl/interfaces/efl_ui_zoom.eo \
 	$(NULL)
 
 efl_eolian_files = \

src/Makefile_Evas.am

@@ -10,11 +10,6 @@ evas_eolian_pub_files = \
 	lib/evas/canvas/efl_canvas_group.eo \
 	lib/evas/canvas/evas_canvas.eo \
 	lib/evas/canvas/efl_canvas_image_internal.eo \
-	lib/evas/canvas/efl_ui_draggable.eo \
-	lib/evas/canvas/efl_ui_clickable.eo \
-	lib/evas/canvas/efl_ui_scrollable.eo \
-	lib/evas/canvas/efl_ui_selectable.eo \
-	lib/evas/canvas/efl_ui_zoom.eo \
 	lib/evas/canvas/evas_canvas3d_camera.eo\
 	lib/evas/canvas/evas_canvas3d_texture.eo\
 	lib/evas/canvas/evas_canvas3d_material.eo\
@@ -154,7 +149,6 @@ lib/evas/main.c
 
 # Canvas
 lib_evas_libevas_la_SOURCES += \
-lib/evas/canvas/common_interfaces.c \
 lib/evas/canvas/evas_callbacks.c \
 lib/evas/canvas/evas_clip.c \
 lib/evas/canvas/evas_data.c \

src/lib/efl/Efl.h

@@ -95,6 +95,11 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_ui_item.eo.h"
 #include "interfaces/efl_ui_menu.eo.h"
 #include "interfaces/efl_ui_autorepeat.eo.h"
+#include "interfaces/efl_ui_draggable.eo.h"
+#include "interfaces/efl_ui_clickable.eo.h"
+#include "interfaces/efl_ui_scrollable.eo.h"
+#include "interfaces/efl_ui_selectable.eo.h"
+#include "interfaces/efl_ui_zoom.eo.h"
 
 #include "interfaces/efl_screen.eo.h"
 

src/lib/efl/interfaces/efl_interfaces_main.c

@@ -63,6 +63,12 @@
 #include "interfaces/efl_ui_factory.eo.c"
 #include "interfaces/efl_ui_model_factory_connect.eo.c"
 
+#include "interfaces/efl_ui_draggable.eo.c"
+#include "interfaces/efl_ui_clickable.eo.c"
+#include "interfaces/efl_ui_scrollable.eo.c"
+#include "interfaces/efl_ui_selectable.eo.c"
+#include "interfaces/efl_ui_zoom.eo.c"
+
 EAPI void
 __efl_internal_init(void)
 {

src/lib/elementary/elm_photocam_legacy.h

@@ -1,4 +1,4 @@
-#include "canvas/efl_ui_zoom.eo.legacy.h"
+#include "interfaces/efl_ui_zoom.eo.legacy.h"
 
 /**
  * @brief Add a new Photocam object

src/lib/evas/Evas_Eo.h

@@ -3,11 +3,6 @@
 #endif
 
 #ifdef EFL_EO_API_SUPPORT
-#include "canvas/efl_ui_draggable.eo.h"
-#include "canvas/efl_ui_clickable.eo.h"
-#include "canvas/efl_ui_scrollable.eo.h"
-#include "canvas/efl_ui_selectable.eo.h"
-#include "canvas/efl_ui_zoom.eo.h"
 
 #include "canvas/evas_canvas.eo.h"
 

src/lib/evas/canvas/common_interfaces.c

@@ -1,8 +0,0 @@
-#include "evas_common_private.h"
-#include "evas_private.h"
-
-#include "canvas/efl_ui_draggable.eo.c"
-#include "canvas/efl_ui_clickable.eo.c"
-#include "canvas/efl_ui_scrollable.eo.c"
-#include "canvas/efl_ui_selectable.eo.c"
-#include "canvas/efl_ui_zoom.eo.c"