merge: add escape ecore, fix several bugs

SVN revision: 79995

299 files changed, 4195 insertions, 682 deletions

diff --git a/AUTHORS b/AUTHORS
index 17b645d05f..63915c70e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,11 @@ Daniel Stenberg (inet_pton and inet_ntop functions)
 The MinGW and MinGW-w64 teams (POSIX printf family functions)
 Keith Marshall (realpath on Windows XP). See http://sourceforge.net/tracker/?func=detail&atid=302435&aid=1294010&group_id=2435
 
+Escape
+------
+
+Youness Alaoui (KaKaRoTo)
+
 Eina
 ----
 
diff --git a/COPYING b/COPYING
index 4cbd1f8642..32df97fe80 100644
--- a/COPYING
+++ b/COPYING
@@ -2,8 +2,9 @@ EFL comes with several licences. Listed are the library/probject
 name and the license file covering it.
 
 evil:            licenses/COPYING.BSD
+escape:          licenses/COPYING.GPL
 eet:             licenses/COPYING.BSD
 eina:            licenses/COPYING.LGPL
 eo:              licenses/COPYING.BSD
 evas:            licenses/COPYING.BSD
-embryo:          licenses/COPYING.BSD
+embryo:          licenses/COPYING.SMALL
diff --git a/Makefile.am b/Makefile.am
index d0f7c55ac0..b59b22074f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,12 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src data doc
 
+if HAVE_PO
+
+SUBDIRS += po
+
+endif
+
 MAINTAINERCLEANFILES = \
 Makefile.in \
 aclocal.m4 \
@@ -53,6 +59,7 @@ old/NEWS.eet \
 old/README.eet \
 spec/efl.spec \
 pc/evil.pc \
+pc/escape.pc \
 pc/eina.pc \
 pc/eet.pc \
 pc/eo.pc \
@@ -65,10 +72,27 @@ pc/evas-software-buffer.pc \
 pc/evas-software-x11.pc \
 pc/evas-software-gdi.pc \
 pc/evas-software-ddraw.pc \
-pc/evas-direct3d.pc \
 pc/evas-psl1ght.pc \
 pc/evas-wayland-shm.pc \
 pc/evas-wayland-egl.pc \
+pc/ecore.pc \
+pc/ecore-con.pc \
+pc/ecore-ipc.pc \
+pc/ecore-file.pc \
+pc/ecore-input.pc \
+pc/ecore-input-evas.pc \
+pc/ecore-cocoa.pc \
+pc/ecore-directfb.pc \
+pc/ecore-fb.pc \
+pc/ecore-psl1ght.pc \
+pc/ecore-sdl.pc \
+pc/ecore-wayland.pc \
+pc/ecore-win32.pc \
+pc/ecore-wince.pc \
+pc/ecore-x.pc \
+pc/ecore-imf.pc \
+pc/ecore-imf-evas.pc \
+pc/ecore-evas.pc \
 pc/embryo.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -78,11 +102,24 @@ if HAVE_WINDOWS
 pkgconfig_DATA += pc/evil.pc
 endif
 
+if HAVE_PS3
+pkgconfig_DATA += pc/escape.pc
+endif
+
 pkgconfig_DATA += \
 pc/eina.pc \
 pc/eo.pc \
 pc/eet.pc \
 pc/evas.pc \
+pc/ecore.pc \
+pc/ecore-con.pc \
+pc/ecore-ipc.pc \
+pc/ecore-file.pc \
+pc/ecore-input.pc \
+pc/ecore-input-evas.pc \
+pc/ecore-imf.pc \
+pc/ecore-imf-evas.pc \
+pc/ecore-evas.pc \
 pc/embryo.pc
 
 if BUILD_ENGINE_SOFTWARE_X11
@@ -121,10 +158,6 @@ if BUILD_ENGINE_SOFTWARE_DDRAW
 pkgconfig_DATA += pc/evas-software-ddraw.pc
 endif
 
-if BUILD_ENGINE_DIRECT3D
-pkgconfig_DATA += pc/evas-direct3d.pc
-endif
-
 if BUILD_ENGINE_PSL1GHT
 pkgconfig_DATA += pc/evas-psl1ght.pc
 endif
@@ -137,6 +170,42 @@ if BUILD_ENGINE_WAYLAND_EGL
 pkgconfig_DATA += pc/evas-wayland-egl.pc
 endif
 
+if HAVE_ECORE_COCOA
+pkgconfig_DATA += pc/ecore-cocoa.pc
+endif
+
+if HAVE_ECORE_DIRECTFB
+pkgconfig_DATA += pc/ecore-directfb.pc
+endif
+
+if HAVE_ECORE_FB
+pkgconfig_DATA += pc/ecore-fb.pc
+endif
+
+if HAVE_PS3
+pkgconfig_DATA += pc/ecore-psl1ght.pc
+endif
+
+if HAVE_ECORE_SDL
+pkgconfig_DATA += pc/ecore-sdl.pc
+endif
+
+if HAVE_ECORE_WAYLAND
+pkgconfig_DATA += pc/ecore-wayland.pc
+endif
+
+if HAVE_WIN32
+pkgconfig_DATA += pc/ecore-win32.pc
+endif
+
+if HAVE_WINCE
+pkgconfig_DATA += pc/ecore-wince.pc
+endif
+
+if HAVE_ECORE_X
+pkgconfig_DATA += pc/ecore-x.pc
+endif
+
 
 .PHONY: doc benchmark examples install-examples
 
diff --git a/configure.ac b/configure.ac
index e2d1b852a4..7b035be665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,7 @@ AH_BOTTOM([
 #endif /* EFL_CONFIG_H__ */
 ])
 
-AC_GNU_SOURCE
-AC_SYS_LARGEFILE
+AC_USE_SYSTEM_EXTENSIONS
 
 AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -76,7 +75,7 @@ esac
 # TODO: add some build "profile" (server, full, etc...)
 
 AC_ARG_ENABLE([coverage],
-   [AC_HELP_STRING([--enable-coverage], [enable unit testing coverage. @<:@default==disabled@:>@])],
+   [AC_HELP_STRING([--enable-coverage], [enable unit testing coverage. @<:@default=disabled@:>@])],
    [
     if test "x${enableval}" = "xyes" ; then
        want_coverage="yes"
@@ -94,7 +93,21 @@ requirements_libs_eina=""
 requirements_libs_eo=""
 requirements_libs_eet=""
 requirements_libs_evas=""
-#requirements_libs_ecore=""
+requirements_libs_ecore=""
+requirements_libs_ecore_con=""
+requirements_libs_ecore_ipc=""
+requirements_libs_ecore_file=""
+requirements_libs_ecore_input=""
+requirements_libs_ecore_cocoa=""
+requirements_libs_ecore_directfb=""
+requirements_libs_ecore_fb=""
+requirements_libs_ecore_psl1ght=""
+requirements_libs_ecore_sdl=""
+requirements_libs_ecore_wayland=""
+requirements_libs_ecore_win32=""
+requirements_libs_ecore_wince=""
+requirements_libs_ecore_x=""
+requirements_libs_ecore_evas=""
 requirements_libs_embryo=""
 #requirements_libs_eio=""
 #requirements_libs_edje=""
@@ -105,27 +118,25 @@ requirements_libs_embryo=""
 #requirements_libs_ethumb=""
 #requirements_libs_elementary=""
 
-requirements_libs_deps_evil=""
-requirements_libs_deps_eina=""
-requirements_libs_deps_eo=""
-requirements_libs_deps_eet=""
-requirements_libs_deps_evas=""
-#requirements_libs_deps_ecore=""
-requirements_libs_deps_embryo=""
-#requirements_libs_deps_eio=""
-#requirements_libs_deps_edje=""
-#requirements_libs_deps_efreet=""
-#requirements_libs_deps_e_dbus=""
-#requirements_libs_deps_eeze=""
-#requirements_libs_deps_emotion=""
-#requirements_libs_deps_ethumb=""
-#requirements_libs_deps_elementary=""
-
 requirements_pc_eina=""
 requirements_pc_eo=""
 requirements_pc_eet=""
 requirements_pc_evas=""
-#requirements_pc_ecore=""
+requirements_pc_ecore=""
+requirements_pc_ecore_con=""
+requirements_pc_ecore_ipc=""
+requirements_pc_ecore_file=""
+requirements_pc_ecore_input=""
+requirements_pc_ecore_cocoa=""
+requirements_pc_ecore_directfb=""
+requirements_pc_ecore_fb=""
+requirements_pc_ecore_psl1ght=""
+requirements_pc_ecore_sdl=""
+requirements_pc_ecore_wayland=""
+requirements_pc_ecore_win32=""
+requirements_pc_ecore_wince=""
+requirements_pc_ecore_x=""
+requirements_pc_ecore_evas=""
 requirements_pc_embryo=""
 #requirements_pc_eio=""
 #requirements_pc_edje=""
@@ -140,7 +151,12 @@ requirements_pc_deps_eina=""
 requirements_pc_deps_eo=""
 requirements_pc_deps_eet=""
 requirements_pc_deps_evas=""
-#requirements_pc_deps_ecore=""
+requirements_pc_deps_ecore=""
+requirements_pc_deps_ecore_con=""
+requirements_pc_deps_ecore_fb=""
+requirements_pc_deps_ecore_sdl=""
+requirements_pc_deps_ecore_wayland=""
+requirements_pc_deps_ecore_evas=""
 requirements_pc_deps_embryo=""
 #requirements_pc_deps_eio=""
 #requirements_pc_deps_edje=""
@@ -156,7 +172,21 @@ AC_SUBST([requirements_libs_eina])
 AC_SUBST([requirements_libs_eo])
 AC_SUBST([requirements_libs_eet])
 AC_SUBST([requirements_libs_evas])
-#AC_SUBST([requirements_libs_ecore])
+AC_SUBST([requirements_libs_ecore])
+AC_SUBST([requirements_libs_ecore_con])
+AC_SUBST([requirements_libs_ecore_ipc])
+AC_SUBST([requirements_libs_ecore_file])
+AC_SUBST([requirements_libs_ecore_input])
+AC_SUBST([requirements_libs_ecore_cocoa])
+AC_SUBST([requirements_libs_ecore_directfb])
+AC_SUBST([requirements_libs_ecore_fb])
+AC_SUBST([requirements_libs_ecore_psl1ght])
+AC_SUBST([requirements_libs_ecore_sdl])
+AC_SUBST([requirements_libs_ecore_wayland])
+AC_SUBST([requirements_libs_ecore_win32])
+AC_SUBST([requirements_libs_ecore_wince])
+AC_SUBST([requirements_libs_ecore_x])
+AC_SUBST([requirements_libs_ecore_evas])
 AC_SUBST([requirements_libs_embryo])
 #AC_SUBST([requirements_libs_eio])
 #AC_SUBST([requirements_libs_edje])
@@ -171,7 +201,21 @@ AC_SUBST([requirements_pc_eina])
 AC_SUBST([requirements_pc_eo])
 AC_SUBST([requirements_pc_eet])
 AC_SUBST([requirements_pc_evas])
-#AC_SUBST([requirements_pc_ecore])
+AC_SUBST([requirements_pc_ecore])
+AC_SUBST([requirements_pc_ecore_con])
+AC_SUBST([requirements_pc_ecore_ipc])
+AC_SUBST([requirements_pc_ecore_file])
+AC_SUBST([requirements_pc_ecore_input])
+AC_SUBST([requirements_pc_ecore_cocoa])
+AC_SUBST([requirements_pc_ecore_directfb])
+AC_SUBST([requirements_pc_ecore_fb])
+AC_SUBST([requirements_pc_ecore_psl1ght])
+AC_SUBST([requirements_pc_ecore_sdl])
+AC_SUBST([requirements_pc_ecore_wayland])
+AC_SUBST([requirements_pc_ecore_win32])
+AC_SUBST([requirements_pc_ecore_wince])
+AC_SUBST([requirements_pc_ecore_x])
+AC_SUBST([requirements_pc_ecore_evas])
 AC_SUBST([requirements_pc_embryo])
 #AC_SUBST([requirements_pc_eio])
 #AC_SUBST([requirements_pc_edje])
@@ -189,6 +233,7 @@ AC_CANONICAL_HOST
 have_wince="no"
 have_win32="no"
 have_windows="no"
+have_ps3="no"
 case "$host_os" in
    cegcc*)
       AC_MSG_ERROR([ceGCC compiler is not supported anymore. Exiting...])
@@ -221,6 +266,12 @@ case "$host_os" in
    ;;
 esac
 
+case "$host_vendor" in
+   ps3*)
+      have_ps3="yes"
+   ;;
+esac
+
 AC_SUBST([MODULE_ARCH])
 AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
 AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
@@ -229,6 +280,7 @@ AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared ob
 AM_CONDITIONAL([HAVE_WINCE], [test "x${have_wince}" = "xyes"])
 AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
 AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
+AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"])
 
 
 #### Checks for programs
@@ -238,14 +290,32 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
 if test "x${have_windows}" = "xyes" ; then
    lt_cv_deplibs_check_method='pass_all'
 fi
-AC_LIBTOOL_WIN32_DLL
-define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])
 version_info="lt_cur:lt_rev:lt_age"
 AC_SUBST([version_info])
 release_info="v_rel"
 AC_SUBST([release_info])
 
+### gettext
+
+AM_GNU_GETTEXT_VERSION([0.17])
+
+m4_ifdef([AM_GNU_GETTEXT], [
+AM_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+have_po="yes"
+],
+[
+have_po="no"
+])
+AC_SUBST([LTLIBINTL])
+
+if test "x${POSUB}" = "x" ; then
+   have_po="no"
+fi
+
+AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
+
 ### compilers
 
 # rw_PROG_OBJC_WORKS
@@ -277,10 +347,22 @@ rw_PROG_OBJC_WORKS
 AM_PROG_AS
 AC_PROG_CXX
 AC_LANG(C)
-AC_PROG_CPP
-AC_PROG_CC
+AC_PROG_CC_C99
 AM_PROG_CC_C_O
 
+if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
+   AC_MSG_ERROR([ecore requires a c99-capable compiler])
+fi
+
+have_gnu_objc=${ac_cv_objc_compiler_gnu}
+
+#echo $ac_cv_prog_CXX
+#if test "x${ac_cv_prog_CXX}" = "x" ; then
+#   AC_MSG_ERROR([C++ compiler needed. Exiting...])
+#fi
+
+AC_SYS_LARGEFILE
+
 # pkg-config
 
 PKG_PROG_PKG_CONFIG
@@ -337,6 +419,7 @@ AC_HEADER_TIME
 
 AC_CHECK_HEADERS([ \
 execinfo.h \
+errno.h \
 inttypes.h \
 libgen.h \
 mcheck.h \
@@ -465,8 +548,6 @@ AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
 
 ### Checks for header files
 
-AC_CHECK_HEADERS([errno.h])
-
 ### Checks for types
 
 ### Checks for structures
@@ -497,6 +578,42 @@ fi
 #### End of Evil
 
 
+#### Escape
+
+if test "x${have_ps3}" = "xyes" ; then
+
+AC_MSG_NOTICE([Escape checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+ESCAPE_LIBS="-llv2"
+requirements_libs_escape="${ESCAPE_LIBS}"
+
+AC_SUBST([ESCAPE_LIBS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+fi
+
+#### End of Evil
+
+
 #### Eina
 
 AC_MSG_NOTICE([Eina checks])
@@ -563,17 +680,15 @@ esac
 # Escape library for compilation on Playstation 3
 
 case "$host_vendor" in
-  ps3*)
-# TODO: add back whenever escape is merged into efl single tree
-#      PKG_CHECK_EXISTS([escape])
-#      AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed])
-#      requirements_pc_eina="${requirements_pc_eina} escape"
+   ps3*)
+      AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed])
+      requirements_pc_eina="${requirements_pc_eina} escape >= ${PACKAGE_VERSION}"
     ;;
 esac
 
 # Exotic library for compilation on Coyote
 
-# TODO: add back whenever escape is merged into efl single tree
+# TODO: add back whenever exotic is merged into efl single tree
 #PKG_CHECK_EXISTS([exotic],
 #   [
 #    enable_exotic="yes"
@@ -745,7 +860,6 @@ case "$build_crypto" in
       AC_PATH_GENERIC([libgcrypt], [], [:],
          [AC_MSG_ERROR([libgcrypt required but not found])])
       requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}"
-      requirements_libs_deps_eet="${LIBGCRYPT_LIBS} ${requirements_libs_deps_eet}"
 
       # TODO: do we need this? can't we just bump required version?
       # Specific GNUTLS improvement
@@ -782,10 +896,12 @@ case "$build_crypto" in
       ;;
 
    openssl)
-      PKG_CHECK_MODULES([OPENSSL], [openssl])
-      AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support])
-      requirements_pc_eet="openssl ${requirements_pc_eet}"
-      requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}"
+      PKG_CHECK_EXISTS([openssl],
+         [
+          AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support])
+          requirements_pc_eet="openssl ${requirements_pc_eet}"
+          requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}"
+         ])
       ;;
 esac
 
@@ -816,15 +932,13 @@ PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
 case "$host_os" in
    mingw32ce*)
       requirements_libs_eet="${requirements_libs_eet} -lws2"
-      requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2"
       ;;
    mingw*)
       requirements_libs_eet="${requirements_libs_eet} -lws2_32"
-      requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2_32"
       ;;
 esac
 
-EET_LIBS="${EET_LIBS} ${requirements_libs_deps_eet}"
+EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
 
 ### Checks for header files
 
@@ -905,7 +1019,7 @@ AC_MSG_NOTICE([Evas checks])
 # a requirement is selected, but not met.
 use_strict="no"
 AC_ARG_ENABLE([strict],
-   [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default==disabled@:>@])],
+   [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default=disabled@:>@])],
    [use_strict="yes"],
    [use_strict="no"])
 
@@ -1204,7 +1318,6 @@ want_evas_engine_gl_xlib="no"
 want_evas_engine_gl_xcb="no"
 want_evas_engine_gl_sdl="no"
 want_evas_engine_gl_cocoa="no"
-want_evas_engine_direct3d="no"
 want_evas_engine_fb="no"
 want_evas_engine_directfb="no"
 want_evas_engine_psl1ght="no"
@@ -1255,7 +1368,7 @@ case "$host_os" in
 esac
 
 EFL_CHECK_FUNC([DLSYM], [dlsym])
-requirements_libs_deps_evas="${requirements_libs_deps_evas} ${DLSYM_LIBS}"
+requirements_libs_evas="${requirements_libs_evas} ${DLSYM_LIBS}"
 
 if test "x${efl_func_dlsym}" = "xno" ; then
    want_evas_engine_gl_xlib="no"
@@ -1385,7 +1498,6 @@ fi
 ## Engines
 
 EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [yes], [Buffer])
-EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D])
 EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB])
 EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer])
 EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa])
@@ -1606,7 +1718,7 @@ AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xye
 
 PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}])
 
-EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_deps_evas}"
+EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_evas}"
 
 ### Checks for header files
 
@@ -1854,6 +1966,2094 @@ fi
 #### End of Embryo
 
 
+#### Ecore
+
+AC_MSG_NOTICE([Ecore checks])
+
+### Additional options to configure
+
+# glib
+
+AC_ARG_WITH([glib],
+   [AC_HELP_STRING([--with-glib=yes|no|always],
+                   [add glib support. @<:@default=enabled@:>@])],
+   [
+    if test "x${withval}" = "xyes" ; then
+       with_glib="yes"
+    else
+       if test "x${withval}" = "xalways" ; then
+          with_glib="always"
+       else
+          with_glib="no"
+       fi
+    fi
+   ],
+   [with_glib="yes"])
+
+AC_ARG_ENABLE([g-main-loop],
+   [AC_HELP_STRING([--enable-g-main-loop],
+       [enable ecore_main_loop based on g_main_loop. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_g_main_loop="yes"
+    else
+       want_g_main_loop="no"
+    fi
+   ],
+   [want_g_main_loop="no"])
+
+# thread safety
+
+AC_ARG_ENABLE([thread-safety],
+   [AC_HELP_STRING([--enable-thread-safety],
+       [enable thread safety. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_thread_safety="yes"
+    else
+       want_thread_safety="no"
+    fi
+   ],
+   [want_thread_safety="no"])
+
+# epoll
+
+AC_ARG_ENABLE([epoll],
+   [AC_HELP_STRING([--disable-epoll],
+       [disable epoll support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_epoll="yes"
+    else
+       want_epoll="no"
+    fi
+   ],
+   [want_epoll="yes"])
+
+### Default values
+
+case "$host_os" in
+   mingw32*)
+      with_glib="no"
+      ;;
+esac
+
+want_glib="no"
+if test "x${with_glib}" = "xyes" || test "x${with_glib}" = "xalways" ; then
+   want_glib="yes"
+fi
+
+if test "x${want_thread_safety}" = "xyes" ; then
+   AC_DEFINE([HAVE_THREAD_SAFETY], [1], [Define to enable thread safety])
+fi
+
+want_ecore_timer_dump="no"
+if test "x${build_profile}" = "xdebug" && test "x${ac_cv_func_backtrace}" = "xyes"; then
+   want_ecore_timer_dump="yes"
+   AC_DEFINE([WANT_ECORE_TIMER_DUMP], [1], [Want Ecore_Timer dump infrastructure])
+fi
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+
+# Evil library for compilation on Windows
+
+if test "x${have_windows}" = "xyes" ; then
+   requirements_pc_ecore="${requirements_pc_ecore} evil >= ${PACKAGE_VERSION}"
+fi
+
+# Escape library for compilation on PS3
+
+if test "x${have_ps3}" = "xyes" ; then
+   requirements_pc_ecore="${requirements_pc_ecore} escape >= ${PACKAGE_VERSION}"
+fi
+
+# Eina, Eo libraries
+
+requirements_pc_ecore="eo >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore}"
+
+# glib
+
+have_glib="no"
+if test "x${want_glib}" = "xyes" ; then
+   PKG_CHECK_EXISTS([glib-2.0], [have_glib="yes"], [have_glib="no"])
+fi
+
+if test "x${want_glib}" = "xyes" && test "x${have_glib}" = "xno"; then
+   AC_MSG_ERROR([GLib support requested, but no GLib found by pkg-config.])
+elif test "x${have_glib}" = "xyes" ; then
+   AC_DEFINE([HAVE_GLIB], [1], [Have GLib])
+   requirements_pc_ecore="glib-2.0 ${requirements_pc_ecore}"
+   requirements_pc_deps_ecore="glib-2.0 ${requirements_pc_deps_ecore}"
+fi
+
+if test "x${have_glib}" = "xno"; then
+   want_g_main_loop="no"
+fi
+
+if test "x${with_glib}" = "xalways" && test "x${want_g_main_loop}" = "xyes"; then
+  AC_MSG_ERROR([--with-glib set to always and --enable-glib-main-loop are mutually exclusive])
+fi
+
+want_glib_integration_always=no
+if test "x${with_glib}" = "xalways" ; then
+  want_glib_integration_always="yes"
+  AC_DEFINE([GLIB_INTEGRATION_ALWAYS], [1], [Always integrate glib if support compiled])
+fi
+
+if test "x${want_g_main_loop}" = "xyes" ; then
+  AC_DEFINE([USE_G_MAIN_LOOP], [1], [Use g_main_loop in ecore])
+fi
+
+if ! test "x${requirements_pc_deps_ecore}" = "x" ; then
+   PKG_CHECK_MODULES([ECORE], [${requirements_pc_deps_ecore}])
+fi
+
+case "$host_os" in
+   mingw32ce*)
+      requirements_libs_ecore="${requirements_libs_ecore} -lws2"
+      ;;
+   mingw*)
+      requirements_libs_ecore="${requirements_libs_ecore} -lws2_32"
+      ;;
+esac
+
+### Checks for header files
+
+AC_HEADER_SYS_WAIT
+
+AC_CHECK_HEADERS([ \
+features.h \
+langinfo.h \
+locale.h \
+signal.h \
+sys/time.h \
+sys/prctl.h \
+sys/resource.h \
+sys/select.h \
+sys/timerfd.h \
+])
+
+if test "x${want_epoll}" = "xyes" ; then
+   AC_CHECK_HEADERS([sys/epoll.h])
+fi
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+## ecore
+
+# isfinite
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <math.h>
+       ]],
+       [[
+int i = isfinite(0);
+       ]])],
+   [
+    AC_DEFINE(HAVE_ISFINITE, 1, [Define to 1 if you have `isfinite', as a function or macro.])
+    have_isfinite="yes"
+   ],
+   [have_isfinite="no"])
+
+AC_MSG_CHECKING([for isfinite])
+AC_MSG_RESULT([${have_isfinite}])
+
+# mallinfo, timerfd_create, clock_gettime
+
+AC_CHECK_FUNCS_ONCE([mallinfo timerfd_create clock_gettime])
+
+if ! test "x${ac_cv_func_clock_gettime}" = "xyes" ; then
+   AC_CHECK_LIB([rt], [clock_gettime],
+      [
+        requirements_libs_ecore="${requirements_libs_ecore} -lrt"
+        AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Have clock_gettime()])
+       ])
+fi
+
+ECORE_LIBS="${ECORE_LIBS} ${LTLIBINTL} ${requirements_libs_ecore}"
+
+### Check availability
+
+#### End of Ecore
+
+
+#### Ecore_Con
+
+AC_MSG_NOTICE([Ecore_Con checks])
+
+### Additional options to configure
+
+AC_ARG_ENABLE([ipv6],
+   [AC_HELP_STRING([--disable-ipv6],
+       [disable ipv6 functionality @<:@default=detect@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ipv6="yes"
+    else
+       want_ipv6="no"
+    fi],
+   [want_ipv6="auto"])
+
+AC_ARG_ENABLE([curl],
+   [AC_HELP_STRING([--disable-curl], [disable curl support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_curl="yes"
+    else
+       want_curl="no"
+    fi
+   ],
+   [want_curl="yes"])
+
+AC_ARG_WITH([tls],
+   [AC_HELP_STRING([--with-tls=TLS],
+                   [select Transport Layer Security, one of: gnutls, openssl, none.
+                    @<:@default=gnutls@:>@])],
+   [with_tls=${withval}],
+   [with_tls="gnutls"])
+
+case "${with_tls}" in
+   gnutls|openssl|none)
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown Transport Layer Security --with-tls=${with_tls}])
+     ;;
+esac
+
+AC_ARG_ENABLE([local-sockets],
+   [AC_HELP_STRING([--disable-local-sockets], [disable local sockets.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ecore_con_local_sockets="yes"
+    else
+       want_ecore_con_local_sockets="no"
+    fi
+   ],
+   [want_ecore_con_local_sockets="yes"])
+
+AC_ARG_ENABLE([abstract-sockets],
+   [AC_HELP_STRING([--disable-abstract-sockets], [disable abstract sockets.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ecore_con_abstract_sockets="yes"
+    else
+       want_ecore_con_abstract_sockets="no"
+    fi
+   ],
+   [want_ecore_con_abstract_sockets="yes"])
+
+### Default values
+
+
+case "$host_os" in
+   mingw32ce*)
+      with_tls="none"
+      want_curl="no"
+      want_cares="no"
+      want_ecore_con_local_sockets="no"
+      want_ecore_con_abstract_sockets="no"
+      ;;
+   mingw*)
+      want_cares="yes"
+      want_ecore_con_abstract_sockets="no"
+      ;;
+   darwin*)
+      want_ecore_con_abstract_sockets="no"
+      ;;
+   *)
+      want_cares="no"
+      ;;
+esac
+
+case "$host_vendor" in
+  ps3*)
+      want_ecore_con_local_sockets="no"
+      ;;
+esac
+
+if test "x${want_ecore_con_local_sockets}" = "xyes" ; then
+   AC_DEFINE([HAVE_LOCAL_SOCKETS], [1], [Have local sockets support])
+fi
+
+if test "x${want_ecore_con_abstract_sockets}" = "xyes" ; then
+   AC_DEFINE([HAVE_ABSTRACT_SOCKETS], [1], [Have abstract sockets namespace])
+fi
+
+### Checks for programs
+
+have_gnutls="no"
+if test "x${with_tls}" = "xgnutls" ; then
+   AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"])
+fi
+
+### Checks for libraries
+
+# Evil library for compilation on Windows
+case "$host_os" in
+   mingw*)
+      requirements_pc_ecore_con="evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_con}"
+      ;;
+esac
+
+# Eina, Eo, Eet, Ecore
+
+requirements_pc_ecore_con="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eo >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_con}"
+
+# gnuTLS
+
+if test "x${have_gnutls}" = "xyes" ; then
+   PKG_CHECK_EXISTS([gnutls >= 2.10.2],
+      [
+       have_gnutls="yes"
+       AC_DEFINE([USE_GNUTLS], [1], [Use GnuTLS])
+       requirements_pc_ecore_con="gnutls >= 2.10.2 ${requirements_pc_ecore_con}"
+       requirements_pc_deps_ecore_con="gnutls >= 2.10.2 ${requirements_pc_deps_ecore_con}"
+      ],
+      [have_gnutls="no"])
+fi
+
+# openssl
+
+have_openssl="no"
+if test "x${with_tls}" = "xopenssl" ; then
+   PKG_CHECK_EXISTS([openssl],
+      [
+       have_openssl="yes"
+       AC_DEFINE([USE_OPENSSL], [1], [Use OpenSSL])
+       requirements_pc_ecore_con="openssl ${requirements_pc_ecore_con}"
+       requirements_pc_deps_ecore_con="openssl ${requirements_pc_deps_ecore_con}"
+      ],
+      [have_openssl="no"])
+fi
+
+# cURL
+
+have_curl="no"
+if test "x${want_curl}" = "xyes" ; then
+   PKG_CHECK_EXISTS([libcurl],
+      [
+       have_curl="yes"
+       AC_DEFINE([HAVE_CURL], [1], [Downloading with CURL])
+       requirements_pc_ecore_con="libcurl ${requirements_pc_ecore_con}"
+       requirements_pc_deps_ecore_con="libcurl ${requirements_pc_deps_ecore_con}"
+      ],
+      [have_curl="no"])
+fi
+
+# c-ares
+
+have_cares="no"
+if test "x${want_cares}" = "xyes" ; then
+   PKG_CHECK_EXISTS([libcares >= 1.6.1],
+     [
+      have_cares="yes"
+      AC_DEFINE([HAVE_CARES], [1], [Build Ecore_Con_Info with c-ares support])
+       requirements_pc_ecore_con="libcares >= 1.6.1 ${requirements_pc_ecore_con}"
+       requirements_pc_deps_ecore_con="libcares >= 1.6.1 ${requirements_pc_deps_ecore_con}"
+     ],
+     [have_cares="no"])
+fi
+
+AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
+
+# FIXME: to remove
+
+AC_DEFINE(ECORE_HAVE_EET, 1, [Define if Ecore_Con Eet_Connection helper is supported])
+AM_CONDITIONAL([ECORE_HAVE_EET], [true])
+
+PKG_CHECK_MODULES([ECORE_CON], [${requirements_pc_deps_ecore_con}])
+
+case "$host_os" in
+   mingw32ce*)
+      requirements_libs_ecore_con="${requirements_libs_ecore_con} -lws2"
+      ;;
+   mingw*)
+      requirements_libs_ecore_con="${requirements_libs_ecore_con} -lws2_32"
+      ;;
+esac
+
+ECORE_CON_CFLAGS="${ECORE_CON_CFLAGS} ${LIBGCRYPT_CFLAGS}"
+ECORE_CON_LIBS="${ECORE_CON_LIBS} ${LIBGCRYPT_LIBS}"
+requirements_libs_ecore_con="${requirements_libs_ecore_con} ${LIBGCRYPT_LIBS}"
+
+### Checks for header files
+
+AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([net/if.h], [], [],
+[
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+])
+AC_CHECK_HEADERS([sys/un.h], [], [],
+[
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+])
+AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h])
+
+if test "x${ac_cv_header_netdb_h}" = "xno" && test "x${have_windows}" = "xno"; then
+   AC_MSG_ERROR([netdb.h is requested to have Ecore_Con. Exiting...])
+fi
+
+### Checks for types
+
+have_ipv6="no"
+if test "x${want_ipv6}" != "xno" ; then
+   AC_CHECK_TYPES([struct ipv6_mreq],
+      [have_ipv6="yes"],
+      [have_ipv6="no"],
+      [[
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+# include <ws2tcpip.h>
+#endif
+      ]])
+fi
+
+if test "x${have_ipv6}" = "xyes" ; then
+   AC_DEFINE([HAVE_IPV6], 1, [Define if IPV6 is supported])
+fi
+
+AM_CONDITIONAL([HAVE_IPV6], [test "x${have_ipv6}" = "xyes"])
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+EFL_CHECK_COMPILER_FLAGS([ECORE_CON], [-Wno-override-init -Wno-initializer-overrides])
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Con
+
+
+#### Ecore_Ipc
+
+AC_MSG_NOTICE([Ecore_Ipc checks])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+
+# Eina, Ecore, Ecore_Con
+
+requirements_pc_ecore_ipc="ecore_con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_ipc}"
+
+### Checks for header files
+
+AC_CHECK_HEADERS([winsock2.h])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Ipc
+
+
+#### Ecore_File
+
+AC_MSG_NOTICE([Ecore_File checks])
+
+### Additional options to configure
+
+AC_ARG_ENABLE([poll],
+   [AC_HELP_STRING([--disable-poll],
+      [disable poll in the ecore_file module. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_poll="yes"
+    else
+       want_poll="no"
+    fi
+   ],
+   [want_poll="yes"])
+
+AC_ARG_ENABLE([inotify],
+   [AC_HELP_STRING([--disable-inotify],
+      [disable inotify in the ecore_file module. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_inotify="yes"
+    else
+       want_inotify="no"
+    fi
+   ],
+   [want_inotify="yes"])
+
+AC_ARG_ENABLE([atfile-source],
+   [AC_HELP_STRING([--disable-atfile-source],
+       [disable use of atfile source functions as openat and mkdirat @<:@default=detect@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_atfile_source="yes"
+    else
+       have_atfile_source="no"
+    fi],
+   [have_atfile_source=auto])
+
+### Default values
+
+have_poll="no"
+if test "x${want_poll}" = "xyes" ; then
+   AC_DEFINE([HAVE_POLL], [1], [File monitoring with polling])
+   have_poll="yes"
+fi
+
+have_notify_win32="no"
+
+case "$host_os" in
+  mingw32ce*)
+    ;;
+  mingw32*)
+     have_notify_win32="yes"
+     AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [File monitoring with Windows notification])
+    ;;
+esac
+
+if ! test "x${have_atfile_source}" = "xno" ; then
+   AC_CHECK_FUNCS([mkdirat],
+      [
+       have_atfile_source="yes"
+       AC_DEFINE(HAVE_ATFILE_SOURCE, 1, [mkdirat exists])
+      ],
+      [
+       if test "x${have_atfile_source}" = "xyes" ; then
+          AC_MSG_ERROR([required atfile-source but no mkdirat()])
+       fi
+       have_atfile_source="no"
+      ])
+fi
+
+# FIXME: remove that
+AC_DEFINE([BUILD_ECORE_CON], [1], [Ecore_Con is supported])
+
+### Checks for programs
+
+### Checks for libraries
+
+# Escape library for compilation on PS3
+
+if test "x${have_ps3}" = "xyes" ; then
+   requirements_pc_ecore_file="${requirements_pc_ecore_file} escape >= ${PACKAGE_VERSION}"
+fi
+
+# Eina, Ecore, Ecore_Con
+
+requirements_pc_ecore_file="ecore_con >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_file}"
+
+### Checks for header files
+
+have_inotify="no"
+if test "x${want_inotify}" = "xyes" ; then
+   AC_CHECK_HEADER([sys/inotify.h],
+      [
+       AC_DEFINE([HAVE_INOTIFY], [1], [File monitoring with Inotify])
+       have_inotify="yes"
+      ],
+      [have_inotify="no"])
+fi
+
+AC_MSG_CHECKING([whether inotify is to be used for filemonitoring])
+AC_MSG_RESULT(${have_inotify})
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_File
+
+
+#### Ecore_Input
+
+AC_MSG_NOTICE([Ecore_Input checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Ecore (ecore_input)
+
+requirements_pc_ecore_input="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_input}"
+
+## Eina, Evas, Ecore, Ecore_Input (ecore_input_evas)
+
+requirements_pc_ecore_input_evas="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_input_evas}"
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Input
+
+
+#### Ecore_Cocoa
+
+AC_MSG_NOTICE([Ecore_Cocoa checks])
+
+### Additional options to configure
+
+### Default values
+
+have_ecore_cocoa="no"
+case "$host_os" in
+   darwin*)
+      have_ecore_cocoa="yes"
+      ;;
+esac
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Ecore, Ecore_Input
+
+requirements_pc_ecore_cocoa="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_cocoa}"
+
+### Checks for header files
+
+ECORE_COCOA_LIBS=""
+if test "x${have_ecore_cocoa}" = "xyes" ; then
+   m4_ifdef([AC_PROG_OBJC],
+      [
+       if test "x${have_gnu_objc}" = "xyes" ; then
+          AC_LANG_PUSH([Objective C])
+          LIBS_save="$LIBS"
+          LIBS="$LIBS -framework Cocoa"
+          AC_LINK_IFELSE(
+             [AC_LANG_PROGRAM(
+                 [[
+#include <Cocoa/Cocoa.h>
+                 ]],
+                 [[
+NSWindow *window;
+window = [[NSWindow alloc]
+           initWithContentRect:NSMakeRect(0, 0, 1, 1)
+           styleMask:(NSTitledWindowMask)
+           backing:NSBackingStoreBuffered
+           defer:NO
+           screen:nil
+         ];
+                 ]])],
+             [
+              have_ecore_cocoa="yes"
+              ECORE_COCOA_LIBS="-framework Cocoa"
+              requirements_libs_ecore_cocoa="-framework Cocoa"
+             ],
+             [have_ecore_cocoa="no"])
+          LIBS="$LIBS_save"
+          AC_MSG_CHECKING([whether Cocoa framework is supported])
+          AC_MSG_RESULT([${have_ecore_cocoa}])
+          AC_LANG_POP([Objective C])
+       fi
+   ])
+fi
+AC_SUBST([ECORE_COCOA_LIBS])
+
+AM_CONDITIONAL([HAVE_ECORE_COCOA], [test "x${have_ecore_cocoa}" = "xyes"])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Cocoa
+
+
+#### Ecore_DirectFB
+
+AC_MSG_NOTICE([Ecore_DirectFB checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Ecore
+
+requirements_pc_ecore_directfb="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_directfb}"
+
+## DirectFB
+
+PKG_CHECK_MODULES([ECORE_DIRECTFB],
+   [directfb >= 0.9.16],
+   [
+    have_ecore_directfb="yes"
+    requirements_pc_ecore_directfb="directfb >= 0.9.16 ${requirements_pc_ecore_directfb}"
+   ],
+   [have_ecore_directfb="no"])
+
+AM_CONDITIONAL([HAVE_ECORE_DIRECTFB], [test "x${have_ecore_directfb}" = "xyes"])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Directfb
+
+
+#### Ecore_FB
+
+AC_MSG_NOTICE([Ecore_FB checks])
+
+### Additional options to configure
+
+### Default values
+
+want_tslib="no"
+case "$host_os" in
+   mingw*|darwin*)
+      ;;
+   *)
+      want_tslib="yes"
+      ;;
+esac
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Ecore
+
+requirements_pc_ecore_fb="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_fb}"
+
+## tslib
+
+PKG_CHECK_EXISTS([tslib-1.0],
+   [
+    have_tslib="yes"
+    AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
+    requirements_pc_ecore_fb="tslib-1.0 ${requirements_pc_ecore_fb}"
+    requirements_pc_deps_ecore_fb="tslib-1.0 ${requirements_pc_deps_ecore_fb}"
+   ],
+   [have_tslib="no"])
+
+if test "x${have_tslib}" = "xno" ; then
+   PKG_CHECK_EXISTS([tslib],
+      [
+       have_tslib="yes"
+       AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
+       requirements_pc_ecore_fb="tslib ${requirements_pc_ecore_fb}"
+       requirements_pc_deps_ecore_fb="tslib-1.0 ${requirements_pc_deps_ecore_fb}"
+      ],
+      [have_tslib="no"])
+fi
+
+if test "x${have_tslib}" = "xno" ; then
+   AC_CHECK_HEADER([tslib.h], [have_tslib="yes"], [have_tslib="no"])
+
+   if test "x${have_tslib}" = "xyes" ; then
+      AC_CHECK_LIB([ts], [ts_open],
+         [
+          have_tslib="yes"
+          AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
+          requirements_libs_ecore_fb="-lts ${requirements_libs_ecore_fb}"
+         ],
+         [have_tslib="no"])
+   fi
+
+   if test "x${have_tslib}" = "xno" ; then
+      AC_CHECK_LIB([tslib], [ts_open],
+         [
+          have_tslib="yes"
+          AC_DEFINE([HAVE_TSLIB], [1], [Build Ecore_FB Touchscreen Code])
+          requirements_libs_ecore_fb="-ltslib ${requirements_libs_ecore_fb}"
+         ],
+         [have_tslib="no"])
+   fi
+fi
+
+if test "x${requirements_pc_deps_ecore_fb}" = "x" ; then
+   ECORE_FB_LIBS=${requirements_libs_ecore_fb}
+   AC_SUBST([ECORE_FB_LIBS])
+else
+   PKG_CHECK_MODULES([ECORE_FB], [${requirements_pc_deps_ecore_fb}])
+fi
+
+### Checks for header files
+
+have_ecore_fb="no"
+AC_CHECK_HEADER([linux/fb.h],
+   [AC_CHECK_HEADER([linux/input.h], [have_ecore_fb="yes"], [have_ecore_fb="no"])])
+
+AM_CONDITIONAL([HAVE_ECORE_FB], [test "x${have_ecore_fb}" = "xyes"])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_FB
+
+
+#### Ecore_Psl1ght
+
+if test "x${have_ps3}" = "xyes" ; then
+
+AC_MSG_NOTICE([Ecore_Psl1ght checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Escape, Eina, Ecore, Ecore_Input
+
+requirements_pc_ecore_psl1ght="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} escape >= ${PACKAGE_VERSION} ${requirements_pc_ecore_psl1ght}"
+
+requirements_libs_ecore_psl1ght="-lio -lsysutil -lgem -lcamera -lspurs"
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+fi
+
+#### End of Ecore_Psl1ght
+
+
+#### Ecore_SDL
+
+AC_MSG_NOTICE([Ecore_SDL checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+# Escape library for compilation on PS3
+
+if test "x${have_ps3}" = "xyes" ; then
+   requirements_pc_ecore_sdl="${requirements_pc_ecore_sdl} escape >= ${PACKAGE_VERSION}"
+fi
+
+## Eina, Ecore
+
+requirements_pc_ecore_sdl="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_sdl}"
+
+## SDL
+
+PKG_CHECK_MODULES([ECORE_SDL],
+   [sdl >= 1.2.0],
+   [
+    have_ecore_sdl="yes"
+    requirements_pc_ecore_sdl="sdl >= 1.2.0 ${requirements_pc_ecore_sdl}"
+   ],
+   [have_ecore_sdl="no"])
+
+if test "x${have_ecore_sdl}" = "xno" ; then
+   AC_PATH_GENERIC([sdl], [],
+      [
+       have_ecore_sdl="yes"
+       requirements_libs_ecore_sdl="${SDL_LIBS} ${requirements_libs_ecore_sdl}"
+       ECORE_SDL_CFLAGS=${SDL_CFLAGS}
+       ECORE_SDL_LIBS=${SDL_LIBS}
+      ],
+      [have_ecore_sdl="no"])
+fi
+
+if test "x${have_ecore_sdl}" = "xyes" ; then
+   PKG_CHECK_EXISTS([sdl >= 1.3.0],
+      [AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL])])
+fi
+
+AM_CONDITIONAL([HAVE_ECORE_SDL], [test "x${have_ecore_sdl}" = "xyes"])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_SDL
+
+
+#### Ecore_Wayland
+
+AC_MSG_NOTICE([Ecore_Wayland checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Evil, Eina, Ecore, Ecore_Input
+
+requirements_pc_ecore_wayland="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wayland}"
+
+## Wayland
+
+PKG_CHECK_MODULES([ECORE_WAYLAND],
+   [wayland-client wayland-cursor xkbcommon],
+   [
+    have_ecore_wayland="yes"
+    requirements_pc_ecore_wayland="wayland-client wayland-cursor xkbcommon ${requirements_pc_ecore_wayland}"
+   ],
+   [have_ecore_wayland="no"])
+
+AM_CONDITIONAL([HAVE_ECORE_WAYLAND], [test "x${have_ecore_wayland}" = "xyes"])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Wayland
+
+
+#### Ecore_Win32
+
+if test "x${have_win32}" = "xyes" ; then
+
+AC_MSG_NOTICE([Ecore_Win32 checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Evil, Eina, Ecore, Ecore_Input
+
+requirements_pc_ecore_win32="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_win32}"
+
+ECORE_WIN32_LIBS="-lole32 -lgdi32"
+requirements_libs_ecore_win32="-lole32 -lgdi32 ${requirements_libs_ecore_win32}"
+AC_SUBST([ECORE_WIN32_LIBS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+fi
+
+#### End of Ecore_Win32
+
+
+#### Ecore_WinCE
+
+if test "x${have_wince}" = "xyes" ; then
+
+AC_MSG_NOTICE([Ecore_WinCE checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Evil, Eina, Ecore, Ecore_Input
+
+requirements_pc_ecore_wince="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wince}"
+
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+fi
+
+#### End of Ecore_WinCE
+
+
+#### Ecore_X
+
+AC_MSG_NOTICE([Ecore_X checks])
+
+### Additional options to configure
+
+# FIXME: recycle that with evas
+AC_ARG_WITH([ecore-x-backend],
+   [AC_HELP_STRING([--ecore-x-backend=BACKEND],
+                   [use the predefined x11 backends, one of: xlib, xcb and none. @<:@default=xlib@:>@])],
+   [ecore_x_backend=${withval}],
+   [ecore_x_backend="xlib"])
+
+case "${ecore_x_backend}" in
+   xlib)
+      have_ecore_x_xlib="yes"
+      ;;
+   xcb)
+      have_ecore_x_xcb="yes"
+      ;;
+   none)
+      have_ecore_x_xcb="no"
+      have_ecore_x_xlib="no"
+      ;;
+   *)
+     AC_MSG_ERROR([Unknown x11 backend --with-ecore-x-backend=${ecore_x_backend}])
+     ;;
+esac
+
+AC_ARG_ENABLE(ecore-x-composite,
+   [AC_HELP_STRING([--disable-ecore-x-composite],
+       [disable the ecore_x support for Xcomposite extension. @<:@default=detect@:>@])],
+   [want_ecore_x_composite=$enableval],
+   [want_ecore_x_composite="yes"])
+
+AC_ARG_ENABLE(ecore-x-cursor,
+   [AC_HELP_STRING([--disable-ecore-x-cursor],
+       [disable the ecore_x support for Xcursor library. @<:@default=detect@:>@])],
+   [want_ecore_x_cursor=$enableval],
+   [want_ecore_x_cursor="yes"])
+
+AC_ARG_ENABLE(ecore-x-damage,
+   [AC_HELP_STRING([--disable-ecore-x-damage],
+       [disable the ecore_x support for Xdamage extension. @<:@default=detect@:>@])],
+   [want_ecore_x_damage=$enableval],
+   [want_ecore_x_damage="yes"])
+
+AC_ARG_ENABLE(ecore-x-dpms,
+   [AC_HELP_STRING([--disable-ecore-x-dpms],
+       [disable the ecore_x support for Xdpms extension. @<:@default=detect@:>@])],
+   [want_ecore_x_dpms=$enableval],
+   [want_ecore_x_dpms="yes"])
+
+AC_ARG_ENABLE(ecore-x-dri,
+   [AC_HELP_STRING([--disable-ecore-x-dri],
+       [disable the ecore_x support for DRI extension. @<:@default=detect@:>@])],
+   [want_ecore_x_dri=$enableval],
+   [want_ecore_x_dri="yes"])
+
+AC_ARG_ENABLE(ecore-x-gesture,
+   [AC_HELP_STRING([--enable-ecore-x-gesture],
+       [enable the ecore_x support for Xgesture extension. @<:@default=detect@:>@])],
+   [want_ecore_x_gesture=$enableval],
+   [want_ecore_x_gesture="yes"])
+
+AC_ARG_ENABLE(ecore-x-input,
+   [AC_HELP_STRING([--disable-ecore-x-input],
+       [disable the ecore_x support for Xinput/Xinput2 extension. @<:@default=detect@:>@])],
+   [want_ecore_x_input=$enableval],
+   [want_ecore_x_input="yes"])
+
+AC_ARG_ENABLE(ecore-x-randr,
+   [AC_HELP_STRING([--disable-ecore-x-randr],
+       [disable the ecore_x support for Xrandr extension. @<:@default=detect@:>@])],
+   [want_ecore_x_randr=$enableval],
+   [want_ecore_x_randr="yes"])
+
+AC_ARG_ENABLE(ecore-x-render,
+   [AC_HELP_STRING([--disable-ecore-x-render],
+       [disable the ecore_x support for Xrender extension. @<:@default=detect@:>@])],
+   [want_ecore_x_render=$enableval],
+   [want_ecore_x_render="yes"])
+
+AC_ARG_ENABLE(ecore-x-screensaver,
+   [AC_HELP_STRING([--disable-ecore-x-screensaver],
+       [disable the ecore_x support for Xscreensaver extension. @<:@default=detect@:>@])],
+   [want_ecore_x_screensaver=$enableval],
+   [want_ecore_x_screensaver="yes"])
+
+AC_ARG_ENABLE(ecore-x-shape,
+   [AC_HELP_STRING([--disable-ecore-x-shape],
+       [disable the ecore_x support for Xshape extension. @<:@default=detect@:>@])],
+   [want_ecore_x_shape=$enableval],
+   [want_ecore_x_shape="yes"])
+
+AC_ARG_ENABLE(ecore-x-sync,
+   [AC_HELP_STRING([--disable-ecore-x-sync],
+       [disable the ecore_x support for Xsync extension. @<:@default=detect@:>@])],
+   [want_ecore_x_sync=$enableval],
+   [want_ecore_x_sync="yes"])
+
+AC_ARG_ENABLE(ecore-x-xfixes,
+   [AC_HELP_STRING([--disable-ecore-x-xfixes],
+       [disable the ecore_x support for Xfixes extension. @<:@default=detect@:>@])],
+   [want_ecore_x_xfixes=$enableval],
+   [want_ecore_x_xfixes="yes"])
+
+AC_ARG_ENABLE(ecore-x-xinerama,
+   [AC_HELP_STRING([--disable-ecore-x-xinerama],
+       [disable the ecore_x support for Xinerama extension. @<:@default=detect@:>@])],
+   [want_ecore_x_xinerama=$enableval],
+   [want_ecore_x_xinerama="yes"])
+
+AC_ARG_ENABLE(ecore-x-xprint,
+   [AC_HELP_STRING([--disable-ecore-x-xprint],
+       [disable the ecore_x support for Xprint extension. @<:@default=detect@:>@])],
+   [want_ecore_x_xprint=$enableval],
+   [want_ecore_x_xprint="yes"])
+
+AC_ARG_ENABLE(ecore-x-xtest,
+   [AC_HELP_STRING([--disable-ecore-x-xtest],
+       [disable the ecore_x support for Xtest extension. @<:@default=detect@:>@])],
+   [want_ecore_x_xtest=$enableval],
+   [want_ecore_x_xtest="yes"])
+
+AC_ARG_ENABLE([xim],
+   [AC_HELP_STRING([--disable-xim], [disable X Input Method.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xim="yes"
+    else
+       want_xim="no"
+    fi
+   ],
+   [want_xim="yes"])
+
+### Default values
+
+have_ecore_x="no"
+use_Xcursor="no"
+
+AC_MSG_CHECKING([which X11 backend is to be built])
+AC_MSG_RESULT([${ecore_x_backend}])
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Ecore, Ecore_Input
+
+requirements_pc_ecore_x="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_x}"
+
+## Xlib
+if test "x${have_ecore_x_xlib}" = "xyes" ; then
+   AC_PATH_XTRA
+fi
+
+## XCB
+
+### Checks for header files
+
+AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes])
+
+if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then
+   FOUND_MAXHOSTNAMELEN="not found"
+
+   AC_COMPILE_IFELSE(
+      [
+       AC_LANG_PROGRAM(
+          [[
+#include <sys/param.h>
+          ]],
+          [[
+int h = MAXHOSTNAMELEN;
+          ]])
+      ],
+      [
+       FOUND_MAXHOSTNAMELEN="sys/param.h"
+       AC_DEFINE([NEED_SYS_PARAM_H], [1], [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])
+      ])
+
+   AC_COMPILE_IFELSE(
+      [
+       AC_LANG_PROGRAM(
+          [[
+#include <netdb.h>
+          ]],
+          [[
+int h = MAXHOSTNAMELEN;
+          ]])
+      ],
+      [
+       FOUND_MAXHOSTNAMELEN="netdb.h"
+       AC_DEFINE([NEED_NETDB_H], [1], [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])
+      ])
+
+   AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
+   AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
+fi
+
+## Xlib
+if test "x${have_ecore_x_xlib}" = "xyes" ; then
+   AC_CHECK_HEADERS([X11/X.h],
+      [
+       if test "x${want_evas_simple_x11}" = "xyes"; then
+          x_libs="${x_libs} -lX11 -lXext"
+       else
+          x_dir=${x_dir:-/usr/X11R6}
+          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+       fi
+       have_ecore_x_xlib="yes"
+      ])
+
+   if test "x$want_ecore_x_cursor" = "xyes"; then
+      CFLAGS_save="${CFLAGS}"
+      CFLAGS="$x_cflags $x_includes"
+      AC_CHECK_HEADER([X11/Xcursor/Xcursor.h],
+         [use_Xcursor="yes"],
+         [use_Xcursor="no"],
+         [#include <X11/Xlib.h>])
+      CFLAGS="$CFLAGS_save"
+   fi
+fi
+
+## XCB
+if test "x${have_ecore_x_xcb}" = "xyes" ; then
+   KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+   FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+   for i in $FILES; do
+       if test -f "$KEYSYMDEFDIR/$i"; then
+         KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
+       elif test "x$i" = "xkeysymdef.h"; then
+         AC_MSG_ERROR([Cannot find keysymdef.h])
+       fi
+   done
+   AC_MSG_CHECKING([keysym definitions])
+   AC_MSG_RESULT([$KEYSYMDEFS])
+   AC_SUBST([KEYSYMDEFS])
+fi
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+## Xlib
+
+if test "x${have_ecore_x_xlib}" = "xyes" ; then
+   AC_CHECK_LIB([X11], [XCreateImage], [have_ecore_x_xlib="yes"], [have_ecore_x_xlib="no"])
+fi
+
+if test "x${have_ecore_x_xlib}" = "xyes" ; then
+   AC_CHECK_LIB([Xext], [XShmCreateImage], [have_ecore_x_xlib="yes"], [have_ecore_x_xlib="no"])
+   have_ecore_x="yes"
+fi
+
+if test "x${have_ecore_x_xlib}" = "xyes" && test "x$want_ecore_x_cursor" = "xyes" ; then
+   AC_CHECK_LIB([Xcursor],
+      [XcursorImageLoadCursor],
+      [
+       use_Xcursor="yes"
+       AC_DEFINE([ECORE_XCURSOR], 1, [Build support for Xcursor])
+       Xcursor_libs="-lXcursor"
+      ],
+      [use_Xcursor="no"],
+      [$x_libs -lXrender])
+   ECORE_X_CFLAGS="${ECORE_X_CFLAGS} $x_cflags $x_includes"
+   ECORE_X_LIBS="${ECORE_X_LIBS} ${Xcursor_libs}"
+fi
+
+if test "x${have_ecore_x_xlib}" = "xyes" ; then
+   ECORE_CHECK_X_EXTENSION([Xkb], [XKB.h], [X11], [XkbSetDetectableAutoRepeat], [$want_ecore_x_xkb])
+   ECORE_CHECK_X_EXTENSION([Xcomposite], [Xcomposite.h], [Xcomposite], [XCompositeQueryExtension], [$want_ecore_x_composite])
+   ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract], [$want_ecore_x_damage])
+   ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension], [$want_ecore_x_dpms])
+   if test "x$use_xdpms" = "xno" ; then
+      ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension], [$want_ecore_x_dpms])
+   fi
+   ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion], [$want_ecore_x_xfixes])
+   ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens], [$want_ecore_x_xinerama])
+   ECORE_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens], [$want_ecore_x_xprint])
+   ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent], [$want_ecore_x_randr])
+   ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension], [$want_ecore_x_gesture])
+   ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat], [$want_ecore_x_render])
+   ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent], [$want_ecore_x_xtest])
+   ECORE_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput], [$want_ecore_x_screensaver])
+   ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice], [$want_ecore_x_input])
+
+   AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.])
+fi
+
+## XCB
+
+# FIXME: remove OLD_XCB_VERSION support
+
+if test "x${have_ecore_x_xcb}" = "xyes" ; then
+
+   PKG_CHECK_EXISTS([x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8],
+      [
+       have_ecore_x_xcb="yes"
+       have_ecore_x="yes"
+       requirements_pc_ecore_x="${requirements_pc_ecore_x} x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"
+       requirements_pc_deps_ecore_x="${requirements_pc_deps_ecore_x} x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"
+      ],
+      [AC_MSG_ERROR([Ecore_X with XCB backend enabled but XCB not available. Exiting...])])
+fi
+
+if test "x${have_ecore_x_xcb}" = "xyes" ; then
+   if test "x${have_pixman}" = "xyes" ; then
+      requirements_pc_ecore_x="${requirements_pc_ecore_x} pixman-1"
+      requirements_pc_deps_ecore_x="${requirements_pc_deps_ecore_x} pixman-1"
+   fi
+
+   if test "x$want_ecore_x_composite" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-composite],
+         [
+          have_ecore_x_xcb_composite="yes"
+          requirements_pc_ecore_x="xcb-composite ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-composite ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_COMPOSITE], [1], [Build support for XCB composite])
+         ],
+         [have_ecore_x_xcb_composite="no"])
+   else
+      have_ecore_x_xcb_composite="no"
+      AC_MSG_NOTICE([composite extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_damage" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-damage],
+         [
+          have_ecore_x_xcb_damage="yes"
+          requirements_pc_ecore_x="xcb-damage ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-damage ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_DAMAGE], [1], [Build support for XCB damage])
+         ],
+         [have_ecore_x_xcb_damage="no"])
+   else
+      have_ecore_x_xcb_damage="no"
+      AC_MSG_NOTICE([damage extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_dpms" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-dpms],
+         [
+          have_ecore_x_xcb_dpms="yes"
+          requirements_pc_ecore_x="xcb-dpms ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-dpms ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_DPMS], [1], [Build support for XCB dpms])
+         ],
+         [have_ecore_x_xcb_dpms="no"])
+   else
+      have_ecore_x_xcb_dpms="no"
+      AC_MSG_NOTICE([dpms extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_randr" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-randr],
+         [
+          have_ecore_x_xcb_randr="yes"
+          requirements_pc_ecore_x="xcb-randr ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-randr ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_RANDR], [1], [Build support for XCB randr])
+         ],
+         [have_ecore_x_xcb_randr="no"])
+   else
+      have_ecore_x_xcb_randr="no"
+      AC_MSG_NOTICE([randr extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_render" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-render],
+         [
+          have_ecore_x_xcb_render="yes"
+          requirements_pc_ecore_x="xcb-render ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-render ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_RENDER], [1], [Build support for XCB render])
+         ],
+         [have_ecore_x_xcb_render="no"])
+   else
+      have_ecore_x_xcb_render="no"
+      AC_MSG_NOTICE([render extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_screensaver" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-screensaver],
+         [
+          have_ecore_x_xcb_screensaver="yes"
+          requirements_pc_ecore_x="xcb-screensaver ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-screensaver ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_SCREENSAVER], [1], [Build support for XCB screensaver])
+         ],
+         [have_ecore_x_xcb_screensaver="no"])
+   else
+      have_ecore_x_xcb_screensaver="no"
+      AC_MSG_NOTICE([screensaver extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_shape" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-shape],
+         [
+          have_ecore_x_xcb_shape="yes"
+          requirements_pc_ecore_x="xcb-shape ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-shape ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_SHAPE], [1], [Build support for XCB shape])
+         ],
+         [have_ecore_x_xcb_shape="no"])
+   else
+      have_ecore_x_xcb_shape="no"
+      AC_MSG_NOTICE([shape extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_gesture" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-gesture],
+         [
+          have_ecore_x_xcb_gesture="yes"
+          requirements_pc_ecore_x="xcb-gesture ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-gesture ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_XGESTURE], [1], [Build support for XCB xgesture])
+         ],
+         [have_ecore_x_xcb_gesture="no"])
+   else
+      have_ecore_x_xcb_gesture="no"
+      AC_MSG_NOTICE([gesture extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_sync" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-sync],
+         [
+          have_ecore_x_xcb_sync="yes"
+          requirements_pc_ecore_x="xcb-sync ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-sync ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_SYNC], [1], [Build support for XCB sync])
+         ],
+         [have_ecore_x_xcb_sync="no"])
+   else
+      have_ecore_x_xcb_sync="no"
+      AC_MSG_NOTICE([sync extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_xfixes" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-xfixes],
+         [
+          have_ecore_x_xcb_xfixes="yes"
+          requirements_pc_ecore_x="xcb-xfixes ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-xfixes ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_XFIXES], [1], [Build support for XCB xfixes])
+         ],
+         [have_ecore_x_xcb_xfixes="no"])
+   else
+      have_ecore_x_xcb_xfixes="no"
+      AC_MSG_NOTICE([xfixes extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_xinerama" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-xinerama],
+         [
+          have_ecore_x_xcb_xinerama="yes"
+          requirements_pc_ecore_x="xcb-xinerama ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-xinerama ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_XINERAMA], [1], [Build support for XCB xinerama])
+         ],
+         [have_ecore_x_xcb_xinerama="no"])
+   else
+      have_ecore_x_xcb_xinerama="no"
+      AC_MSG_NOTICE([xinerama extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_xprint" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-xprint],
+         [
+          have_ecore_x_xcb_xprint="yes"
+          requirements_pc_ecore_x="xcb-xprint ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-xprint ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_XPRINT], [1], [Build support for XCB xprint])
+         ],
+         [have_ecore_x_xcb_xprint="no"])
+   else
+      have_ecore_x_xcb_xprint="no"
+      AC_MSG_NOTICE([xprint extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_xtest" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-xtest],
+         [
+          have_ecore_x_xcb_xtest="yes"
+          requirements_pc_ecore_x="xcb-xtest ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-xtest ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest])
+         ],
+         [have_ecore_x_xcb_xtest="no"])
+   else
+      have_ecore_x_xcb_xtest="no"
+      AC_MSG_NOTICE([xtest extension explicitly disabled])
+   fi
+
+# input extension disabled currently in xcb as xcb-input has some issues
+   want_ecore_x_input="no"
+   if test "x$want_ecore_x_input" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-xinput],
+         [
+          have_ecore_x_xcb_xinput="yes"
+          requirements_pc_ecore_x="xcb-xinput ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-xinput ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_XINPUT], [1], [Build support for XCB input])
+         ],
+         [have_ecore_x_xcb_xinput="no"])
+   else
+      have_ecore_x_xcb_xinput="no"
+      AC_MSG_NOTICE([input extension explicitly disabled])
+   fi
+
+   if test "x$want_ecore_x_cursor" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-render xcb-renderutil],
+         [
+          have_ecore_x_xcb_cursor="yes"
+          requirements_pc_ecore_x="xcb-render xcb-renderutil ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-render xcb-renderutil ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor])
+         ],
+         [have_ecore_x_xcb_cursor="no"])
+   else
+      have_ecore_x_xcb_cursor="no"
+      AC_MSG_NOTICE([cursor extension explicitly disabled])
+   fi
+
+# dri extension disabled currently in xcb
+   want_ecore_x_dri="no"
+   if test "x$want_ecore_x_dri" != "xno"; then
+      PKG_CHECK_EXISTS([xcb-dri2],
+         [
+          have_ecore_x_xcb_dri="yes"
+          requirements_pc_ecore_x="xcb-dri2 ${requirements_pc_ecore_x}"
+          requirements_pc_deps_ecore_x="xcb-dri2 ${requirements_pc_deps_ecore_x}"
+          AC_DEFINE([ECORE_XCB_DRI], [1], [Build support for XCB dri])
+         ],
+         [have_ecore_x_xcb_dri="no"])
+   else
+      have_ecore_x_xcb_dri="no"
+      AC_MSG_NOTICE([dri extension explicitly disabled])
+   fi
+
+   PKG_CHECK_MODULES([ECORE_X], [${requirements_pc_deps_ecore_x}])
+   EFL_CHECK_FUNCS([ECORE_X], [dlopen iconv])
+   AC_DEFINE([HAVE_ECORE_X_XCB], [1], [Defined to 1 if XCB is enabled.])
+   have_ecore_x_xcb_define="-DHAVE_ECORE_X_XCB"
+   AC_SUBST([have_ecore_x_xcb_define])
+fi
+
+requirements_libs_ecore_x="${requirements_libs_ecore_x} ${ECORE_X_LIBS}"
+
+AC_SUBST([ECORE_X_CFLAGS])
+AC_SUBST([ECORE_X_LIBS])
+
+AM_CONDITIONAL([HAVE_ECORE_X_XLIB], [test "x${have_ecore_x_xlib}" = "xyes"])
+AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "x${have_ecore_x_xcb}" = "xyes"])
+AM_CONDITIONAL([HAVE_ECORE_X], [test "x${have_ecore_x}" = "xyes"])
+
+#### End of Ecore_X
+
+
+#### Ecore_Imf
+
+AC_MSG_NOTICE([Ecore_Imf checks])
+
+### Additional options to configure
+
+### Default values
+
+want_ecore_imf="yes"
+want_ecore_imf_xim="no"
+want_ecore_imf_scim="no"
+want_ecore_imf_ibus="no"
+
+case "$host_os" in
+   mingw32ce*)
+      want_ecore_imf="no"
+      ;;
+   mingw*)
+      want_ecore_imf="yes"
+      ;;
+   darwin*)
+      want_ecore_imf="yes"
+      ;;
+   *)
+      want_ecore_imf="yes"
+      want_ecore_imf_xim="yes"
+      want_ecore_imf_scim="yes"
+      want_ecore_imf_ibus="yes"
+      ;;
+esac
+
+### Checks for programs
+
+### Checks for libraries
+
+# Escape library for compilation on PS3
+
+if test "x${have_ps3}" = "xyes" ; then
+   requirements_pc_ecore_imf="${requirements_pc_ecore_imf} escape >= ${PACKAGE_VERSION}"
+   requirements_pc_ecore_imf_evas="${requirements_pc_ecore_imf_evas} escape >= ${PACKAGE_VERSION}"
+fi
+
+## Eina, Ecore (ecore_imf)
+
+requirements_pc_ecore_imf="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_imf}"
+
+## Eina, Evas, Ecore, Ecore_Imf (ecore_imf_evas)
+
+requirements_pc_ecore_imf_evas="ecore_imf >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_imf_evas}"
+
+## modules
+
+# ibus
+
+have_ecore_imf_ibus="no"
+if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
+   PKG_CHECK_MODULES([IBUS],
+      [ibus-1.0 >= 1.4],
+      [
+       have_ecore_imf_ibus="yes"
+       AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
+      ],
+      [have_ecore_imf_ibus="no"])
+   IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"²
+   IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}"
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"])
+
+# scim
+
+if test "x${want_ecore_imf_scim}" = "xyes" ; then
+   PKG_CHECK_MODULES([SCIM],
+      [scim],
+      [
+       have_ecore_imf_scim="yes"
+       AC_DEFINE([BUILD_ECORE_IMF_SCIM], [1], [Ecore Imf SCIM Support])
+      ],
+      [have_ecore_imf_scim="no"])
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [test "x${have_ecore_imf_scim}" = "xyes"])
+
+# xim
+
+have_ecore_imf_xim="no"
+if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then
+   have_ecore_imf_xim="yes"
+   AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Imf
+
+
+#### Ecore_Evas
+
+AC_MSG_NOTICE([Ecore_Evas checks])
+
+### Additional options to configure
+
+### Default values
+
+have_ecore_evas="yes"
+
+want_ecore_evas_software_buffer="yes"
+want_ecore_evas_software_x11="no"
+want_ecore_evas_opengl_x11="no"
+want_ecore_evas_software_xcb="no"
+want_ecore_evas_software_gdi="no"
+want_ecore_evas_software_ddraw="no"
+want_ecore_evas_software_sdl="no"
+want_ecore_evas_gl_sdl="no"
+want_ecore_evas_gl_cocoa="no"
+want_ecore_evas_directfb="no"
+want_ecore_evas_fb="no"
+want_ecore_evas_ews="yes"
+want_ecore_evas_extn="yes"
+want_ecore_evas_wayland_shm="no"
+want_ecore_evas_wayland_egl="no"
+
+case "$host_os" in
+   mingw32ce*)
+      want_ecore_evas_extn="no"
+      ;;
+   mingw*)
+      want_ecore_evas_software_gdi="yes"
+      want_ecore_evas_software_ddraw="yes"
+      want_ecore_evas_software_sdl="yes"
+      want_ecore_evas_gl_sdl="yes"
+      ;;
+   darwin*)
+      want_ecore_evas_software_sdl="yes"
+      want_ecore_evas_gl_sdl="yes"
+      want_ecore_evas_gl_cocoa="yes"
+      ;;
+   *)
+      want_ecore_evas_software_x11="yes"
+      want_ecore_evas_opengl_x11="yes"
+      want_ecore_evas_software_xcb="no"
+      want_ecore_evas_software_sdl="yes"
+      want_ecore_evas_gl_sdl="yes"
+      want_ecore_evas_gl_cocoa="no"
+      want_ecore_evas_directfb="yes"
+      want_ecore_evas_fb="yes"
+      want_ecore_evas_wayland_shm="yes"
+      want_ecore_evas_wayland_egl="yes"
+      ;;
+esac
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Evas, Ecore, Ecore_Input
+
+requirements_pc_ecore_evas="ecore-input-evas >= ${PACKAGE_VERSION} ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} evas >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
+
+## modules
+
+# ecore_evas_buffer
+
+ECORE_EVAS_CHECK_MODULE_FULL([software-buffer],
+   [${have_evas_engine_buffer}],
+   [${want_ecore_evas_software_buffer}],
+   [Software Buffer],
+   [yes])
+
+# ecore_evas_cocoa
+
+ECORE_EVAS_CHECK_MODULE_FULL([opengl-cocoa],
+   [${have_evas_engine_gl_cocoa}],
+   [${want_ecore_evas_gl_cocoa}],
+   [OpenGL Cocoa],
+   [${have_ecore_cocoa}],
+   [requirements_pc_ecore_evas="ecore-cocoa >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
+
+# ecore_evas_directfb
+
+ECORE_EVAS_CHECK_MODULE_FULL([directfb],
+   [${have_evas_engine_directfb}],
+   [${want_ecore_evas_directfb}],
+   [DirectFB],
+   [${have_ecore_directfb}],
+   [requirements_pc_ecore_evas="ecore-directfb >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
+
+# ecore_evas_ews
+
+ECORE_EVAS_CHECK_MODULE_FULL([ews],
+   [${have_evas_engine_buffer}],
+   [${want_ecore_evas_ews}],
+   [Ecore Evas Single Process Windowing System],
+   [yes], [])
+
+# ecore_evas_extn
+
+have_extn="yes"
+if test "x${have_ecore_ipc}" = "xno" || \
+   test "x${have_ecore_evas_software_buffer}" = "xno" || \
+   test "x${have_shm_open}" = "xno" ; then
+   have_extn="no"
+fi
+
+dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE
+have_ecore_evas_extn="no"
+if test "x${want_ecore_evas_extn}" = "xyes" && \
+   test "x${have_extn}" = "xyes" && \
+   test "x${have_ecore_evas}" = "xyes"; then
+   have_ecore_evas_extn="yes"
+   AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas])
+   requirements_pc_ecore_evas="ecore-ipc >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
+fi
+
+# ecore_evas_fb
+
+ECORE_EVAS_CHECK_MODULE_FULL([fb],
+   [${have_evas_engine_fb}],
+   [${want_ecore_evas_fb}],
+   [Linux Framebuffer],
+   [${have_ecore_fb}],
+   [requirements_pc_ecore_evas="ecore-fb >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
+
+# ecore_evas_psl1ght
+
+ECORE_EVAS_CHECK_MODULE_FULL([psl1ght],
+   [${have_evas_engine_psl1ght}],
+   [${want_ecore_evas_psl1ght}],
+   [PSL1GHT],
+   [${have_ecore_psl1ght}],
+   [requirements_pc_ecore_evas="ecore-psl1ght >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
+
+# ecore_evas_sdl
+
+ECORE_EVAS_CHECK_MODULE_FULL([software-sdl],
+   [${have_evas_engine_software_sdl}],
+   [${want_ecore_evas_software_sdl}],
+   [Software SDL],
+   [${have_ecore_sdl}],
+   [requirements_ecore_evas="ecore-sdl >= ${PACKAGE_VERSION} ${requirements_ecore_evas}"])
+
+ECORE_EVAS_CHECK_MODULE_FULL([opengl-sdl],
+   [${have_evas_engine_gl_sdl}],
+   [${want_ecore_evas_gl_sdl}],
+   [OpenGL SDL],
+   [${have_ecore_sdl}],
+   [requirements_ecore_evas="ecore-sdl >= ${PACKAGE_VERSION} ${requirements_ecore_evas}"])
+
+# ecore_evas_wayland
+
+ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm],
+   [wayland-shm],
+   [${want_ecore_evas_wayland_shm}],
+   [Wayland Shm],
+   [${have_ecore_wayland}],
+   [requirements_pc_ecore_evas="ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
+
+ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl],
+   [wayland-egl egl >= 7.10],
+   [${want_ecore_evas_wayland_egl}],
+   [Wayland Egl],
+   [${have_ecore_wayland}],
+   [
+    PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wayland_egl="yes"], [have_wayland_egl="no"])
+    if test "x${have_wayland_egl}" = "xyes" ; then
+       requirements_pc_ecore_evas="wayland-egl egl >= 7.10 ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
+       requirements_pc_deps_ecore_evas="wayland-egl egl >= 7.10 ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_deps_ecore_evas}"
+    fi
+   ])
+
+# ecore_evas_win32
+ECORE_EVAS_CHECK_MODULE_FULL([software-gdi],
+   [${have_evas_engine_software_gdi}],
+   [${want_ecore_evas_software_gdi}],
+   [Software GDI],
+   [${have_win32}])
+
+ECORE_EVAS_CHECK_MODULE_FULL([software-ddraw],
+   [${have_evas_engine_software_ddraw}],
+   [${want_ecore_evas_software_ddraw}],
+   [Software DirectDraw],
+   [${have_win32}])
+
+if test "x${have_ecore_evas_software_gdi}" = "xyes" || \
+   test "x${have_ecore_evas_software_ddraw}" = "xyes" ; then
+   AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
+   requirements_pc_ecore_evas="ecore-win32 >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
+fi
+
+# ecore_evas_x11
+
+ECORE_EVAS_CHECK_MODULE_FULL([software-x11],
+   [${have_evas_engine_software_x11}],
+   [${want_ecore_evas_software_x11}],
+   [Software X11],
+   [${have_ecore_x}])
+
+have_ecore_evas_software_xlib="no"
+have_ecore_evas_software_xcb="no"
+if test "x$have_ecore_evas_software_x11" = "xyes" ; then
+   have_ecore_evas_software_xlib=`${PKG_CONFIG} --variable=Xlib evas-software-x11`
+   if test "x${have_ecore_evas_software_xlib}" = "xstatic"; then
+      have_ecore_evas_software_xlib="yes"
+   fi
+   if test "x${have_ecore_evas_software_xlib}" = "xyes" && test "x${have_ecore_x_xlib}" = "xyes" ; then
+      AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support])
+   fi
+   have_ecore_evas_software_xcb=`${PKG_CONFIG} --variable=XCB evas-software-x11`
+   if test "x$have_ecore_evas_software_xcb" = "xstatic"; then
+      have_ecore_evas_software_xcb="yes"
+   fi
+   if test "x$have_ecore_evas_software_xcb" = "xyes" && test "x${have_ecore_x_xcb}" = "xyes" ; then
+      AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XCB], [1], [Evas Software XCB Engine Support])
+   fi
+fi
+
+# ecore_evas_opengl_x11
+
+ECORE_EVAS_CHECK_MODULE_FULL([opengl-x11],
+   [${have_evas_engine_gl_x11}],
+   [${want_ecore_evas_opengl_x11}],
+   [OpenGL Xlib],
+   [${have_ecore_x}])
+
+have_ecore_evas_opengl_xlib="no"
+have_ecore_evas_opengl_xcb="no"
+if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then
+   have_ecore_evas_opengl_xlib=`${PKG_CONFIG} --variable=Xlib evas-opengl-x11`
+   if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then
+      AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend])
+   fi
+
+# opengl does not work with xcb (yet)
+   have_ecore_evas_opengl_xcb=`${PKG_CONFIG} --variable=XCB evas-opengl-x11`
+   if test "x${have_ecore_evas_opengl_xcb}" = "xstatic"; then
+      have_ecore_evas_opengl_xcb="yes"
+   fi
+   if test "x${have_ecore_evas_opengl_xcb}" = "xyes" && test "x${have_ecore_x_xcb}" = "xyes" ; then
+      PKG_CHECK_MODULES([XCB_X11],
+         [x11-xcb],
+         [
+          have_ecore_x_opengl_xcb="yes"
+          requirements_ecore_x="x11-xcb ${requirements_ecore_x}"
+          AC_DEFINE([BUILD_ECORE_X_OPENGL_XCB], [1], [Build support for XCB-based OpenGL])
+          AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XCB], [1], [OpenGL XCB rendering backend])
+         ],
+         [have_ecore_x_opengl_xcb="no"])
+    else
+      have_ecore_x_opengl_xcb="no"
+      AC_MSG_NOTICE(["XCB-based OpenGL explicitly disabled"])
+    fi
+fi
+
+if test "x$have_ecore_evas_software_x11" = "xyes" || \
+   test "x$have_ecore_evas_opengl_x11" = "xyes" || \
+   test "x$have_ecore_evas_software_xcb" = "xyes"; then
+   AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas])
+   requirements_pc_ecore_evas="ecore-x >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"
+fi
+
+if test "x${requirements_pc_deps_ecore_evas}" = "x" ; then
+   ECORE_EVAS_CFLAGS=""
+   ECORE_EVAS_LIBS=""
+   AC_SUBST([ECORE_EVAS_CFLAGS])
+   AC_SUBST([ECORE_EVAS_LIBS])
+else
+   PKG_CHECK_MODULES([ECORE_EVAS], [${requirements_pc_deps_ecore_evas}])
+fi
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of Ecore_Evas
+
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -1874,8 +4074,6 @@ pc/evil.pc
 pc/eina.pc
 pc/eet.pc
 pc/eo.pc
-pc/embryo.pc
-pc/evas-direct3d.pc
 pc/evas-directfb.pc
 pc/evas-fb.pc
 pc/evas-opengl-x11.pc
@@ -1890,6 +4088,24 @@ pc/evas-software-sdl.pc
 pc/evas-wayland-shm.pc
 pc/evas-wayland-egl.pc
 pc/evas.pc
+pc/ecore.pc
+pc/ecore-con.pc
+pc/ecore-ipc.pc
+pc/ecore-file.pc
+pc/ecore-input.pc
+pc/ecore-input-evas.pc
+pc/ecore-cocoa.pc
+pc/ecore-directfb.pc
+pc/ecore-fb.pc
+pc/ecore-sdl.pc
+pc/ecore-win32.pc
+pc/ecore-wince.pc
+pc/ecore-x.pc
+pc/ecore-evas.pc
+pc/ecore-imf.pc
+pc/ecore-imf-evas.pc
+pc/embryo.pc
+$po_makefile_in
 ])
 
 AC_OUTPUT
@@ -1917,6 +4133,7 @@ echo "    barrier............: ${efl_have_pthread_barrier}"
 echo "    affinity...........: ${efl_have_setaffinity}"
 echo "  Cryptographic System.: ${build_crypto}"
 echo
+
 echo "Evas:"
 echo
 echo "  Engines:"
@@ -1930,8 +4147,7 @@ else
 fi
 echo "    Software GDI...............: $have_evas_engine_software_gdi"
 echo "    Software DirectDraw........: $have_evas_engine_software_ddraw"
-echo "    Direct3d...................: $have_evas_engine_direct3d"
-echo "    OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
+echo $ECHO_N "    OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
 if test "x$have_evas_engine_gl_sdl" = "xyes"; then
   echo "(GLES: $gl_flavor_gles)"
 else
@@ -1985,6 +4201,133 @@ echo "    Line Dither Mask........: $conv_line_dither"
 echo "    No Dither Mask for 16bpp: $conv_no_dither"
 echo "    Tiled 32BPP rotate......: $have_tile_rotate"
 echo
+
+echo "Ecore:"
+echo "  Thread safety..............: $want_thread_safety"
+echo "  GLib support...............: $with_glib"
+echo "  Use g_main_loop............: $want_g_main_loop"
+echo "  Gathering memory statistic.: $ac_cv_func_mallinfo"
+echo "  Gathering timer allocation.: $want_ecore_timer_dump"
+echo
+
+echo "Ecore_Con:"
+if test "x${have_gnutls}" = "xyes" || test "x${have_openssl}" = "xyes" ; then
+echo "  TLS........................: $with_tls"
+else
+echo "  TLS........................: no"
+fi
+echo "  IPv6.......................: $have_ipv6"
+echo "  CURL.......................: $have_curl"
+echo "  Local Sockets..............: $want_ecore_con_local_sockets"
+if test "x$want_ecore_con_local_sockets" = "xyes" ; then
+echo "  Abstract Sockets...........: $want_ecore_con_abstract_sockets"
+fi
+if test "x$have_cares" = "xyes" ; then
+echo "  Resolver...................: c-ares"
+elif test "x$have_ipv6" = "xyes" ; then
+echo "  Resolver...................: dns.c"
+else
+echo "  Resolver...................: fork"
+fi
+echo
+
+echo "Ecore_Ipc:"
+echo "  TLS........................: $with_tls"
+echo
+
+echo "Ecore_File:"
+echo "  Inotify....................: $have_inotify"
+echo "  Windows notification.......: $have_notify_win32"
+echo "  Poll.......................: $have_poll"
+echo "  CURL.......................: $have_curl"
+echo
+
+echo "Ecore_IMF....................: $have_ecore_imf"
+echo "  XIM........................: $have_ecore_imf_xim"
+echo "  SCIM.......................: $have_ecore_imf_scim"
+echo "  IBUS.......................: $have_ecore_imf_ibus"
+echo "Ecore_IMF_Evas...............: $have_ecore_imf_evas"
+echo
+
+echo "Ecore Graphic systems:"
+echo
+
+if test "x$have_ecore_x" = "xyes" ; then
+  if test "x$have_ecore_x_xcb" = "xyes" ; then
+    echo "  Ecore_X (XCB backend)........: $have_ecore_x_xcb"
+    echo "    Xprint.....................: $have_ecore_x_xcb_xprint"
+    echo "    Xinerama...................: $have_ecore_x_xcb_xinerama"
+    echo "    Xrandr.....................: $have_ecore_x_xcb_randr"
+    echo "    Xscreensaver...............: $have_ecore_x_xcb_screensaver"
+    echo "    Xshape.....................: $have_ecore_x_xcb_shape"
+    echo "    Xgesture...................: $have_ecore_x_xcb_gesture"
+    echo "    Xsync......................: $have_ecore_x_xcb_sync"
+    echo "    Xrender....................: $have_ecore_x_xcb_render"
+    echo "    Xcomposite.................: $have_ecore_x_xcb_composite"
+    echo "    Xfixes.....................: $have_ecore_x_xcb_xfixes"
+    echo "    Xdamage....................: $have_ecore_x_xcb_damage"
+    echo "    Xdpms......................: $have_ecore_x_xcb_dpms"
+    echo "    Xtest......................: $have_ecore_x_xcb_xtest"
+  else
+    echo "  Ecore_X (Xlib backend).......: $have_ecore_x"
+    echo "    Xcursor....................: $use_Xcursor"
+    echo "    Xkb........................: $use_xkb"
+    echo "    Xprint.....................: $use_xprint"
+    echo "    Xinerama...................: $use_xinerama"
+    echo "    Xrandr.....................: $use_xrandr"
+    echo "    Xgesture...................: $use_xgesture"
+    echo "    Xscreensaver...............: $use_xss"
+    echo "    Xrender....................: $use_xrender"
+    echo "    Xcomposite.................: $use_xcomposite"
+    echo "    Xfixes.....................: $use_xfixes"
+    echo "    Xdamage....................: $use_xdamage"
+    echo "    Xdpms......................: $use_xdpms"
+    echo "    Xtest......................: $use_xtest"
+    echo "    XIM........................: $want_xim"
+    echo "    Xi2........................: $use_xi2"
+  fi
+else
+  echo "  Ecore_X....................: $have_ecore_x"
+fi
+echo "  Ecore_Win32................: $have_win32"
+echo "  Ecore_Cocoa................: $have_ecore_cocoa"
+echo "  Ecore_SDL..................: $have_ecore_sdl"
+echo "  Ecore_FB...................: $have_ecore_fb"
+if test "x${have_ecore_fb}" = "xyes" ; then
+  echo "    Touchscreen..............: $have_tslib"
+fi
+echo "  Ecore_DirectFB.............: $have_ecore_directfb"
+echo "  Ecore_WinCE................: $have_wince"
+echo "  Ecore_PSL1GHT..............: $have_ps3"
+echo "  Ecore_Wayland..............: $have_ecore_wayland"
+
+echo "  Ecore_Evas...................: $have_ecore_evas"
+#if test "x${have_ecore_evas}" = "xyes" ; then
+  echo "    Software Memory Buffer.....: $have_ecore_evas_software_buffer"
+  if test "x${have_ecore_evas_software_x11}" = "xyes" ; then
+    echo "    Software X11...............: $have_ecore_evas_software_x11 (Xlib=${have_ecore_evas_software_xlib}) (XCB=${have_ecore_evas_software_xcb})"
+  else
+    echo "    Software X11...............: $have_ecore_evas_software_x11"
+  fi
+  if test "x${have_ecore_evas_opengl_x11}" = "xyes" ; then
+    echo "    OpenGL X11.................: $have_ecore_evas_opengl_x11 (Xlib=${have_ecore_evas_opengl_xlib}) (XCB=${have_ecore_evas_opengl_xcb})"
+  else
+    echo "    OpenGL X11.................: $have_ecore_evas_opengl_x11"
+  fi
+  echo "    Software GDI...............: $have_ecore_evas_software_gdi"
+  echo "    Software DirectDraw........: $have_ecore_evas_software_ddraw"
+  echo "    Software SDL...............: $have_ecore_evas_software_sdl"
+  echo "    OpenGL SDL.................: $have_ecore_evas_opengl_sdl"
+  echo "    OpenGL Cocoa...............: $have_ecore_evas_opengl_cocoa"
+  echo "    DirectFB...................: $have_ecore_evas_directfb"
+  echo "    PSL1GHT....................: $have_ecore_evas_psl1ght"
+  echo "    Software Framebuffer.......: $have_ecore_evas_fb"
+  echo "    Sing.Proc. Windowing System: $have_ecore_evas_ews"
+  echo "    Wayland Shm................: $have_ecore_evas_wayland_shm"
+  echo "    Wayland Egl................: $have_ecore_evas_wayland_egl"
+  echo "    Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
+#fi
+echo
 echo "Tests..................: ${_efl_enable_tests}"
 if test "x${_efl_enable_tests}" = "xyes"; then
 echo "    Coverage...........: ${_efl_enable_coverage}"
diff --git a/legacy/emotion/COPYING b/licenses/COPYING.SMALL
index aab836272d..26d6208129 100644
--- a/legacy/emotion/COPYING
+++ b/licenses/COPYING.SMALL
@@ -1,4 +1,4 @@
-Copyright notice for Emotion:
+Copyright notice for Embryo:
 
 Copyright (C) 2004-2011 Carsten Haitzler and various contributors (see AUTHORS)
 
@@ -23,3 +23,25 @@ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Large parts of this source come under the following license from the
+original Small (renamed to Pawn afterwards, but was named Small when
+Embryo split off). See the source files that are clearly marked as below:
+
+Copyright (c) ITB CompuPhase, 1997-2003
+
+This software is provided "as-is", without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from
+the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1.  The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software in
+     a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+ 2.  Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+ 3.  This notice may not be removed or altered from any source distribution.
diff --git a/legacy/ecore/m4/check_x_extension.m4 b/m4/ecore_check_c_extension.m4
index a15120c7ef..1ef3bd2f91 100644
--- a/legacy/ecore/m4/check_x_extension.m4
+++ b/m4/ecore_check_c_extension.m4
@@ -19,8 +19,8 @@ if test "x$5" != "xno"; then
         UP[]_LIBS="-l$3"
         use_[]DOWN="yes"
        ],
-       [ use_[]DOWN="no" ],
-       [ $x_libs ]
+       [use_[]DOWN="no"],
+       [$x_libs]
      )
     ],
     [ use_[]DOWN="no" ],
@@ -32,6 +32,8 @@ else
   AC_MSG_NOTICE([$1 support disabled])
 fi
 
+ECORE_X_LIBS="${ECORE_X_LIBS} ${UP[]_LIBS}"
+
 AC_SUBST(UP[]_CFLAGS)
 AC_SUBST(UP[]_LIBS)
 
diff --git a/legacy/ecore/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4
index 01c4e0eb60..8d0d76bf3c 100644
--- a/legacy/ecore/m4/ecore_check_module.m4
+++ b/m4/ecore_check_module.m4
@@ -73,14 +73,12 @@ AC_ARG_ENABLE(ecore-evas-$1,
 AC_MSG_CHECKING([whether ecore_evas $4 support is to be built])
 AC_MSG_RESULT([${want_module}])
 
-if test "x$5" = "xyes" && \
+if test "x$2" = "xyes" && \
+   test "x$5" = "xyes" && \
    test "x$have_ecore_evas" = "xyes" && \
    test "x$want_module" = "xyes" ; then
-   PKG_CHECK_EXISTS([evas-$2],
-      [
-       AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas])
-       have_ecore_evas_[]m4_defn([DOWN])="yes"
-      ])
+      AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas])
+      have_ecore_evas_[]m4_defn([DOWN])="yes"
 fi
 
 AC_MSG_CHECKING([whether ecore_evas $4 support is built])
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index cbdb11b795..c43e8d0187 100644
--- a/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
@@ -26,7 +26,6 @@ if test "x${have_dep}" = "xyes" ; then
       [
        have_dep="yes"
        requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg"
-       requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -ljpeg"
       ],
       [
        AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file")
@@ -66,7 +65,6 @@ else
          [
           _efl_have_lib="yes"
           requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz"
-          requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -lz"
          ],
          [
           AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"])
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
index bba617f955..a657500434 100644
--- a/m4/efl_threads.m4
+++ b/m4/efl_threads.m4
@@ -28,15 +28,10 @@ case "$host_os" in
       AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported])
       AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
       ;;
-   solaris*)
-      _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-mt"
-      _efl_threads_libs="-mt"
-      ;;
    *)
       _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-pthread"
-      _efl_threads_libs="-pthread"
+      _efl_threads_cflags="-D_REENTRANT"
+      _efl_threads_libs="-lpthread"
       ;;
 esac
 
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index b3803941cc..599cb3370d 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -51,7 +51,6 @@ fi
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -174,7 +173,6 @@ fi
 
 if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -346,7 +344,6 @@ fi
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
    requirements_pc_evas="${requirement} ${requirements_pc_evas}"
    requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
 fi
@@ -376,7 +373,6 @@ AC_CHECK_HEADER([windows.h],
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -403,7 +399,6 @@ AC_CHECK_HEADER([ddraw.h],
 
 if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -430,7 +425,6 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h],
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -479,7 +473,6 @@ AC_LANG_POP([Objective C])
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 66cb98087e..5dc01d2fe0 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -84,7 +84,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
@@ -149,7 +148,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
@@ -350,7 +348,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
@@ -399,7 +396,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
diff --git a/legacy/escape/ChangeLog b/old/ChangeLog.escape
index 8b13789179..8b13789179 100644
--- a/legacy/escape/ChangeLog
+++ b/old/ChangeLog.escape
diff --git a/old/NEWS.escape b/old/NEWS.escape
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/old/NEWS.escape
@@ -0,0 +1 @@
+
diff --git a/legacy/escape/README b/old/README.escape
index d45099f00d..d45099f00d 100644
--- a/legacy/escape/README
+++ b/old/README.escape
diff --git a/legacy/ecore/ecore-cocoa.pc.in b/pc/ecore-cocoa.pc.in
index 91fc4ee0ac..fc3607768e 100644
--- a/legacy/ecore/ecore-cocoa.pc.in
+++ b/pc/ecore-cocoa.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-cocoa
 Description: E core library, Cocoa module
-@pkgconfig_requires_private@: @requirements_ecore_cocoa@
+Requires.private: @requirements_pc_ecore_cocoa@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_cocoa
+Libs.private: @requirements_libs_ecore_cocoa@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-con.pc.in b/pc/ecore-con.pc.in
index 9b188aa4e4..ecf7b257a9 100644
--- a/legacy/ecore/ecore-con.pc.in
+++ b/pc/ecore-con.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-con
 Description: E core library, Con module
-@pkgconfig_requires_private@: @requirements_ecore_con@
+Requires.private: @requirements_pc_ecore_con@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_con
+Libs.private: @requirements_libs_ecore_con@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-directfb.pc.in b/pc/ecore-directfb.pc.in
index 9eb104a10f..b02870b80a 100644
--- a/legacy/ecore/ecore-directfb.pc.in
+++ b/pc/ecore-directfb.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-directfb
 Description: E core library, DirectFB module
-@pkgconfig_requires_private@: @requirements_ecore_directfb@
+Requires.private: @requirements_pc_ecore_directfb@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_directfb
+Libs.private: @requirements_libs_ecore_directfb@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-evas.pc.in b/pc/ecore-evas.pc.in
index 155abbe974..02a30ac63f 100644
--- a/legacy/ecore/ecore-evas.pc.in
+++ b/pc/ecore-evas.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-evas
 Description: E core library, Evas module
-@pkgconfig_requires_private@: @requirements_ecore_evas@
+Requires.private: @requirements_pc_ecore_evas@
 Version: @VERSION@
-Libs: -L${libdir} @ecore_evas_libs@
+Libs: -L${libdir} -lecore_evas
+Libs.private: @requirements_libs_ecore_evas@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-fb.pc.in b/pc/ecore-fb.pc.in
index 4e70c48c77..f37881662b 100644
--- a/legacy/ecore/ecore-fb.pc.in
+++ b/pc/ecore-fb.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-fb
 Description: E core library, FB module
-@pkgconfig_requires_private@: @requirements_ecore_fb@
+Requires.private: @requirements_pc_ecore_fb@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_fb
+Libs.private: @requirements_libs_ecore_fb@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-file.pc.in b/pc/ecore-file.pc.in
index 833ff1e06f..b0c210dacd 100644
--- a/legacy/ecore/ecore-file.pc.in
+++ b/pc/ecore-file.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-file
 Description: E core library, File module
-@pkgconfig_requires_private@: @requirements_ecore_file@
+Requires.private: @requirements_pc_ecore_file@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_file
+Libs.private: @requirements_libs_ecore_file@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-imf-evas.pc.in b/pc/ecore-imf-evas.pc.in
index 23451c80e5..23451c80e5 100644
--- a/legacy/ecore/ecore-imf-evas.pc.in
+++ b/pc/ecore-imf-evas.pc.in
diff --git a/legacy/ecore/ecore-imf.pc.in b/pc/ecore-imf.pc.in
index cc155ed29a..cc155ed29a 100644
--- a/legacy/ecore/ecore-imf.pc.in
+++ b/pc/ecore-imf.pc.in
diff --git a/legacy/ecore/ecore-input-evas.pc.in b/pc/ecore-input-evas.pc.in
index f95325c79d..39912d32d2 100644
--- a/legacy/ecore/ecore-input-evas.pc.in
+++ b/pc/ecore-input-evas.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-input-evas
 Description: E core library, Input module Evas extension
-@pkgconfig_requires_private@: @requirements_ecore_input_evas@
+Requires.private: @requirements_pc_ecore_input_evas@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_input_evas
+Libs.private: @requirements_libs_ecore_input_evas@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-input.pc.in b/pc/ecore-input.pc.in
index b670b71ccb..4fc5d86f48 100644
--- a/legacy/ecore/ecore-input.pc.in
+++ b/pc/ecore-input.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-input
 Description: E core library, Input module
-@pkgconfig_requires_private@: @requirements_ecore_input@
+Requires.private: @requirements_pc_ecore_input@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_input
+Libs.private: @requirements_libs_ecore_input@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-ipc.pc.in b/pc/ecore-ipc.pc.in
index d66f404687..541de2170d 100644
--- a/legacy/ecore/ecore-ipc.pc.in
+++ b/pc/ecore-ipc.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
 
 Name: ecore-ipc
 Description: E core library, IPC module
-@pkgconfig_requires_private@: @requirements_ecore_ipc@
+Requires.private: @requirements_pc_ecore_ipc@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_ipc
+Libs.private: @requirements_libs_ecore_ipc@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-psl1ght.pc.in b/pc/ecore-psl1ght.pc.in
index e81f4e8366..0b53362985 100644
--- a/legacy/ecore/ecore-psl1ght.pc.in
+++ b/pc/ecore-psl1ght.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: ecore-psl1ght
 Description: E core library, PSL1GHT module
-@pkgconfig_requires_private@: @requirements_ecore_psl1ght@
+Requires.private: @requirements_pc_ecore_psl1ght@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_psl1ght
-Libs.private: -lio -lsysutil -lgem -lcamera -lspurs
+Libs.private: @requirements_libs_ecore_psl1ght@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-sdl.pc.in b/pc/ecore-sdl.pc.in
index 78170c1c41..78170c1c41 100644
--- a/legacy/ecore/ecore-sdl.pc.in
+++ b/pc/ecore-sdl.pc.in
diff --git a/legacy/ecore/ecore-wayland.pc.in b/pc/ecore-wayland.pc.in
index f4f5cf3a0a..5a123cf498 100644
--- a/legacy/ecore/ecore-wayland.pc.in
+++ b/pc/ecore-wayland.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: ecore-wayland
 Description: E core library, Wayland module
-@pkgconfig_requires_private@: @requirements_ecore_wayland@
+Requires.private: @requirements_pc_ecore_wayland@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wayland
-Libs.private: -lwayland-client
+Libs.private: @requirements_libs_ecore_wayland@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-win32.pc.in b/pc/ecore-win32.pc.in
index ac5ab32bb9..09383d645d 100644
--- a/legacy/ecore/ecore-win32.pc.in
+++ b/pc/ecore-win32.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: ecore-win32
 Description: E core library, Win32 module
-@pkgconfig_requires_private@: @requirements_ecore_win32@
+Requires.private: @requirements_pc_ecore_win32@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_win32
-Libs.private: @WIN32_LIBS@
+Libs.private: @requirements_libs_ecore_win32@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-wince.pc.in b/pc/ecore-wince.pc.in
index c937e8871a..344f29a622 100644
--- a/legacy/ecore/ecore-wince.pc.in
+++ b/pc/ecore-wince.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: ecore-wince
 Description: E core library, WinCE module
-@pkgconfig_requires_private@: @requirements_ecore_wince@
+Requires.private: @requirements_pc_ecore_wince@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wince
-Libs.private: @WIN32_LIBS@
+Libs.private: @requirements_libs_ecore_wince@
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/ecore/ecore-x.pc.in b/pc/ecore-x.pc.in
index a02b42ba54..ec7fae7916 100644
--- a/legacy/ecore/ecore-x.pc.in
+++ b/pc/ecore-x.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: ecore-x
 Description: E core library, X module
-@pkgconfig_requires_private@: @requirements_ecore_x@
+Requires.private: @requirements_pc_ecore_x@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_x
-Libs.private: @x_libs@ @ecore_x_libs_private@
+Libs.private: @requirements_libs_ecore_x@
 Cflags: -I${includedir}/ecore-@VMAJ@ @have_ecore_x_xcb_define@
diff --git a/legacy/ecore/ecore.pc.in b/pc/ecore.pc.in
index db67e7a7b5..f141c4cad7 100644
--- a/legacy/ecore/ecore.pc.in
+++ b/pc/ecore.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: ecore
 Description: Ecore event abstraction library
-@pkgconfig_requires_private@: @requirements_ecore@
+Requires.private: @requirements_pc_ecore@
 Version: @VERSION@
-Libs: -L${libdir} -lecore @EINA_LIBS@
-Libs.private: -lm
+Libs: -L${libdir} -lecore
+Libs.private: @requirements_libs_ecore@ -lm
 Cflags: -I${includedir}/ecore-@VMAJ@
diff --git a/legacy/escape/escape.pc.in b/pc/escape.pc.in
index 5d18d8008e..5d18d8008e 100644
--- a/legacy/escape/escape.pc.in
+++ b/pc/escape.pc.in
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/po/ChangeLog
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000000..3ea2f05548
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
+cs de el es fr gl it ko nl pt sl
+
diff --git a/legacy/ecore/po/Makevars b/po/Makevars
index 22837aba49..22837aba49 100644
--- a/legacy/ecore/po/Makevars
+++ b/po/Makevars
diff --git a/legacy/ecore/po/POTFILES.in b/po/POTFILES.in
index 5014aa2e92..5014aa2e92 100644
--- a/legacy/ecore/po/POTFILES.in
+++ b/po/POTFILES.in
diff --git a/legacy/ecore/po/cs.po b/po/cs.po
index db049a6ea2..4aa405d85c 100644
--- a/legacy/ecore/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2011-10-23 01:28+0100\n"
 "Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -16,159 +16,159 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Verze:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Použití:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [volby]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licence:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Typ: "
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Výchozí: "
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Možnosti: "
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Volby:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "CHYBA: neznámá volba --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "CHYBA: neznámá volba -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "CHYBA: "
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "hodnota nemá nastaven pointer.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "neznámá boolean hodnota %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "neznámý číselný formát %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "neznámá volba \"%s\". Možné hodnoty jsou: "
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "chybějící parametr k připojení.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "nemůžu parsovat hodnotu.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "chybějící parametr.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "chybějící callback funkce!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "nebyla definována verze.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "nebyl definován copyright.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "nebyla definována licence.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "CHYBA: neznámá volba --%s, ignoruji.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "CHYBA: volba --%s vyžaduje argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "CHYBA: neznámá volba -%c, ignoruji.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "CHYBA: volba -%c vyžaduje argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "CHYBA: nebyl poskytnut parser.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "CHYBA: nebyly poskytnuty hodnoty.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "CHYBA: nebyly poskytnuty argumenty.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "CHYBA: nalezeny neplatné volby."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Viz --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Viz -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "CHYBA: neplatná hodnota geometrie '%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "CHYBA: neplatná hodnota velikosti '%s'\n"
diff --git a/legacy/ecore/po/de.po b/po/de.po
index 4a16766e17..e389a835a9 100644
--- a/legacy/ecore/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore 0.9.9.063-2\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2010-01-03 21:52+GMT\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -17,159 +17,159 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Version:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [Optionen]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Lizenz:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Typ: "
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Standard: "
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Auswahlmöglichkeiten: "
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "FEHLER: Unbekannte Option --%s\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "FEHLER: Unbekannte Option -%c\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "FEHLER: "
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "kein Zeiger auf Wert gesetzt\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "unbekannter boolescher Wert %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "ungültiges Zahlenformat %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "ungültige Auswahl \"%s\". Gültige Werte sind: "
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "fehlender Parameter zum Anhängen.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "Wert kann nicht ausgewertet werden.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "fehlender Parameter.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "fehlende Rückruffunktion!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "es wurde keine Version angegeben.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "es wurde kein Copyright angegeben.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "es wurde keine Lizenz angegeben.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "FEHLER: Unbekannte Option --%s, ignoriert\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "FEHLER: Option --%s benötigt ein Argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "FEHLER: Unbekannte Option -%c, ignoriert\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "FEHLER: Option -%c benötigt ein Argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "FEHLER: Kein Parser bereitgestellt.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "FEHLER: Keine Werte bereitgestellt.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "FEHLER: Keine Argumente bereitgestellt.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "FEHLER: Ungültige Optionen gefunden."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Siehe --%s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Siehe -%c\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "FEHLER: Falscher Geometriewert \"%s\"\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "FEHLER: Falscher Größenwert \"%s\"\n"
diff --git a/legacy/ecore/po/el.po b/po/el.po
index 882f77c859..945251b6d0 100644
--- a/legacy/ecore/po/el.po
+++ b/po/el.po
@@ -1,178 +1,174 @@
 # Greek translation for Ecore.
 # This file is put in the public domain.
 # ragecryx <ragecryx@yahoo.gr>, 2009.
-# George Rizopoulos <george.rizopoulos.1@gmail.com> 20 11
-# Alex-P. Natsios <drakevr@linuxteam.teilar.gr> 2012
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
-"PO-Revision-Date: 2012-12-01 18:25+0200\n"
-"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
-"Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el@opensuse.org>\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
+"PO-Revision-Date: 2011-11-20 22:42+0200\n"
+"Last-Translator: George Rizopoulos <george.rizopoulos.1@gmail.com>\n"
+"Language-Team: Greek\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Έκδοση:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Χρήση:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [επιλογές]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Πνευματικά δικαιώματα:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Άδεια:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
-msgstr "Τύπος: "
+msgstr "Τύπος:"
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
-msgstr "Προκαθορισμένο: "
+msgstr "Προκαθορισμένο:"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Επιλογές:"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Επιλογές:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "ΣΦΑΛΜΑ: άγνωστη επιλογή --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "ΣΦΑΛΜΑ: άγνωστη επιλογή -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
-msgstr "ΣΦΑΛΜΑ: "
+msgstr "ΣΦΑΛΜΑ:"
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
-msgstr "η τιμή δεν έχει καθορισμένο τον δείκτη.\n"
+msgstr "η τιμή δεν έχει δείκτη ορισμένο.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "άγνωστη τιμή boolean %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
-msgstr "μη έγκυρη μορφή αριθμού %s\n"
+msgstr "άγνωστη μορφή αριθμού %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "μη έγκυρη επιλογή \"%s\". Οι έγκυρες τιμές είναι: "
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
-msgstr "απούσα παράμετρος για προσάρτηση.\n"
+msgstr "ελλιπής παράμετρος προς επισύναψη.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "αδυναμία ανάλυσης τιμών.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
-msgstr "απούσα παράμετρος.\n"
+msgstr "ελλιπής παράμετρος.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
-msgstr "απούσα λειτουργία επανάκλησης!\n"
+msgstr "λείπει η λειτουργία επανάκλησης!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "δεν έχει οριστεί έκδοση.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "δεν έχουν οριστεί πνευματικά δικαιώματα.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "δεν έχει οριστεί άδεια.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
-msgstr "ΣΦΑΛΜΑ: άγνωστη επιλογή --%s, αγνοήθηκε.\n"
+msgstr "ΣΦΑΛΜΑ:άγνωστη επιλογή --%s, αγνοήθηκε.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
-msgstr "ΣΦΑΛΜΑ: η επιλογή --%s απαιτεί μια παράμετρο!\n"
+msgstr "ΣΦΑΛΜΑ: η επιλογή --%s απαιτεί παραμέτρους!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "ΣΦΑΛΜΑ: άγνωστη επιλογή -%c, αγνοήθηκε.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "ΣΦAΛΜΑ: η επιλογή -%c απαιτεί μία παράμετρο!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
+#, fuzzy
 msgid "ERROR: no parser provided.\n"
-msgstr "ΣΦΑΛΜΑ: δεν παρέχεται αναλυτής.\n"
+msgstr "ΣΦΑΛΜΑ:δεν παρέχεται αναλυτής.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
-msgstr "ΣΦΑΛΜΑ: δεν έχουν δοθεί τιμές.\n"
+msgstr "ΣΦΑΛΜΑ:δεν έχουν δοθεί τιμές.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "ΣΦΑΛΜΑ:δεν έχουν δοθεί παράμετροι.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "ΣΦΑΛΜΑ: βρέθηκαν μη έγκυρες επιλογές."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Δείτε --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Δείτε -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "ΣΦΑΛΜΑ: μη έγκυρη γεωμετρική τιμή '%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ΣΦΑΛΜΑ: μη έγκυρη τιμή μεγέθους '%s'\n"
diff --git a/legacy/ecore/po/es.po b/po/es.po
index 3e4c0e3d53..4a55b3e1fc 100644
--- a/legacy/ecore/po/es.po
+++ b/po/es.po
@@ -2,12 +2,11 @@
 # Copyright (C) YEAR Enlightenment development team
 # This file is distributed under the same license as the PACKAGE package.
 # Aníbal Garrido <khany@member.trisquel.info>, 2012.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-11-08 02:06+0100\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2012-11-08 02:06+0100\n"
 "Last-Translator: Aníbal Garrido <khany@member.trisquel.info>\n"
 "Language-Team: Enlightenment Team\n"
@@ -16,166 +15,159 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Versión:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Uso:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [opciones]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licencia:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Tipo:"
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Predeterminado"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Elecciones:"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "ERROR: opción desconocida --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "ERROR: opción desconocida -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: src/lib/ecore/ecore_getopt.c:931
-#: src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084
-#: src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116
-#: src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283
-#: src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "no se definió el valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963
-#: src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "valor booleano desconocido %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014
-#: src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "formato numérico inválido %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "Elección inválida \"%s\". Los valores válidos son:"
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "faltan los parámetros a anexar.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "incapaz de procesar el valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "parámetro ausente.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "¡función de invocación desaparecida!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "no se definió la versión.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "no se definió el copyright.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "no se definió la licencia.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "ERROR: opción desconocida --%s, ignorada.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "ERROR: opción --%s ¡requiere un argumento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "ERROR: opción desconocida -%c, ignorada.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "ERROR: opción -%c ¡requiere un argumento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "ERROR: no se proporcionó ningún procesador.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "ERROR: no se proporcionó ningún valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "ERROR: no se proporcionó ningún argumento.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "ERROR: encontradas opciones inválidas."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Vea --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Vea -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "ERROR: valor geométrico incorrecto '%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERROR: valor del tamaño incorrecto '%s'\n"
-
diff --git a/legacy/ecore/po/fr.po b/po/fr.po
index 4858bc0b54..1dd79fddb2 100644
--- a/legacy/ecore/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2010-07-11 11:01+0400\n"
 "Last-Translator: batden <batden@orange.fr>\n"
 "Language-Team: Enlightenment French Team <pourunmondesansgourou@gmail.com>\n"
@@ -19,159 +19,159 @@ msgstr ""
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Version :"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Usage :"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [options]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Copyright :"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licence :"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Type : "
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Par défaut :"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Choix :"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "ERREUR : option inconnue --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "ERREUR : option inconnue -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "ERREUR :"
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "la valeur n'a aucun pointeur défini.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "valeur booléenne inconnue %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "format du nombre non valide %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "choix non valide « %s ». Les valeurs valides sont : "
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "paramètre manquant à ajouter.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "analyse de la valeur impossible.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "paramètre manquant.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "fonction de rappel manquante !\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "aucune version n'est définie.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "aucun copyright n'est défini.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "aucune licence n'est définie.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "ERREUR : option inconnue --%s, non prise en compte.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "ERREUR : l'option --%s requiert un argument !\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "ERREUR : option inconnue -%c, non prise en compte.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "ERREUR : l'option -%c requiert un argument !\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "ERREUR : aucun analyseur n'est fourni.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "ERREUR : aucune valeur n'est fournie.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "ERREUR : aucun argument n'est fourni.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "ERREUR : options non valides détectées."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Voir --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Voir -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "ERREUR : valeur géométrique incorrecte « %s »\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERREUR : valeur de taille incorrecte « %s »\n"
diff --git a/legacy/ecore/po/gl.po b/po/gl.po
index 33ba338459..d1eeb91399 100644
--- a/legacy/ecore/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 09:50+0200\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2012-10-16 09:53+0200\n"
 "Last-Translator: Aníbal Garrido <khany@member.trisquel.info>\n"
 "Language-Team: http://trasno.net/ <proxecto@trasno.net>\n"
@@ -15,166 +15,159 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Versión:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Uso:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [opcións]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Dereitos de autor:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licenza"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Tipo:"
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Predeterminado:"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Eleccións:"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Opcións:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "ERRO: opción descoñecida --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "ERRO: opción descoñecida -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "ERRO: "
 
-#: src/lib/ecore/ecore_getopt.c:931
-#: src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084
-#: src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116
-#: src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283
-#: src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "non se definiu o valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963
-#: src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "valor booleano descoñecido %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014
-#: src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "formato numérico inválido %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "Elección inválida \"%s\". Os valores válidos son:"
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "faltan os parámetros a anexar.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "incapaz de procesar o valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "parámetro ausente.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "Función de invocación desaparecida!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "non se definiu a versión.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "non se definiron os dereitos de autor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "non se definiu a licenza.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "ERRO: opción descoñecida --%s, ignorada.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "ERRO: opción --%s require un argumento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "ERRO: opción descoñecida -%c, ignorada.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "ERRO: opción -%c require un argumento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "ERRO: non se forneceu ningún procesador.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "ERRO: non se forneceu ningún valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "ERRO: non se forneceu ningún argumento.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "ERRO: atopadas opcións inválidas."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Consulte --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Consulte  -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "ERRO: valor xeométrico incorrecto '%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERRO: valor do tamaño incorrecto '%s'\n"
-
diff --git a/legacy/ecore/po/it.po b/po/it.po
index eb48e55e8d..93d26c74b2 100644
--- a/legacy/ecore/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2009-10-27 19:36+0100\n"
 "Last-Translator: quaker66 <quaker66@gmail.com>\n"
 "Language-Team: none\n"
@@ -15,159 +15,159 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Versione:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Uso:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [opzioni]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licenza:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Tipo: "
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Predefinito:"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Scelte:"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "ERRORE: opzione sconosciuta --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "ERRORE: opzione sconosciuta -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "ERRORE:"
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "il valore non ha puntatori impostati.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "valore booleano sconosciuto %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "formato numero non valido %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "scelta non valida \"%s\". I valori ammessi sono: "
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "parametro da appendere mancante.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "impossibile il parsing del valore.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "parametro mancante.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "funzione callback mancante!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "nessuna versione definita.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "nessun copyright definito.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "nessuna licenza definita.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "ERRORE: opzione sconosciuta --%s, ignorata.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "ERRORE: l'opzione --%s richiede un argomento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "ERRORE: opzione sconosciuta -%c, ignorata.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "ERRORE: l'opzione -%c richiede un argomento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "ERRORE: nessun parser fornito.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "ERRORE: nessun valore fornito.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "ERRORE: nessun argomento fornito.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "ERRORE: trovate opzioni non valide."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " Vedere --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " Vedere -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "ERRORE: valore geometrico non corretto '%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERRORE: valore dimensione non corretto '%s'\n"
diff --git a/legacy/ecore/po/ko.po b/po/ko.po
index db5f21e3f7..877964aadb 100644
--- a/legacy/ecore/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment Ecore 1.7.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2012-08-30 22:50+0900\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: Enlightenment-Intl <enlightenment-intl@lists.sourceforge."
@@ -21,159 +21,159 @@ msgstr ""
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "버전:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "사용법:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s <옵션>\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "저작권 정보:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "라이선스:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "형식: "
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "기본값: "
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "선택: "
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "옵션:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "오류: 알 수 없는 옵션 --%s 입니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "오류: 알 수 없는 옵션 -%c 입니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "오류: "
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "값에 포인터 집합이 없습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "알 수 없는 부울린 값 %s 입니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "잘못된 숫자 형식 %s 입니다\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "잘못된 선택 \"%s\" 입니다. 유효한 값은 다음과 같습니다: "
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "붙일 매개변수가 빠졌습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "값을 해석할 수 없습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "매개변수가 빠졌습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "콜백 함수가 빠졌습니다!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "정의한 버전이 없습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "정의한 저작권 정보가 없습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "정의한 라이선스가 없습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "오류: 알 수 없는 --%s 옵션을 무시합니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "오류: --%s 옵션에 인자가 필요합니다!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "오류: 알 수 없는 -%c 옵션을 무시합니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "오류: -%c 옵션에 인자가 필요합니다!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "오류: 해석 프로그램이 존재하지 않습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "오류: 값이 존재하지 않습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "인자가 존재하지 않습니다.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "오류: 잘못된 옵션이 있습니다."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr " --%s을(를) 참조하십시오.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr " -%c을(를) 참조하십시오.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "오류: '%s' 값의 좌표가 올바르지 않습니다\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "오류: '%s' 값의 크기가 올바르지 않습니다\n"
diff --git a/legacy/ecore/po/nl.po b/po/nl.po
index 7e4d79013a..64a8d99976 100644
--- a/legacy/ecore/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2011-09-03 15:48+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team:  <vistausss@gmail.com>\n"
@@ -17,159 +17,159 @@ msgstr ""
 "X-Poedit-Language: NL\n"
 "X-Poedit-Country: Nederland\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Versie:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [opties]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licentie:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Type:"
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Standaard:"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Keuzes:"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Opties:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "FOUT: onbekende optie --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "FOUT: onbekende optie -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "FOUT:"
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "waarde heeft geen pointer ingsteld.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "onbekende boolean-waarde %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "ongeldig nummerformaat %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "ongeldige keuze \"%s\". Geldige waardes zijn:"
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "parameter om toe te wijzen ontbreekt.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "kon waarde niet doorvoeren.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "paramater ontbreekt.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "ontbrekende terugroep-functie!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "geen versie was gedefinieerd.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "geen copyright was gedefinieerd.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "geen licentie was gedefinieerd.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "FOUT: onbekende optie --%s, genegeerd.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "FOUT: optie --%s vereist een argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "FOUT: onbekende opties -%c, genegeerd.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "FOUT: optie -%c vereist een argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "FOUT: geen doorvoerder beschikbaar gesteld.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "FOUT: geen waarden beschikbaar gesteld.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "FOUT: geen argumenten beschibaar gesteld.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "FOUT: ongeldige opties gevonden."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr "Zie --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr "Zie -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "Fout: foutieve wiskundige waarde '%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "FOUT: foutieve grootte-waarden '%s'\n"
diff --git a/legacy/ecore/po/pt.po b/po/pt.po
index 859652c7b1..794a654b79 100644
--- a/legacy/ecore/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2012-08-23 00:30+0100\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
@@ -18,159 +18,159 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: Portugal\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Versão:"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Utilização:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s [opções]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Direitos de autor:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licença:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Tipo:"
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Padrão:"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Escolhas:"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "ERRO: opção desconhecida --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "ERRO: opção desconhecida -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "ERRO: "
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "o valor não está definido.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "valor booleano desconhecido %s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "formato numérico inválido %s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "escolha inválida \"%s\". O valores possíveis são:"
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "faltam os parâmetros a anexar.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "incapaz de processar o valor.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "parâmetro em falta.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "função de invocação em falta!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "nenhuma versão definida.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "direitos de autor não definidos.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "licença não definida.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "ERRO: opção desconhecida --%s, ignorada.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "ERRO: a opção --%s requer um argumento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "ERRO: opção desconhecida --%c, ignorada.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "ERRO: a opção --%c requer um argumento!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "ERRO: nenhum processador fornecido.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "ERRO: nenhum valor fornecido.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "ERRO: nenhum argumento fornecido.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "ERRO: encontradas opções inválidas."
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr "Consulte --%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr "Consulte -%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "ERRO: valor geométrico incorreto \"%s\"\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERRO: tamanho incorreto \"%s\"\n"
diff --git a/legacy/ecore/po/sl.po b/po/sl.po
index c138f5cec9..ea20e0d2ff 100644
--- a/legacy/ecore/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ecore 1.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-10-16 11:52+0900\n"
+"POT-Creation-Date: 2012-11-21 13:41+0100\n"
 "PO-Revision-Date: 2011-02-24 16:54+0100\n"
 "Last-Translator: r1to <renato.rener@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,159 +17,159 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/ecore/ecore_getopt.c:95
+#: src/lib/ecore/ecore_getopt.c:104
 msgid "Version:"
 msgstr "Različica"
 
-#: src/lib/ecore/ecore_getopt.c:104
+#: src/lib/ecore/ecore_getopt.c:113
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: src/lib/ecore/ecore_getopt.c:109
+#: src/lib/ecore/ecore_getopt.c:118
 #, c-format
 msgid "%s [options]\n"
 msgstr "%s·[možnosti]\n"
 
-#: src/lib/ecore/ecore_getopt.c:264
+#: src/lib/ecore/ecore_getopt.c:273
 msgid "Copyright:"
 msgstr "Avtorstvo:"
 
-#: src/lib/ecore/ecore_getopt.c:276
+#: src/lib/ecore/ecore_getopt.c:285
 msgid "License:"
 msgstr "Licenca:"
 
-#: src/lib/ecore/ecore_getopt.c:457
+#: src/lib/ecore/ecore_getopt.c:466
 msgid "Type: "
 msgstr "Vrsta:·"
 
-#: src/lib/ecore/ecore_getopt.c:533
+#: src/lib/ecore/ecore_getopt.c:542
 msgid "Default: "
 msgstr "Privzeto:·"
 
-#: src/lib/ecore/ecore_getopt.c:560
+#: src/lib/ecore/ecore_getopt.c:569
 msgid "Choices: "
 msgstr "Izbire:·"
 
-#: src/lib/ecore/ecore_getopt.c:661
+#: src/lib/ecore/ecore_getopt.c:670
 msgid "Options:\n"
 msgstr "Možnosti:\n"
 
-#: src/lib/ecore/ecore_getopt.c:788
+#: src/lib/ecore/ecore_getopt.c:797
 #, c-format
 msgid "ERROR: unknown option --%s.\n"
 msgstr "NAPAKA:·Neznana možnost·--%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:790
+#: src/lib/ecore/ecore_getopt.c:799
 #, c-format
 msgid "ERROR: unknown option -%c.\n"
 msgstr "NAPAKA:·neznana možnost·-%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:848
+#: src/lib/ecore/ecore_getopt.c:857
 msgid "ERROR: "
 msgstr "NAPAKA:"
 
-#: src/lib/ecore/ecore_getopt.c:931 src/lib/ecore/ecore_getopt.c:1068
-#: src/lib/ecore/ecore_getopt.c:1084 src/lib/ecore/ecore_getopt.c:1099
-#: src/lib/ecore/ecore_getopt.c:1116 src/lib/ecore/ecore_getopt.c:1163
-#: src/lib/ecore/ecore_getopt.c:1283 src/lib/ecore/ecore_getopt.c:1324
+#: src/lib/ecore/ecore_getopt.c:940 src/lib/ecore/ecore_getopt.c:1077
+#: src/lib/ecore/ecore_getopt.c:1093 src/lib/ecore/ecore_getopt.c:1108
+#: src/lib/ecore/ecore_getopt.c:1125 src/lib/ecore/ecore_getopt.c:1172
+#: src/lib/ecore/ecore_getopt.c:1292 src/lib/ecore/ecore_getopt.c:1333
 msgid "value has no pointer set.\n"
 msgstr "vrednost nima nastavljenega kazalnika.\n"
 
-#: src/lib/ecore/ecore_getopt.c:963 src/lib/ecore/ecore_getopt.c:1183
+#: src/lib/ecore/ecore_getopt.c:972 src/lib/ecore/ecore_getopt.c:1192
 #, c-format
 msgid "unknown boolean value %s.\n"
 msgstr "neznana Boolova vrednost·%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1014 src/lib/ecore/ecore_getopt.c:1271
+#: src/lib/ecore/ecore_getopt.c:1023 src/lib/ecore/ecore_getopt.c:1280
 #, c-format
 msgid "invalid number format %s\n"
 msgstr "napačen·format števila·%s\n"
 
-#: src/lib/ecore/ecore_getopt.c:1129
+#: src/lib/ecore/ecore_getopt.c:1138
 #, c-format
 msgid "invalid choice \"%s\". Valid values are: "
 msgstr "napačna izbira·\"%s\".·Pravilne izbire so:·"
 
-#: src/lib/ecore/ecore_getopt.c:1157
+#: src/lib/ecore/ecore_getopt.c:1166
 msgid "missing parameter to append.\n"
 msgstr "manjka·parameter·za dodajo.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1261
+#: src/lib/ecore/ecore_getopt.c:1270
 msgid "could not parse value.\n"
 msgstr "vrednosti ni bilo možno razčleniti.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1318
+#: src/lib/ecore/ecore_getopt.c:1327
 msgid "missing parameter.\n"
 msgstr "manjkajoči·parameter.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1331
+#: src/lib/ecore/ecore_getopt.c:1340
 msgid "missing callback function!\n"
 msgstr "manjkajoča povratno-zasilna funkcija !\n"
 
-#: src/lib/ecore/ecore_getopt.c:1360
+#: src/lib/ecore/ecore_getopt.c:1369
 msgid "no version was defined.\n"
 msgstr "definirana ni bila nobena različica.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1377
+#: src/lib/ecore/ecore_getopt.c:1386
 msgid "no copyright was defined.\n"
 msgstr "definirano ni bilo nobeno avtorstvo.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1394
+#: src/lib/ecore/ecore_getopt.c:1403
 msgid "no license was defined.\n"
 msgstr "definirana ni bila nobena licenca.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1469
+#: src/lib/ecore/ecore_getopt.c:1478
 #, c-format
 msgid "ERROR: unknown option --%s, ignored.\n"
 msgstr "NAPAKA:·neznana možnost·--%s,·prezrto.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1502
+#: src/lib/ecore/ecore_getopt.c:1511
 #, c-format
 msgid "ERROR: option --%s requires an argument!\n"
 msgstr "NAPAKA:·možnost·--%s·zahteva argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1544
+#: src/lib/ecore/ecore_getopt.c:1553
 #, c-format
 msgid "ERROR: unknown option -%c, ignored.\n"
 msgstr "NAPAKA:·neznana možnost·-%c,·prezrto.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1582
+#: src/lib/ecore/ecore_getopt.c:1591
 #, c-format
 msgid "ERROR: option -%c requires an argument!\n"
 msgstr "NAPAKA:·možnost·-%c zahteva argument!\n"
 
-#: src/lib/ecore/ecore_getopt.c:1793
+#: src/lib/ecore/ecore_getopt.c:1802
 msgid "ERROR: no parser provided.\n"
 msgstr "NAPAKA:·ni podan razčlenjevalnik.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1798
+#: src/lib/ecore/ecore_getopt.c:1807
 msgid "ERROR: no values provided.\n"
 msgstr "NAPAKA::·ni podanih vrednosti.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1807
+#: src/lib/ecore/ecore_getopt.c:1816
 msgid "ERROR: no arguments provided.\n"
 msgstr "NAPAKA::·ni podanih argumentov.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1833
+#: src/lib/ecore/ecore_getopt.c:1842
 msgid "ERROR: invalid options found."
 msgstr "NAPAKA::·najdene nepravilne možnosti"
 
-#: src/lib/ecore/ecore_getopt.c:1839
+#: src/lib/ecore/ecore_getopt.c:1848
 #, c-format
 msgid " See --%s.\n"
 msgstr "·Glej·--%s.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1841
+#: src/lib/ecore/ecore_getopt.c:1850
 #, c-format
 msgid " See -%c.\n"
 msgstr "·Glej·-%c.\n"
 
-#: src/lib/ecore/ecore_getopt.c:1887
+#: src/lib/ecore/ecore_getopt.c:1896
 #, c-format
 msgid "ERROR: incorrect geometry value '%s'\n"
 msgstr "NAPAKA::·nepravilna geometrijska vrednost·'%s'\n"
 
-#: src/lib/ecore/ecore_getopt.c:1919
+#: src/lib/ecore/ecore_getopt.c:1928
 #, c-format
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "NAPAKA::·nepravilna vrednost velikosti·'%s'\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 68b83fc598..e9c5a9bdbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,10 +13,47 @@ if HAVE_WINDOWS
 include Makefile_Evil.am
 endif
 
+if HAVE_PS3
+include Makefile_Escape.am
+endif
+
 include Makefile_Eina.am
 include Makefile_Eo.am
 include Makefile_Eet.am
 include Makefile_Evas.am
+include Makefile_Ecore.am
+include Makefile_Ecore_Con.am
+include Makefile_Ecore_Ipc.am
+include Makefile_Ecore_File.am
+include Makefile_Ecore_Input.am
+if HAVE_ECORE_COCOA
+include Makefile_Ecore_Cocoa.am
+endif
+if HAVE_ECORE_DIRECTFB
+include Makefile_Ecore_DirectFB.am
+endif
+if HAVE_ECORE_FB
+include Makefile_Ecore_FB.am
+endif
+if HAVE_PS3
+include Makefile_Ecore_Psl1ght.am
+endif
+if HAVE_ECORE_SDL
+include Makefile_Ecore_SDL.am
+endif
+if HAVE_ECORE_WAYLAND
+include Makefile_Ecore_Wayland.am
+endif
+if HAVE_WIN32
+include Makefile_Ecore_Win32.am
+endif
+if HAVE_WINCE
+include Makefile_Ecore_WinCE.am
+endif
+if HAVE_ECORE_X
+include Makefile_Ecore_X.am
+endif
+include Makefile_Ecore_Imf.am
 include Makefile_Embryo.am
 
 .PHONY: benchmark examples
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
new file mode 100644
index 0000000000..eabe603558
--- /dev/null
+++ b/src/Makefile_Ecore.am
@@ -0,0 +1,88 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore/libecore.la
+
+installed_ecoremainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoremainheaders_DATA = \
+lib/ecore/Ecore.h \
+lib/ecore/Ecore_Getopt.h
+
+lib_ecore_libecore_la_SOURCES = \
+lib/ecore/ecore.c \
+lib/ecore/ecore_alloc.c \
+lib/ecore/ecore_anim.c \
+lib/ecore/ecore_app.c \
+lib/ecore/ecore_events.c \
+lib/ecore/ecore_getopt.c \
+lib/ecore/ecore_glib.c \
+lib/ecore/ecore_idle_enterer.c \
+lib/ecore/ecore_idle_exiter.c \
+lib/ecore/ecore_idler.c \
+lib/ecore/ecore_job.c \
+lib/ecore/ecore_main.c \
+lib/ecore/ecore_pipe.c \
+lib/ecore/ecore_poll.c \
+lib/ecore/ecore_time.c \
+lib/ecore/ecore_timer.c \
+lib/ecore/ecore_thread.c \
+lib/ecore/ecore_throttle.c \
+lib/ecore/ecore_private.h
+
+if HAVE_WIN32
+lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_win32.c
+else
+if HAVE_WINCE
+lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_wince.c
+else
+#if ECORE_HAVE_PS3
+#libecore_la_SOURCES += ecore_exe_ps3.c
+#else
+#if ECORE_HAVE_EXOTIC
+#libecore_la_SOURCES +=
+#else
+lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
+#endif
+#endif
+endif
+endif
+
+lib_ecore_libecore_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-DEFL_ECORE_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_CFLAGS@
+
+if HAVE_WINDOWS
+lib_ecore_libecore_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+if HAVE_PS3
+lib_ecore_libecore_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/escape \
+-I$(top_builddir)/src/lib/escape
+endif
+
+lib_ecore_libecore_la_LIBADD = \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+if HAVE_WINDOWS
+lib_ecore_libecore_la_LIBADD += lib/evil/libevil.la
+endif
+
+if HAVE_PS3
+lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la
+endif
+
+lib_ecore_libecore_la_LIBADD += @ECORE_LIBS@ @EFL_COV_LIBS@ -lm
+
+lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
new file mode 100644
index 0000000000..f7f82918a1
--- /dev/null
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -0,0 +1,37 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_cocoa/libecore_cocoa.la
+
+installed_ecorecocoamainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorecocoamainheaders_DATA = \
+lib/ecore_cocoa/Ecore_Cocoa.h \
+lib/ecore_cocoa/Ecore_Cocoa_Keys.h
+
+lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
+lib/ecore_cocoa/ecore_cocoa.m \
+lib/ecore_cocoa/ecore_cocoa_window.m \
+lib/ecore_cocoa/ecore_cocoa_private.h
+
+lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_cocoa \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_cocoa \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_COCOA_LIBS@
+
+lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
new file mode 100644
index 0000000000..f2e6ee8537
--- /dev/null
+++ b/src/Makefile_Ecore_Con.am
@@ -0,0 +1,70 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
+
+installed_ecoreconmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreconmainheaders_DATA = \
+lib/ecore_con/Ecore_Con.h \
+lib/ecore_con/Ecore_Con_Eet.h
+
+lib_ecore_con_libecore_con_la_SOURCES = \
+lib/ecore_con/ecore_con_alloc.c \
+lib/ecore_con/ecore_con.c \
+lib/ecore_con/ecore_con_eet.c \
+lib/ecore_con/ecore_con_socks.c \
+lib/ecore_con/ecore_con_ssl.c \
+lib/ecore_con/ecore_con_url.c \
+lib/ecore_con/ecore_con_private.h
+
+if HAVE_WINDOWS
+lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local_win32.c
+else
+lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local.c
+endif
+
+if HAVE_CARES
+lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_ares.c
+else
+if HAVE_IPV6
+lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_dns.c lib/ecore_con/dns.c lib/ecore_con/dns.h
+else
+lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
+endif
+endif
+
+lib_ecore_con_libecore_con_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_con \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_con \
+-DEFL_ECORE_CON_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_CON_CFLAGS@
+
+if HAVE_WINDOWS
+lib_ecore_con_libecore_con_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+lib_ecore_con_libecore_con_la_LIBADD = \
+lib/ecore/libecore.la \
+lib/eet/libeet.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+if HAVE_WINDOWS
+lib_ecore_con_libecore_con_la_LIBADD += lib/evil/libevil.la
+endif
+
+lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm
+
+lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_DirectFB.am b/src/Makefile_Ecore_DirectFB.am
new file mode 100644
index 0000000000..6e2d54c27a
--- /dev/null
+++ b/src/Makefile_Ecore_DirectFB.am
@@ -0,0 +1,34 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_directfb/libecore_directfb.la
+
+installed_ecoredirectfbmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoredirectfbmainheaders_DATA = \
+lib/ecore_directfb/Ecore_DirectFB.h
+
+lib_ecore_directfb_libecore_directfb_la_SOURCES = \
+lib/ecore_directfb/ecore_directfb.c \
+lib/ecore_directfb/ecore_directfb_keys.h \
+lib/ecore_directfb/ecore_directfb_private.h
+
+lib_ecore_directfb_libecore_directfb_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_directfb \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_directfb \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_DIRECTFB_CFLAGS@
+
+lib_ecore_directfb_libecore_directfb_la_LIBADD = \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_DIRECTFB_LIBS@
+
+lib_ecore_directfb_libecore_directfb_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
new file mode 100644
index 0000000000..595cd25f0f
--- /dev/null
+++ b/src/Makefile_Ecore_Evas.am
@@ -0,0 +1,160 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_evas/libecore_evas.la
+
+installed_ecoreevasmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreevasmainheaders_DATA = \
+lib/ecore_evas/Ecore_Evas.h
+
+lib_ecore_evas_libecore_evas_la_SOURCES = \
+lib/ecore_evas/ecore_evas.c \
+lib/ecore_evas/ecore_evas_util.c \
+lib/ecore_evas/ecore_evas_x.c \
+lib/ecore_evas/ecore_evas_fb.c \
+lib/ecore_evas/ecore_evas_buffer.c \
+lib/ecore_evas/ecore_evas_directfb.c \
+lib/ecore_evas/ecore_evas_win32.c \
+lib/ecore_evas/ecore_evas_sdl.c \
+lib/ecore_evas/ecore_evas_cocoa.c \
+lib/ecore_evas/ecore_evas_wince.c \
+lib/ecore_evas/ecore_evas_ews.c \
+lib/ecore_evas/ecore_evas_psl1ght.c \
+lib/ecore_evas/ecore_evas_wayland_shm.c \
+lib/ecore_evas/ecore_evas_wayland_egl.c \
+lib/ecore_evas/ecore_evas_extn.c \
+lib/ecore_evas/ecore_evas_private.h
+
+if BUILD_ECORE_WAYLAND
+lib_ecore_evas_libecore_evas_la_SOURCES += \
+lib/ecore_evas/ecore_evas_wayland_common.c
+endif
+
+lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_ipc \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_input_evas \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_ipc \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_input_evas \
+-I$(top_builddir)/src/lib/ecore_evas \
+-DEFL_ECORE_EVAS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+if BUILD_ECORE_COCOA
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_cocoa \
+-I$(top_builddir)/src/lib/ecore_cocoa
+endif
+
+if BUILD_ECORE_DIRECTFB
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_directfb \
+-I$(top_builddir)/src/lib/ecore_directfb
+endif
+
+if BUILD_ECORE_FB
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_fb \
+-I$(top_builddir)/src/lib/ecore_fb
+endif
+
+if BUILD_ECORE_PSL1GHT
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_psl1ght \
+-I$(top_builddir)/src/lib/ecore_psl1ght
+endif
+
+if BUILD_ECORE_SDL
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_sdl \
+-I$(top_builddir)/src/lib/ecore_sdl
+endif
+
+if BUILD_ECORE_WAYLAND
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_wayland \
+-I$(top_builddir)/src/lib/ecore_wayland
+endif
+
+if BUILD_ECORE_WIN32
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_win32 \
+-I$(top_builddir)/src/lib/ecore_win32
+endif
+
+if BUILD_ECORE_WINCE
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_wince \
+-I$(top_builddir)/src/lib/ecore_wince
+endif
+
+if BUILD_ECORE_X
+lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/ecore_x
+endif
+
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_input_evas/libecore_input_evas.la \
+lib/ecore_input/libecore_input.la \
+lib/ecore_ipc/libecore_ipc.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_EVAS_LIBS@
+
+if BUILD_ECORE_COCOA
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_cocoa/libecore_cocoa.la
+endif
+
+if BUILD_ECORE_DIRECTFB
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_directfb/libecore_directfb.la
+endif
+
+if BUILD_ECORE_FB
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_fb/libecore_fb.la
+endif
+
+if BUILD_ECORE_PSL1GHT
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_psl1ght/libecore_psl1ght.la
+endif
+
+if BUILD_ECORE_SDL
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_sdl/libecore_sdl.la
+endif
+
+if BUILD_ECORE_WAYLAND
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_wayland/libecore_wayland.la
+endif
+
+if BUILD_ECORE_WIN32
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_win32/libecore_win32.la
+endif
+
+if BUILD_ECORE_WINCE
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_wince/libecore_wince.la
+endif
+
+if BUILD_ECORE_X
+lib_ecore_evas_libecore_evas_la_LIBADD = \
+lib/ecore_x/libecore_x.la
+endif
+
+lib_ecore_evas_libecore_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
new file mode 100644
index 0000000000..adcc5ebdc6
--- /dev/null
+++ b/src/Makefile_Ecore_FB.am
@@ -0,0 +1,42 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_fb/libecore_fb.la
+
+installed_ecorefbmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorefbmainheaders_DATA = \
+lib/ecore_fb/Ecore_Fb.h
+
+lib_ecore_fb_libecore_fb_la_SOURCES = \
+lib/ecore_fb/ecore_fb.c \
+lib/ecore_fb/ecore_fb_li.c \
+lib/ecore_fb/ecore_fb_ts.c \
+lib/ecore_fb/ecore_fb_vt.c \
+lib/ecore_fb/ecore_fb_keytable.h \
+lib/ecore_fb/ecore_fb_private.h
+# deprecated sources (might not compile):
+# lib/ecore_fb/ecore_fb_kbd.c
+# lib/ecore_fb/ecore_fb_ps2.c
+
+lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_fb \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_fb \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_FB_CFLAGS@
+
+lib_ecore_fb_libecore_fb_la_LIBADD = \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_FB_LIBS@
+
+lib_ecore_fb_libecore_fb_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
new file mode 100644
index 0000000000..2172245342
--- /dev/null
+++ b/src/Makefile_Ecore_File.am
@@ -0,0 +1,41 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_file/libecore_file.la
+
+installed_ecorefilemainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorefilemainheaders_DATA = \
+lib/ecore_file/Ecore_File.h
+
+lib_ecore_file_libecore_file_la_SOURCES = \
+lib/ecore_file/ecore_file.c \
+lib/ecore_file/ecore_file_download.c \
+lib/ecore_file/ecore_file_monitor.c \
+lib/ecore_file/ecore_file_monitor_inotify.c \
+lib/ecore_file/ecore_file_monitor_poll.c \
+lib/ecore_file/ecore_file_monitor_win32.c \
+lib/ecore_file/ecore_file_path.c \
+lib/ecore_file/ecore_file_private.h
+
+lib_ecore_file_libecore_file_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_con \
+-I$(top_srcdir)/src/lib/ecore_file \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_con \
+-I$(top_builddir)/src/lib/ecore_file \
+-DEFL_ECORE_FILE_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_file_libecore_file_la_LIBADD = \
+lib/ecore_con/libecore_con.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_file_libecore_file_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
new file mode 100644
index 0000000000..820ae2b12a
--- /dev/null
+++ b/src/Makefile_Ecore_Imf.am
@@ -0,0 +1,186 @@
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/ecore_imf/libecore_imf.la \
+lib/ecore_imf/libecore_imf_evas.la
+
+installed_ecoreimfmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreimfmainheaders_DATA = \
+lib/ecore_imf/Ecore_IMF.h
+
+lib_ecore_imf_libecore_imf_la_SOURCES = \
+lib/ecore_imf/ecore_imf.c \
+lib/ecore_imf/ecore_imf_context.c \
+lib/ecore_imf/ecore_imf_module.c \
+lib/ecore_imf/ecore_imf_private.h
+
+lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_imf \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_ECORE_IMF_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_imf_libecore_imf_la_LIBADD = \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_imf_libecore_imf_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreimfevasmainheaders_DATA = \
+lib/ecore_imf/Ecore_IMF_Evas.h
+
+lib_ecore_imf_libecore_imf_evas_la_SOURCES = \
+lib/ecore_imf/ecore_imf_evas.c
+
+lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_srcdir)/src/lib/ecore_imf_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/ecore_imf_evas \
+-DEFL_ECORE_IMF_EVAS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_imf_libecore_imf_evas_la_LIBADD = \
+lib/ecore_imf/libecore_imf.la \
+lib/ecore/libecore.la \
+lib/evas/libevas.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+
+### Modules
+
+# Ibus
+
+if BUILD_ECORE_IMF_IBUS
+ecoreimfibuspkgdir = $(libdir)/ecore/immodules
+ecoreimfibuspkg_LTLIBRARIES = modules/ecore/immodules/ibus/ibus.la
+modules_ecore_immodules_ibus_ibus_la_SOURCES = \
+modules/ecore/immodules/ibus/ibus_module.c \
+modules/ecore/immodules/ibus/ibus_imcontext.c \
+modules/ecore/immodules/ibus/ibus_imcontext.h
+modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/ecore_evas \
+-DEFL_ECORE_IMF_EVAS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@IBUS_CFLAGS@
+modules_ecore_immodules_ibus_ibus_la_LIBADD = \
+lib/ecore_imf/libecore_evas.la \
+lib/ecore_imf/libecore_imf.la \
+lib/ecore_x/libecore_x.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@IBUS_LIBS@
+modules_ecore_immodules_ibus_ibus_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_ecore_immodules_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# Scim
+
+if BUILD_ECORE_IMF_SCIM
+ecoreimfscimpkgdir = $(libdir)/ecore/immodules
+ecoreimfscimpkg_LTLIBRARIES = modules/ecore/immodules/scim/scim.la
+modules_ecore_immodules_scim_scim_la_SOURCES = \
+modules/ecore/immodules/scim/scim_module.cpp \
+modules/ecore/immodules/scim/scim_imcontext.cpp \
+modules/ecore/immodules/scim/scim_imcontext.h
+modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/ecore_evas \
+-DEFL_ECORE_IMF_EVAS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@SCIM_CFLAGS@
+modules_ecore_immodules_scim_scim_la_LIBADD = \
+lib/ecore_imf/libecore_evas.la \
+lib/ecore_imf/libecore_imf.la \
+lib/ecore_x/libecore_x.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@SCIM_LIBS@
+modules_ecore_immodules_scim_scim_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_ecore_immodules_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# Xim
+
+if BUILD_ECORE_IMF_XIM
+ecoreimfximpkgdir = $(libdir)/ecore/immodules
+ecoreimfximpkg_LTLIBRARIES = modules/ecore/immodules/xim/xim.la
+modules_ecore_immodules_xim_xim_la_SOURCES = \
+modules/ecore/immodules/xim/ecore_imf_xim.c
+modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/ecore_imf \
+-DEFL_ECORE_IMF_EVAS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+modules_ecore_immodules_xim_xim_la_LIBADD = \
+lib/ecore_imf/libecore_imf.la \
+lib/ecore_x/libecore_x.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+modules_ecore_immodules_xim_xim_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_ecore_immodules_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static
+endif
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
new file mode 100644
index 0000000000..29aa449f45
--- /dev/null
+++ b/src/Makefile_Ecore_Input.am
@@ -0,0 +1,70 @@
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/ecore_input/libecore_input.la \
+lib/ecore_input/libecore_input_evas.la
+
+installed_ecoreinputmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreinputmainheaders_DATA = \
+lib/ecore_input/Ecore_Input.h
+
+lib_ecore_input_libecore_input_la_SOURCES = \
+lib/ecore_input/ecore_input.c \
+lib/ecore_input/ecore_input_compose.c \
+lib/ecore_input/ecore_input_compose.h \
+lib/ecore_input/ecore_input_private.h
+
+lib_ecore_input_libecore_input_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-DEFL_ECORE_INPUT_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_input_libecore_input_la_LIBADD = \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_input_libecore_input_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreinputevasmainheaders_DATA = \
+lib/ecore_input/Ecore_Input_Evas.h
+
+lib_ecore_input_libecore_input_evas_la_SOURCES = \
+lib/ecore_input/ecore_input_evas.c \
+lib/ecore_input/ecore_input_evas_private.h
+
+lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_input_evas \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_input_evas \
+-DEFL_ECORE_INPUT_EVAS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_input_libecore_input_evas_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/evas/libevas.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_input_libecore_input_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
new file mode 100644
index 0000000000..ba09f374b7
--- /dev/null
+++ b/src/Makefile_Ecore_Ipc.am
@@ -0,0 +1,37 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_ipc/libecore_ipc.la
+
+installed_ecoreipcmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoreipcmainheaders_DATA = \
+lib/ecore_ipc/Ecore_Ipc.h
+
+lib_ecore_ipc_libecore_ipc_la_SOURCES = \
+lib/ecore_ipc/ecore_ipc.c \
+lib/ecore_ipc/ecore_ipc_private.h
+
+lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_con \
+-I$(top_srcdir)/src/lib/ecore_ipc \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_con \
+-I$(top_builddir)/src/lib/ecore_ipc \
+-DEFL_ECORE_IPC_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_ipc_libecore_ipc_la_LIBADD = \
+lib/ecore_con/libecore_con.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_ipc_libecore_ipc_la_LIBADD += @EFL_COV_LIBS@ -lm
+
+lib_ecore_ipc_libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
new file mode 100644
index 0000000000..9ac146c63d
--- /dev/null
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -0,0 +1,38 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_psl1ght/libecore_psl1ght.la
+
+installed_ecorepsl1ghtmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorepsl1ghtmainheaders_DATA = \
+lib/ecore_psl1ght/Ecore_Psl1ght.h
+
+lib_ecore_psl1ght_libecore_psl1ght_la_SOURCES = \
+lib/ecore_psl1ght/ecore_psl1ght.c \
+lib/ecore_psl1ght/moveutil.c \
+lib/ecore_psl1ght/spursutil.c \
+lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
+lib/ecore_psl1ght/ecore_psl1ght_private.h
+
+lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_psl1ght \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_psl1ght \
+-DEFL_ECORE_PSL1GHT_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la
+
+lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
new file mode 100644
index 0000000000..62e7a10266
--- /dev/null
+++ b/src/Makefile_Ecore_SDL.am
@@ -0,0 +1,38 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_sdl/libecore_sdl.la
+
+installed_ecoresdlmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoresdlmainheaders_DATA = \
+lib/ecore_sdl/Ecore_Sdl.h
+
+lib_ecore_sdl_libecore_sdl_la_SOURCES = \
+lib/ecore_sdl/ecore_sdl.c \
+lib/ecore_sdl/Ecore_Sdl_Keys.h \
+lib/ecore_sdl/ecore_sdl_private.h
+
+lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_sdl \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_sdl \
+-DEFL_ECORE_SDL_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_SDL_CFLAGS@
+
+lib_ecore_sdl_libecore_sdl_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_SDL_LIBS@
+
+lib_ecore_sdl_libecore_sdl_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
new file mode 100644
index 0000000000..4923a1abf4
--- /dev/null
+++ b/src/Makefile_Ecore_Wayland.am
@@ -0,0 +1,40 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_wayland/libecore_wayland.la
+
+installed_ecorewaylandmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorewaylandmainheaders_DATA = \
+lib/ecore_wayland/Ecore_Wayland.h
+
+lib_ecore_wayland_libecore_wayland_la_SOURCES = \
+lib/ecore_wayland/ecore_wayland.c \
+lib/ecore_wayland/ecore_wl_dnd.c \
+lib/ecore_wayland/ecore_wl_input.c \
+lib/ecore_wayland/ecore_wl_output.c \
+lib/ecore_wayland/ecore_wl_window.c \
+lib/ecore_wayland/ecore_wayland_private.h
+
+lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_wayland \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_wayland \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_WAYLAND_CFLAGS@
+
+lib_ecore_wayland_libecore_wayland_la_LIBADD = \
+lib/ecore/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_WAYLAND_LIBS@
+
+lib_ecore_wayland_libecore_wayland_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
new file mode 100644
index 0000000000..2491ca5aa7
--- /dev/null
+++ b/src/Makefile_Ecore_Win32.am
@@ -0,0 +1,51 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_win32/libecore_win32.la
+
+installed_ecorewin32mainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorewin32mainheaders_DATA = \
+lib/ecore_win32/Ecore_Win32.h
+
+lib_ecore_win32_libecore_win32_la_SOURCES = \
+lib/ecore_win32/ecore_win32.c \
+lib/ecore_win32/ecore_win32_cursor.c \
+lib/ecore_win32/ecore_win32_dnd.c \
+lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp \
+lib/ecore_win32/ecore_win32_dnd_data_object.cpp \
+lib/ecore_win32/ecore_win32_dnd_drop_source.cpp \
+lib/ecore_win32/ecore_win32_dnd_drop_target.cpp \
+lib/ecore_win32/ecore_win32_event.c \
+lib/ecore_win32/ecore_win32_window.c \
+lib/ecore_win32/ecore_win32_private.h \
+lib/ecore_win32/ecore_win32_dnd_enumformatetc.h \
+lib/ecore_win32/ecore_win32_dnd_data_object.h \
+lib/ecore_win32/ecore_win32_dnd_drop_source.h \
+lib/ecore_win32/ecore_win32_dnd_drop_target.h
+
+lib_ecore_win32_libecore_win32_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_win32 \
+-I$(top_builddir)/src/lib/evil \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_win32 \
+-DEFL_ECORE_WIN32_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_win32_libecore_win32_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+lib/evil/libevil.la \
+@ECORE_WIN32_LIBS@
+
+lib_ecore_win32_libecore_win32_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
new file mode 100644
index 0000000000..29122ab8c0
--- /dev/null
+++ b/src/Makefile_Ecore_WinCE.am
@@ -0,0 +1,41 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_wince/libecore_wince.la
+
+installed_ecorewincemainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorewincemainheaders_DATA = \
+lib/ecore_wince/Ecore_Wince.h
+
+lib_ecore_wince_libecore_wince_la_SOURCES = \
+lib/ecore_wince/ecore_wince.c \
+lib/ecore_wince/ecore_wince_event.c \
+lib/ecore_wince/ecore_wince_window.c \
+lib/ecore_wince/ecore_wince_private.h
+
+lib_ecore_wince_libecore_wince_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_wince \
+-I$(top_builddir)/src/lib/evil \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_wince \
+-DEFL_ECORE_WINCE_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+lib_ecore_wince_libecore_wince_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+lib/evil/libevil.la \
+@ECORE_WINCE_LIBS@
+
+lib_ecore_wince_libecore_wince_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
new file mode 100644
index 0000000000..cda857bd59
--- /dev/null
+++ b/src/Makefile_Ecore_X.am
@@ -0,0 +1,126 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_x/libecore_x.la
+
+installed_ecorexmainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecorexmainheaders_DATA = \
+lib/ecore_x/Ecore_X.h \
+lib/ecore_x/Ecore_X_Atoms.h \
+lib/ecore_x/Ecore_X_Cursor.h
+
+if HAVE_ECORE_X_XCB
+lib_ecore_x_libecore_x_la_SOURCES = \
+lib/ecore_x/xcb/ecore_xcb.c \
+lib/ecore_x/xcb/ecore_xcb_atoms.c \
+lib/ecore_x/xcb/ecore_xcb_extensions.c \
+lib/ecore_x/xcb/ecore_xcb_shape.c \
+lib/ecore_x/xcb/ecore_xcb_screensaver.c \
+lib/ecore_x/xcb/ecore_xcb_sync.c \
+lib/ecore_x/xcb/ecore_xcb_render.c \
+lib/ecore_x/xcb/ecore_xcb_randr.c \
+lib/ecore_x/xcb/ecore_xcb_xfixes.c \
+lib/ecore_x/xcb/ecore_xcb_composite.c \
+lib/ecore_x/xcb/ecore_xcb_cursor.c \
+lib/ecore_x/xcb/ecore_xcb_damage.c \
+lib/ecore_x/xcb/ecore_xcb_dnd.c \
+lib/ecore_x/xcb/ecore_xcb_dpms.c \
+lib/ecore_x/xcb/ecore_xcb_drawable.c \
+lib/ecore_x/xcb/ecore_xcb_e.c \
+lib/ecore_x/xcb/ecore_xcb_gc.c \
+lib/ecore_x/xcb/ecore_xcb_image.c \
+lib/ecore_x/xcb/ecore_xcb_input.c \
+lib/ecore_x/xcb/ecore_xcb_gesture.c \
+lib/ecore_x/xcb/ecore_xcb_mwm.c \
+lib/ecore_x/xcb/ecore_xcb_pixmap.c \
+lib/ecore_x/xcb/ecore_xcb_region.c \
+lib/ecore_x/xcb/ecore_xcb_selection.c \
+lib/ecore_x/xcb/ecore_xcb_textlist.c \
+lib/ecore_x/xcb/ecore_xcb_events.c \
+lib/ecore_x/xcb/ecore_xcb_keymap.c \
+lib/ecore_x/xcb/ecore_xcb_netwm.c \
+lib/ecore_x/xcb/ecore_xcb_icccm.c \
+lib/ecore_x/xcb/ecore_xcb_window.c \
+lib/ecore_x/xcb/ecore_xcb_window_prop.c \
+lib/ecore_x/xcb/ecore_xcb_window_shape.c \
+lib/ecore_x/xcb/ecore_xcb_window_shadow.c \
+lib/ecore_x/xcb/ecore_xcb_xinerama.c \
+lib/ecore_x/xcb/ecore_xcb_error.c \
+lib/ecore_x/xcb/ecore_xcb_xtest.c \
+lib/ecore_x/xcb/ecore_xcb_vsync.c \
+lib/ecore_x/xcb/ecore_xcb_xdefaults.c \
+lib/ecore_x/xcb/ecore_xcb_private.h
+else
+lib_ecore_x_libecore_x_la_SOURCES = \
+lib/ecore_x/xlib/ecore_x.c \
+lib/ecore_x/xlib/ecore_x_dnd.c \
+lib/ecore_x/xlib/ecore_x_sync.c \
+lib/ecore_x/xlib/ecore_x_randr.c \
+lib/ecore_x/xlib/ecore_x_randr_11.c \
+lib/ecore_x/xlib/ecore_x_randr_12.c \
+lib/ecore_x/xlib/ecore_x_randr_12_edid.c \
+lib/ecore_x/xlib/ecore_x_randr_13.c \
+lib/ecore_x/xlib/ecore_x_fixes.c \
+lib/ecore_x/xlib/ecore_x_damage.c \
+lib/ecore_x/xlib/ecore_x_composite.c \
+lib/ecore_x/xlib/ecore_x_error.c \
+lib/ecore_x/xlib/ecore_x_events.c \
+lib/ecore_x/xlib/ecore_x_icccm.c \
+lib/ecore_x/xlib/ecore_x_netwm.c \
+lib/ecore_x/xlib/ecore_x_mwm.c \
+lib/ecore_x/xlib/ecore_x_e.c \
+lib/ecore_x/xlib/ecore_x_selection.c \
+lib/ecore_x/xlib/ecore_x_window.c \
+lib/ecore_x/xlib/ecore_x_window_prop.c \
+lib/ecore_x/xlib/ecore_x_window_shape.c \
+lib/ecore_x/xlib/ecore_x_pixmap.c \
+lib/ecore_x/xlib/ecore_x_gc.c \
+lib/ecore_x/xlib/ecore_x_xinerama.c \
+lib/ecore_x/xlib/ecore_x_screensaver.c \
+lib/ecore_x/xlib/ecore_x_dpms.c \
+lib/ecore_x/xlib/ecore_x_drawable.c \
+lib/ecore_x/xlib/ecore_x_cursor.c \
+lib/ecore_x/xlib/ecore_x_test.c \
+lib/ecore_x/xlib/ecore_x_atoms.c \
+lib/ecore_x/xlib/ecore_x_region.c \
+lib/ecore_x/xlib/ecore_x_image.c \
+lib/ecore_x/xlib/ecore_x_xi2.c \
+lib/ecore_x/xlib/ecore_x_vsync.c \
+lib/ecore_x/xlib/ecore_x_randr.h \
+lib/ecore_x/xlib/ecore_x_gesture.c \
+lib/ecore_x/xlib/ecore_x_private.h
+endif
+
+lib_ecore_x_libecore_x_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_x \
+-DEFL_ECORE_X_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@ECORE_X_CFLAGS@
+
+lib_ecore_x_libecore_x_la_LIBADD = \
+lib/ecore_input/libecore_input.la \
+lib/ecore/libecore.la \
+lib/eo/libeo.la \
+lib/eina/libeina.la \
+@ECORE_X_LIBS@
+
+lib_ecore_x_libecore_x_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+### Utils
+
+noinst_PROGRAMS = utils/ecore/makekeys
+
+utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
+
+EXTRA_DIST += utils/ecore/mkks.sh
+
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
new file mode 100644
index 0000000000..d237d184a2
--- /dev/null
+++ b/src/Makefile_Escape.am
@@ -0,0 +1,25 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/escape/libescape.la
+
+install_escapeheadersdir = $(includedir)/escape-@VMAJ@
+dist_install_escapeheaders_DATA = \
+lib/escape/Escape.h \
+lib/escape/escape_libgen.h \
+lib/escape/escape_unistd.h
+
+escapemmanheadersdir = $(includedir)/escape-@VMAJ@/sys
+dist_escapemmanheaders_DATA = \
+lib/escape/sys/mman.h
+
+lib_escape_libescape_la_SOURCES = \
+lib/escape/escape_libgen.c \
+lib/escape/escape_mman.c \
+lib/escape/escape_unistd.c
+
+lib_escape_libescape_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/escape \
+-I$(top_builddir)/src/lib/escape
+lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
+lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 616c466b4e..62b86c0f14 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -439,70 +439,6 @@ modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
 endif
 
-if BUILD_ENGINE_DIRECT3D
-dist_installed_evasmainheaders_DATA += modules/evas/engines/direct3d/Evas_Engine_Direct3D.h
-DIRECT3D_SOURCES = \
-modules/evas/engines/direct3d/evas_engine.c \
-modules/evas/engines/direct3d/evas_direct3d_context.cpp \
-modules/evas/engines/direct3d/evas_direct3d_device.cpp \
-modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp \
-modules/evas/engines/direct3d/evas_direct3d_main.cpp \
-modules/evas/engines/direct3d/evas_direct3d_object.cpp \
-modules/evas/engines/direct3d/evas_direct3d_object_font.cpp \
-modules/evas/engines/direct3d/evas_direct3d_object_image.cpp \
-modules/evas/engines/direct3d/evas_direct3d_object_line.cpp \
-modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp \
-modules/evas/engines/direct3d/evas_direct3d_scene.cpp \
-modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp \
-modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp \
-modules/evas/engines/direct3d/array.h \
-modules/evas/engines/direct3d/evas_direct3d_context.h \
-modules/evas/engines/direct3d/evas_direct3d_device.h \
-modules/evas/engines/direct3d/evas_direct3d_image_cache.h \
-modules/evas/engines/direct3d/evas_direct3d_object.h \
-modules/evas/engines/direct3d/evas_direct3d_object_font.h \
-modules/evas/engines/direct3d/evas_direct3d_object_image.h \
-modules/evas/engines/direct3d/evas_direct3d_object_line.h \
-modules/evas/engines/direct3d/evas_direct3d_object_rect.h \
-modules/evas/engines/direct3d/evas_direct3d_scene.h \
-modules/evas/engines/direct3d/evas_direct3d_shader_pack.h \
-modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h \
-modules/evas/engines/direct3d/evas_engine.h \
-modules/evas/engines/direct3d/ref.h
-if EVAS_STATIC_BUILD_DIRECT3D
-lib_evas_libevas_la_SOURCES += $(DIRECT3D_SOURCES)
-lib_evas_libevas_la_CPPFLAGS += @evas_engine_direct3d_cflags@
-lib_evas_libevas_la_CXXFLAGS += -fno-rtti -fno-exceptions
-lib_evas_libevas_la_LIBADD += @evas_engine_direct3d_libs@
-else
-enginedirect3dpkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
-enginedirect3dpkg_LTLIBRARIES = modules/evas/engines/direct3d/module.la
-modules_evas_engines_direct3d_module_la_SOURCES = $(DIRECT3D_SOURCES)
-modules_evas_engines_direct3d_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
--I$(top_builddir)/src/lib/evas \
--I$(top_srcdir)/src/lib/evas/include \
--I$(top_builddir)/src/lib/evas/include \
--I$(top_srcdir)/src/lib/evas/cserve2 \
--I$(top_builddir)/src/lib/evas/cserve2 \
--DEFL_EVAS_BUILD \
-@evas_engine_direct3d_cflags@ \
-@EFL_CFLAGS@ \
-@EVAS_CFLAGS@
-modules_evas_engines_direct3d_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-modules_evas_engines_direct3d_module_la_LIBADD = \
-lib/evas/libevas.la \
-@EFL_LIBS@ \
-@evas_engine_direct3d_libs@
-modules_evas_engines_direct3d_module_la_LDFLAGS = -no-undefined -module -avoid-version
-modules_evas_engines_direct3d_module_la_LIBTOOLFLAGS = --tag=disable-static
-endif
-endif
-
 if BUILD_ENGINE_DIRECTFB
 dist_installed_evasmainheaders_DATA += modules/evas/engines/directfb/Evas_Engine_DirectFB.h
 DIRECTFB_SOURCES = \
diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 5a02211526..5a02211526 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
diff --git a/legacy/ecore/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h
index 0a11787d4d..0a11787d4d 100644
--- a/legacy/ecore/src/lib/ecore/Ecore_Getopt.h
+++ b/src/lib/ecore/Ecore_Getopt.h
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 433294cbb4..3aa15bf77c 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -37,7 +37,7 @@
 #include <malloc.h>
 
 
-static Ecore_Version _version = { VERS_MAJ, VERS_MIN, VERS_MIC, VERS_REV };
+static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV };
 EAPI Ecore_Version *ecore_version = &_version;
 
 #define KEEP_MAX(Global, Local) \
diff --git a/legacy/ecore/src/lib/ecore/ecore_alloc.c b/src/lib/ecore/ecore_alloc.c
index bec66ef0d5..bec66ef0d5 100644
--- a/legacy/ecore/src/lib/ecore/ecore_alloc.c
+++ b/src/lib/ecore/ecore_alloc.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index c06d139add..c06d139add 100644
--- a/legacy/ecore/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index 04df487d3c..04df487d3c 100644
--- a/legacy/ecore/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c
index 2d8ac1f661..2d8ac1f661 100644
--- a/legacy/ecore/src/lib/ecore/ecore_events.c
+++ b/src/lib/ecore/ecore_events.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index 19bc39b008..19bc39b008 100644
--- a/legacy/ecore/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_exe_ps3.c b/src/lib/ecore/ecore_exe_ps3.c
index 1ef1e81fcb..1ef1e81fcb 100644
--- a/legacy/ecore/src/lib/ecore/ecore_exe_ps3.c
+++ b/src/lib/ecore/ecore_exe_ps3.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index 71557c3676..71557c3676 100644
--- a/legacy/ecore/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_exe_wince.c b/src/lib/ecore/ecore_exe_wince.c
index c07fcbe31b..c07fcbe31b 100644
--- a/legacy/ecore/src/lib/ecore/ecore_exe_wince.c
+++ b/src/lib/ecore/ecore_exe_wince.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c
index 42e43e8915..42e43e8915 100644
--- a/legacy/ecore/src/lib/ecore/ecore_getopt.c
+++ b/src/lib/ecore/ecore_getopt.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c
index 5b73180951..5b73180951 100644
--- a/legacy/ecore/src/lib/ecore/ecore_glib.c
+++ b/src/lib/ecore/ecore_glib.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 64956ad7b7..e7d10e555a 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -175,7 +175,6 @@ _ecore_idle_enterer_del(Ecore_Idle_Enterer *obj)
 {
    Ecore_Idle_Enterer_Private_Data *idle_enterer = eo_data_get(obj, MY_CLASS);
 
-   if (!idle_enterer) return NULL;
    EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_enterer->delete_me, NULL);
    idle_enterer->delete_me = 1;
    idle_enterers_delete_me = 1;
diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index 8fd20e7a0a..8fd20e7a0a 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 147b3c1880..147b3c1880 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index bc438b7209..bc438b7209 100644
--- a/legacy/ecore/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 9bed47a841..cc7b0654a5 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -127,6 +127,9 @@ epoll_ctl(int                 epfd EINA_UNUSED,
 # ifndef TFD_NONBLOCK
 #  define TFD_NONBLOCK    0 /* bogus value */
 # endif
+#endif /* HAVE_SYS_TIMERFD_H */
+
+#ifndef HAVE_TIMERFD_CREATE
 static inline int
 timerfd_create(int clockid EINA_UNUSED,
                int flags EINA_UNUSED)
@@ -143,7 +146,7 @@ timerfd_settime(int                      fd EINA_UNUSED,
    return -1;
 }
 
-#endif /* HAVE_SYS_TIMERFD_H */
+#endif /* HAVE_TIMERFD_CREATE */
 
 #ifdef USE_G_MAIN_LOOP
 # include <glib.h>
diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index 3caf9781d0..c6962a5d58 100644
--- a/legacy/ecore/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -7,10 +7,6 @@
 #include <errno.h>
 #include <math.h>
 
-#ifdef __SUNPRO_C
-# include <ieeefp.h>
-#endif
-
 #ifdef HAVE_ISFINITE
 # define ECORE_FINITE(t)  isfinite(t)
 #else
diff --git a/legacy/ecore/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c
index 28be53857c..28be53857c 100644
--- a/legacy/ecore/src/lib/ecore/ecore_poll.c
+++ b/src/lib/ecore/ecore_poll.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index f0add822fe..f0add822fe 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
diff --git a/legacy/ecore/src/lib/ecore/ecore_signal.c b/src/lib/ecore/ecore_signal.c
index 8114f72b09..8114f72b09 100644
--- a/legacy/ecore/src/lib/ecore/ecore_signal.c
+++ b/src/lib/ecore/ecore_signal.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 4937ef5290..4937ef5290 100644
--- a/legacy/ecore/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_throttle.c b/src/lib/ecore/ecore_throttle.c
index febaeacb77..febaeacb77 100644
--- a/legacy/ecore/src/lib/ecore/ecore_throttle.c
+++ b/src/lib/ecore/ecore_throttle.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index 44b1dab81f..44b1dab81f 100644
--- a/legacy/ecore/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
diff --git a/legacy/ecore/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 768198876b..768198876b 100644
--- a/legacy/ecore/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
diff --git a/legacy/ecore/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h
index 51c8ead21b..51c8ead21b 100644
--- a/legacy/ecore/src/lib/ecore_cocoa/Ecore_Cocoa.h
+++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h
diff --git a/legacy/ecore/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h b/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h
index 7068bc22a8..7068bc22a8 100644
--- a/legacy/ecore/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h
+++ b/src/lib/ecore_cocoa/Ecore_Cocoa_Keys.h
diff --git a/legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index 3f6023af1f..3f6023af1f 100644
--- a/legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
diff --git a/legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa_private.h b/src/lib/ecore_cocoa/ecore_cocoa_private.h
index 0b4cf3178e..0b4cf3178e 100644
--- a/legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa_private.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h
diff --git a/legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m
index 2091a69b32..2091a69b32 100644
--- a/legacy/ecore/src/lib/ecore_cocoa/ecore_cocoa_window.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m
diff --git a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index 0a832fc37a..0a832fc37a 100644
--- a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
diff --git a/legacy/ecore/src/lib/ecore_con/Ecore_Con_Eet.h b/src/lib/ecore_con/Ecore_Con_Eet.h
index bdf0d2d605..bdf0d2d605 100644
--- a/legacy/ecore/src/lib/ecore_con/Ecore_Con_Eet.h
+++ b/src/lib/ecore_con/Ecore_Con_Eet.h
diff --git a/legacy/ecore/src/lib/ecore_con/dns.c b/src/lib/ecore_con/dns.c
index b50d306dc6..b50d306dc6 100644
--- a/legacy/ecore/src/lib/ecore_con/dns.c
+++ b/src/lib/ecore_con/dns.c
diff --git a/legacy/ecore/src/lib/ecore_con/dns.h b/src/lib/ecore_con/dns.h
index f9213167e5..f9213167e5 100644
--- a/legacy/ecore/src/lib/ecore_con/dns.h
+++ b/src/lib/ecore_con/dns.h
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 056db2eec0..056db2eec0 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c b/src/lib/ecore_con/ecore_con_alloc.c
index 324d47d100..324d47d100 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_alloc.c
+++ b/src/lib/ecore_con/ecore_con_alloc.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c b/src/lib/ecore_con/ecore_con_ares.c
index 3c0ca22c85..3c0ca22c85 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c
+++ b/src/lib/ecore_con/ecore_con_ares.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_dns.c b/src/lib/ecore_con/ecore_con_dns.c
index 7851d0db82..7851d0db82 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_dns.c
+++ b/src/lib/ecore_con/ecore_con_dns.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index f3948ca5f8..3a958f3663 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -312,7 +312,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
    else if (eet_connection_empty(n->econn) && size > (int) (4 * sizeof (unsigned int) + 2))
      {
         unsigned int *tmp = data;
-        size -= 4 * sizeof (unsigned int);
+        size -= 4 * sizeof (unsigned int) + 2;
 
         if (ntohl(tmp[0]) == ECORE_CON_EET_RAW_MAGIC)
           {
@@ -340,7 +340,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
                        n->buffer_length = data_length;
                        n->buffer_current = 0;
                        if (n->buffer_handler)
-                         n->buffer = malloc(sizeof (char) * data_length);
+                         n->buffer = malloc(sizeof (data_length));
                        else
                          n->buffer = (void*) 1;
                        if (n->buffer)
@@ -355,7 +355,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
                }
           }
 
-        size += 4 * sizeof (unsigned int);
+        size += 4 * sizeof (unsigned int) + 2;
      }
 
    eet_connection_received(n->econn, data, size);
@@ -468,7 +468,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
    r->handler_data = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
                                              (Ecore_Event_Handler_Cb)_ecore_con_eet_server_data, r);
    r->data_callbacks = eina_hash_stringshared_new(_ecore_con_eet_data_free);
-   r->raw_data_callbacks = eina_hash_string_superfast_new(_ecore_con_eet_raw_data_free);
+   r->raw_data_callbacks = eina_hash_stringshared_new(_ecore_con_eet_raw_data_free);
 
    _ecore_con_eet_data_descriptor_setup(r);
 
@@ -494,7 +494,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
    r->handler_data = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
                                              (Ecore_Event_Handler_Cb)_ecore_con_eet_client_data, r);
    r->data_callbacks = eina_hash_stringshared_new(_ecore_con_eet_data_free);
-   r->raw_data_callbacks = eina_hash_string_superfast_new(_ecore_con_eet_raw_data_free);
+   r->raw_data_callbacks = eina_hash_stringshared_new(_ecore_con_eet_raw_data_free);
 
    _ecore_con_eet_data_descriptor_setup(r);
 
@@ -658,7 +658,7 @@ ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
    c->func = func;
    c->data = data;
 
-   ece->u.server.client_disconnect_callbacks = eina_list_append(ece->u.server.client_disconnect_callbacks, c);
+   ece->u.server.client_connect_callbacks = eina_list_append(ece->u.server.client_disconnect_callbacks, c);
 }
 
 EAPI void
@@ -805,7 +805,7 @@ ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const
    size = sizeof (protocol) + protocol_length + section_length;
    tmp = alloca(size);
    memcpy(tmp, protocol, sizeof (protocol));
-   memcpy(tmp + sizeof (protocol), protocol_name, protocol_length);
+   memcpy(tmp + sizeof (protocol), protocol, protocol_length);
    memcpy(tmp + sizeof (protocol) + protocol_length, section, section_length);
 
    if (reply->client)
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c b/src/lib/ecore_con/ecore_con_info.c
index 80e199a411..80e199a411 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c
+++ b/src/lib/ecore_con/ecore_con_info.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index fff0059d66..fff0059d66 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 2b7e5c5bd2..2b7e5c5bd2 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h b/src/lib/ecore_con/ecore_con_private.h
index d8b0abb5c3..d8b0abb5c3 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
+++ b/src/lib/ecore_con/ecore_con_private.h
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index a6df8a9640..a6df8a9640 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c
index 609d29161a..609d29161a 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c
+++ b/src/lib/ecore_con/ecore_con_ssl.c
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 467f3f113b..467f3f113b 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
diff --git a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h b/src/lib/ecore_directfb/Ecore_DirectFB.h
index 3b94816d96..3b94816d96 100644
--- a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
+++ b/src/lib/ecore_directfb/Ecore_DirectFB.h
diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c b/src/lib/ecore_directfb/ecore_directfb.c
index 008fa1d6f9..008fa1d6f9 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
+++ b/src/lib/ecore_directfb/ecore_directfb.c
diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_keys.h b/src/lib/ecore_directfb/ecore_directfb_keys.h
index 19cca46e57..19cca46e57 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_keys.h
+++ b/src/lib/ecore_directfb/ecore_directfb_keys.h
diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h b/src/lib/ecore_directfb/ecore_directfb_private.h
index ed34587ab5..ed34587ab5 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h
+++ b/src/lib/ecore_directfb/ecore_directfb_private.h
diff --git a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 3c59c80c84..3c59c80c84 100644
--- a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 3d841e7db6..3d841e7db6 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index 26f48ce336..26f48ce336 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c b/src/lib/ecore_evas/ecore_evas_cocoa.c
index bf88e5e33f..bf88e5e33f 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_cocoa.c
+++ b/src/lib/ecore_evas/ecore_evas_cocoa.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/src/lib/ecore_evas/ecore_evas_directfb.c
index f3567341b1..f3567341b1 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
+++ b/src/lib/ecore_evas/ecore_evas_directfb.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c
index ceffd663e6..ceffd663e6 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c b/src/lib/ecore_evas/ecore_evas_extn.c
index 2e1dac5cf8..2e1dac5cf8 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c
+++ b/src/lib/ecore_evas/ecore_evas_extn.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c b/src/lib/ecore_evas/ecore_evas_fb.c
index 0f98e62d06..0f98e62d06 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
+++ b/src/lib/ecore_evas/ecore_evas_fb.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 0c7b03043d..0c7b03043d 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_psl1ght.c b/src/lib/ecore_evas/ecore_evas_psl1ght.c
index 35252a3703..35252a3703 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_psl1ght.c
+++ b/src/lib/ecore_evas/ecore_evas_psl1ght.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c b/src/lib/ecore_evas/ecore_evas_sdl.c
index 90b348ef2c..90b348ef2c 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
+++ b/src/lib/ecore_evas/ecore_evas_sdl.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 85ff2bd37f..85ff2bd37f 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c b/src/lib/ecore_evas/ecore_evas_wayland_common.c
index 5e83175932..f29e711166 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_common.c
+++ b/src/lib/ecore_evas/ecore_evas_wayland_common.c
@@ -43,11 +43,13 @@ _ecore_evas_wl_common_cb_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
    ee = ecore_event_window_match(ev->window);
    if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
    if (ev->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
-   if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
-   ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);
-   evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL);
-   _ecore_evas_mouse_move_process(ee, ev->x, ev->y, ev->timestamp);
-   ee->in = EINA_TRUE;
+   if (!ee->in)
+     {
+        if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
+        ecore_event_evas_modifier_lock_update(ee->evas, ev->modifiers);
+        evas_event_feed_mouse_in(ee->evas, ev->timestamp, NULL);
+        ee->in = EINA_TRUE;
+     }
    return ECORE_CALLBACK_PASS_ON;
 }
 
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/src/lib/ecore_evas/ecore_evas_wayland_egl.c
index ed176e8b6e..ed176e8b6e 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_egl.c
+++ b/src/lib/ecore_evas/ecore_evas_wayland_egl.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/src/lib/ecore_evas/ecore_evas_wayland_shm.c
index 24e349534a..24e349534a 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
+++ b/src/lib/ecore_evas/ecore_evas_wayland_shm.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/src/lib/ecore_evas/ecore_evas_win32.c
index 32ecc46de4..32ecc46de4 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
+++ b/src/lib/ecore_evas/ecore_evas_win32.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/src/lib/ecore_evas/ecore_evas_wince.c
index 142a85059c..142a85059c 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
+++ b/src/lib/ecore_evas/ecore_evas_wince.c
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c
index d94f055319..d94f055319 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
diff --git a/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h b/src/lib/ecore_fb/Ecore_Fb.h
index 069cccdff9..069cccdff9 100644
--- a/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h
+++ b/src/lib/ecore_fb/Ecore_Fb.h
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c
index ff96ac8a77..ff96ac8a77 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c
+++ b/src/lib/ecore_fb/ecore_fb.c
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c b/src/lib/ecore_fb/ecore_fb_kbd.c
index fd111db04d..fd111db04d 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c
+++ b/src/lib/ecore_fb/ecore_fb_kbd.c
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_keytable.h b/src/lib/ecore_fb/ecore_fb_keytable.h
index 70bf6b9689..70bf6b9689 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_keytable.h
+++ b/src/lib/ecore_fb/ecore_fb_keytable.h
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c b/src/lib/ecore_fb/ecore_fb_li.c
index 0ea0549f92..0ea0549f92 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c
+++ b/src/lib/ecore_fb/ecore_fb_li.c
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h b/src/lib/ecore_fb/ecore_fb_private.h
index 797f86305f..797f86305f 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_private.h
+++ b/src/lib/ecore_fb/ecore_fb_private.h
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c b/src/lib/ecore_fb/ecore_fb_ps2.c
index 53aa302fef..53aa302fef 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c
+++ b/src/lib/ecore_fb/ecore_fb_ps2.c
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c b/src/lib/ecore_fb/ecore_fb_ts.c
index ce9c733c3e..ce9c733c3e 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c
+++ b/src/lib/ecore_fb/ecore_fb_ts.c
diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c b/src/lib/ecore_fb/ecore_fb_vt.c
index c92c087336..c92c087336 100644
--- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c
+++ b/src/lib/ecore_fb/ecore_fb_vt.c
diff --git a/legacy/ecore/src/lib/ecore_file/Ecore_File.h b/src/lib/ecore_file/Ecore_File.h
index 30f3bd7d9e..30f3bd7d9e 100644
--- a/legacy/ecore/src/lib/ecore_file/Ecore_File.h
+++ b/src/lib/ecore_file/Ecore_File.h
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index 6876511fc6..6876511fc6 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c
index 98d4a1f972..98d4a1f972 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
+++ b/src/lib/ecore_file/ecore_file_download.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c b/src/lib/ecore_file/ecore_file_monitor.c
index 8b07589a9e..8b07589a9e 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
+++ b/src/lib/ecore_file/ecore_file_monitor.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c b/src/lib/ecore_file/ecore_file_monitor_inotify.c
index 1b682fc4a0..1b682fc4a0 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c
+++ b/src/lib/ecore_file/ecore_file_monitor_inotify.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c b/src/lib/ecore_file/ecore_file_monitor_poll.c
index 68889a74e8..68889a74e8 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c
+++ b/src/lib/ecore_file/ecore_file_monitor_poll.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c b/src/lib/ecore_file/ecore_file_monitor_win32.c
index 7f3af0907b..7f3af0907b 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_win32.c
+++ b/src/lib/ecore_file/ecore_file_monitor_win32.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c b/src/lib/ecore_file/ecore_file_path.c
index c1c54b7c0f..c1c54b7c0f 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c
+++ b/src/lib/ecore_file/ecore_file_path.c
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 45d2cbd65c..45d2cbd65c 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
diff --git a/legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index 641ece74a3..641ece74a3 100644
--- a/legacy/ecore/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
diff --git a/legacy/ecore/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h b/src/lib/ecore_imf/Ecore_IMF_Evas.h
index 5f7cdb90f3..5f7cdb90f3 100644
--- a/legacy/ecore/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
+++ b/src/lib/ecore_imf/Ecore_IMF_Evas.h
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c b/src/lib/ecore_imf/ecore_imf.c
index 7cf8a4a9f6..7cf8a4a9f6 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
+++ b/src/lib/ecore_imf/ecore_imf.c
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c
index 3faa5acbd5..3faa5acbd5 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
+++ b/src/lib/ecore_imf/ecore_imf_context.c
diff --git a/legacy/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c b/src/lib/ecore_imf/ecore_imf_evas.c
index 4a5f3dd5f4..4a5f3dd5f4 100644
--- a/legacy/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c
+++ b/src/lib/ecore_imf/ecore_imf_evas.c
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index cbdee47178..cbdee47178 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h b/src/lib/ecore_imf/ecore_imf_private.h
index b4ff0f2ee0..b4ff0f2ee0 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h
+++ b/src/lib/ecore_imf/ecore_imf_private.h
diff --git a/legacy/ecore/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h
index d1feb220e1..d1feb220e1 100644
--- a/legacy/ecore/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
diff --git a/legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h b/src/lib/ecore_input/Ecore_Input_Evas.h
index c97274eb0b..c97274eb0b 100644
--- a/legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h
+++ b/src/lib/ecore_input/Ecore_Input_Evas.h
diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input.c b/src/lib/ecore_input/ecore_input.c
index 8f4b1f9bc0..8f4b1f9bc0 100644
--- a/legacy/ecore/src/lib/ecore_input/ecore_input.c
+++ b/src/lib/ecore_input/ecore_input.c
diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input_compose.c b/src/lib/ecore_input/ecore_input_compose.c
index 5335a7fe0c..5335a7fe0c 100644
--- a/legacy/ecore/src/lib/ecore_input/ecore_input_compose.c
+++ b/src/lib/ecore_input/ecore_input_compose.c
diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input_compose.h b/src/lib/ecore_input/ecore_input_compose.h
index 9fbfb76616..9fbfb76616 100644
--- a/legacy/ecore/src/lib/ecore_input/ecore_input_compose.h
+++ b/src/lib/ecore_input/ecore_input_compose.h
diff --git a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input/ecore_input_evas.c
index 1f5b38e03c..1f5b38e03c 100644
--- a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/src/lib/ecore_input/ecore_input_evas.c
diff --git a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas_private.h b/src/lib/ecore_input/ecore_input_evas_private.h
index c19cfbf675..c19cfbf675 100644
--- a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas_private.h
+++ b/src/lib/ecore_input/ecore_input_evas_private.h
diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input_private.h b/src/lib/ecore_input/ecore_input_private.h
index 5660a2024a..5660a2024a 100644
--- a/legacy/ecore/src/lib/ecore_input/ecore_input_private.h
+++ b/src/lib/ecore_input/ecore_input_private.h
diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/src/lib/ecore_ipc/Ecore_Ipc.h
index f77870f84d..f77870f84d 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/src/lib/ecore_ipc/Ecore_Ipc.h
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index a421febdf9..a421febdf9 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h b/src/lib/ecore_ipc/ecore_ipc_private.h
index bedaab167c..bedaab167c 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/src/lib/ecore_ipc/ecore_ipc_private.h
diff --git a/legacy/ecore/src/lib/ecore_sdl/Ecore_Sdl.h b/src/lib/ecore_sdl/Ecore_Sdl.h
index 359e974718..359e974718 100644
--- a/legacy/ecore/src/lib/ecore_sdl/Ecore_Sdl.h
+++ b/src/lib/ecore_sdl/Ecore_Sdl.h
diff --git a/legacy/ecore/src/lib/ecore_sdl/Ecore_Sdl_Keys.h b/src/lib/ecore_sdl/Ecore_Sdl_Keys.h
index 4d0b60b854..4d0b60b854 100644
--- a/legacy/ecore/src/lib/ecore_sdl/Ecore_Sdl_Keys.h
+++ b/src/lib/ecore_sdl/Ecore_Sdl_Keys.h
diff --git a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c b/src/lib/ecore_sdl/ecore_sdl.c
index d9f2775004..f4a8faedb0 100644
--- a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c
+++ b/src/lib/ecore_sdl/ecore_sdl.c
@@ -12,6 +12,7 @@
 #include "Ecore_Sdl_Keys.h"
 #include "ecore_sdl_private.h"
 
+
 int _ecore_sdl_log_dom = -1;
 
 typedef struct _Ecore_SDL_Pressed Ecore_SDL_Pressed;
diff --git a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h b/src/lib/ecore_sdl/ecore_sdl_private.h
index 37e957015d..37e957015d 100644
--- a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h
+++ b/src/lib/ecore_sdl/ecore_sdl_private.h
diff --git a/legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index 5281c6f8f3..5281c6f8f3 100644
--- a/legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index 481ba790b6..481ba790b6 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_dnd.c b/src/lib/ecore_wayland/ecore_wl_dnd.c
index 403e3b9f6b..403e3b9f6b 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_dnd.c
+++ b/src/lib/ecore_wayland/ecore_wl_dnd.c
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c
index b8485fb625..b8485fb625 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c b/src/lib/ecore_wayland/ecore_wl_output.c
index 5498895007..5498895007 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_output.c
+++ b/src/lib/ecore_wayland/ecore_wl_output.c
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index ecd7a110b3..ecd7a110b3 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 3d221e9f2a..3d221e9f2a 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
diff --git a/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h b/src/lib/ecore_win32/Ecore_Win32.h
index ae1bd4ec8c..ae1bd4ec8c 100644
--- a/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
+++ b/src/lib/ecore_win32/Ecore_Win32.h
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c b/src/lib/ecore_win32/ecore_win32.c
index b571d74d1b..b571d74d1b 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
+++ b/src/lib/ecore_win32/ecore_win32.c
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_cursor.c b/src/lib/ecore_win32/ecore_win32_cursor.c
index 9b58c95160..9b58c95160 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_cursor.c
+++ b/src/lib/ecore_win32/ecore_win32_cursor.c
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd.c b/src/lib/ecore_win32/ecore_win32_dnd.c
index 6c5253ae20..6c5253ae20 100755
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd.c
+++ b/src/lib/ecore_win32/ecore_win32_dnd.c
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp b/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
index 213197780b..213197780b 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.h b/src/lib/ecore_win32/ecore_win32_dnd_data_object.h
index 3d289cf7f5..3d289cf7f5 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.h
+++ b/src/lib/ecore_win32/ecore_win32_dnd_data_object.h
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp b/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
index a3a8bb1865..a3a8bb1865 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.h b/src/lib/ecore_win32/ecore_win32_dnd_drop_source.h
index 9081f46a15..9081f46a15 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.h
+++ b/src/lib/ecore_win32/ecore_win32_dnd_drop_source.h
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp b/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
index 2f2da1af65..2f2da1af65 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.h b/src/lib/ecore_win32/ecore_win32_dnd_drop_target.h
index 24c3de3e1a..24c3de3e1a 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.h
+++ b/src/lib/ecore_win32/ecore_win32_dnd_drop_target.h
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp b/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp
index a3858bcdd8..a3858bcdd8 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.cpp
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.h b/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.h
index 9f17f5684e..9f17f5684e 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.h
+++ b/src/lib/ecore_win32/ecore_win32_dnd_enumformatetc.h
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c b/src/lib/ecore_win32/ecore_win32_event.c
index fc285995fc..fc285995fc 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_event.c
+++ b/src/lib/ecore_win32/ecore_win32_event.c
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h b/src/lib/ecore_win32/ecore_win32_private.h
index e3e44264cc..e3e44264cc 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h
+++ b/src/lib/ecore_win32/ecore_win32_private.h
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c b/src/lib/ecore_win32/ecore_win32_window.c
index 36f8a86047..36f8a86047 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
+++ b/src/lib/ecore_win32/ecore_win32_window.c
diff --git a/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h b/src/lib/ecore_wince/Ecore_WinCE.h
index 20c197575a..20c197575a 100644
--- a/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h
+++ b/src/lib/ecore_wince/Ecore_WinCE.h
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince.c b/src/lib/ecore_wince/ecore_wince.c
index 15da44c5e3..15da44c5e3 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
+++ b/src/lib/ecore_wince/ecore_wince.c
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c b/src/lib/ecore_wince/ecore_wince_event.c
index 39430343e3..39430343e3 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c
+++ b/src/lib/ecore_wince/ecore_wince_event.c
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h b/src/lib/ecore_wince/ecore_wince_private.h
index b506312f99..b506312f99 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h
+++ b/src/lib/ecore_wince/ecore_wince_private.h
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c b/src/lib/ecore_wince/ecore_wince_window.c
index 49a6312da3..49a6312da3 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
+++ b/src/lib/ecore_wince/ecore_wince_window.c
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index b3fc0fabab..b3fc0fabab 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h b/src/lib/ecore_x/Ecore_X_Atoms.h
index ca6351d839..ca6351d839 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h
+++ b/src/lib/ecore_x/Ecore_X_Atoms.h
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X_Cursor.h b/src/lib/ecore_x/Ecore_X_Cursor.h
index 807541e596..807541e596 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X_Cursor.h
+++ b/src/lib/ecore_x/Ecore_X_Cursor.h
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h b/src/lib/ecore_x/ecore_x_atoms_decl.h
index 155283efe6..155283efe6 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h
+++ b/src/lib/ecore_x/ecore_x_atoms_decl.h
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c b/src/lib/ecore_x/xcb/ecore_xcb.c
index 2f1e1a2601..2f1e1a2601 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atoms.c b/src/lib/ecore_x/xcb/ecore_xcb_atoms.c
index c8c217eec7..c8c217eec7 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_atoms.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_atoms.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_composite.c b/src/lib/ecore_x/xcb/ecore_xcb_composite.c
index 0d3b44e4aa..0d3b44e4aa 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_composite.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_composite.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_cursor.c b/src/lib/ecore_x/xcb/ecore_xcb_cursor.c
index 755df04e4f..755df04e4f 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_cursor.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_cursor.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_damage.c b/src/lib/ecore_x/xcb/ecore_xcb_damage.c
index deb3b9cb49..deb3b9cb49 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_damage.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_damage.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_dnd.c b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
index 80ae6b4c5d..80ae6b4c5d 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_dpms.c b/src/lib/ecore_x/xcb/ecore_xcb_dpms.c
index 39ef589dd1..39ef589dd1 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_dpms.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_dpms.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_drawable.c b/src/lib/ecore_x/xcb/ecore_xcb_drawable.c
index 4e9a3564ce..4e9a3564ce 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_drawable.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_drawable.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c b/src/lib/ecore_x/xcb/ecore_xcb_e.c
index 82d94b634f..82d94b634f 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_e.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_e.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c b/src/lib/ecore_x/xcb/ecore_xcb_error.c
index fc329265d5..fc329265d5 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_error.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c
index 9cc86f62a8..9cc86f62a8 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_extensions.c b/src/lib/ecore_x/xcb/ecore_xcb_extensions.c
index 40c10ac05b..40c10ac05b 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_extensions.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_extensions.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_gc.c b/src/lib/ecore_x/xcb/ecore_xcb_gc.c
index d811b54594..d811b54594 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_gc.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_gc.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_gesture.c b/src/lib/ecore_x/xcb/ecore_xcb_gesture.c
index 27c13167af..27c13167af 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_gesture.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_gesture.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c b/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
index 8dea8617d1..8dea8617d1 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c b/src/lib/ecore_x/xcb/ecore_xcb_image.c
index 8e221101b0..8e221101b0 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_image.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_input.c b/src/lib/ecore_x/xcb/ecore_xcb_input.c
index 6cf3ebf6e6..6cf3ebf6e6 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_input.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_input.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_keymap.c b/src/lib/ecore_x/xcb/ecore_xcb_keymap.c
index 6c112464b0..6c112464b0 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_keymap.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_keymap.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_mwm.c b/src/lib/ecore_x/xcb/ecore_xcb_mwm.c
index 6c9533136f..6c9533136f 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_mwm.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_mwm.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c b/src/lib/ecore_x/xcb/ecore_xcb_netwm.c
index ae801d3407..ae801d3407 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_netwm.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_netwm.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c b/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c
index f9bf525f7a..f9bf525f7a 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_pixmap.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h b/src/lib/ecore_x/xcb/ecore_xcb_private.h
index 240210ca0d..240210ca0d 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/src/lib/ecore_x/xcb/ecore_xcb_private.h
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c b/src/lib/ecore_x/xcb/ecore_xcb_randr.c
index a2a4e6271f..a2a4e6271f 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_randr.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_region.c b/src/lib/ecore_x/xcb/ecore_xcb_region.c
index a221d8fc37..a221d8fc37 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_region.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_region.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_render.c b/src/lib/ecore_x/xcb/ecore_xcb_render.c
index f36b4d2489..f36b4d2489 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_render.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_render.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_screensaver.c b/src/lib/ecore_x/xcb/ecore_xcb_screensaver.c
index 6106450c88..6106450c88 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_screensaver.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_screensaver.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c b/src/lib/ecore_x/xcb/ecore_xcb_selection.c
index 6d5c5aca4c..6d5c5aca4c 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_selection.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_shape.c b/src/lib/ecore_x/xcb/ecore_xcb_shape.c
index 913f1992b9..913f1992b9 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_shape.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_shape.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_sync.c b/src/lib/ecore_x/xcb/ecore_xcb_sync.c
index 75f4e4f2be..75f4e4f2be 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_sync.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_sync.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_textlist.c b/src/lib/ecore_x/xcb/ecore_xcb_textlist.c
index 2a5c854494..2a5c854494 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_textlist.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_textlist.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_vsync.c b/src/lib/ecore_x/xcb/ecore_xcb_vsync.c
index 7888796f9a..7888796f9a 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_vsync.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_vsync.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c b/src/lib/ecore_x/xcb/ecore_xcb_window.c
index f8405fe1ec..f8405fe1ec 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c b/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c
index e00fdc1963..e00fdc1963 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_shadow.c b/src/lib/ecore_x/xcb/ecore_xcb_window_shadow.c
index d46e306c8d..d46e306c8d 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_shadow.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window_shadow.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c
index 6206a51833..6206a51833 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xdefaults.c b/src/lib/ecore_x/xcb/ecore_xcb_xdefaults.c
index e0e56102e2..e0e56102e2 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xdefaults.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_xdefaults.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c b/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c
index 58444cdf1f..58444cdf1f 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_xfixes.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xinerama.c b/src/lib/ecore_x/xcb/ecore_xcb_xinerama.c
index 37a2339e9b..37a2339e9b 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xinerama.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_xinerama.c
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xtest.c b/src/lib/ecore_x/xcb/ecore_xcb_xtest.c
index 7f76b2ccb5..7f76b2ccb5 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_xtest.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_xtest.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
index d9b81bc0f8..d9b81bc0f8 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/src/lib/ecore_x/xlib/ecore_x.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/src/lib/ecore_x/xlib/ecore_x_atoms.c
index 2aec7ce740..2aec7ce740 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c
+++ b/src/lib/ecore_x/xlib/ecore_x_atoms.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c b/src/lib/ecore_x/xlib/ecore_x_composite.c
index b919db96d2..b919db96d2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c
+++ b/src/lib/ecore_x/xlib/ecore_x_composite.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c b/src/lib/ecore_x/xlib/ecore_x_cursor.c
index a968c56af2..a968c56af2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_cursor.c
+++ b/src/lib/ecore_x/xlib/ecore_x_cursor.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c b/src/lib/ecore_x/xlib/ecore_x_damage.c
index b094f85235..b094f85235 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_damage.c
+++ b/src/lib/ecore_x/xlib/ecore_x_damage.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c b/src/lib/ecore_x/xlib/ecore_x_dnd.c
index e4f74a7257..e4f74a7257 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
+++ b/src/lib/ecore_x/xlib/ecore_x_dnd.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c b/src/lib/ecore_x/xlib/ecore_x_dpms.c
index 23349f44e6..23349f44e6 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dpms.c
+++ b/src/lib/ecore_x/xlib/ecore_x_dpms.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c b/src/lib/ecore_x/xlib/ecore_x_drawable.c
index d1b41114da..d1b41114da 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_drawable.c
+++ b/src/lib/ecore_x/xlib/ecore_x_drawable.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/src/lib/ecore_x/xlib/ecore_x_e.c
index 430b24b117..430b24b117 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c
+++ b/src/lib/ecore_x/xlib/ecore_x_e.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c b/src/lib/ecore_x/xlib/ecore_x_error.c
index f6eb075b54..f6eb075b54 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_error.c
+++ b/src/lib/ecore_x/xlib/ecore_x_error.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c
index 9ce7163d53..9ce7163d53 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/src/lib/ecore_x/xlib/ecore_x_events.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c b/src/lib/ecore_x/xlib/ecore_x_fixes.c
index da0a6c3ac9..da0a6c3ac9 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c
+++ b/src/lib/ecore_x/xlib/ecore_x_fixes.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c b/src/lib/ecore_x/xlib/ecore_x_gc.c
index 539636648f..539636648f 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
+++ b/src/lib/ecore_x/xlib/ecore_x_gc.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c b/src/lib/ecore_x/xlib/ecore_x_gesture.c
index dbde8b0db2..dbde8b0db2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c
+++ b/src/lib/ecore_x/xlib/ecore_x_gesture.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c b/src/lib/ecore_x/xlib/ecore_x_icccm.c
index 8d6ea1f50e..8d6ea1f50e 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c
+++ b/src/lib/ecore_x/xlib/ecore_x_icccm.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/src/lib/ecore_x/xlib/ecore_x_image.c
index def81104a2..def81104a2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
+++ b/src/lib/ecore_x/xlib/ecore_x_image.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c b/src/lib/ecore_x/xlib/ecore_x_mwm.c
index 7812cc23ae..7812cc23ae 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_mwm.c
+++ b/src/lib/ecore_x/xlib/ecore_x_mwm.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c b/src/lib/ecore_x/xlib/ecore_x_netwm.c
index 3f08af8b9c..3f08af8b9c 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
+++ b/src/lib/ecore_x/xlib/ecore_x_netwm.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c b/src/lib/ecore_x/xlib/ecore_x_pixmap.c
index 7b13615675..7b13615675 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_pixmap.c
+++ b/src/lib/ecore_x/xlib/ecore_x_pixmap.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h
index f962ffb4b2..f962ffb4b2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
+++ b/src/lib/ecore_x/xlib/ecore_x_private.h
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c b/src/lib/ecore_x/xlib/ecore_x_randr.c
index 58a28305ac..58a28305ac 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.h b/src/lib/ecore_x/xlib/ecore_x_randr.h
index eca3c0c32c..eca3c0c32c 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.h
+++ b/src/lib/ecore_x/xlib/ecore_x_randr.h
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c b/src/lib/ecore_x/xlib/ecore_x_randr_11.c
index 7d2b3b34b5..7d2b3b34b5 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr_11.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c b/src/lib/ecore_x/xlib/ecore_x_randr_12.c
index 9e937d7bf7..9e937d7bf7 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr_12.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c b/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c
index 5bda332a06..5bda332a06 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c b/src/lib/ecore_x/xlib/ecore_x_randr_13.c
index 5d1c8e96db..5d1c8e96db 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr_13.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_region.c b/src/lib/ecore_x/xlib/ecore_x_region.c
index 81d7eea49c..81d7eea49c 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_region.c
+++ b/src/lib/ecore_x/xlib/ecore_x_region.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c b/src/lib/ecore_x/xlib/ecore_x_screensaver.c
index 3688a44c56..3688a44c56 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c
+++ b/src/lib/ecore_x/xlib/ecore_x_screensaver.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c b/src/lib/ecore_x/xlib/ecore_x_selection.c
index 3e1d2d34a2..3e1d2d34a2 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c
+++ b/src/lib/ecore_x/xlib/ecore_x_selection.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c b/src/lib/ecore_x/xlib/ecore_x_sync.c
index 0c7f546f1a..0c7f546f1a 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c
+++ b/src/lib/ecore_x/xlib/ecore_x_sync.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c b/src/lib/ecore_x/xlib/ecore_x_test.c
index 4eec6b74b3..4eec6b74b3 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_test.c
+++ b/src/lib/ecore_x/xlib/ecore_x_test.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c b/src/lib/ecore_x/xlib/ecore_x_vsync.c
index a316a33c45..a316a33c45 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_vsync.c
+++ b/src/lib/ecore_x/xlib/ecore_x_vsync.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c b/src/lib/ecore_x/xlib/ecore_x_window.c
index 36fc5cc53a..36fc5cc53a 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c
+++ b/src/lib/ecore_x/xlib/ecore_x_window.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c b/src/lib/ecore_x/xlib/ecore_x_window_prop.c
index 535c521941..535c521941 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c
+++ b/src/lib/ecore_x/xlib/ecore_x_window_prop.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c b/src/lib/ecore_x/xlib/ecore_x_window_shape.c
index 71718cfa3a..71718cfa3a 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c
+++ b/src/lib/ecore_x/xlib/ecore_x_window_shape.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c
index 04d1023ec7..04d1023ec7 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c
+++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c b/src/lib/ecore_x/xlib/ecore_x_xinerama.c
index f49a4d348f..f49a4d348f 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xinerama.c
+++ b/src/lib/ecore_x/xlib/ecore_x_xinerama.c
diff --git a/legacy/escape/src/lib/Escape.h b/src/lib/escape/Escape.h
index ca728b50b7..ca728b50b7 100644
--- a/legacy/escape/src/lib/Escape.h
+++ b/src/lib/escape/Escape.h
diff --git a/legacy/escape/src/lib/escape_libgen.c b/src/lib/escape/escape_libgen.c
index 796708978e..796708978e 100644
--- a/legacy/escape/src/lib/escape_libgen.c
+++ b/src/lib/escape/escape_libgen.c
diff --git a/legacy/escape/src/lib/escape_libgen.h b/src/lib/escape/escape_libgen.h
index 0c23a76821..0c23a76821 100644
--- a/legacy/escape/src/lib/escape_libgen.h
+++ b/src/lib/escape/escape_libgen.h
diff --git a/legacy/escape/src/lib/escape_mman.c b/src/lib/escape/escape_mman.c
index 995c72e7f4..995c72e7f4 100644
--- a/legacy/escape/src/lib/escape_mman.c
+++ b/src/lib/escape/escape_mman.c
diff --git a/legacy/escape/src/lib/escape_unistd.c b/src/lib/escape/escape_unistd.c
index 5dbbb18634..5dbbb18634 100644
--- a/legacy/escape/src/lib/escape_unistd.c
+++ b/src/lib/escape/escape_unistd.c
diff --git a/legacy/escape/src/lib/escape_unistd.h b/src/lib/escape/escape_unistd.h
index 0e96d3f3cb..0e96d3f3cb 100644
--- a/legacy/escape/src/lib/escape_unistd.h
+++ b/src/lib/escape/escape_unistd.h
diff --git a/legacy/escape/src/lib/sys/mman.h b/src/lib/escape/sys/mman.h
index 98ef7fa5fc..98ef7fa5fc 100644
--- a/legacy/escape/src/lib/sys/mman.h
+++ b/src/lib/escape/sys/mman.h
diff --git a/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c b/src/modules/ecore/immodules/ibus/ibus_imcontext.c
index a5afed5574..02f4fce9c1 100644
--- a/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c
+++ b/src/modules/ecore/immodules/ibus/ibus_imcontext.c
@@ -434,7 +434,7 @@ ibus_im_context_preedit_string_get(Ecore_IMF_Context *ctx,
 EAPI void
 ibus_im_context_preedit_string_with_attributes_get(Ecore_IMF_Context   *ctx,
                                                    char          **str,
-                                                   Eina_List     **attr __UNUSED__,
+                                                   Eina_List     **attr EINA_UNUSED,
                                                    int            *cursor_pos)
 {
    IBusIMContext *ibusimcontext = (IBusIMContext*)ecore_imf_context_data_get(ctx);
@@ -555,7 +555,7 @@ ibus_im_context_use_preedit_set(Ecore_IMF_Context *ctx, Eina_Bool use_preedit)
 }
 
 static void
-_bus_connected_cb(IBusBus          *bus __UNUSED__,
+_bus_connected_cb(IBusBus          *bus EINA_UNUSED,
                   IBusIMContext    *ibusimcontext)
 {
    EINA_LOG_DBG("ibus is connected");
@@ -565,7 +565,7 @@ _bus_connected_cb(IBusBus          *bus __UNUSED__,
 }
 
 static void
-_ibus_context_commit_text_cb(IBusInputContext *ibuscontext __UNUSED__,
+_ibus_context_commit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED,
                              IBusText         *text,
                              IBusIMContext    *ibusimcontext)
 {
@@ -609,10 +609,10 @@ static XKeyEvent createXKeyEvent(Window win, Eina_Bool press, int keysym, int mo
 }
 
 static void
-_ibus_context_forward_key_event_cb(IBusInputContext  *ibuscontext __UNUSED__,
+_ibus_context_forward_key_event_cb(IBusInputContext  *ibuscontext EINA_UNUSED,
                                    guint              keyval,
                                    guint              state,
-                                   IBusIMContext     *ibusimcontext __UNUSED__)
+                                   IBusIMContext     *ibusimcontext EINA_UNUSED)
 {
    EINA_LOG_DBG("keyval : %d, state : %d", keyval, state);
 
@@ -620,7 +620,7 @@ _ibus_context_forward_key_event_cb(IBusInputContext  *ibuscontext __UNUSED__,
 }
 
 static void
-_ibus_context_update_preedit_text_cb(IBusInputContext  *ibuscontext __UNUSED__,
+_ibus_context_update_preedit_text_cb(IBusInputContext  *ibuscontext EINA_UNUSED,
                                      IBusText          *text,
                                      gint               cursor_pos,
                                      gboolean           visible,
@@ -673,7 +673,7 @@ _ibus_context_update_preedit_text_cb(IBusInputContext  *ibuscontext __UNUSED__,
 }
 
 static void
-_ibus_context_show_preedit_text_cb(IBusInputContext *ibuscontext __UNUSED__,
+_ibus_context_show_preedit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED,
                                    IBusIMContext    *ibusimcontext)
 {
    EINA_LOG_DBG("preedit visible : %d", ibusimcontext->preedit_visible);
@@ -694,7 +694,7 @@ _ibus_context_show_preedit_text_cb(IBusInputContext *ibuscontext __UNUSED__,
 }
 
 static void
-_ibus_context_hide_preedit_text_cb(IBusInputContext *ibuscontext __UNUSED__,
+_ibus_context_hide_preedit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED,
                                    IBusIMContext    *ibusimcontext)
 {
    EINA_LOG_DBG("%s", __FUNCTION__);
@@ -715,7 +715,7 @@ _ibus_context_hide_preedit_text_cb(IBusInputContext *ibuscontext __UNUSED__,
 }
 
 static void
-_ibus_context_enabled_cb(IBusInputContext *ibuscontext __UNUSED__,
+_ibus_context_enabled_cb(IBusInputContext *ibuscontext EINA_UNUSED,
                          IBusIMContext    *ibusimcontext)
 {
    EINA_LOG_DBG("%s", __FUNCTION__);
@@ -725,7 +725,7 @@ _ibus_context_enabled_cb(IBusInputContext *ibuscontext __UNUSED__,
 }
 
 static void
-_ibus_context_disabled_cb(IBusInputContext *ibuscontext __UNUSED__,
+_ibus_context_disabled_cb(IBusInputContext *ibuscontext EINA_UNUSED,
                           IBusIMContext    *ibusimcontext)
 {
    EINA_LOG_DBG("%s", __FUNCTION__);
@@ -749,7 +749,7 @@ _ibus_context_disabled_cb(IBusInputContext *ibuscontext __UNUSED__,
 }
 
 static void
-_ibus_context_destroy_cb(IBusInputContext *ibuscontext __UNUSED__,
+_ibus_context_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED,
                          IBusIMContext    *ibusimcontext)
 {
    EINA_LOG_DBG("%s", __FUNCTION__);
diff --git a/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.h b/src/modules/ecore/immodules/ibus/ibus_imcontext.h
index ce5c075c3f..ce5c075c3f 100644
--- a/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.h
+++ b/src/modules/ecore/immodules/ibus/ibus_imcontext.h
diff --git a/legacy/ecore/src/modules/immodules/ibus/ibus_module.c b/src/modules/ecore/immodules/ibus/ibus_module.c
index a6e175c3ca..a6e175c3ca 100644
--- a/legacy/ecore/src/modules/immodules/ibus/ibus_module.c
+++ b/src/modules/ecore/immodules/ibus/ibus_module.c
diff --git a/legacy/ecore/src/modules/immodules/scim/scim_imcontext.cpp b/src/modules/ecore/immodules/scim/scim_imcontext.cpp
index d4d20b161a..d4d20b161a 100644
--- a/legacy/ecore/src/modules/immodules/scim/scim_imcontext.cpp
+++ b/src/modules/ecore/immodules/scim/scim_imcontext.cpp
diff --git a/legacy/ecore/src/modules/immodules/scim/scim_imcontext.h b/src/modules/ecore/immodules/scim/scim_imcontext.h
index 72533e245d..72533e245d 100644
--- a/legacy/ecore/src/modules/immodules/scim/scim_imcontext.h
+++ b/src/modules/ecore/immodules/scim/scim_imcontext.h
diff --git a/legacy/ecore/src/modules/immodules/scim/scim_module.cpp b/src/modules/ecore/immodules/scim/scim_module.cpp
index d77fb11f3a..d77fb11f3a 100644
--- a/legacy/ecore/src/modules/immodules/scim/scim_module.cpp
+++ b/src/modules/ecore/immodules/scim/scim_module.cpp
diff --git a/legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c b/src/modules/ecore/immodules/xim/ecore_imf_xim.c
index bab1aa7cee..64fc46c122 100644
--- a/legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c
+++ b/src/modules/ecore/immodules/xim/ecore_imf_xim.c
@@ -912,9 +912,9 @@ imf_context_data_destroy(Ecore_IMF_Context_Data *imf_context_data)
 }
 
 static int
-preedit_start_callback(XIC xic __UNUSED__,
+preedit_start_callback(XIC xic EINA_UNUSED,
                        XPointer client_data,
-                       XPointer call_data __UNUSED__)
+                       XPointer call_data EINA_UNUSED)
 {
    EINA_LOG_DBG("in");
    Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data;
@@ -931,9 +931,9 @@ preedit_start_callback(XIC xic __UNUSED__,
 }
 
 static void
-preedit_done_callback(XIC xic __UNUSED__,
+preedit_done_callback(XIC xic EINA_UNUSED,
                       XPointer client_data,
-                      XPointer call_data __UNUSED__)
+                      XPointer call_data EINA_UNUSED)
 {
    EINA_LOG_DBG("in");
    Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data;
@@ -959,7 +959,7 @@ preedit_done_callback(XIC xic __UNUSED__,
 
 /* FIXME */
 static int
-xim_text_to_utf8(Ecore_IMF_Context *ctx __UNUSED__,
+xim_text_to_utf8(Ecore_IMF_Context *ctx EINA_UNUSED,
                  XIMText *xim_text,
                  char **text)
 {
@@ -1003,7 +1003,7 @@ xim_text_to_utf8(Ecore_IMF_Context *ctx __UNUSED__,
 }
 
 static void
-preedit_draw_callback(XIC xic __UNUSED__,
+preedit_draw_callback(XIC xic EINA_UNUSED,
                       XPointer client_data,
                       XIMPreeditDrawCallbackStruct *call_data)
 {
@@ -1094,7 +1094,7 @@ done:
 }
 
 static void
-preedit_caret_callback(XIC xic __UNUSED__,
+preedit_caret_callback(XIC xic EINA_UNUSED,
                        XPointer client_data,
                        XIMPreeditCaretCallbackStruct *call_data)
 {
@@ -1437,8 +1437,8 @@ xim_info_try_im(XIM_Im_Info *info)
 }
 
 static void
-xim_info_display_closed(Ecore_X_Display *display __UNUSED__,
-                        int is_error __UNUSED__,
+xim_info_display_closed(Ecore_X_Display *display EINA_UNUSED,
+                        int is_error EINA_UNUSED,
                         XIM_Im_Info *info)
 {
    Eina_List *ics, *tmp_list;
@@ -1470,7 +1470,7 @@ xim_info_display_closed(Ecore_X_Display *display __UNUSED__,
 static void
 xim_instantiate_callback(Display *display,
                          XPointer client_data,
-                         XPointer call_data __UNUSED__)
+                         XPointer call_data EINA_UNUSED)
 {
    XIM_Im_Info *info = (XIM_Im_Info *)client_data;
    XIM im = NULL;
@@ -1538,9 +1538,9 @@ setup_im(XIM_Im_Info *info)
 }
 
 static void
-xim_destroy_callback(XIM xim __UNUSED__,
+xim_destroy_callback(XIM xim EINA_UNUSED,
                      XPointer client_data,
-                     XPointer call_data __UNUSED__)
+                     XPointer call_data EINA_UNUSED)
 {
    XIM_Im_Info *info = (XIM_Im_Info *)client_data;
 
diff --git a/legacy/ecore/src/util/makekeys.c b/src/utils/ecore/makekeys.c
index a057fa2c65..a057fa2c65 100644
--- a/legacy/ecore/src/util/makekeys.c
+++ b/src/utils/ecore/makekeys.c
diff --git a/legacy/ecore/src/util/mkks.sh b/src/utils/ecore/mkks.sh
index 666924258a..666924258a 100755
--- a/legacy/ecore/src/util/mkks.sh
+++ b/src/utils/ecore/mkks.sh