all: Simplify definition of EAPI

This will help in the transition from Autotools to Meson. This has been tested on Windows for which EFL_XXX_BUILD were first introduced.
5 years ago · f5b01ac5ce
parent 8a1655a15c
commit f5b01ac5ce
84 changed files with 345 additions and 337 deletions
--- a/m4/efl.m4
+++ b/m4/efl.m4
@ -427,7 +427,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS}
 m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
 USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
 USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
-m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1"
+m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_BUILD=1"
 requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}"
 requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}"

--- a/src/benchmarks/eina/Ecore_Data.h
+++ b/src/benchmarks/eina/Ecore_Data.h
@ -10,15 +10,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -29,7 +29,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @file Ecore_Data.h
--- a/src/benchmarks/eina/Evas_Data.h
+++ b/src/benchmarks/eina/Evas_Data.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EVAS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EVAS_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -25,7 +25,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @file
--- a/src/bindings/js/ecore_js/Ecore_Js.hh
+++ b/src/bindings/js/ecore_js/Ecore_Js.hh
@ -12,15 +12,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_JS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -31,7 +31,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 namespace efl { namespace ecore { namespace js {

@ -55,4 +55,7 @@ EAPI void register_ecore(v8::Isolate *isolate,v8::Handle<v8::Object> exports);

 } } }

+#undef EAPI
+#define EAPI
+
 #endif
--- a/src/bindings/js/eina_js/Eina_Js.hh
+++ b/src/bindings/js/eina_js/Eina_Js.hh
@ -10,15 +10,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EINA_JS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -29,7 +29,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #include <eina_js_container.hh>
 #include <eina_js_accessor.hh>
--- a/src/bindings/js/eldbus_js/Eldbus_Js.hh
+++ b/src/bindings/js/eldbus_js/Eldbus_Js.hh
@ -12,15 +12,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EINA_JS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -31,7 +31,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 namespace efl { namespace eldbus { namespace js {

@ -40,9 +40,12 @@ EAPI void register_eldbus_core(v8::Isolate* isolate, v8::Handle<v8::Object> expo
 EAPI void register_eldbus_message(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
 EAPI void register_eldbus_object_mapper(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
 EAPI void register_eldbus(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
-      
+
 } } }

+#undef EAPI
+#define EAPI
+
 #include <eldbus_js_util.hh>

 #endif
--- a/src/examples/efl_mono/example_numberwrapper.c
+++ b/src/examples/efl_mono/example_numberwrapper.c
@ -10,15 +10,15 @@
 #define EOAPI EAPI EAPI_WEAK

 #ifdef _WIN32
-# ifdef EFL_EO_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EO_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -29,7 +29,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #include "example_numberwrapper.eo.h"

--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@ -281,15 +281,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -300,7 +300,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef _WIN32
 # define WIN32_LEAN_AND_MEAN
--- a/src/lib/ecore/Ecore_Getopt.h
+++ b/src/lib/ecore/Ecore_Getopt.h
@ -9,15 +9,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -28,7 +28,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @ingroup Ecore
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@ -16,15 +16,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -35,7 +35,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef _WIN32
 # define WIN32_LEAN_AND_MEAN
--- a/src/lib/ecore/ecore_internal.h
+++ b/src/lib/ecore/ecore_internal.h
@ -7,15 +7,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -26,7 +26,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 EAPI void ecore_loop_arguments_send(int argc, const char **argv);

--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@ -10,15 +10,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -29,7 +29,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 extern int _ecore_log_dom;
 #ifdef  _ECORE_DEFAULT_LOG_DOM
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@ -9,15 +9,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_AUDIO_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_AUDIO_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -28,7 +28,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @file Ecore_Audio.h
--- a/src/lib/ecore_avahi/Ecore_Avahi.h
+++ b/src/lib/ecore_avahi/Ecore_Avahi.h
@ -12,15 +12,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_AVAHI_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -31,7 +31,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef __cplusplus
 extern "C" {
--- a/src/lib/ecore_buffer/Ecore_Buffer.h
+++ b/src/lib/ecore_buffer/Ecore_Buffer.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUFFER_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUFFER_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -25,7 +25,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @defgroup Ecore_Buffer_Group Ecore_Buffer - Graphics buffer functions
@ -626,4 +626,7 @@ EAPI unsigned int  ecore_buffer_flags_get(Ecore_Buffer *buf);
 }
 #endif

+#undef EAPI
+#define EAPI
+
 #endif
--- a/src/lib/ecore_buffer/Ecore_Buffer_Queue.h
+++ b/src/lib/ecore_buffer/Ecore_Buffer_Queue.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_BUFFER_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_BUFFER_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -25,7 +25,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef __cplusplus
 extern "C" {
@ -448,4 +448,7 @@ EAPI void                      ecore_buffer_provider_buffer_released_cb_set(Ecor
 }
 #endif

+#undef EAPI
+#define EAPI
+
 #endif /* _ECORE_BUFFER_QUEUE_H_ */
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@ -20,7 +20,7 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_CON_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
--- a/src/lib/ecore_con/Ecore_Con_Eet.h
+++ b/src/lib/ecore_con/Ecore_Con_Eet.h
@ -10,7 +10,7 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_CON_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
@ -317,5 +317,5 @@ EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_na

 #undef EAPI
 #define EAPI
-  
+
 #endif
--- a/src/lib/ecore_con/Efl_Net.h
+++ b/src/lib/ecore_con/Efl_Net.h
@ -18,7 +18,7 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_CON_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@ -9,15 +9,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_EVAS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_EVAS_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -28,7 +28,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @file Ecore_Evas.h
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_EVAS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_EVAS_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -25,7 +25,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #define ECORE_MAGIC_EVAS 0x76543211

--- a/src/lib/ecore_file/Ecore_File.h
+++ b/src/lib/ecore_file/Ecore_File.h
@ -13,15 +13,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_FILE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_FILE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -32,7 +32,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @file Ecore_File.h
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@ -8,15 +8,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_IMF_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_IMF_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -27,7 +27,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef __cplusplus
 extern "C" {
--- a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
+++ b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
@ -9,15 +9,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_IMF_EVAS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_IMF_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -28,7 +28,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @defgroup Ecore_IMF_Evas_Group Ecore Input Method Context Evas Helper Functions
--- a/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
@ -16,15 +16,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_INPUT_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_INPUT_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/ecore_input_evas/Ecore_Input_Evas.h
+++ b/src/lib/ecore_input_evas/Ecore_Input_Evas.h
@ -8,15 +8,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_INPUT_EVAS_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_INPUT_EVAS_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/src/lib/ecore_ipc/Ecore_Ipc.h
@ -8,7 +8,7 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_IPC_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
--- a/src/lib/ecore_sdl/Ecore_Sdl.h
+++ b/src/lib/ecore_sdl/Ecore_Sdl.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_SDL_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_SDL_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -25,7 +25,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 /**
 * @file
--- a/src/lib/ecore_win32/Ecore_Win32.h
+++ b/src/lib/ecore_win32/Ecore_Win32.h
@ -23,15 +23,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECORE_WIN32_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_ECORE_WIN32_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -42,7 +42,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif


 #ifdef __cplusplus
--- a/src/lib/ector/Ector.h
+++ b/src/lib/ector/Ector.h
@ -10,15 +10,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECTOR_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EO_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -29,7 +29,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef __cplusplus
 extern "C" {
--- a/src/lib/ector/cairo/Ector_Cairo.h
+++ b/src/lib/ector/cairo/Ector_Cairo.h
@ -8,15 +8,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECTOR_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EO_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -27,7 +27,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef EFL_BETA_API_SUPPORT

--- a/src/lib/ector/gl/Ector_GL.h
+++ b/src/lib/ector/gl/Ector_GL.h
@ -8,15 +8,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECTOR_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EO_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -27,7 +27,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef EFL_BETA_API_SUPPORT

--- a/src/lib/ector/software/Ector_Software.h
+++ b/src/lib/ector/software/Ector_Software.h
@ -8,15 +8,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_ECTOR_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EO_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -27,7 +27,7 @@
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #ifdef EFL_BETA_API_SUPPORT

--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@ -221,15 +221,15 @@ param in edje programs
 #endif

 #ifdef _WIN32
-# ifdef EFL_EDJE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EDJE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@ -12,15 +12,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EDJE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EDJE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@ -75,15 +75,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EDJE_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EDJE_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@ -102,29 +102,29 @@

 #ifdef EAPI
 # undef EAPI
-#endif /* ifdef EAPI */
+#endif

 #ifdef _WIN32
-# ifdef EFL_EET_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
-#  else /* ifdef DLL_EXPORT */
+#  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
-# else /* ifdef EFL_EET_BUILD */
+#  endif
+# else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EET_BUILD */
-#else /* ifdef _WIN32 */
+# endif
+#else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
 #   define EAPI __attribute__ ((visibility("default")))
-#  else /* if __GNUC__ >= 4 */
+#  else
 #   define EAPI
-#  endif /* if __GNUC__ >= 4 */
-# else /* ifdef __GNUC__ */
+#  endif
+# else
 #  define EAPI
-# endif /* ifdef __GNUC__ */
-#endif /* ! _WIN32 */
+# endif
+#endif

 #ifdef __cplusplus
 extern "C" {
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@ -12,15 +12,15 @@ extern "C" {
 #endif

 #ifdef _WIN32
-# ifdef EFL_EFL_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EFL_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -31,7 +31,7 @@ extern "C" {
 # else
 #  define EAPI
 # endif
-#endif /* ! _WIN32 */
+#endif

 #define EFL_VERSION_1_18 1
 #define EFL_VERSION_1_19 1
@ -39,7 +39,7 @@ extern "C" {
 #define EFL_VERSION_1_21 1

 /* Add here all the required ifdef for any @protected method */
-#ifdef EFL_EFL_BUILD
+#ifdef EFL_BUILD
 # define EFL_PACK_LAYOUT_PROTECTED
 # define EFL_GFX_SIZE_HINT_PROTECTED
 #endif
--- a/src/lib/efl_wl/Efl_Wl.h
+++ b/src/lib/efl_wl/Efl_Wl.h
@ -9,26 +9,14 @@
 # undef EAPI
 #endif

-#ifdef _WIN32
-# ifdef EFL_EINA_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif /* ! DLL_EXPORT */
-# else
-#  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EINA_BUILD */
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+#  define EAPI __attribute__ ((visibility("default")))
 # else
 #  define EAPI
 # endif
+#else
+# define EAPI
 #endif

 /**
--- a/src/lib/efreet/Efreet.h
+++ b/src/lib/efreet/Efreet.h
@ -79,15 +79,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EFREET_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EFREET_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/efreet/Efreet_Mime.h
+++ b/src/lib/efreet/Efreet_Mime.h
@ -19,15 +19,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EFREET_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EFREET_MIME_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -127,4 +127,7 @@ EAPI void efreet_mime_type_cache_flush(void);
 }
 #endif

+#undef EAPI
+#define EAPI
+
 #endif
--- a/src/lib/efreet/Efreet_Trash.h
+++ b/src/lib/efreet/Efreet_Trash.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EFREET_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EFREET_TRASH_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
@ -101,4 +101,7 @@ EAPI int         efreet_trash_empty_trash(void);
 }
 #endif

+#undef EAPI
+#define EAPI
+
 #endif
--- a/src/lib/efreet/efreet_cache_private.h
+++ b/src/lib/efreet/efreet_cache_private.h
@ -17,15 +17,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EFREET_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EFREET_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/efreet/efreet_private.h
+++ b/src/lib/efreet/efreet_private.h
@ -6,15 +6,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EFREET_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EFREET_BUILD */
+# endif
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
--- a/src/lib/eina/eina_internal.h
+++ b/src/lib/eina/eina_internal.h
@ -13,15 +13,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EINA_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
 #   define EAPI
-#  endif /* ! DLL_EXPORT */
+#  endif
 # else
 #  define EAPI __declspec(dllimport)
-# endif /* ! EFL_EINA_BUILD */
+# endif
 # define EAPI_WEAK
 #else
 # ifdef __GNUC__
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@ -36,15 +36,15 @@
 #endif

 #ifdef _WIN32
-# ifdef EFL_EINA_BUILD