summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-09 15:08:40 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-09 15:13:37 -0800
commitbd83a76393a1e5ceb7f725916a7eb9d41305f788 (patch)
tree926566c022d5c6f7905aed495a2051d57341a16e
parent66c46f052832a98b2e6c09d7853e9557f03287c3 (diff)
ecore: move EFL_MAIN to Efl_Core.h
This make EFL_MAIN available and working with just Ecore. For simplicity it is available with Efl_Core.h. Ideally it should also work with Efl_Net.h alone and finally with an Efl_Ui.h. T6262
-rw-r--r--src/Makefile_Ecore.am1
-rw-r--r--src/Makefile_Elementary.am1
-rw-r--r--src/lib/ecore/Efl_Core.h4
-rw-r--r--src/lib/ecore/efl_general.h (renamed from src/lib/elementary/efl_general.h)0
-rw-r--r--src/lib/elementary/elm_general.h1
5 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index ad637161b4..02b06f0353 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -65,6 +65,7 @@ lib/ecore/Ecore_Common.h \
65lib/ecore/Ecore_Legacy.h \ 65lib/ecore/Ecore_Legacy.h \
66lib/ecore/Ecore_Eo.h \ 66lib/ecore/Ecore_Eo.h \
67lib/ecore/Efl_Core.h \ 67lib/ecore/Efl_Core.h \
68lib/ecore/efl_general.h \
68lib/ecore/Ecore_Getopt.h 69lib/ecore/Ecore_Getopt.h
69 70
70nodist_installed_ecoremainheaders_DATA = \ 71nodist_installed_ecoremainheaders_DATA = \
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 4101360d7b..1c41f580f7 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -415,7 +415,6 @@ includesub_HEADERS = \
415 lib/elementary/efl_ui_frame_legacy.h \ 415 lib/elementary/efl_ui_frame_legacy.h \
416 lib/elementary/elm_gen.h \ 416 lib/elementary/elm_gen.h \
417 lib/elementary/elm_general.h \ 417 lib/elementary/elm_general.h \
418 lib/elementary/efl_general.h \
419 lib/elementary/elm_gengrid.h \ 418 lib/elementary/elm_gengrid.h \
420 lib/elementary/elm_gengrid_common.h \ 419 lib/elementary/elm_gengrid_common.h \
421 lib/elementary/elm_gengrid_legacy.h \ 420 lib/elementary/elm_gengrid_legacy.h \
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index a88e5412ed..585f847b55 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -76,3 +76,7 @@ extern EAPI double _efl_startup_time;
76#define EAPI 76#define EAPI
77 77
78#endif 78#endif
79
80// We are including efl_general.h again, just in case Efl_Core.h was already included before this
81// and the __EFL_*_IS_REQUIRED changed since then.
82#include "efl_general.h"
diff --git a/src/lib/elementary/efl_general.h b/src/lib/ecore/efl_general.h
index b4ffdfe97a..b4ffdfe97a 100644
--- a/src/lib/elementary/efl_general.h
+++ b/src/lib/ecore/efl_general.h
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index be657e1660..d718594f8a 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -99,7 +99,6 @@ extern EAPI double _elm_startup_time;
99#define __EFL_UI_IS_REQUIRED 99#define __EFL_UI_IS_REQUIRED
100 100
101#include "Efl_Core.h" 101#include "Efl_Core.h"
102#include "efl_general.h"
103 102
104/**************************************************************************/ 103/**************************************************************************/
105/* General calls */ 104/* General calls */