summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@yahoo.com>2017-08-02 21:32:30 +0300
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2017-08-22 09:53:24 +0300
commit2f53bdfe60c9730ad8274616d556ac408aaf149f (patch)
tree2e62030a2e71c972d1585e663e27cb10b486cf0c
parentd1631d8a86a6c68f9bc5f0c12ac09c27defbe177 (diff)
Move efl interfaces from evas to efl directory
You may need to remove your installed directory to avoid conflicts
-rw-r--r--src/Makefile_Efl.am5
-rw-r--r--src/Makefile_Evas.am6
-rw-r--r--src/lib/efl/Efl.h5
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c6
-rw-r--r--src/lib/efl/interfaces/efl_ui_clickable.eo (renamed from src/lib/evas/canvas/efl_ui_clickable.eo)0
-rw-r--r--src/lib/efl/interfaces/efl_ui_draggable.eo (renamed from src/lib/evas/canvas/efl_ui_draggable.eo)0
-rw-r--r--src/lib/efl/interfaces/efl_ui_scrollable.eo (renamed from src/lib/evas/canvas/efl_ui_scrollable.eo)0
-rw-r--r--src/lib/efl/interfaces/efl_ui_selectable.eo (renamed from src/lib/evas/canvas/efl_ui_selectable.eo)0
-rw-r--r--src/lib/efl/interfaces/efl_ui_zoom.eo (renamed from src/lib/evas/canvas/efl_ui_zoom.eo)0
-rw-r--r--src/lib/elementary/elm_photocam_legacy.h2
-rw-r--r--src/lib/evas/Evas_Eo.h5
-rw-r--r--src/lib/evas/canvas/common_interfaces.c8
12 files changed, 17 insertions, 20 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index e95a40dc4b..58601aabdd 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -5,6 +5,11 @@ efl_eolian_legacy_files = \
5 lib/efl/interfaces/efl_image.eo \ 5 lib/efl/interfaces/efl_image.eo \
6 lib/efl/interfaces/efl_image_animated.eo \ 6 lib/efl/interfaces/efl_image_animated.eo \
7 lib/efl/interfaces/efl_input_device.eo \ 7 lib/efl/interfaces/efl_input_device.eo \
8 lib/efl/interfaces/efl_ui_draggable.eo \
9 lib/efl/interfaces/efl_ui_clickable.eo \
10 lib/efl/interfaces/efl_ui_scrollable.eo \
11 lib/efl/interfaces/efl_ui_selectable.eo \
12 lib/efl/interfaces/efl_ui_zoom.eo \
8 $(NULL) 13 $(NULL)
9 14
10efl_eolian_files = \ 15efl_eolian_files = \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 37c31f62e2..61648bd8b4 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -10,11 +10,6 @@ evas_eolian_pub_files = \
10 lib/evas/canvas/efl_canvas_group.eo \ 10 lib/evas/canvas/efl_canvas_group.eo \
11 lib/evas/canvas/evas_canvas.eo \ 11 lib/evas/canvas/evas_canvas.eo \
12 lib/evas/canvas/efl_canvas_image_internal.eo \ 12 lib/evas/canvas/efl_canvas_image_internal.eo \
13 lib/evas/canvas/efl_ui_draggable.eo \
14 lib/evas/canvas/efl_ui_clickable.eo \
15 lib/evas/canvas/efl_ui_scrollable.eo \
16 lib/evas/canvas/efl_ui_selectable.eo \
17 lib/evas/canvas/efl_ui_zoom.eo \
18 lib/evas/canvas/evas_canvas3d_camera.eo\ 13 lib/evas/canvas/evas_canvas3d_camera.eo\
19 lib/evas/canvas/evas_canvas3d_texture.eo\ 14 lib/evas/canvas/evas_canvas3d_texture.eo\
20 lib/evas/canvas/evas_canvas3d_material.eo\ 15 lib/evas/canvas/evas_canvas3d_material.eo\
@@ -154,7 +149,6 @@ lib/evas/main.c
154 149
155# Canvas 150# Canvas
156lib_evas_libevas_la_SOURCES += \ 151lib_evas_libevas_la_SOURCES += \
157lib/evas/canvas/common_interfaces.c \
158lib/evas/canvas/evas_callbacks.c \ 152lib/evas/canvas/evas_callbacks.c \
159lib/evas/canvas/evas_clip.c \ 153lib/evas/canvas/evas_clip.c \
160lib/evas/canvas/evas_data.c \ 154lib/evas/canvas/evas_data.c \
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 8477574f70..82a1e3d460 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -95,6 +95,11 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
95#include "interfaces/efl_ui_item.eo.h" 95#include "interfaces/efl_ui_item.eo.h"
96#include "interfaces/efl_ui_menu.eo.h" 96#include "interfaces/efl_ui_menu.eo.h"
97#include "interfaces/efl_ui_autorepeat.eo.h" 97#include "interfaces/efl_ui_autorepeat.eo.h"
98#include "interfaces/efl_ui_draggable.eo.h"
99#include "interfaces/efl_ui_clickable.eo.h"
100#include "interfaces/efl_ui_scrollable.eo.h"
101#include "interfaces/efl_ui_selectable.eo.h"
102#include "interfaces/efl_ui_zoom.eo.h"
98 103
99#include "interfaces/efl_screen.eo.h" 104#include "interfaces/efl_screen.eo.h"
100 105
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index a4ca74e593..ded13b6ece 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -63,6 +63,12 @@
63#include "interfaces/efl_ui_factory.eo.c" 63#include "interfaces/efl_ui_factory.eo.c"
64#include "interfaces/efl_ui_model_factory_connect.eo.c" 64#include "interfaces/efl_ui_model_factory_connect.eo.c"
65 65
66#include "interfaces/efl_ui_draggable.eo.c"
67#include "interfaces/efl_ui_clickable.eo.c"
68#include "interfaces/efl_ui_scrollable.eo.c"
69#include "interfaces/efl_ui_selectable.eo.c"
70#include "interfaces/efl_ui_zoom.eo.c"
71
66EAPI void 72EAPI void
67__efl_internal_init(void) 73__efl_internal_init(void)
68{ 74{
diff --git a/src/lib/evas/canvas/efl_ui_clickable.eo b/src/lib/efl/interfaces/efl_ui_clickable.eo
index 5cfaa89a35..5cfaa89a35 100644
--- a/src/lib/evas/canvas/efl_ui_clickable.eo
+++ b/src/lib/efl/interfaces/efl_ui_clickable.eo
diff --git a/src/lib/evas/canvas/efl_ui_draggable.eo b/src/lib/efl/interfaces/efl_ui_draggable.eo
index c3b8a68d3b..c3b8a68d3b 100644
--- a/src/lib/evas/canvas/efl_ui_draggable.eo
+++ b/src/lib/efl/interfaces/efl_ui_draggable.eo
diff --git a/src/lib/evas/canvas/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo
index 366e2c02f9..366e2c02f9 100644
--- a/src/lib/evas/canvas/efl_ui_scrollable.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo
diff --git a/src/lib/evas/canvas/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_selectable.eo
index b24772ee02..b24772ee02 100644
--- a/src/lib/evas/canvas/efl_ui_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_selectable.eo
diff --git a/src/lib/evas/canvas/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index 327c34d5e6..327c34d5e6 100644
--- a/src/lib/evas/canvas/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index c88a912660..d33005f564 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -1,4 +1,4 @@
1#include "canvas/efl_ui_zoom.eo.legacy.h" 1#include "interfaces/efl_ui_zoom.eo.legacy.h"
2 2
3/** 3/**
4 * @brief Add a new Photocam object 4 * @brief Add a new Photocam object
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 7dd6b087db..bcd1b80dc0 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -3,11 +3,6 @@
3#endif 3#endif
4 4
5#ifdef EFL_EO_API_SUPPORT 5#ifdef EFL_EO_API_SUPPORT
6#include "canvas/efl_ui_draggable.eo.h"
7#include "canvas/efl_ui_clickable.eo.h"
8#include "canvas/efl_ui_scrollable.eo.h"
9#include "canvas/efl_ui_selectable.eo.h"
10#include "canvas/efl_ui_zoom.eo.h"
11 6
12#include "canvas/evas_canvas.eo.h" 7#include "canvas/evas_canvas.eo.h"
13 8
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
deleted file mode 100644
index e177ed5360..0000000000
--- a/src/lib/evas/canvas/common_interfaces.c
+++ /dev/null
@@ -1,8 +0,0 @@
1#include "evas_common_private.h"
2#include "evas_private.h"
3
4#include "canvas/efl_ui_draggable.eo.c"
5#include "canvas/efl_ui_clickable.eo.c"
6#include "canvas/efl_ui_scrollable.eo.c"
7#include "canvas/efl_ui_selectable.eo.c"
8#include "canvas/efl_ui_zoom.eo.c"