jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bd9c752d3f65834559e3249bfb95aea332e8b2b5
commit bd9c752d3f65834559e3249bfb95aea332e8b2b5
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu Oct 27 08:53:12 2016 +0900
elm: Fix elementary uninstalled eo headers
This fixes compilation for terminology for example.
Thanks to @Etrunko for the report.
Note: My builds originally worked fine because my installed
include folder contained the old files :(
---
src/Makefile_Elementary.am | 6 ------
src/lib/elementary/elc_fileselector.c | 2 ++
src/lib/elementary/elc_fileselector_button.c | 2 ++
src/lib/elementary/elc_fileselector_button.h | 3 ---
src/lib/elementary/elc_fileselector_button_eo.h | 1 -
src/lib/elementary/elc_fileselector_entry.c | 2 ++
src/lib/elementary/elc_fileselector_entry.h | 3 ---
src/lib/elementary/elc_fileselector_entry_eo.h | 1 -
src/lib/elementary/elm_diskselector.c | 2 ++
src/lib/elementary/elm_diskselector.h | 3 ---
src/lib/elementary/elm_diskselector_eo.h | 2 --
src/lib/elementary/elm_segment_control.c | 2 ++
src/lib/elementary/elm_segment_control.h | 3 ---
src/lib/elementary/elm_segment_control_eo.h | 2 --
src/lib/elementary/elm_separator.c | 1 +
src/lib/elementary/elm_separator.h | 3 ---
src/lib/elementary/elm_separator_eo.h | 1 -
src/lib/elementary/elm_slideshow.c | 2 ++
src/lib/elementary/elm_slideshow.h | 3 ---
src/lib/elementary/elm_slideshow_eo.h | 2 --
20 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 5a3de81..44d344c 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -292,10 +292,8 @@ includesub_HEADERS = \
lib/elementary/elc_fileselector_legacy.h \
lib/elementary/elc_fileselector_common.h \
lib/elementary/elc_fileselector_button.h \
- lib/elementary/elc_fileselector_button_eo.h \
lib/elementary/elc_fileselector_button_legacy.h \
lib/elementary/elc_fileselector_entry.h \
- lib/elementary/elc_fileselector_entry_eo.h \
lib/elementary/elc_fileselector_entry_legacy.h \
lib/elementary/elc_hoversel.h \
lib/elementary/elc_hoversel_legacy.h \
@@ -359,7 +357,6 @@ includesub_HEADERS = \
lib/elementary/elm_deprecated.h \
lib/elementary/elm_diskselector.h \
lib/elementary/elm_diskselector_common.h \
- lib/elementary/elm_diskselector_eo.h \
lib/elementary/elm_diskselector_legacy.h \
lib/elementary/elm_entry.h \
lib/elementary/elm_entry_common.h \
@@ -476,10 +473,8 @@ includesub_HEADERS = \
lib/elementary/elm_scroller_eo.h \
lib/elementary/elm_scroller_legacy.h \
lib/elementary/elm_segment_control.h \
- lib/elementary/elm_segment_control_eo.h \
lib/elementary/elm_segment_control_legacy.h \
lib/elementary/elm_separator.h \
- lib/elementary/elm_separator_eo.h \
lib/elementary/elm_separator_legacy.h \
lib/elementary/elm_slider.h \
lib/elementary/elm_slider_common.h \
@@ -487,7 +482,6 @@ includesub_HEADERS = \
lib/elementary/elm_slider_legacy.h \
lib/elementary/elm_slideshow.h \
lib/elementary/elm_slideshow_common.h \
- lib/elementary/elm_slideshow_eo.h \
lib/elementary/elm_slideshow_legacy.h \
lib/elementary/elm_spinner.h \
lib/elementary/elm_spinner_eo.h \
diff --git a/src/lib/elementary/elc_fileselector.c
b/src/lib/elementary/elc_fileselector.c
index 79a3034..ccf405d 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -14,6 +14,8 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_fileselector_button.eo.h"
+#include "elm_fileselector_entry.eo.h"
#include "elm_interface_fileselector.h"
#include "elm_widget_fileselector.h"
diff --git a/src/lib/elementary/elc_fileselector_button.c
b/src/lib/elementary/elc_fileselector_button.c
index a2ab8e4..2b37fe8 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -6,6 +6,8 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_fileselector_button.eo.h"
+#include "elm_fileselector_entry.eo.h"
#include "elm_interface_fileselector.h"
#include "elm_widget_fileselector_button.h"
diff --git a/src/lib/elementary/elc_fileselector_button.h
b/src/lib/elementary/elc_fileselector_button.h
index a60f981..624d0bb 100644
--- a/src/lib/elementary/elc_fileselector_button.h
+++ b/src/lib/elementary/elc_fileselector_button.h
@@ -64,9 +64,6 @@
* @{
*/
-#ifdef EFL_EO_API_SUPPORT
-#include "elc_fileselector_button_eo.h"
-#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elc_fileselector_button_legacy.h"
#endif
diff --git a/src/lib/elementary/elc_fileselector_button_eo.h
b/src/lib/elementary/elc_fileselector_button_eo.h
deleted file mode 100644
index df32844..0000000
--- a/src/lib/elementary/elc_fileselector_button_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_fileselector_button.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elc_fileselector_entry.c
b/src/lib/elementary/elc_fileselector_entry.c
index 9de1f22..e5632c1 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -7,6 +7,8 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_fileselector_button.eo.h"
+#include "elm_fileselector_entry.eo.h"
#include "elm_interface_fileselector.h"
#include "elm_widget_fileselector_entry.h"
diff --git a/src/lib/elementary/elc_fileselector_entry.h
b/src/lib/elementary/elc_fileselector_entry.h
index 5e8f643..fe0dfde 100644
--- a/src/lib/elementary/elc_fileselector_entry.h
+++ b/src/lib/elementary/elc_fileselector_entry.h
@@ -73,9 +73,6 @@
* @{
*/
-#ifdef EFL_EO_API_SUPPORT
-#include "elc_fileselector_entry_eo.h"
-#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elc_fileselector_entry_legacy.h"
#endif
diff --git a/src/lib/elementary/elc_fileselector_entry_eo.h
b/src/lib/elementary/elc_fileselector_entry_eo.h
deleted file mode 100644
index 0e5a7b6..0000000
--- a/src/lib/elementary/elc_fileselector_entry_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_fileselector_entry.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_diskselector.c
b/src/lib/elementary/elm_diskselector.c
index 8d8f29c..7195c1b 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -8,6 +8,8 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_diskselector.eo.h"
+#include "elm_diskselector_item.eo.h"
#include "elm_widget_diskselector.h"
#include "elm_interface_scrollable.h"
diff --git a/src/lib/elementary/elm_diskselector.h
b/src/lib/elementary/elm_diskselector.h
index 8ed6904..a6b40fb 100644
--- a/src/lib/elementary/elm_diskselector.h
+++ b/src/lib/elementary/elm_diskselector.h
@@ -67,9 +67,6 @@
*/
#include "elm_diskselector_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_diskselector_eo.h"
-#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_diskselector_legacy.h"
#endif
diff --git a/src/lib/elementary/elm_diskselector_eo.h
b/src/lib/elementary/elm_diskselector_eo.h
deleted file mode 100644
index 3dbebc1..0000000
--- a/src/lib/elementary/elm_diskselector_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "elm_diskselector_item.eo.h"
-#include "elm_diskselector.eo.h"
diff --git a/src/lib/elementary/elm_segment_control.c
b/src/lib/elementary/elm_segment_control.c
index bc1f2fe..08bb419 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -8,6 +8,8 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_segment_control.eo.h"
+#include "elm_segment_control_item.eo.h"
#include "elm_widget_segment_control.h"
#define MY_CLASS ELM_SEGMENT_CONTROL_CLASS
diff --git a/src/lib/elementary/elm_segment_control.h
b/src/lib/elementary/elm_segment_control.h
index 6a75321..8d0df1d 100644
--- a/src/lib/elementary/elm_segment_control.h
+++ b/src/lib/elementary/elm_segment_control.h
@@ -61,9 +61,6 @@
* @{
*/
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_segment_control_eo.h"
-#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_segment_control_legacy.h"
#endif
diff --git a/src/lib/elementary/elm_segment_control_eo.h
b/src/lib/elementary/elm_segment_control_eo.h
deleted file mode 100644
index 3c192e3..0000000
--- a/src/lib/elementary/elm_segment_control_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "elm_segment_control_item.eo.h"
-#include "elm_segment_control.eo.h"
diff --git a/src/lib/elementary/elm_separator.c
b/src/lib/elementary/elm_separator.c
index ff49649..a961b02 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -7,6 +7,7 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_separator.eo.h"
#include "elm_widget_separator.h"
#include "elm_widget_layout.h"
diff --git a/src/lib/elementary/elm_separator.h
b/src/lib/elementary/elm_separator.h
index de537e7..40d39dc 100644
--- a/src/lib/elementary/elm_separator.h
+++ b/src/lib/elementary/elm_separator.h
@@ -18,9 +18,6 @@
* @{
*/
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_separator_eo.h"
-#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_separator_legacy.h"
#endif
diff --git a/src/lib/elementary/elm_separator_eo.h
b/src/lib/elementary/elm_separator_eo.h
deleted file mode 100644
index d7b1346..0000000
--- a/src/lib/elementary/elm_separator_eo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "elm_separator.eo.h"
\ No newline at end of file
diff --git a/src/lib/elementary/elm_slideshow.c
b/src/lib/elementary/elm_slideshow.c
index 2fb9bd9..45ee8d4 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -9,6 +9,8 @@
#include <Elementary.h>
#include "elm_priv.h"
+#include "elm_slideshow.eo.h"
+#include "elm_slideshow_item.eo.h"
#include "elm_widget_slideshow.h"
#define MY_CLASS ELM_SLIDESHOW_CLASS
diff --git a/src/lib/elementary/elm_slideshow.h
b/src/lib/elementary/elm_slideshow.h
index 9762f6b..b13edf9 100644
--- a/src/lib/elementary/elm_slideshow.h
+++ b/src/lib/elementary/elm_slideshow.h
@@ -74,9 +74,6 @@
*/
#include "elm_slideshow_common.h"
-#ifdef EFL_EO_API_SUPPORT
-#include "elm_slideshow_eo.h"
-#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_slideshow_legacy.h"
#endif
diff --git a/src/lib/elementary/elm_slideshow_eo.h
b/src/lib/elementary/elm_slideshow_eo.h
deleted file mode 100644
index 22021b7..0000000
--- a/src/lib/elementary/elm_slideshow_eo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "elm_slideshow_item.eo.h"
-#include "elm_slideshow.eo.h"
--
