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

src/Makefile_Ecore.am

@@ -65,6 +65,7 @@ lib/ecore/Ecore_Common.h \
 lib/ecore/Ecore_Legacy.h \
 lib/ecore/Ecore_Eo.h \
 lib/ecore/Efl_Core.h \
+lib/ecore/efl_general.h \
 lib/ecore/Ecore_Getopt.h
 
 nodist_installed_ecoremainheaders_DATA = \

src/Makefile_Elementary.am

@@ -415,7 +415,6 @@ includesub_HEADERS = \
 	lib/elementary/efl_ui_frame_legacy.h \
 	lib/elementary/elm_gen.h \
 	lib/elementary/elm_general.h \
-	lib/elementary/efl_general.h \
 	lib/elementary/elm_gengrid.h \
 	lib/elementary/elm_gengrid_common.h \
 	lib/elementary/elm_gengrid_legacy.h \

src/lib/ecore/Efl_Core.h

@@ -76,3 +76,7 @@ extern EAPI double _efl_startup_time;
 #define EAPI
 
 #endif
+
+// We are including efl_general.h again, just in case Efl_Core.h was already included before this
+// and the __EFL_*_IS_REQUIRED changed since then.
+#include "efl_general.h"

src/lib/elementary/elm_general.h

@@ -99,7 +99,6 @@ extern EAPI double _elm_startup_time;
 #define __EFL_UI_IS_REQUIRED
 
 #include "Efl_Core.h"
-#include "efl_general.h"
 
 /**************************************************************************/
 /* General calls */