Revert "autotools: REMOVAL!"

This reverts commit e8c69667b01e2795c1e4ead0536652f935ffa674.

git push on a wrong branch, sorry. This will land today, but not now.

136 files changed, 27171 insertions, 0 deletions

diff --git a/.travis.yml b/.travis.yml
index 9c51162333..647e1df343 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,18 @@ jobs:
     - os: osx
       env: BUILDSYSTEM=ninja
     - os: linux
+      env: DISTRO=Fedora30-mingw CI_BUILD_TYPE=mingw
+    - os: linux
       env: DISTRO=Fedora30-mingw CI_BUILD_TYPE=mingw BUILDSYSTEM=ninja
     - os: linux
+      env: DISTRO=Fedora30 CI_BUILD_TYPE=options-enabled
+    - os: linux
+      env: DISTRO=Fedora30 CI_BUILD_TYPE=options-disabled
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=default
+    - os: linux
       env: DISTRO=Fedora30 CI_BUILD_TYPE=options-enabled BUILDSYSTEM=ninja
     - os: linux
       env: DISTRO=Fedora30 CI_BUILD_TYPE=options-disabled BUILDSYSTEM=ninja
@@ -28,11 +38,25 @@ jobs:
       env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland BUILDSYSTEM=ninja
     - os: linux
       env: DISTRO=Fedora29 CI_BUILD_TYPE=default BUILDSYSTEM=ninja
+    - os: osx
+      if: type = cron
+    - os: linux
+      if: type = cron
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready
     - os: linux
       if: type = cron
       env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready BUILDSYSTEM=ninja
     - os: linux
       if: type = cron
+      env: DISTRO=Ubuntu1804
+    - os: linux
+      if: type = cron
+      env: DISTRO=Ubuntu1904
+    - os: linux
+      if: type = cron
+      env: DISTRO=Debian99
+    - os: linux
+      if: type = cron
       env: DISTRO=Ubuntu1804 BUILDSYSTEM=ninja
     - os: linux
       if: type = cron
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000000..9f2d6976f8
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,537 @@
+ACLOCAL_AMFLAGS = -I m4
+AM_MAKEFLAGS = --no-print-directory
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+--with-tests=regular \
+--with-systemdunitdir=. \
+--enable-always-build-examples \
+--disable-dependency-tracking
+
+SUBDIRS = src data doc
+
+if HAVE_PO
+
+SUBDIRS += po
+
+endif
+
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+compile \
+config.cache-env \
+config.guess \
+config.h.in \
+config.h.in~ \
+config.sub \
+configure \
+depcomp \
+install-sh \
+ltmain.sh \
+missing \
+m4/libtool.m4 \
+m4/lt~obsolete.m4 \
+m4/ltoptions.m4 \
+m4/ltsugar.m4 \
+m4/ltversion.m4
+
+EXTRA_DIST =  \
+m4/pkg_var.m4 \
+m4/ac_path_generic.m4 \
+m4/ecore_check_c_extension.m4 \
+m4/ecore_check_module.m4 \
+m4/efl_attribute.m4 \
+m4/efl_check_funcs.m4 \
+m4/efl_compiler.m4 \
+m4/efl_doxygen.m4 \
+m4/efl_path_max.m4 \
+m4/efl_threads.m4 \
+m4/efl_libunwind.m4 \
+m4/eina_check.m4 \
+m4/eina_config.m4 \
+m4/eio_check_options.m4 \
+m4/evas_check_engine.m4 \
+m4/evas_check_loader.m4 \
+m4/evil_windows.m4 \
+m4/libgcrypt.m4 \
+m4/gcc_check_builtin.m4
+
+EXTRA_DIST += \
+README \
+AUTHORS \
+COPYING \
+COMPLIANCE \
+licenses/COPYING.LGPL \
+licenses/COPYING.GPL \
+licenses/COPYING.BSD \
+licenses/COPYING.SMALL \
+licenses/COPYING.FTL \
+licenses/COPYING.NGINX-MIT \
+old/ChangeLog.ecore \
+old/ChangeLog.edje \
+old/ChangeLog.eet \
+old/ChangeLog.eeze \
+old/ChangeLog.efreet \
+old/ChangeLog.eina \
+old/ChangeLog.eio \
+old/ChangeLog.embryo \
+old/ChangeLog.emotion \
+old/ChangeLog.escape \
+old/ChangeLog.ethumb \
+old/ChangeLog.evas \
+old/ChangeLog.evil \
+old/ChangeLog.evil.0 \
+old/NEWS.ecore \
+old/NEWS.edje \
+old/NEWS.eet \
+old/NEWS.eeze \
+old/NEWS.efreet \
+old/NEWS.eina \
+old/NEWS.eio \
+old/NEWS.embryo \
+old/NEWS.emotion \
+old/NEWS.escape \
+old/NEWS.ethumb \
+old/NEWS.evas \
+old/NEWS.evil \
+old/README.ecore \
+old/README.eldbus \
+old/README.edje \
+old/README.eet \
+old/README.eeze \
+old/README.efreet \
+old/README.eina \
+old/README.eio \
+old/README.embryo \
+old/README.emotion \
+old/README.ephysics \
+old/README.escape \
+old/README.ethumb \
+old/README.evas \
+old/README.evil \
+spec/efl.spec \
+pkgbuild/PKGBUILD \
+pkgbuild/efl.install
+
+if HAVE_FREEBSD
+pkgconfigdir = $(libdir)data/pkgconfig
+else
+pkgconfigdir = $(libdir)/pkgconfig
+endif
+
+pkgconfig_DATA =
+
+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/eolian.pc \
+pc/efl.pc \
+pc/emile.pc \
+pc/eet.pc \
+pc/evas.pc \
+pc/ecore.pc \
+pc/efl-core.pc \
+pc/ecore-con.pc \
+pc/efl-net.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/ecore-avahi.pc \
+pc/ector.pc \
+pc/embryo.pc \
+pc/eio.pc \
+pc/eldbus.pc \
+pc/efreet.pc \
+pc/efreet-mime.pc \
+pc/efreet-trash.pc \
+pc/edje.pc \
+pc/emotion.pc \
+pc/ethumb.pc \
+pc/ethumb_client.pc \
+pc/elocation.pc \
+pc/elementary.pc \
+pc/efl-ui.pc
+
+if HAVE_CXX
+pkgconfig_DATA += \
+pc/eina-cxx.pc \
+pc/evas-cxx.pc \
+pc/ecore-cxx.pc \
+pc/efl-cxx.pc \
+pc/eolian-cxx.pc \
+pc/edje-cxx.pc \
+pc/eet-cxx.pc \
+pc/eo-cxx.pc \
+pc/eio-cxx.pc \
+pc/elementary-cxx.pc
+endif
+
+if HAVE_ELUA
+pkgconfig_DATA += pc/elua.pc
+endif
+
+if HAVE_JS
+pkgconfig_DATA += \
+pc/eolian-js.pc \
+pc/efl-js.pc \
+pc/eo-js.pc \
+pc/eina-js.pc
+endif
+
+if HAVE_CSHARP
+pkgconfig_DATA += \
+pc/efl-mono.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_X11
+pkgconfig_DATA += pc/evas-software-x11.pc
+endif
+
+if BUILD_ENGINE_FB
+pkgconfig_DATA += pc/evas-fb.pc
+endif
+
+if BUILD_ENGINE_EGLFS
+pkgconfig_DATA += pc/evas-eglfs.pc
+endif
+
+if BUILD_ENGINE_BUFFER
+pkgconfig_DATA += pc/evas-software-buffer.pc
+endif
+
+if BUILD_ENGINE_GL_X11
+pkgconfig_DATA += pc/evas-opengl-x11.pc
+endif
+
+if BUILD_ENGINE_GL_SDL
+pkgconfig_DATA += pc/evas-opengl-sdl.pc
+endif
+
+if BUILD_ENGINE_GL_COCOA
+pkgconfig_DATA += pc/evas-opengl-cocoa.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_GDI
+pkgconfig_DATA += pc/evas-software-gdi.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_DDRAW
+pkgconfig_DATA += pc/evas-software-ddraw.pc
+endif
+
+if BUILD_ENGINE_WAYLAND_SHM
+pkgconfig_DATA += pc/evas-wayland-shm.pc
+endif
+
+if BUILD_ENGINE_WAYLAND_EGL
+pkgconfig_DATA += pc/evas-wayland-egl.pc
+endif
+
+if BUILD_ENGINE_DRM
+pkgconfig_DATA += pc/evas-drm.pc
+endif
+
+if HAVE_ECORE_COCOA
+pkgconfig_DATA += pc/ecore-cocoa.pc
+endif
+
+if HAVE_ECORE_FB
+pkgconfig_DATA += pc/ecore-fb.pc
+endif
+
+if HAVE_ECORE_DRM
+pkgconfig_DATA += pc/ecore-drm.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_ECORE_WL2
+pkgconfig_DATA += pc/ecore-wl2.pc
+endif
+
+if HAVE_EFL_WL
+pkgconfig_DATA += pc/efl-wl.pc
+endif
+
+if HAVE_WIN32
+pkgconfig_DATA += pc/ecore-win32.pc
+endif
+
+if HAVE_ECORE_X
+pkgconfig_DATA += pc/ecore-x.pc
+endif
+
+if HAVE_EEZE
+pkgconfig_DATA += pc/eeze.pc
+endif
+
+if HAVE_EPHYSICS
+pkgconfig_DATA += pc/ephysics.pc
+endif
+
+if HAVE_ECORE_AUDIO
+pkgconfig_DATA += pc/ecore-audio.pc pc/ecore-audio-cxx.pc
+endif
+
+if HAVE_ECORE_BUFFER
+pkgconfig_DATA += pc/ecore-buffer.pc
+endif
+
+if HAVE_ELPUT
+pkgconfig_DATA += pc/elput.pc
+endif
+
+if HAVE_ECORE_DRM2
+pkgconfig_DATA += pc/ecore-drm2.pc
+endif
+
+# Cmake configs:
+efl_cmakeconfigdir = $(libdir)/cmake/Efl/
+efl_cmakeconfig_DATA = \
+cmakeconfig/EflConfig.cmake \
+cmakeconfig/EflConfigVersion.cmake
+
+eina_cmakeconfigdir = $(libdir)/cmake/Eina/
+eina_cmakeconfig_DATA = \
+cmakeconfig/EinaConfig.cmake \
+cmakeconfig/EinaConfigVersion.cmake
+
+eio_cmakeconfigdir = $(libdir)/cmake/Eio/
+eio_cmakeconfig_DATA = \
+cmakeconfig/EioConfig.cmake \
+cmakeconfig/EioConfigVersion.cmake
+
+eeze_cmakeconfigdir = $(libdir)/cmake/Eeze/
+eeze_cmakeconfig_DATA = \
+cmakeconfig/EezeConfig.cmake \
+cmakeconfig/EezeConfigVersion.cmake
+
+eo_cmakeconfigdir = $(libdir)/cmake/Eo/
+eo_cmakeconfig_DATA = \
+cmakeconfig/EoConfig.cmake \
+cmakeconfig/EoConfigVersion.cmake
+
+eolian_cmakeconfigdir = $(libdir)/cmake/Eolian/
+eolian_cmakeconfig_DATA = \
+cmakeconfig/EolianConfig.cmake \
+cmakeconfig/EolianConfigVersion.cmake \
+cmakeconfig/EolianHelper.cmake
+
+eolian_cxx_cmakeconfigdir = $(libdir)/cmake/EolianCxx/
+eolian_cxx_cmakeconfig_DATA = \
+cmakeconfig/EolianCxxConfig.cmake \
+cmakeconfig/EolianCxxConfigVersion.cmake
+
+eina_cxx_cmakeconfigdir = $(libdir)/cmake/EinaCxx/
+eina_cxx_cmakeconfig_DATA = \
+cmakeconfig/EinaCxxConfig.cmake \
+cmakeconfig/EinaCxxConfigVersion.cmake
+
+eo_cxx_cmakeconfigdir = $(libdir)/cmake/EoCxx/
+eo_cxx_cmakeconfig_DATA = \
+cmakeconfig/EoCxxConfig.cmake \
+cmakeconfig/EoCxxConfigVersion.cmake
+
+ecore_cxx_cmakeconfigdir = $(libdir)/cmake/EcoreCxx/
+ecore_cxx_cmakeconfig_DATA = \
+cmakeconfig/EcoreCxxConfig.cmake \
+cmakeconfig/EcoreCxxConfigVersion.cmake
+
+evas_cxx_cmakeconfigdir = $(libdir)/cmake/EvasCxx/
+evas_cxx_cmakeconfig_DATA = \
+cmakeconfig/EvasCxxConfig.cmake \
+cmakeconfig/EvasCxxConfigVersion.cmake
+
+eet_cxx_cmakeconfigdir = $(libdir)/cmake/EetCxx/
+eet_cxx_cmakeconfig_DATA = \
+cmakeconfig/EetCxxConfig.cmake \
+cmakeconfig/EetCxxConfigVersion.cmake
+
+eet_cmakeconfigdir = $(libdir)/cmake/Eet/
+eet_cmakeconfig_DATA = \
+cmakeconfig/EetConfig.cmake \
+cmakeconfig/EetConfigVersion.cmake
+
+evas_cmakeconfigdir =  $(libdir)/cmake/Evas/
+evas_cmakeconfig_DATA = \
+cmakeconfig/EvasConfig.cmake \
+cmakeconfig/EvasConfigVersion.cmake
+
+ecore_cmakeconfigdir =  $(libdir)/cmake/Ecore/
+ecore_cmakeconfig_DATA = \
+cmakeconfig/EcoreConfig.cmake \
+cmakeconfig/EcoreConfigVersion.cmake
+
+edje_cmakeconfigdir =  $(libdir)/cmake/Edje/
+edje_cmakeconfig_DATA = \
+cmakeconfig/EdjeConfig.cmake \
+cmakeconfig/EdjeConfigVersion.cmake
+
+eldbus_cmakeconfigdir = $(libdir)/cmake/Eldbus/
+eldbus_cmakeconfig_DATA = \
+cmakeconfig/EldbusConfig.cmake \
+cmakeconfig/EldbusConfigVersion.cmake
+
+efreet_cmakeconfigdir =  $(libdir)/cmake/Efreet/
+efreet_cmakeconfig_DATA = \
+cmakeconfig/EfreetConfig.cmake \
+cmakeconfig/EfreetConfigVersion.cmake
+
+ethumb_cmakeconfigdir =  $(libdir)/cmake/Ethumb/
+ethumb_cmakeconfig_DATA = \
+cmakeconfig/EthumbConfig.cmake \
+cmakeconfig/EthumbConfigVersion.cmake
+
+ethumbclient_cmakeconfigdir =  $(libdir)/cmake/EthumbClient/
+ethumbclient_cmakeconfig_DATA = \
+cmakeconfig/EthumbClientConfig.cmake \
+cmakeconfig/EthumbClientConfigVersion.cmake
+
+cmakeconfigdir = $(libdir)/cmake/Elementary
+cmakeconfig_DATA = \
+cmakeconfig/ElementaryConfig.cmake \
+cmakeconfig/ElementaryConfigVersion.cmake
+
+emotion_cmakeconfigdir =  $(libdir)/cmake/Emotion/
+emotion_cmakeconfig_DATA = \
+cmakeconfig/EmotionConfig.cmake \
+cmakeconfig/EmotionConfigVersion.cmake
+
+elua_cmakeconfigdir = $(libdir)/cmake/Elua
+elua_cmakeconfig_DATA = \
+cmakeconfig/EluaConfig.cmake \
+cmakeconfig/EluaConfigVersion.cmake
+
+emile_cmakeconfigdir = $(libdir)/cmake/Emile
+emile_cmakeconfig_DATA = \
+cmakeconfig/EmileConfig.cmake \
+cmakeconfig/EmileConfigVersion.cmake
+
+# D-Bus services:
+
+servicedir = @dbusservicedir@
+service_DATA = \
+dbus-services/org.enlightenment.Ethumb.service
+
+if HAVE_SYSTEMD_USER_SESSION
+systemdunitsdir = @USER_SESSION_DIR@
+systemdunits_DATA = \
+systemd-services/ethumb.service
+endif
+EXTRA_DIST += $(systemdunits_DATA)
+
+
+.PHONY: doc benchmark examples install-examples
+
+# MSBuild C Sharp projects generation:
+
+if HAVE_CSHARP
+
+msbuildcsprojs:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src msbuildcsprojs
+
+endif
+
+# Documentation
+
+doc:
+	@echo "entering doc/"
+	$(MAKE) $(AM_MAKEFLAGS) -C doc doc
+
+# Unit tests
+
+if EFL_ENABLE_COVERAGE
+
+lcov-reset:
+	@rm -rf $(abs_top_builddir)/coverage
+	@find $(abs_top_builddir) -name "*.gcda" -delete
+	@lcov --zerocounters --directory $(abs_top_builddir)
+
+lcov-baseline:
+	$(MKDIR_P) $(abs_top_builddir)/coverage
+	lcov --capture --initial --compat-libtool --no-external --output-file $(abs_top_builddir)/coverage/coverage-baseline.info --directory $(abs_top_builddir) --config-file .lcov-config
+
+lcov-report: lcov-baseline
+	lcov --capture --compat-libtool --no-external --output-file $(abs_top_builddir)/coverage/coverage-check.info --directory $(abs_top_builddir) --config-file .lcov-config
+	lcov --no-external --compat-libtool --add-tracefile $(abs_top_builddir)/coverage/coverage-baseline.info --add-tracefile $(abs_top_builddir)/coverage/coverage-check.info --output-file $(abs_top_builddir)/coverage/coverage.info --config-file .lcov-config
+	lcov --no-external --compat-libtool --remove $(abs_top_builddir)/coverage/coverage.info \
+	  '*.h' '*/tests/*' '*NONE*' '*/doc/*' '*usr/include*' '*/bin*' '*/edje_external*' \
+	  '*/generic/*' '*/modules/*' '*/static_libs/*' \
+	  --output-file $(abs_top_builddir)/coverage/coverage.cleaned.info --config-file .lcov-config
+	genhtml --config-file .lcov-config --legend -t "$(PACKAGE_STRING)" -o $(abs_top_builddir)/coverage/html $(abs_top_builddir)/coverage/coverage.cleaned.info
+	@echo "Coverage Report at $(abs_top_builddir)/coverage/html"
+
+endif
+
+if EFL_ENABLE_TESTS
+
+lcov-check:
+if EFL_ENABLE_COVERAGE
+	@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
+	@$(MAKE) $(AM_MAKEFLAGS) lcov-baseline
+endif
+	@$(MAKE) $(AM_MAKEFLAGS) check
+if EFL_ENABLE_COVERAGE
+	@$(MAKE) $(AM_MAKEFLAGS) lcov-report
+endif
+
+check-build:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src check-build
+endif
+
+# benchmark
+
+benchmark:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
+	$(MKDIR_P) benchmark
+	@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
+
+# examples
+
+examples:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src examples
+
+install-examples:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
+
+pkgbuild::
+	@echo "making arch packages"
+	makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
+
+# cleaning
+
+clean-local:
+	rm -rf benchmark coverage
+	@find . -name '*.eo.legacy.c' -delete
+
+DISTCLEANFILES= \
+./src/lib/emile/Makefile \
+./src/lib/eo/Makefile \
+./src/lib/eet/Makefile \
+./src/lib/ecore/Makefile \
+./src/lib/efl/Makefile \
+./src/lib/eina/Makefile \
+./src/lib/eio/Makefile \
+./src/lib/elementary/Makefile \
+./src/lib/ector/Makefile \
+./src/lib/evil/Makefile \
+./src/lib/edje/Makefile \
+./src/lib/efl/Efl_Config.h \
+./src/lib/eina/eina_config.h
diff --git a/Makefile_Elm_Helpers.am b/Makefile_Elm_Helpers.am
new file mode 100644
index 0000000000..8acaab46f8
--- /dev/null
+++ b/Makefile_Elm_Helpers.am
@@ -0,0 +1,21 @@
+if HAVE_ELM_PREFS_CC
+ELM_PREFS_CC = @elm_prefs_cc@
+else
+ELM_PREFS_CC = $(top_builddir)/src/bin/elementary/elm_prefs_cc
+endif
+
+AM_V_EPB = $(am__v_EPB_@AM_V@)
+am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@)
+am__v_EPB_0 = @echo "  EPB     " $@;
+
+if HAVE_ELEMENTARY_CODEGEN
+ELEMENTARY_CODEGEN = @elementary_codegen@
+else
+ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/elementary/elementary_codegen
+endif
+
+AM_V_CODEGEN = $(am__v_CODEGEN_@AM_V@)
+am__v_CODEGEN_ = $(am__v_CODEGEN_@AM_DEFAULT_V@)
+am__v_CODEGEN_0 = @echo "  CODEGEN     " $@;
+
+
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000000..0481d71613
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+(
+  cd "$srcdir" &&
+  (
+    rm -rf autom4te.cache
+    rm -f aclocal.m4 ltmain.sh
+
+    autoreconf -vif
+  )
+
+  W=0
+
+  rm -f config.cache-env.tmp
+  echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
+  echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
+  echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
+  echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
+  echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
+
+  cmp config.cache-env.tmp config.cache-env >> /dev/null
+  if [ $? -ne 0 ]; then
+    W=1;
+  fi
+
+  if [ $W -ne 0 ]; then
+    echo "Cleaning configure cache...";
+    rm -f config.cache config.cache-env
+    mv config.cache-env.tmp config.cache-env
+  else
+    rm -f config.cache-env.tmp
+  fi
+)
+
+if [ -z "$NOCONFIGURE" ]; then
+  exec $srcdir/configure -C "$@"
+fi
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000000..4ca3d09e2b
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,6337 @@
+EFL_VERSION([1], [22], [99], [dev])
+AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net])
+
+AC_PREREQ([2.60])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_CONFIG_HEADERS([config.h])
+AH_TOP([
+#ifndef EFL_CONFIG_H__
+#define EFL_CONFIG_H__
+])
+AH_BOTTOM([
+#endif /* EFL_CONFIG_H__ */
+])
+
+
+AM_INIT_AUTOMAKE([1.6 dist-xz no-dist-gzip -Wall color-tests subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_CONDITIONAL([HAVE_AM_16], [test $(echo "${am__api_version}"|cut -d. -f2) -ge 16])
+# Due to a bug in automake 1.14 we need to use this after AM_INIT_AUTOMAKE
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15981
+AC_USE_SYSTEM_EXTENSIONS
+
+CFOPT_WARNING=""
+CXXFLAGS="${CXXFLAGS} -Wno-shadow" # No shadow warnings
+
+#### Apply configuring with legacy api's only, eo api's or both.
+
+EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT"
+efl_api="both"
+
+#### For the moment the Eo EFL API is not ready you need to explicitly optin.
+EFL_ENABLE_EO_API_SUPPORT
+EFL_ENABLE_BETA_API_SUPPORT
+
+AC_ARG_WITH([api],
+   [AS_HELP_STRING([--with-api=@<:@eo/legacy/both@:>@],[Select the EFL API Model @<:@default=both@:>@])],
+   [efl_api=${withval}],
+   [efl_api="both"])
+
+case "$efl_api" in
+    eo)
+        EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT"
+        CFOPT_WARNING="xyes"
+        ;;
+    legacy|both)
+        EFL_API_LEGACY_DEF=""
+        ;;
+    *) AC_MSG_ERROR([Invalid api (${efl_api}): must be eo, legacy or both]) ;;
+esac
+
+AC_SUBST(EFL_API_LEGACY_DEF)
+
+#### Additional options to configure
+
+# string to identify the build
+AC_ARG_WITH([id],
+   [AS_HELP_STRING([--with-id=BUILD_ID],[Specify a string to identify the build (vendor, maintainer, etc).
+                     @<:@default=none@:>@])],
+   [EFL_BUILD_ID="${withval}"],
+   [EFL_BUILD_ID="none"])
+AC_SUBST(EFL_BUILD_ID)
+
+# profile
+AC_ARG_WITH([profile],
+   [AS_HELP_STRING([--with-profile=PROFILE],[use the predefined build profile, one of: dev, debug and release.
+                    @<:@default=dev@:>@])],
+   [build_profile=${withval}],
+   [build_profile=def_build_profile])
+
+case "${build_profile}" in
+   dev|debug|release)
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown build profile --with-profile=${build_profile}])
+     ;;
+esac
+
+prefer_assert="no"
+eina_log_backtrace="yes"
+efl_less_insane="no"
+case "${build_profile}" in
+   dev|debug)
+     prefer_assert="yes"
+     eina_log_backtrace="no"
+     efl_less_insane="yes"
+     ;;
+esac
+
+# Enable CRI & ERR backtrace by default for release but not for dev/debug
+AC_DEFINE_IF([EINA_LOG_BACKTRACE_ENABLE], [test "x${eina_log_backtrace}" = "xyes"], [1], [Default log level triggering backtraces])
+
+# Additional sanity checks only performed in debug builds
+AC_DEFINE_IF([EFL_EXTRA_SANITY_CHECKS], [test "x${efl_less_insane}" = "xyes"], [1], [Extra run time sanity checks])
+
+# TODO: add some build "profile" (server, full, etc...)
+
+AC_ARG_WITH([crypto],
+   [AS_HELP_STRING([--with-crypto=CRYPTO],[use the predefined build crypto, one of:
+                    openssl, gnutls or none.
+                    @<:@default=openssl@:>@])],
+   [build_crypto=${withval}],
+   [build_crypto=openssl])
+
+case "${build_crypto}" in
+   openssl|gnutls|none)
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown build crypto option: --with-crypto=${build_crypto}])
+     ;;
+esac
+
+AC_ARG_WITH([tests],
+   [AS_HELP_STRING([--with-tests=none|regular|coverage],[choose testing method: regular, coverage or none.
+                    @<:@default=auto@:>@])],
+   [build_tests=${withval}],
+   [build_tests=auto])
+
+want_coverage="no"
+want_tests="no"
+case "${build_tests}" in
+   auto)
+     if test "${build_profile}" = "dev"; then
+        want_tests="yes"
+     fi
+     ;;
+   regular)
+     want_tests="yes"
+     ;;
+   coverage)
+     want_tests="yes"
+     want_coverage="yes"
+     ;;
+   no*)
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown build tests option: --with-tests=${build_tests}])
+     ;;
+esac
+
+install_eo_files="no"
+AC_ARG_ENABLE([install-eo-files],
+   [AS_HELP_STRING([--enable-install-eo-files],[Enable installing eo files. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       install_eo_files="yes"
+    else
+       install_eo_files="no"
+    fi
+   ],
+   [install_eo_files="no"])
+
+AM_CONDITIONAL([INSTALL_EO_FILES], [test "${install_eo_files}" = "yes"])
+
+AC_ARG_WITH([ecore-con-http-test-url],
+   [AS_HELP_STRING([--with-ecore-con-http-test-url=http://username:password@example.com],[Url of http server for testing with username and password])],[ECORE_CON_HTTP_TEST_URL=${withval}][AC_DEFINE_UNQUOTED([ECORE_CON_HTTP_TEST_URL],["$withval"],[Http url for testing])])
+
+AC_ARG_WITH([ecore-con-ftp-test-url],
+   [AS_HELP_STRING([--with-ecore-con-ftp-test-url=ftp://username:password@ftp.example.com?file=filename&directory=dir],[Url of ftp server for testing with username, password, complete filepath for upload with optional directory])],[ECORE_CON_FTP_TEST_URL=${withval}][AC_DEFINE_UNQUOTED([ECORE_CON_FTP_TEST_URL],["$withval"],[Ftp url for testing])])
+
+dbusservicedir="${datadir}/dbus-1/services"
+AC_ARG_WITH([dbus-services],
+   [AS_HELP_STRING([--with-dbus-services=DBUS_SERVICES],[specify a directory to store dbus service files.])],
+   [dbusservicedir=$withval])
+AC_SUBST(dbusservicedir)
+
+efl_deprecated_option="no"
+EFL_WITH_BIN([eet], [eet-eet])
+EFL_WITH_BIN([edje], [edje-cc])
+EFL_WITH_BIN([eolian], [eolian-gen])
+EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
+EFL_WITH_BIN([eolian_mono], [eolian-mono])
+EFL_WITH_BIN([eolian-js], [eolian-js])
+EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
+EFL_WITH_BIN([eldbus], [eldbus_codegen])
+EFL_WITH_BIN([elementary], [elementary-codegen])
+EFL_WITH_BIN([elementary], [elm-prefs-cc])
+
+#### Default values
+
+requirements_pc_eflall=""
+requirements_pc_deps_eflall=""
+requirements_libs_eflall=""
+requirements_cflags_eflall=""
+
+requirements_pc_crypto=""
+requirements_pc_deps_crypto=""
+requirements_libs_crypto=""
+requirements_cflags_crypto=""
+
+AC_CANONICAL_HOST
+
+# TODO: move me to m4 file that setups module/so related variables
+case "$host_os" in
+   cegcc*|mingw32ce*)
+      AC_MSG_ERROR([ceGCC compiler is not supported anymore. Exiting...])
+   ;;
+   mingw*)
+      have_win32="yes"
+      have_windows="yes"
+      MODULE_ARCH="v-v_maj.v_min"
+      MODULE_EXT=".dll"
+   ;;
+   cygwin*)
+      MODULE_ARCH="v-v_maj.v_min"
+      MODULE_EXT=".dll"
+   ;;
+   *solaris*)
+      have_solaris="yes"
+      MODULE_ARCH="v-v_maj.v_min"
+      MODULE_EXT=".so"
+   ;;
+   *)
+      MODULE_ARCH="v-v_maj.v_min"
+      MODULE_EXT=".so"
+   ;;
+esac
+
+EFL_VERSION_MAJOR="v_maj"
+EFL_VERSION_MINOR="v_min"
+AC_SUBST(EFL_VERSION_MAJOR)
+AC_SUBST(EFL_VERSION_MINOR)
+
+ELM_UNIX_DEF="#undef"
+ELM_WIN32_DEF="#undef"
+
+have_systemd_pkg="no"
+have_win32="no"
+have_windows="no"
+have_freebsd="no"
+have_darwin="no"
+have_linux="no"
+have_ps3="no"
+case "$host_os" in
+   mingw*|cygwin*)
+      # TODO: check cygwin* here
+      have_win32="yes"
+      have_windows="yes"
+      ELM_WIN32_DEF="#define"
+      EFLALL_CFLAGS="${EFLALL_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
+   ;;
+   freebsd*)
+      have_freebsd="yes"
+      ELM_UNIX_DEF="#define"
+   ;;
+   darwin*)
+      have_darwin="yes"
+      ELM_UNIX_DEF="#define"
+   ;;
+   linux*)
+      have_linux="yes"
+      have_systemd_pkg="auto"
+      want_systemd="yes"
+      ELM_UNIX_DEF="#define"
+   ;;
+   *)
+      ELM_UNIX_DEF="#define"
+      ;;
+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])
+AC_DEFINE_UNQUOTED([EXEEXT], ["${EXEEXT}"], [Suffix for binary objects])
+
+# TODO: move me to m4 file that setups the windows related variables
+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"])
+
+AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"])
+AM_CONDITIONAL([HAVE_OSX], [test "x${have_darwin}" = "xyes"])
+AM_CONDITIONAL([HAVE_X86_64], [test "x${host_cpu}" = "xx86_64"])
+
+AC_SUBST([ELM_UNIX_DEF])
+AC_SUBST([ELM_WIN32_DEF])
+
+#### Checks for programs
+
+### libtool
+
+if test "x${have_windows}" = "xyes" ; then
+   lt_cv_deplibs_check_method='pass_all'
+fi
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+LT_INIT([win32-dll disable-static pic-only])
+EFL_INIT
+
+if test "x${have_win32}" = "xyes" ; then
+    # We should be using ${CXX} here, but there is a bug in
+    # autotools macro and CXX is always set to g++ even if
+    # it's not found. So we are using an internal variable
+    # that does the work for now, may get broken in the future.
+    AC_DEFINE([_POSIX_C_SOURCE], [200809L], [Define the POSIX version])
+    if test "x${ac_ct_CXX}" = "x" -a "x${CXX}" = "xg++"; then
+       AC_MSG_ERROR([efl requires a C++ compiler got ${ac_ct_CXX} and ${CXX}.])
+    fi
+else
+   CXXFLAGS="${CXXFLAGS} -fPIC -DPIC"
+   LDFLAGS="${LDFLAGS} -fPIC -DPIC"
+fi
+
+### gettext
+
+AM_GNU_GETTEXT_VERSION([0.18])
+
+m4_ifdef([AC_GNU_GETTEXT], [
+AC_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+have_po="yes"
+],
+[
+m4_ifdef([AM_GNU_GETTEXT], [
+AM_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+have_po="yes"
+],
+[
+have_po="no"
+])
+])
+AC_SUBST([LTLIBINTL])
+LOCALE_DIR="${localedir}"
+AC_SUBST(LOCALE_DIR)
+
+if test "x${POSUB}" = "x" ; then
+   have_po="no"
+fi
+
+AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
+
+### compilers
+
+AC_PROG_MKDIR_P
+AM_PROG_AS
+AC_PROG_CXX
+AC_PROG_OBJC
+AC_LANG(C)
+AC_PROG_CC_C99
+AM_PROG_CC_C_O
+AC_PROG_SED
+AC_PROG_MCS
+
+AM_CONDITIONAL([BUILD_EFL_NATIVE], [test "x${cross_compiling}" = "xno"])
+
+if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
+   AC_MSG_ERROR([efl requires a c99-capable compiler])
+fi
+
+AC_SYS_LARGEFILE
+
+# pkg-config
+
+PKG_PROG_PKG_CONFIG
+if test "x${PKG_CONFIG}" = "x" ; then
+   AC_MSG_ERROR([pkg-config tool not found. Install it or set PKG_CONFIG environment variable to that path tool. Exiting...])
+fi
+
+# doxygen program for documentation building
+
+EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
+
+# lcov
+
+if test "${want_coverage}" = "yes" ; then
+   AC_CHECK_PROG([have_lcov], [lcov], [yes], [no])
+   if test "x${have_lcov}" = "xyes" ; then
+      AC_SEARCH_LIBS([__gcov_init], [gcov])
+      EFL_CHECK_COMPILER_FLAGS([EFLALL], [-fprofile-arcs -ftest-coverage])
+      EFL_CHECK_COMPILER_FLAGS([EFLALL], [-fprofile-instr-generate -fcoverage-mapping])
+      EFL_CHECK_LINKER_FLAGS([EFLALL], [-fprofile-instr-generate -fcoverage-mapping])
+      if test "x${prefer_assert}" = "xno"; then
+         EFLALL_COV_CFLAGS="${EFLALL_COV_CFLAGS} -DNDEBUG"
+      else
+         EFLALL_COV_CFLAGS="${EFLALL_COV_CFLAGS} -g -O0"
+      fi
+   else
+      AC_MSG_ERROR([lcov is not found])
+   fi
+fi
+
+AM_CONDITIONAL([EFL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"])
+
+#### Checks for libraries
+
+# check unit testing library
+
+if test "${want_tests}" = "yes"; then
+   PKG_CHECK_MODULES([CHECK], [check >= 0.9.10])
+fi
+AM_CONDITIONAL([EFL_ENABLE_TESTS], [test "${want_tests}" = "yes"])
+
+
+# check for crypto/tls library to use
+case "$build_crypto" in
+   gnutls)
+      EFL_DEPEND_PKG([crypto], [GNUTLS], [gnutls >= 3.3.6])
+
+      AM_PATH_LIBGCRYPT([], [:],
+         [AC_MSG_ERROR([libgcrypt required but not found])])
+      requirements_libs_crypto="${LIBGCRYPT_LIBS} ${requirements_libs_crypto}"
+      requirements_cflags_crypto="${LIBGCRYPT_CFLAGS} ${requirements_cflags_crypto}"
+      ;;
+
+   openssl)
+      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
+      ;;
+esac
+AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
+AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test "${build_crypto}" = "openssl"])
+
+# check for lua old
+want_lua_old="no"
+AC_ARG_ENABLE([lua-old],
+   [AS_HELP_STRING([--enable-lua-old],[Enable interpreted Lua support (5.1 or 5.2). @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_lua_old="yes"
+    else
+       want_lua_old="no"
+    fi
+   ],
+   [want_lua_old="no"])
+
+AM_CONDITIONAL([ENABLE_LUA_OLD], [test "${want_lua_old}" = "yes"])
+AC_DEFINE_IF([ENABLE_LUA_OLD], [test "${want_lua_old}" = "yes"],
+  [1], [Use interpreted Lua (5.1 or 5.2)])
+AC_SUBST([want_lua_old])
+
+
+want_liblz4="no"
+AC_ARG_ENABLE([liblz4],
+   [AS_HELP_STRING([--enable-liblz4],[Enable usage of liblz4 instead of our embedded copy. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+	# Only ships pc file since r120
+	PKG_CHECK_MODULES([LIBLZ4], [liblz4])
+	EFL_DEPEND_PKG([EET], [LIBLZ4], [liblz4])
+	EFL_DEPEND_PKG([EVAS], [LIBLZ4], [liblz4])
+       want_liblz4="yes"
+    else
+       want_liblz4="no"
+    fi
+   ],
+   [want_liblz4="no"])
+
+AM_CONDITIONAL([ENABLE_LIBLZ4], [test "${want_liblz4}" = "yes"])
+AC_DEFINE_IF([ENABLE_LIBLZ4], [test "${want_liblz4}" = "yes"], [1], [Use liblz4 external library instead of embedded copy])
+AC_SUBST([want_liblz4])
+AC_SUBST([ENABLE_LIBLZ4])
+
+
+want_vnc_server="no"
+AC_ARG_ENABLE([vnc-server],
+   [AS_HELP_STRING([--enable-vnc-server],[Build Ecore_Evas VNC module. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       PKG_CHECK_MODULES([LIBVNCSERVER], [libvncserver])
+       want_vnc_server="yes"
+    else
+       want_vnc_server="no"
+    fi
+   ],
+   [want_vnc_server="no"])
+
+#### Checks for header files
+
+# Common Checks (keep names sorted for ease of use):
+AC_HEADER_DIRENT
+AC_HEADER_TIME
+
+AC_CHECK_HEADERS([ \
+execinfo.h \
+mcheck.h \
+sys/signalfd.h \
+sys/types.h \
+sys/param.h \
+sys/mman.h \
+netinet/in.h \
+sys/auxv.h \
+asm/hwcap.h \
+])
+
+if test "x${have_linux}" = "xyes" ; then
+    AC_CHECK_HEADERS([sys/inotify.h])
+    AC_CHECK_HEADERS([sys/epoll.h])
+fi
+
+EFL_CHECK_PATH_MAX
+
+#### Checks for defines in headers
+
+EFL_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
+EFL_CHECK_DEFINE(TCP_NOPUSH, netinet/tcp.h)
+EFL_CHECK_DEFINE(UDP_CORK, netinet/udp.h)
+
+#### Checks for types
+
+# wchar_t
+AC_CHECK_SIZEOF([wchar_t])
+EINA_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t
+AC_SUBST([EINA_SIZEOF_WCHAR_T])
+
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+
+AC_CHECK_SIZEOF([uintptr_t])
+EINA_SIZEOF_UINTPTR_T=$ac_cv_sizeof_uintptr_t
+AC_SUBST([EINA_SIZEOF_UINTPTR_T])
+
+AC_CHECK_TYPES([siginfo_t], [], [],
+   [[
+#include <signal.h>
+#if HAVE_SIGINFO_H
+# include <siginfo.h>
+#endif
+   ]])
+
+#### Checks for structures
+
+
+#### Checks for compiler characteristics
+
+AC_C_BIGENDIAN
+AC_C_INLINE
+EFL_CHECK_COMPILER_FLAGS([EFLALL], [-Wall -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections])
+EFL_CHECK_LINKER_FLAGS([EFLALL], [-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
+case "${build_profile}" in
+   dev)
+     dnl Check if compiler has a dodgy -Wshadow that emits errors when shadowing a global
+     AC_MSG_CHECKING([whether -Wshadow generates spurious warnings])
+     CFLAGS_save="${CFLAGS}"
+     CFLAGS="${CFLAGS} -Werror -Wshadow"
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int x;]], [[int x = 0; (void)x;]])],[AC_MSG_RESULT([no])
+        EFL_CHECK_COMPILER_FLAGS([EFLALL], [-Wshadow])],[AC_MSG_RESULT([yes])])
+     CFLAGS="${CFLAGS_save}"
+     ;;
+
+   debug)
+     ;;
+
+   release)
+     ;;
+esac
+
+EFL_ATTRIBUTE_VECTOR
+EFL_ATTRIBUTE_ALWAYS_INLINE
+
+EFLALL_LIBS="${EFLALL_LIBS}"
+EFLALL_CFLAGS="${EFLALL_CFLAGS}"
+
+## CPU architecture specific assembly
+
+build_cpu_mmx="no"
+build_cpu_sse3="no"
+build_cpu_altivec="no"
+build_cpu_neon="no"
+
+want_neon="yes"
+AC_ARG_ENABLE([neon],
+   [AS_HELP_STRING([--disable-neon],[disable neon support @<:@default=enable@:>@])],
+   [
+    if test "x${enableval}" = "xyes"; then
+       want_neon="yes"
+    else
+       want_neon="no"
+    fi
+   ])
+
+SSE3_CFLAGS=""
+ALTIVEC_CFLAGS=""
+NEON_CFLAGS=""
+
+case $host_cpu in
+  i*86|x86_64|amd64)
+    AC_DEFINE([BUILD_MMX], [1], [Build MMX Code])
+    build_cpu_mmx="yes"
+    AC_CHECK_HEADER([immintrin.h],
+       [
+        AC_DEFINE(BUILD_SSE3, 1, [Build SSE3 Code])
+        build_cpu_sse3="yes"
+       ],
+       [build_cpu_sse3="no"])
+    AC_MSG_CHECKING([whether to build SSE3 code])
+    AC_MSG_RESULT([${build_cpu_sse3}])
+
+    if test "x$build_cpu_sse3" = "xyes" ; then
+       SSE3_CFLAGS="-msse3"
+    fi
+    ;;
+  *power* | *ppc*)
+    build_cpu_altivec="yes"
+    AC_CHECK_HEADER([altivec.h],
+       [
+        AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+        AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file])
+        build_cpu_altivec="yes"
+       ],
+       [
+        save_CFLAGS=$CFLAGS
+        save_CPPFLAGS=$CPPFLAGS
+        CFLAGS=$CFLAGS" -maltivec"
+        CPPFLAGS=$CPPFLAGS" -maltivec"
+        unset ac_cv_header_altivec_h
+        AC_CHECK_HEADER([altivec.h],
+          [
+            AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+            AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file])
+            build_cpu_altivec="yes"
+          ],
+          [build_cpu_altivec="no"]
+        )
+        CFLAGS=$save_CFLAGS
+        CPPFLAGS=$save_CPPFLAGS
+       ]
+    )
+    if test "x${build_cpu_altivec}" = "xyes"; then
+       AC_MSG_CHECKING([whether to use altivec compiler flag])
+       if test "x$GCC" = "xyes"; then
+          if echo "int main(){return 0;}" | ${CPP} -faltivec - > /dev/null 2>&1; then
+             altivec_cflags="-faltivec"
+             AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+          elif echo "int main(){return 0;}" | ${CPP} -maltivec - > /dev/null 2>&1; then
+             altivec_cflags="-maltivec"
+             AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+          fi
+       fi
+       AC_MSG_RESULT([${altivec_cflags}])
+       CFLAGS="$CFLAGS ${altivec_cflags}"
+       ALTIVEC_CFLAGS="-maltivec"
+    fi
+    ;;
+  arm*)
+    if test "x${want_neon}" = "xyes"; then
+       build_cpu_neon="yes"
+       AC_MSG_CHECKING([whether to use NEON instructions])
+       CFLAGS_save="${CFLAGS}"
+       CFLAGS="-mfpu=neon -ftree-vectorize ${CFLAGS}"
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]], [[asm volatile ("vqadd.u8 d0, d1, d0\n")]])],[
+           AC_MSG_RESULT([yes])
+           AC_DEFINE([BUILD_NEON], [1], [Build NEON Code])
+           build_cpu_neon="yes"
+           NEON_CFLAGS="-mfpu=neon"
+       	 ],[
+	   AC_MSG_RESULT([no])
+           build_cpu_neon="no"
+       	 ])
+       CFLAGS="${CFLAGS_save}"
+    fi
+    ;;
+  aarch64*)
+    if test "x${want_neon}" = "xyes"; then
+       build_cpu_neon="yes"
+       AC_MSG_CHECKING([whether to use NEON instructions])
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]], [[volatile uint32x4_t test = vdupq_n_u32(0x1);]])],[
+           AC_MSG_RESULT([yes])
+           AC_DEFINE([BUILD_NEON], [1], [Build NEON Code])
+           AC_DEFINE([BUILD_NEON_INTRINSICS], [1], [Build NEON Intrinsics])
+           build_cpu_neon="yes"
+           build_cpu_neon_intrinsics="yes"
+       	 ],[
+	   AC_MSG_RESULT([no])
+           build_cpu_neon="no"
+       	 ])
+    fi
+    ;;
+esac
+
+AM_CONDITIONAL([BUILD_NEON], [test "${build_cpu_neon}" = "yes"])
+AM_CONDITIONAL([BUILD_NEON_INTRINSICS], [test "${build_cpu_neon_intrinsics}" = "yes"])
+
+AC_SUBST([ALTIVEC_CFLAGS])
+AC_SUBST([SSE3_CFLAGS])
+AC_SUBST([NEON_CFLAGS])
+
+#### Checks for linker characteristics
+
+
+#### Checks for library functions
+
+AC_CHECK_FUNCS([\
+backtrace \
+backtrace_symbols \
+execvp \
+fpathconf \
+fstatat \
+malloc_usable_size \
+mkdirat \
+mtrace \
+realpath \
+strlcpy \
+geteuid \
+getuid \
+pause \
+gmtime_r \
+pthread_getcpuclockid \
+clock_gettime \
+clearenv
+])
+
+AC_FUNC_ALLOCA
+AC_FUNC_MMAP
+AC_FUNC_STRERROR_R
+
+EFL_CHECK_FUNCS([EFLALL], [fnmatch gettimeofday dirfd fcntl sched_getcpu])
+
+have_atfile_source="${ac_cv_func_fstatat}"
+AC_DEFINE_IF([HAVE_ATFILE_SOURCE],
+   [test "x${have_atfile_source}" = "xyes"],
+   [1], [Use fstatat and other -at file functions])
+
+
+
+######################  EFL  ######################
+
+want_libeeze="yes"
+AC_ARG_ENABLE([libeeze],
+   [AS_HELP_STRING([--disable-libeeze],[disable Eeze device library @<:@default=enable@:>@])],
+   [
+    if test "x${enableval}" = "xyes"; then
+       want_libeeze="yes"
+    else
+       want_libeeze="no"
+       CFOPT_WARNING="yes"
+    fi
+   ])
+
+build_libeeze="yes"
+if test "x${want_libeeze}" = "xyes" ; then
+    if test "x${have_linux}" = "xyes" ; then
+        build_libeeze="yes"
+    else
+        build_libeeze="no"
+        want_libeeze="no"
+    fi
+else
+    build_libeeze="no"
+fi
+
+AC_ARG_ENABLE([systemd],
+   [AS_HELP_STRING([--disable-systemd],[Disable systemd support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_systemd="yes"
+    else
+       want_systemd="no"
+    fi
+   ])
+
+systemd_dbus_prefix="# "
+if test "${want_systemd}" = "yes"; then
+   systemd_dbus_prefix=""
+fi
+AC_SUBST(systemd_dbus_prefix)
+
+AC_ARG_WITH([systemdunitdir],
+         AS_HELP_STRING([--with-systemdunitdir=DIR],[path to systemd user services directory]),
+         [USER_SESSION_DIR=${withval}])
+if test "$want_systemd" == "no"; then
+  have_systemd_user_session="no"
+elif test -n "${USER_SESSION_DIR}"; then
+  have_systemd_user_session="yes"
+  AC_MSG_NOTICE([Using systemd user services directory as ${USER_SESSION_DIR}])
+else
+  # Detect systemd user session directory properly
+  EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd >= 192], [systemduserunitdir],
+	[have_systemd_user_session="yes"], [have_systemd_user_session="no"])
+
+  if test "$want_systemd" = "yes" -a "$have_systemd_user_session" = "no"; then
+     AC_MSG_ERROR([systemd support wanted, but systemd was not found.])
+  fi
+fi
+
+AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test "x${have_systemd_user_session}" = "xyes"])
+AC_SUBST([USER_SESSION_DIR])
+
+if test "x${have_systemd_pkg}" = "xauto" -o "x${have_systemd_pkg}" = "xyes"; then
+   PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209],
+   [
+     have_systemd_pkg="yes"
+     AC_DEFINE_UNQUOTED([HAVE_SYSTEMD_LOGIN_209],[1],[Defined if systemd >= 209])
+   ],
+   [have_systemd_pkg="no"])
+fi
+
+# check for systemd library if requested
+if test "x${want_systemd}" = "xyes" -a "x${have_systemd_pkg}" = "xno"; then
+   AC_MSG_ERROR([Systemd dependency requested but not found])
+fi
+
+AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "${want_systemd}" = "yes" -a "${have_systemd_pkg}" = "yes"])
+#### Platform-dependent
+
+#### Evil
+EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"])
+
+### Default values
+
+### Additional options to configure
+EFL_SELECT_WINDOWS_VERSION
+
+### Checks for programs
+
+### Checks for libraries
+
+EFL_ADD_LIBS([EVIL], [-lpsapi -lole32 -lws2_32 -lsecur32 -luuid -lregex])
+
+### Checks for header files
+
+AC_CHECK_HEADERS([regex.h fnmatch.h],
+   [],
+   [AC_MSG_ERROR([regex.h or fnmatch.h can not be found])])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+EVIL_CPPFLAGS="-DPSAPI_VERSION=1"
+# TODO: should we have these at EFL (global?)
+# Note: these warnings should not be used with C++ code
+EVIL_CFLAGS_WRN="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
+EVIL_CXXFLAGS="${EVIL_CXXFLAGS}"
+
+if test "x${have_win32}" = "xyes" ; then
+   EVIL_CFLAGS="-DSECURITY_WIN32 ${EVIL_CFLAGS}"
+   EVIL_CXXFLAGS="-fno-rtti -fno-exceptions -DSECURITY_WIN32 ${EVIL_CXXFLAGS}"
+fi
+
+AC_SUBST([EVIL_CPPFLAGS])
+AC_SUBST([EVIL_CFLAGS_WRN])
+AC_SUBST([EVIL_CXXFLAGS])
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+AC_SEARCH_LIBS([regcomp], [regex],
+   [],
+   [AC_MSG_ERROR([regcomp() can not be found in libregex])])
+
+AC_SEARCH_LIBS([fnmatch], [regex],
+   [],
+   [AC_MSG_ERROR([fnmatch() can not be found in libregex])])
+
+EFL_LIB_END_OPTIONAL([Evil])
+
+AC_SUBST([USE_EVIL_CFLAGS])
+AC_SUBST([USE_EVIL_LIBS])
+#### End of Evil
+
+
+#### Escape
+EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Escape])
+#### End of Escape
+
+EFL_CHECK_FUNC([SHM], [shm_open])
+SHM_LIBS="${requirements_libs_shm}"
+AC_SUBST([SHM_LIBS])
+
+AC_SUBST([DL_LIBS])
+AC_SUBST([DL_INTERNAL_LIBS])
+#### End of Platform-dependent
+
+
+#### Eina
+
+EFL_LIB_START([Eina])
+
+### Default values
+
+have_safety_checks="yes"
+want_log="yes"
+case "${build_profile}" in
+   dev)
+     with_max_log_level=""
+     have_stringshare_usage="no"
+     want_valgrind="auto"
+     want_debug_malloc="no"
+     want_debug_threads="no"
+     want_default_mempool="no"
+     want_cow_magic="no"
+     ;;
+
+   debug)
+     with_max_log_level=""
+     have_stringshare_usage="yes"
+     want_valgrind="auto"
+     want_debug_malloc="yes"
+     want_debug_threads="yes"
+     want_default_mempool="yes"
+     want_cow_magic="yes"
+     ;;
+
+   release)
+     with_max_log_level=""
+     have_stringshare_usage="no"
+     want_valgrind="no"
+     want_debug_malloc="no"
+     want_debug_threads="no"
+     want_default_mempool="no"
+     want_cow_magic="no"
+     ;;
+esac
+
+EFL_CHECK_LIBUNWIND
+
+EINA_CONFIG([HAVE_ALLOCA_H], [test "x${ac_cv_working_alloca_h}" = "xyes"])
+EINA_CONFIG([SAFETY_CHECKS], [test "x${have_safety_checks}" = "xyes"])
+EINA_CONFIG([DEFAULT_MEMPOOL], [test "x${want_default_mempool}" = "xyes"])
+
+if test -n "${with_max_log_level}"; then
+   AC_MSG_NOTICE([ignoring any EINA_LOG() with level greater than ${with_max_log_level}])
+   AC_DEFINE_UNQUOTED([EINA_LOG_LEVEL_MAXIMUM], [${with_max_log_level}], [if set, logging is limited to this amount.])
+fi
+
+AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
+   [test "x${have_stringshare_usage}" = "xyes"],
+   [1], [Report Eina stringshare usage pattern])
+
+### Additional options to configure
+AC_ARG_ENABLE([magic-debug],
+   [AS_HELP_STRING([--disable-magic-debug],[disable magic debug of eina structure @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_magic_debug="yes"
+    else
+       have_magic_debug="no"
+    fi
+   ],
+   [have_magic_debug="yes"])
+
+AC_ARG_ENABLE([debug-threads],
+   [AS_HELP_STRING([--enable-debug-threads], [enable debugging of eina threads @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_debug_threads="yes"
+    else
+       want_debug_threads="no"
+    fi
+   ])
+
+EINA_CONFIG([MAGIC_DEBUG], [test "x${have_magic_debug}" = "xyes"])
+
+AC_ARG_WITH([xattr-tests-path],
+   [AS_HELP_STRING([--with-xattr-tests-path=DIR],[path of xattr enabled directory to create test files])],[XATTR_TEST_DIR=${withval}][AC_DEFINE_UNQUOTED([XATTR_TEST_DIR],["$withval"], [xattr enabled directory])])
+
+evas_dicts_hyphen_dir="/usr/share/hyphen/"
+AC_ARG_WITH([dictionaries-hyphen-dir],
+   [AS_HELP_STRING([--with-dictionaries-hyphen-dir=DIR],[path of hunspell-compatible hyphen dictionaries])], [evas_dicts_hyphen_dir=$withval])
+AC_DEFINE_UNQUOTED([EVAS_DICTS_HYPHEN_DIR],["$evas_dicts_hyphen_dir"], [Hunspell-compatible hyphen dictionaries install directory])
+
+### Checks for programs
+
+### Checks for libraries
+
+# sockets
+
+case "$host_os" in
+   mingw*)
+      have_socket="no"
+      ;;
+   *solaris*)
+      AC_CHECK_LIB([socket], [connect],
+         [
+          have_socket="yes"
+          requirement_socket="-lsocket"
+          requirement_nsl="-lnsl"
+         ],
+         [have_socket="no"])
+      ;;
+   darwin*)
+      have_socket="yes"
+      ;;
+   *)
+      have_socket="yes"
+      ;;
+esac
+
+EFL_PLATFORM_DEPEND([EINA], [all])
+
+EFL_ADD_LIBS([EINA], [${requirement_socket} -lm])
+
+## Options
+
+# Valgrind
+AC_ARG_ENABLE([valgrind],
+   [AS_HELP_STRING([--disable-valgrind],[enable valgrind mempool declaration. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_valgrind="yes"
+    else
+       want_valgrind="no"
+    fi
+   ])
+
+if test "${want_valgrind}" = "auto"; then
+   PKG_CHECK_EXISTS([valgrind >= 2.4.0], [want_valgrind="yes"],
+      [want_valgrind="no"
+       AC_MSG_WARN([valgrind support desired by --with-profile=${build_profile} but not found. If your platform supports it, install valgrind.])])
+fi
+
+if test "${want_valgrind}" = "no"; then
+    AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
+else
+    PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0])
+    AC_DEFINE([HAVE_VALGRIND], [1], [Valgrind support enabled])
+fi
+
+AC_DEFINE_IF([EINA_DEBUG_MALLOC],
+   [test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_malloc}" = "xyes"],
+   [1], [Turn on debugging overhead in mempool])
+
+AC_DEFINE_IF([EINA_COW_MAGIC_ON],
+   [test "x${want_cow_magic}" = "xyes" ],
+   [1], [Turn on Eina_Magic in Eina_Cow])
+
+EFL_OPTIONAL_DEPEND_PKG([EINA], [${want_systemd}], [SYSTEMD], [libsystemd])
+
+EFL_EVAL_PKGS([EINA])
+
+## Examples
+
+## Benchmarks
+
+PKG_CHECK_MODULES([GLIB],
+   [glib-2.0],
+   [have_glib="yes"],
+   [have_glib="no"])
+
+if test "x${have_glib}" = "xyes" ; then
+   GLIB_CFLAGS="${GLIB_CFLAGS} -DEINA_BENCH_HAVE_GLIB"
+fi
+
+### Checks for header files
+
+# sys/mman.h could be provided by evil/escape/exotic so we need to set CFLAGS accordingly
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${CFLAGS} ${EINA_CFLAGS}"
+AC_CHECK_HEADERS([sys/mman.h])
+CFLAGS="${CFLAGS_save}"
+
+AC_CHECK_HEADER([byteswap.h], [have_byteswap="yes"], [have_byteswap="no"])
+
+### Checks for types
+
+EINA_CONFIG([HAVE_DIRENT_H], [test "x${have_dirent}" = "xyes"])
+AC_DEFINE_IF([HAVE_DIRENT_H], [test "x${have_dirent}" = "xyes"],
+   [1], [Define to 1 if you have a valid <dirent.h> header file.])
+
+### Checks for structures
+
+### Checks for compiler characteristics
+EINA_CONFIG([HAVE_BYTESWAP_H], [test "x${have_byteswap}" = "xyes"])
+
+EFL_CHECK_GCC_BUILTIN([bswap16], [HAVE_BSWAP16])
+EFL_CHECK_GCC_BUILTIN([bswap32], [HAVE_BSWAP32])
+EFL_CHECK_GCC_BUILTIN([bswap64], [HAVE_BSWAP64])
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+AC_CHECK_FUNCS([fchmod])
+
+EFL_CHECK_FUNCS([EINA], [dlopen dladdr iconv shm_open splice setxattr getpagesize prctl])
+
+enable_log="no"
+if test "x${efl_func_fnmatch}" = "xyes" && test "x${want_log}" = "xyes" ; then
+   enable_log="yes"
+fi
+
+AC_MSG_CHECKING([wether to build Eina_Log infrastructure])
+AC_MSG_RESULT([${enable_log}])
+
+EINA_CONFIG([ENABLE_LOG], [test "x${enable_log}" = "xyes"])
+
+EFL_CHECK_THREADS
+if test "x${efl_have_threads}" = "xno"; then
+   CFOPT_WARNING="xyes"
+fi
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[ ]],
+       [[
+        static __thread int a = 0;
+       ]])],
+   [have_thread_specifier="yes"],
+   [have_thread_specifier="no"])
+AC_MSG_CHECKING([for __thread specifier])
+AC_MSG_RESULT([${have_thread_specifier}])
+if test "x${have_thread_specifier}" = "xyes" ; then
+    AC_DEFINE([HAVE_THREAD_SPECIFIER], [1], [Have the __thread specifier])
+fi
+
+EFL_ADD_PUBLIC_LIBS([EINA], [${EFL_PTHREAD_LIBS}])
+EFL_ADD_CFLAGS([EINA], [${EFL_PTHREAD_CFLAGS}])
+
+EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"])
+EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"])
+EINA_CONFIG([HAVE_PTHREAD_SETNAME], [test "x${efl_have_setname}" = "xyes"])
+EINA_CONFIG([HAVE_DEBUG_THREADS], [test "x${want_debug_threads}" = "xyes"])
+EINA_CONFIG([HAVE_POSIX_SPINLOCK], [test "x${efl_have_posix_threads_spinlock}" = "xyes"])
+EINA_CONFIG([HAVE_OSX_SPINLOCK], [test "x${efl_have_osx_spinlock}" = "xyes"])
+EINA_CONFIG([HAVE_OSX_SEMAPHORE], [test "x${have_darwin}" = "xyes"])
+EINA_CONFIG([HAVE_WORDS_BIGENDIAN], [test "x${ac_cv_c_bigendian}" = "xyes"])
+
+### Modules
+
+EINA_CHECK_MODULE([chained-pool], [static], [chained pool])
+EINA_CHECK_MODULE([pass-through], [static], [pass through])
+EINA_CHECK_MODULE([one-big],      [static], [one big])
+
+EFL_ADD_FEATURE([EINA], [systemd-journal], [${want_systemd}])
+
+EFL_LIB_END([Eina])
+#### End of Eina
+
+#### Eina CXX
+EFL_LIB_START([Eina_Cxx])
+
+AC_ARG_ENABLE([cxx-bindings],
+   [AS_HELP_STRING([--disable-cxx-bindings],[disable C++11 bindings. @<:@default=enabled@:>@])],
+   [want_cxx11="${enableval}"], [want_cxx11="yes"])
+
+have_cxx11="no"
+if test "x${want_cxx11}" = "xyes"; then
+  EFL_CXX_COMPILE_STDCXX_11([ext])
+  if test "x${HAVE_CXX11}" = "x1" ; then
+
+    # We should be using ${CXX} here, but there is a bug in
+    # autotools macro and CXX is always set to g++ even if
+    # it's not found. So we are using an internal variable
+    # that does the work for now, may get broken in the future.
+    if test "x${ac_ct_CXX}" = "x" -a "x${CXX}" = "xg++"; then
+       AC_MSG_ERROR([efl requires a C++ compiler got ${ac_ct_CXX} and ${CXX}.])
+    fi
+
+    have_cxx11="yes"
+  fi
+fi
+
+AM_CONDITIONAL([HAVE_CXX], [test "x${have_cxx11}" = "xyes"])
+
+EFL_INTERNAL_DEPEND_PKG([EINA_CXX], [Eina])
+EFL_ADD_CFLAGS([EINA_CXX], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([EINA_CXX])
+
+EFL_LIB_END([Eina_Cxx])
+#### End of Eina CXX
+
+AC_ARG_WITH([js],
+   [AS_HELP_STRING([--with-js=@<:@nodejs/libv8/libuv/none@:>@],[enable JavaScript bindings using nodejs or libv8/libuv as build dependencies. The libuv option implies libv8. @<:@default=none@:>@])],
+   [want_js="${withval}"], [want_js="none"])
+
+EFLJS_CXXFLAGS=""
+AC_LANG_PUSH([C++])
+case "$want_js" in
+     nodejs)
+        AC_CHECK_HEADERS([node/v8.h nodejs/deps/v8/v8.h nodejs/deps/v8/include/v8.h nodejs/src/v8.h v8.h],
+                         [
+                           v8_header=AC_header
+                           v8_header_define=AS_TR_CPP([HAVE_]AC_header)
+                           EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -D$v8_header_define"
+                           break
+                         ]
+                         [AC_MSG_ERROR([Could not find v8 include headers from nodejs.])])
+        AC_CHECK_HEADERS([node/node.h nodejs/deps/node/node.h nodejs/deps/node/include/node.h nodejs/src/node.h node.h],
+                         [
+                           node_header_define=AS_TR_CPP([HAVE_]AC_header)
+                           EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -D$node_header_define"
+                           break
+                         ]
+                         [AC_MSG_ERROR([Could not find node include headers from nodejs.])])
+        AC_CHECK_HEADERS([node/uv.h nodejs/deps/uv/uv.h nodejs/deps/uv/include/uv.h nodejs/src/uv.h uv.h],
+                         [
+                           uv_header_define=AS_TR_CPP([HAVE_]AC_header)
+                           EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -D$uv_header_define"
+                           break
+                         ]
+                         [AC_MSG_ERROR([Could not find uv include headers from nodejs.])])
+        ;;
+     libv8)
+        AC_CHECK_HEADERS([v8.h],
+                         [
+                           v8_header=AC_header
+                           break
+                         ]
+                         [AC_MSG_ERROR([Could not find v8 include headers from libv8.])])
+        ;;
+     libuv)
+        AC_CHECK_HEADERS([v8.h],
+                         [
+                           v8_header=AC_header
+                           break
+                         ]
+                         [AC_MSG_ERROR([Could not find v8 include headers from libv8.])])
+        AC_CHECK_HEADERS([uv.h],
+                         [break]
+                         [AC_MSG_ERROR([Could not find uv include headers from libuv.])])
+        ;;
+     none)
+        ;;
+     *) AC_MSG_ERROR([Invalid javascript dependency (${want_js}): must be none, nodejs, libv8 or libuv]) ;;
+esac
+
+have_v8_global="no"
+have_v8_create_params="no"
+if test "$want_js" != "none" ; then
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include "$v8_header"
+       ]],
+       [[
+v8::Isolate::CreateParams create_params; create_params.array_buffer_allocator = nullptr;
+       ]])
+   ],
+   [
+    AC_DEFINE(HAVE_V8_CREATE_PARAMS, 1, [Define to 1 if you must pass create_params explicitly.])
+    have_v8_create_params="yes"
+    AC_MSG_NOTICE([checking for v8::Isolate::CreateParams... yes])
+   ],
+   [
+    AC_MSG_NOTICE([checking for v8::Isolate::CreateParams... no])
+   ])
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include "$v8_header"
+#include <type_traits>
+       ]],
+       [[
+       static_assert((std::is_same< ::v8::Global<void>, ::v8::UniquePersistent<void>>::value), "");
+       ]])
+   ],
+   [
+    AC_DEFINE(HAVE_V8_GLOBAL, 1, [Define to 1 if you must pass create_params explicitly.])
+    have_v8_global="yes"
+    AC_MSG_NOTICE([checking for v8::Global<T> class... yes])
+   ],
+   [
+    AC_MSG_NOTICE([checking for v8::Global<T> class... no])
+   ])
+fi
+AM_CONDITIONAL([HAVE_V8_CREATE_PARAMS], [test "x${have_v8_create_params}" = "xyes"])
+AM_CONDITIONAL([HAVE_V8_GLOBAL], [test "x${have_v8_global}" = "xyes"])
+AC_SUBST([HAVE_V8_CREATE_PARAMS])
+AC_SUBST([HAVE_V8_GLOBAL])
+AC_LANG_POP([C++])
+
+AM_CONDITIONAL([HAVE_NODEJS], [test "x${want_js}" = "xnodejs"])
+AC_DEFINE_IF([HAVE_NODEJS], [test "x${want_js}" = "xnodejs"],
+  [1], [Using NodeJS])
+AC_SUBST([want_js])
+AC_SUBST([HAVE_NODEJS])
+
+have_js="no"
+if test "x${want_js}" != "xnone" ; then
+   have_js="yes"
+fi
+AM_CONDITIONAL([HAVE_JS], [test "x${have_js}" = "xyes"])
+AC_DEFINE_IF([HAVE_JS], [test "x${have_js}" = "xyes"], [1], [Compiling bindings for JavaScript])
+AC_SUBST([HAVE_JS])
+
+AM_CONDITIONAL([HAVE_LIBUV], [test "x${want_js}" = "xnodejs" -o "x${want_js}" = "xlibuv"])
+AC_DEFINE_IF([HAVE_LIBUV], [test "x${want_js}" = "xnodejs" -o "x${want_js}" = "xlibuv"],
+             [1], [Compiling libuv event loop integration])
+AC_SUBST([HAVE_LIBUV])
+
+# For efljspack mime handling
+AM_CONDITIONAL([HAVE_XDG_DATA_HOME], [test "x${XDG_DATA_HOME}" != "x"])
+AM_COND_IF([HAVE_XDG_DATA_HOME], [AC_SUBST([XDG_DATA_HOME])], [AC_SUBST([XDG_DATA_HOME], "$HOME/.local/share")])
+
+#### Eina JS
+EFL_LIB_START_OPTIONAL([Eina_Js], [test "x${have_js}" = "xyes"])
+EFL_INTERNAL_DEPEND_PKG([EINA_JS], [Eina])
+EFL_INTERNAL_DEPEND_PKG([EINA_JS], [Eo])
+EFL_ADD_CFLAGS([EINA_JS], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([EINA_JS])
+
+EFL_LIB_END_OPTIONAL([Eina_Js])
+#### End of Eina JS
+
+#### Ecore JS
+EFL_LIB_START_OPTIONAL([Ecore_Js], [test "x${have_js}" = "xyes"])
+
+EFL_INTERNAL_DEPEND_PKG([ECORE_JS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_JS], [ecore_file])
+EFL_INTERNAL_DEPEND_PKG([ECORE_JS], [efl])
+EFL_ADD_CFLAGS([ECORE_JS], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([ECORE_JS])
+
+EFL_LIB_END_OPTIONAL([Ecore_Js])
+#### End of Ecore JS
+
+#### Eio JS
+EFL_LIB_START_OPTIONAL([Eio_Js], [test "x${have_js}" = "xyes"])
+
+EFL_INTERNAL_DEPEND_PKG([EIO_JS], [eio])
+EFL_ADD_CFLAGS([EIO_JS], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([EIO_JS])
+
+EFL_LIB_END_OPTIONAL([Eio_Js])
+#### End of Eio JS
+
+#### Ethumb JS
+EFL_LIB_START_OPTIONAL([Ethumb_Js], [test "x${have_js}" = "xyes"])
+
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_JS], [ethumb])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_JS], [ethumb_client])
+EFL_ADD_CFLAGS([ETHUMB_JS], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([ETHUMB_JS])
+
+EFL_LIB_END_OPTIONAL([Ethumb_Js])
+#### End of Ethumb JS
+
+#### Eldbus JS
+EFL_LIB_START_OPTIONAL([Eldbus_Js], [test "x${have_js}" = "xyes"])
+
+EFL_INTERNAL_DEPEND_PKG([ELDBUS_JS], [eldbus])
+EFL_ADD_CFLAGS([ELDBUS_JS], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([ELDBUS_JS])
+
+EFL_LIB_END_OPTIONAL([Eldbus_Js])
+#### End of Eldbus JS
+
+#### Eo JS
+EFL_LIB_START_OPTIONAL([Eo_Js], [test "x${have_js}" = "xyes"])
+
+EFL_INTERNAL_DEPEND_PKG([EO_JS], [eina])
+EFL_ADD_CFLAGS([EO_JS], [${EFL_PTHREAD_CFLAGS}])
+EFL_EVAL_PKGS([EO_JS])
+
+EFL_LIB_END_OPTIONAL([Eo_Js])
+#### End of Eo JS
+
+#### Efl C Sharp Bindings
+want_csharp_beta="no"
+AC_ARG_ENABLE([csharp-beta],
+  [AS_HELP_STRING([--enable-csharp-beta],[enable C Sharp bindings. @<:@default=disabled@:>@])],
+  [
+    if test "x${enableval}" = "xyes" ; then
+      want_csharp_beta="yes"
+    else
+      want_csharp_beta="no"
+    fi
+  ],
+  [want_csharp_beta="no"])
+
+want_csharp="no"
+AC_ARG_ENABLE([csharp-bindings],
+  [AS_HELP_STRING([--enable-csharp-bindings],[enable C Sharp bindings. @<:@default=disabled@:>@])],
+  [
+    if test "x${enableval}" = "xyes" ; then
+      want_csharp="yes"
+    else
+      want_csharp="no"
+    fi
+  ],
+  [want_csharp="no"])
+
+if test "x${want_csharp}" = "xyes" -a "x${HAVE_MCS}" != "x1"; then
+  want_csharp="no"
+  AC_MSG_ERROR([C Sharp bindings requested but C Sharp compiler could not be found])
+fi
+
+AM_CONDITIONAL([HAVE_CSHARP], [test "x${want_csharp}" = "xyes"])
+AC_DEFINE_IF([HAVE_CSHARP], [test "x${want_csharp}" = "xyes"],
+  [1], [Compiling bindings for C Sharp])
+AC_SUBST([want_csharp])
+
+AM_CONDITIONAL([HAVE_CSHARP_BETA], [test "x${want_csharp_beta}" = "xyes"])
+AC_DEFINE_IF([HAVE_CSHARP_BETA], [test "x${want_csharp_beta}" = "xyes"],
+  [1], [Compiling bindings for C Sharp with beta methods, properties and classes])
+AC_SUBST([want_csharp_beta])
+
+if test "x${have_windows}" = "xyes"; then
+  eflmonodlldir="$prefix/bin"
+else
+  eflmonodlldir="$libdir/efl-mono-${EFL_VERSION_MAJOR}"
+fi
+AC_SUBST([eflmonodlldir])
+
+# Efl Mono
+EFL_LIB_START_OPTIONAL([Efl_Mono], [test "x${want_csharp}" = "xyes"])
+
+EFL_PLATFORM_DEPEND([EFL_MONO], [evil])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Eina])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Eo])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Eet])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Ecore_Evas])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Ecore_Con])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Ecore_Audio])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Efl])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Evas])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Edje])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Emotion])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Eldbus])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Emile])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Ethumb])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Ethumb_Client])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Eio])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Elementary])
+EFL_INTERNAL_DEPEND_PKG([EFL_MONO], [Efl_Custom_Exports_Mono])
+
+EFL_EVAL_PKGS([EFL_MONO])
+
+EFL_LIB_END_OPTIONAL([Efl_Mono])
+
+# Efl Custom Exports Mono
+EFL_LIB_START_OPTIONAL([Efl_Custom_Exports_Mono], [test "x${want_csharp}" = "xyes"])
+
+EFL_PLATFORM_DEPEND([EFL_CUSTOM_EXPORTS_MONO], [evil])
+EFL_INTERNAL_DEPEND_PKG([EFL_CUSTOM_EXPORTS_MONO], [Eina])
+EFL_INTERNAL_DEPEND_PKG([EFL_CUSTOM_EXPORTS_MONO], [Eo])
+EFL_INTERNAL_DEPEND_PKG([EFL_CUSTOM_EXPORTS_MONO], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([EFL_CUSTOM_EXPORTS_MONO], [Efl])
+EFL_INTERNAL_DEPEND_PKG([EFL_CUSTOM_EXPORTS_MONO], [Eldbus])
+
+EFL_EVAL_PKGS([EFL_CUSTOM_EXPORTS_MONO])
+
+EFL_LIB_END_OPTIONAL([Efl_Custom_Exports_Mono])
+
+# Libtool versioning stuff.
+# On windows, the version of the library goes into the filename.
+# See https://autotools.io/libtool/windows.html#libtool.windows.version
+# Based on the current:revision:age string passed to libtool, the generated suffix
+# has the value of (current - age).
+# To get the current and age, we use the same calculation from m4/efl.m4 (lt_cur, lt_age)
+DLIB_PREFIX_MONO=""
+DLIB_SUFFIX_MONO=""
+if test "x${have_windows}" = "xyes"; then
+  DLIB_PREFIX_MONO="lib"
+  if test "x${EFL_VERSION_MAJOR}" = "x1"; then
+    DLIB_SUFFIX_MONO="-${EFL_VERSION_MAJOR}"
+  else
+    DLIB_SUFFIX_MONO="-${EFL_VERSION_MAJOR}00"
+  fi
+fi
+AC_SUBST([DLIB_PREFIX_MONO])
+AC_SUBST([DLIB_SUFFIX_MONO])
+
+EFL_DL_MONO="${DLIB_PREFIX_MONO}efl${DLIB_SUFFIX_MONO}";
+ECORE_DL_MONO="${DLIB_PREFIX_MONO}ecore${DLIB_SUFFIX_MONO}";
+EINA_DL_MONO="${DLIB_PREFIX_MONO}eina${DLIB_SUFFIX_MONO}"
+EO_DL_MONO="${DLIB_PREFIX_MONO}eo${DLIB_SUFFIX_MONO}"
+EVAS_DL_MONO="${DLIB_PREFIX_MONO}evas${DLIB_SUFFIX_MONO}"
+if test "x${have_windows}" = "xyes"; then
+  EVIL_DL_MONO="${DLIB_PREFIX_MONO}evil${DLIB_SUFFIX_MONO}"
+else
+  EVIL_DL_MONO="dl"
+fi
+EDJE_DL_MONO="${DLIB_PREFIX_MONO}edje${DLIB_SUFFIX_MONO}"
+ELEMENTARY_DL_MONO="${DLIB_PREFIX_MONO}elementary${DLIB_SUFFIX_MONO}"
+ELDBUS_DL_MONO="${DLIB_PREFIX_MONO}eldbus${DLIB_SUFFIX_MONO}"
+CUSTOM_EXPORTS_MONO_DL_MONO="${DLIB_PREFIX_MONO}eflcustomexportsmono${DLIB_SUFFIX_MONO}"
+
+AC_SUBST([EFL_DL_MONO])
+AC_SUBST([ECORE_DL_MONO])
+AC_SUBST([EINA_DL_MONO])
+AC_SUBST([EO_DL_MONO])
+AC_SUBST([EVAS_DL_MONO])
+AC_SUBST([EVIL_DL_MONO])
+AC_SUBST([EDJE_DL_MONO])
+AC_SUBST([ELEMENTARY_DL_MONO])
+AC_SUBST([ELDBUS_DL_MONO])
+AC_SUBST([CUSTOM_EXPORTS_MONO_DL_MONO])
+
+# Eos file/library mapping
+
+# Unescaped sed pattern: sed -n 's/src\/lib\/\([a-z0-9_]*\)\/[a-z\/]*\/\([a-z0-9\._]*\)/\2,\1/pg'
+AC_CHECK_PROG([have_realpath], [realpath], [yes], [no])
+if test "x${have_realpath}" = "xyes" ; then
+  _configure_path=`realpath $0`
+else
+  AC_CHECK_PROG([have_readlink], [readlink], [yes], [no])
+  if test "x${have_readlink}" = "xyes" ; then
+    _configure_path=`readlink -f $0`
+  fi
+fi
+efl_mono_top_srcdir=`dirname ${_configure_path}`
+EFL_MONO_LIBRARY_MAP=`find ${efl_mono_top_srcdir}/src/lib/ -iname "*\.eo" | sed -n 's/.*\/src\/lib\/\(@<:@a-z0-9_@:>@*\)@<:@\/a-z@:>@*\/\(@<:@a-z0-9\._@:>@*\)/\2,\1/pg'`
+
+AC_SUBST([EFL_MONO_LIBRARY_MAP])
+AM_SUBST_NOTMAKE([EFL_MONO_LIBRARY_MAP])
+
+#### End of Efl C Sharp Bindings
+
+#### Eo
+
+EFL_LIB_START([Eo])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EO], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EO], [eina])
+
+# Example (evas one)
+
+# TODO: add once elementary is merged
+#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
+AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+EFL_CHECK_FUNCS([EO], [dladdr])
+
+### Check availability
+
+EFL_LIB_END([Eo])
+#### End of Eo
+
+#### Eet CXX
+EFL_LIB_START([Eet_Cxx])
+
+EFL_INTERNAL_DEPEND_PKG([EET_CXX], [Eina_Cxx])
+EFL_INTERNAL_DEPEND_PKG([EET_CXX], [Eet])
+
+EFL_EVAL_PKGS([EET_CXX])
+
+EFL_LIB_END([Eet_Cxx])
+#### End of Eet CXX
+
+#### Emile
+
+EFL_LIB_START([Emile])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+
+EFL_CHECK_LIBS([EMILE], [libjpeg])
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EMILE], [evil])
+
+EFL_ADD_LIBS([EMILE], [-lm])
+
+# Cryptography support
+if test "$build_crypto" != "none" ; then
+   AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in emile])
+   AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support in emile])
+   EFL_CRYPTO_DEPEND([EMILE])
+fi
+
+EFL_CHECK_LIBS([EMILE], [zlib])
+
+EFL_INTERNAL_DEPEND_PKG([EMILE], [eina])
+
+EFL_EVAL_PKGS([EMILE])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_ADD_FEATURE([EMILE], [crypto], [${build_crypto}])
+
+EFL_LIB_END([Emile])
+#### End of Emile
+
+
+#### Eet
+
+EFL_LIB_START([Eet])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+
+EFL_CHECK_LIBS([EET], [libjpeg])
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EET], [evil])
+
+EFL_ADD_LIBS([EET], [-lm])
+
+# Cryptography support
+if test "$build_crypto" != "none" ; then
+   AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
+   AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
+   EFL_CRYPTO_DEPEND([EET])
+fi
+
+EFL_INTERNAL_DEPEND_PKG([EET], [eina])
+EFL_INTERNAL_DEPEND_PKG([EET], [emile])
+
+EFL_EVAL_PKGS([EET])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([Eet])
+#### End of Eet
+
+#### Eo CXX
+EFL_LIB_START([Eo_Cxx])
+
+EFL_EVAL_PKGS([EO_CXX])
+
+EFL_LIB_END([Eo_Cxx])
+#### End of Eo CXX
+
+#### Eolian
+
+EFL_LIB_START([Eolian])
+
+### Default values
+
+### Additional options to configure
+EFL_ADD_FEATURE([EOLIAN], [cxx], [${have_cxx11}])
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EOLIAN], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EOLIAN], [eina])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([Eolian])
+#### End of Eolian
+
+EFL_LIB_START_OPTIONAL([Eolian_Js], [test "${have_js}" = "yes"])
+
+EFL_INTERNAL_DEPEND_PKG([EOLIAN_JS], [eina])
+EFL_INTERNAL_DEPEND_PKG([EOLIAN_JS], [eolian])
+
+EFL_LIB_END_OPTIONAL([Eolian_Js])
+#### End of Eolian
+
+
+EFL_LIB_START([Eolian_Cxx])
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EOLIAN_CXX], [eina])
+EFL_INTERNAL_DEPEND_PKG([EOLIAN_CXX], [eo])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+EFL_LIB_END([Eolian_Cxx])
+
+#### Efl
+
+EFL_LIB_START([Efl])
+
+EFL_PLATFORM_DEPEND([EFL], [evil])
+EFL_INTERNAL_DEPEND_PKG([EFL], [eina])
+EFL_INTERNAL_DEPEND_PKG([EFL], [eo])
+
+EFL_ADD_LIBS([EFL], [-lm])
+
+EFL_LIB_END([Efl])
+#### End of Efl
+
+#### Ector
+
+EFL_LIB_START([Ector])
+
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+
+EFL_PLATFORM_DEPEND([ECTOR], [evil])
+
+EFL_INTERNAL_DEPEND_PKG([ECTOR], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECTOR], [emile])
+EFL_INTERNAL_DEPEND_PKG([ECTOR], [eet])
+EFL_INTERNAL_DEPEND_PKG([ECTOR], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECTOR], [efl])
+
+EFL_ADD_LIBS([ECTOR], [-lm])
+
+EFL_EVAL_PKGS([ECTOR])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([ECTOR])
+
+#### End of Ector
+
+
+#### Ecore
+
+EFL_LIB_START([Ecore])
+
+### Additional options to configure
+
+# glib
+
+AC_ARG_WITH([glib],
+   [AS_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],
+   [AS_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"
+       CFOPT_WARNING="xyes"
+    else
+       want_g_main_loop="no"
+    fi
+   ],
+   [want_g_main_loop="no"])
+AC_ARG_ENABLE([libuv],
+   [AS_HELP_STRING([--enable-libuv],[enable ecore_main_loop based on libuv. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_libuv="yes"
+       CFOPT_WARNING="xyes"
+    else
+       want_libuv="no"
+    fi
+   ],
+   [want_libuv="no"])
+
+AC_ARG_ENABLE([gstreamer],
+   [AS_HELP_STRING([--enable-gstreamer],[enable gstreamer 0.10 support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_gstreamer="yes"
+       CFOPT_WARNING="xyes"
+    else
+       want_gstreamer="no"
+    fi
+   ],
+   [want_gstreamer="no"])
+
+AC_ARG_ENABLE([gstreamer1],
+   [AS_HELP_STRING([--disable-gstreamer1],[disable gstreamer 1.0 support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_gstreamer1="yes"
+    else
+       want_gstreamer1="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_gstreamer1="yes"])
+
+AC_ARG_ENABLE([tizen],
+   [AS_HELP_STRING([--enable-tizen],[enable tizen support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_tizen="yes"
+    else
+       want_tizen="no"
+    fi
+   ],
+   [want_tizen="no"])
+
+if test "${want_tizen}" = "yes"; then
+     PKG_CHECK_MODULES([TIZEN_CONFIGURATION_MANAGER],
+      [vconf],
+      [have_tizen_vconf="yes"],
+      [have_tizen_vconf="no"])
+  PKG_CHECK_MODULES([TIZEN_CONFIGURATION_MANAGER], [vconf])
+fi
+
+AM_CONDITIONAL([HAVE_TIZEN_CONFIGURATION_MANAGER], [test "${have_tizen_vconf}" = "yes"])
+if test "${have_tizen_vconf}"  = "yes"; then
+  AC_DEFINE(HAVE_TIZEN_CONFIGURATION_MANAGER, 1, [Define to 1 if you have Tizen configuration manager(vconf).])
+fi
+
+AC_ARG_ENABLE([ecore_wayland],
+   [AS_HELP_STRING([--enable-ecore-wayland],[enable legacy Ecore_Wayland support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ecore_wayland="yes"
+    else
+       want_ecore_wayland="no"
+    fi
+   ],
+   [want_ecore_wayland="no"])
+
+AC_ARG_ENABLE([ecore_drm],
+   [AS_HELP_STRING([--enable-ecore-drm],[enable legacy Ecore_Drm support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ecore_drm="yes"
+    else
+       want_ecore_drm="no"
+    fi
+   ],
+   [want_ecore_drm="no"])
+
+### Default values
+
+if test "${have_windows}" = "yes"; then
+   with_glib="no"
+fi
+
+want_glib="no"
+if test "x${with_glib}" = "xyes" || test "x${with_glib}" = "xalways" ; then
+   want_glib="yes"
+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
+EFL_PLATFORM_DEPEND([ECORE], [all])
+EFL_INTERNAL_DEPEND_PKG([ECORE], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE], [efl])
+
+EFL_ADD_LIBS([ECORE], [-lm])
+
+# glib
+
+EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0 gthread-2.0])
+if test "x${have_glib}" = "xno"; then
+   want_g_main_loop="no"
+fi
+
+EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_systemd}], [SYSTEMD], [libsystemd])
+
+EFL_ADD_FEATURE([ECORE], [systemd-daemon], [${want_systemd}])
+EFL_ADD_FEATURE([ECORE], [glib])
+EFL_ADD_FEATURE([ECORE], [g-main-loop])
+EFL_ADD_FEATURE([ECORE], [libuv])
+
+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])
+  if test "x${want_js}" = "xnodejs" -o "x${want_js}" = "xlibuv" ; then
+    AC_MSG_ERROR([Can't define glib and libuv integration together])
+  fi
+fi
+
+# not EFL_OPTIONAL_DEPEND_PKG() because it's only used for ecore examples
+if test "${want_gstreamer1}" = "yes" -a "${want_gstreamer}" = "yes"; then
+   AC_MSG_ERROR([You can only enable either GStreamer 1.0 or GStreamer 0.10 support])
+fi
+
+if test "${want_gstreamer1}" = "yes"; then
+  PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0])
+fi
+if test "${want_gstreamer}" = "yes"; then
+  PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10])
+fi
+
+AM_CONDITIONAL([HAVE_GSTREAMER], [test "x${want_gstreamer}" = "xyes" -o "x${want_gstreamer1}" = "xyes"])
+AM_CONDITIONAL([HAVE_GSTREAMER0], [test "x${want_gstreamer}" = "xyes"])
+AM_CONDITIONAL([HAVE_GSTREAMER1], [test "x${want_gstreamer1}" = "xyes"])
+
+EFL_EVAL_PKGS([ECORE])
+
+### Checks for header files
+
+AC_HEADER_SYS_WAIT
+
+AC_CHECK_HEADERS([sys/socket.h])
+
+AC_CHECK_HEADERS([ \
+arpa/inet.h \
+arpa/nameser.h \
+langinfo.h \
+features.h \
+netinet/in.h \
+netinet/tcp.h \
+netinet/udp.h \
+sys/prctl.h \
+sys/ioctl.h \
+sys/resource.h \
+sys/timerfd.h \
+sys/un.h \
+ieeefp.h \
+],[],[],
+[
+ #ifdef HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+])
+
+AC_CHECK_HEADERS([net/if.h], [], [],
+[#include <stdio.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+])
+
+### 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 malloc_info])
+
+if ! test "x${ac_cv_func_clock_gettime}" = "xyes" ; then
+   AC_CHECK_LIB([rt], [clock_gettime],
+      [
+        EFL_ADD_LIBS([ECORE], [-lrt])
+        AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Have clock_gettime()])
+       ])
+fi
+
+EFL_ADD_LIBS([ECORE], [${LTLIBINTL}])
+
+# coroutine function specific
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <ucontext.h>
+       ]],
+       [[
+ucontext_t test;
+getcontext(&test);
+       ]])],
+   [have_ucontext="yes"],
+   [have_ucontext="no"])
+
+AC_MSG_CHECKING([for ucontext])
+AC_MSG_RESULT([${have_ucontext}])
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <setjmp.h>
+       ]],
+       [[
+jmp_buf context;
+setjmp(&context);
+       ]])],
+   [have_setjmp="yes"],
+   [have_setjmp="no"])
+
+AC_MSG_CHECKING([for setjmp])
+AC_MSG_RESULT([${have_setjmp}])
+
+if test "X${have_windows}" = "xyes"; then
+   AC_DEFINE(USE_FIBER, 1, [Define to 1 if you have Windows Fiber support.])
+   EFL_ADD_FEATURE([system], [coroutine], [fiber])
+elif test "x${have_ucontext}" = "xyes"; then
+   AC_DEFINE(USE_UCONTEXT, 1, [Define to 1 if you have posix ucontext functions.])
+   EFL_ADD_FEATURE([system], [coroutine], [ucontext])
+elif test "x${have_setjmp}" = "xyes"; then
+   AC_DEFINE(USE_SETJMP, 1, [Define to 1 if you have setjmp/longjmp functions.])
+   EFL_ADD_FEATURE([system], [coroutine], [setjmp])
+else
+   AC_MSG_ERROR([You do not have a working way to implement coroutine. Exiting...])
+fi
+
+### Check availability
+
+EFL_LIB_END([Ecore])
+#### End of Ecore
+
+#### Evas
+
+EFL_LIB_START([Evas])
+
+### Additional options to configure
+
+# X11
+AC_ARG_WITH([x11],
+   [AS_HELP_STRING([--with-x11=xlib|none],[Use X11 (Xlib) or not])])
+
+if test "x${have_windows}" = "xyes" || test "x${have_ps3}" = "xyes" || test "x${have_darwin}" = "xyes"; then
+   with_x11="none"
+elif test "x${with_x11}" = "x"; then
+   with_x11="xlib"
+fi
+
+want_x11_xlib="no"
+want_x11_none="no"
+want_x11_any="no"
+case "${with_x11}" in
+   xlib)
+     want_x11_xlib="yes"
+     want_x11_any="yes"
+     ;;
+   none)
+     want_x11_none="yes"
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown build x11 --with-x11=${with_x11}])
+     ;;
+esac
+
+# OpenGL
+AC_ARG_WITH([opengl],
+   [AS_HELP_STRING([--with-opengl=full|es|none],[OpenGL method to use: full, es or none])])
+
+if test "x${have_windows}" = "xyes" || test "x${have_ps3}" = "xyes"; then
+   with_opengl="none"
+elif test "x${with_opengl}" = "x"; then
+   with_opengl="full"
+fi
+
+case "${with_opengl}" in
+   full|es|none)
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown build opengl --with-opengl=${with_opengl}])
+     ;;
+esac
+
+want_x11_xlib_opengl="no"
+if test "${with_opengl}" != "none"; then
+   want_x11_xlib_opengl="${want_x11_xlib}"
+   want_x11_any_opengl="${want_x11_any}"
+fi
+
+# Wayland
+AC_ARG_ENABLE([wayland],
+   [AS_HELP_STRING([--enable-wayland],[enable wayland display server. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_wayland="yes"
+    else
+       want_wayland="no"
+    fi
+   ],
+   [want_wayland="no"])
+
+if test "${want_wayland}" = "yes"; then
+   EFL_PKG_CHECK_STRICT([wayland-client >= 1.11.0 wayland-scanner >= 1.11.0 wayland-protocols >= 1.12])
+   PKG_CHECK_MODULES([WAYLAND], [wayland-scanner >= 1.11.0],
+    [
+      AC_ARG_VAR([wayland_scanner], [The wayland-scanner executable])
+      AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+      if test x$wayland_scanner = x; then
+        PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
+        wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
+      fi
+      ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
+      AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
+    ])
+fi
+AM_CONDITIONAL([HAVE_WAYLAND_SCANNER], [test x$wayland_scanner != x])
+
+# Wayland IVI-Shell
+AC_ARG_ENABLE([wayland-ivi-shell],
+   [AS_HELP_STRING([--enable-wayland-ivi-shell],[enable ivi-shell support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_wayland_ivi_shell="yes"
+    else
+       want_wayland_ivi_shell="no"
+    fi
+   ],
+   [want_wayland_ivi_shell="no"])
+
+# Fb
+AC_ARG_ENABLE([fb],
+   [AS_HELP_STRING([--enable-fb],[enable raw Framebuffer access. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_fb="yes"
+    else
+       want_fb="no"
+    fi
+   ],
+   [want_fb="no"])
+
+# Eglfs
+AC_ARG_ENABLE([eglfs],
+   [AS_HELP_STRING([--enable-eglfs],[enable hardware accelerated framebuffer access. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_eglfs="yes"
+       want_fb="yes"
+    else
+       want_eglfs="no"
+    fi
+   ],
+   [want_eglfs="no"])
+
+# SDL
+AC_ARG_ENABLE([sdl],
+   [AS_HELP_STRING([--enable-sdl],[enable SDL support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_sdl="yes"
+    else
+       want_sdl="no"
+    fi
+   ],
+   [want_sdl="no"])
+
+if test "${want_sdl}" = "yes"; then
+   EFL_PKG_CHECK_STRICT([sdl2 >= 2.0.0])
+fi
+
+# We only enable SDL with opengl if it is the full version and not ES
+# This can be changed if we ported our SDL code over to SDL 2.0. For older
+# versions the SDL_opengles.h has never been released.
+want_gl_sdl="no"
+if test "${want_sdl}" = "yes" && test "${with_opengl}" = "es"; then
+   AC_MSG_ERROR([We currently do not support SDL with OpenGL ES. Please consider full OpenGL if you want to use it with SDL.])
+fi
+if test "${want_sdl}" = "yes" && test "${with_opengl}" = "full"; then
+   want_gl_sdl="yes"
+fi
+
+# Cocoa
+AC_ARG_ENABLE([cocoa],
+    [AS_HELP_STRING([--enable-cocoa],[enable Cocoa backend on Mac OS X. @<:@default=enabled@:>@])],
+    [
+     if test "x${enableval}" = "xyes" ; then
+        want_cocoa="yes"
+     else
+        want_cocoa="no"
+     fi
+    ],
+    [want_cocoa="yes"])
+
+if test "${want_cocoa}" = "yes"; then
+   #test cocoa requirements (objc and Cocoa/Cocoa.h)
+    cocoa_ldflags=""
+    have_cocoa="no"
+    m4_ifdef([AC_PROG_OBJC],
+      [
+          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_cocoa="yes"
+              cocoa_ldflags="-framework Cocoa"
+             ],
+             [have_cocoa="no"])
+          LIBS="$LIBS_save"
+          AC_MSG_CHECKING([whether Cocoa framework is supported])
+          AC_MSG_RESULT([${have_cocoa}])
+          AC_LANG_POP([Objective C])
+   ])
+fi
+AC_SUBST(cocoa_ldflags)
+
+if test "x${have_cocoa}" = "xyes"; then
+    #test cocoa requirements (objc and Cocoa/Cocoa.h)
+    cocoa_coreservices_ldflags=""
+    have_cocoa_coreservices="no"
+    m4_ifdef([AC_PROG_OBJC],
+      [
+          AC_LANG_PUSH([Objective C])
+          LIBS_save="$LIBS"
+          LIBS="$LIBS -framework CoreServices"
+          AC_LINK_IFELSE(
+             [AC_LANG_PROGRAM(
+                 [[
+#include <CoreServices/CoreServices.h>
+                 ]],
+                 [[
+//test function here
+                 ]])],
+             [
+              have_cocoa_coreservices="yes"
+              cocoa_coreservices_ldflags="-framework CoreServices"
+             ],
+             [have_cocoa_coreservices="no"])
+          LIBS="$LIBS_save"
+          AC_MSG_CHECKING([whether Cocoa CoreServices framework is supported])
+          AC_MSG_RESULT([${have_cocoa_coreservices}])
+          AC_LANG_POP([Objective C])
+   ])
+fi
+AC_SUBST(cocoa_coreservices_ldflags)
+
+AC_ARG_ENABLE([elput],
+   [AS_HELP_STRING([--enable-elput],[enable elput library. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_elput="yes"
+    else
+       want_elput="no"
+    fi
+   ],
+   [
+    if test "x${want_wayland}" = "xyes" ; then
+       want_elput="yes"
+    else
+       want_elput="no"
+    fi
+   ])
+
+# Drm
+AC_ARG_ENABLE([drm],
+   [AS_HELP_STRING([--enable-drm],[enable drm engine. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+      if test "x${want_elput}" != "xyes" ; then
+        AC_MSG_ERROR([elput is required to build drm support])
+      fi
+      want_drm="yes"
+    else
+      want_drm="no"
+    fi
+   ],
+   [want_drm="no"])
+
+AC_ARG_ENABLE([gl-drm],
+   [AC_HELP_STRING([--enable-gl-drm],
+       [enable gl drm engine. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+      if test "x${want_elput}" != "xyes" ; then
+        AC_MSG_ERROR([elput is required to build gl-drm support])
+      fi
+      want_gl_drm="yes"
+    else
+      want_gl_drm="no"
+    fi
+   ],
+   [want_gl_drm="no"])
+
+# Fontconfig
+AC_ARG_ENABLE([fontconfig],
+   [AS_HELP_STRING([--disable-fontconfig],[disable fontconfig for finding fonts. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_fontconfig="yes"
+    else
+       want_fontconfig="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_fontconfig="yes"])
+
+# Fribidi
+AC_ARG_ENABLE([fribidi],
+   [AS_HELP_STRING([--disable-fribidi],[disable bidirectional text support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_fribidi="yes"
+    else
+       want_fribidi="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_fribidi="yes"])
+
+# Harfbuzz
+AC_ARG_ENABLE([harfbuzz],
+   [AS_HELP_STRING([--enable-harfbuzz],[enable complex text shaping and layouting support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_harfbuzz="yes"
+    else
+       want_harfbuzz="no"
+    fi
+   ],
+   [want_harfbuzz="no"])
+
+# Hyphenation
+AC_ARG_ENABLE([hyphen],
+   [AS_HELP_STRING([--enable-hyphen],[enable text hyphenation support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_hyphen="yes"
+    else
+       want_hyphen="no"
+    fi
+   ],
+   [want_hyphen="no"])
+
+# Egl
+AC_ARG_ENABLE([egl],
+   [AS_HELP_STRING([--enable-egl],[enable EGL rendering. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_egl="yes"
+    else
+       want_egl="no"
+    fi
+   ],
+   [want_egl="no"])
+
+# Verify OpenGL + EGL modes match (full+glx or es+egl)
+if test "x${want_egl}" = "xyes" && test "x${with_opengl}" != "xes" ; then
+  AC_MSG_ERROR([Full OpenGL with EGL is not supported, please add --with-opengl=es to your configure options to switch to EGL + OpenGL ES.])
+fi
+if test "x${want_egl}" = "xno" && test "x${with_opengl}" = "xes" ; then
+  AC_MSG_ERROR([OpenGL ES requires EGL, please add --enable-egl to your configure options to switch to EGL + OpenGL ES.])
+fi
+
+# Pixman
+AC_ARG_ENABLE([pixman],
+   [AS_HELP_STRING([--enable-pixman],[enable pixman for software rendering. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_pixman="yes"
+       CFOPT_WARNING="xyes"
+    else
+       want_pixman="no"
+    fi
+   ],
+   [want_pixman="no"])
+
+AC_ARG_ENABLE([pixman-font],
+   [AS_HELP_STRING([--enable-pixman-font],[Allow pixman to render fonts. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_pixman_font="yes"
+    else
+       have_pixman_font="no"
+    fi
+   ],
+   [have_pixman_font="no"])
+
+AC_ARG_ENABLE([pixman-rect],
+   [AS_HELP_STRING([--enable-pixman-rect],[Allow pixman to render rects. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_pixman_rect="yes"
+    else
+       have_pixman_rect="no"
+    fi
+   ],
+   [have_pixman_rect="no"])
+
+AC_ARG_ENABLE([pixman-line],
+   [AS_HELP_STRING([--enable-pixman-line],[Allow pixman to render lines. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_pixman_line="yes"
+    else
+       have_pixman_line="no"
+    fi
+   ],
+   [have_pixman_line="no"])
+
+AC_ARG_ENABLE(pixman-poly,
+   AS_HELP_STRING([--enable-pixman-poly],[Allow pixman to render polys. @<:@default=disabled@:>@]),
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_pixman_poly="yes"
+    else
+       have_pixman_poly="no"
+    fi
+   ],
+   [have_pixman_poly="no"])
+
+AC_ARG_ENABLE([pixman-image],
+   [AS_HELP_STRING([--enable-pixman-image],[Allow pixman to render images. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_pixman_image="yes"
+    else
+       have_pixman_image="no"
+    fi
+   ],
+   [have_pixman_image="no"])
+
+AC_ARG_ENABLE([pixman-image-scale-sample],
+   [AS_HELP_STRING([--enable-pixman-image-scale-sample],[Allow pixman to render sampled scaled images. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_pixman_image_scale_sample="yes"
+    else
+       have_pixman_image_scale_sample="no"
+    fi
+   ],
+   [have_pixman_image_scale_sample="no"])
+
+# Ecore Buffer
+AC_ARG_ENABLE([ecore-buffer],
+   [AS_HELP_STRING([--enable-ecore-buffer],[enable ecore-buffer. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ecore_buffer="yes"
+    else
+       want_ecore_buffer="no"
+    fi
+   ],
+   [want_ecore_buffer="no"])
+
+# Image Loaders
+case "$host_os" in
+   cegcc*|mingw32ce*)
+      AC_MSG_ERROR([ceGCC compiler is not supported anymore. Exiting...])
+   ;;
+   mingw*)
+      want_generic="no"
+      want_poppler="no"
+      want_spectre="no"
+      want_libraw="no"
+      want_rsvg="no"
+      want_xcf="no"
+   ;;
+   cygwin*)
+      want_generic="no"
+      want_poppler="no"
+      want_spectre="no"
+      want_libraw="no"
+      want_rsvg="no"
+      want_xcf="no"
+   ;;
+   *)
+      want_generic="static"
+      want_poppler="yes"
+      want_spectre="yes"
+      want_libraw="yes"
+      want_rsvg="yes"
+      want_xcf="yes"
+   ;;
+esac
+
+ARG_ENABLE_EVAS_VG_LOADER(SVG, static)
+ARG_ENABLE_EVAS_VG_LOADER(EET, static)
+
+
+ARG_ENABLE_EVAS_IMAGE_LOADER(BMP, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(Eet, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(Generic, [${want_generic}])
+ARG_ENABLE_EVAS_IMAGE_LOADER(Gif, yes)
+ARG_ENABLE_EVAS_IMAGE_LOADER(ICO, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(JPEG, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(JP2K, auto)
+ARG_ENABLE_EVAS_IMAGE_LOADER(PMAPS, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(PNG, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(PSD, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(Tga, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(Tiff, yes)
+ARG_ENABLE_EVAS_IMAGE_LOADER(WBMP, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(WEBP, no)
+ARG_ENABLE_EVAS_IMAGE_LOADER(XPM, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(TGV, static)
+ARG_ENABLE_EVAS_IMAGE_LOADER(DDS, static)
+
+### Default values
+
+want_evas_engine_software_gdi="${have_win32}"
+want_evas_engine_software_ddraw="${have_win32}"
+want_evas_engine_gl_cocoa="${have_cocoa}"
+want_evas_engine_wayland_egl="no"
+if test "${want_wayland}" = "yes" && test "${want_egl}" = "yes" && test "${with_opengl}" = "es"; then
+   want_evas_engine_wayland_egl="yes"
+fi
+
+if test "${want_lua_old}" = "yes"; then
+   EFL_CHECK_LUA_OLD([EVAS])
+else
+   EFL_DEPEND_PKG([EVAS], [LUAJIT], [luajit >= 2.0.0])
+fi
+
+EFL_ADD_FEATURE([EVAS], [lua-old])
+
+EFL_CHECK_FUNC([EVAS], [dlsym])
+
+if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then
+   AC_MSG_ERROR([OpenGL cannot work without dlsym()])
+fi
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EVAS], [all])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [eo])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [eet])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [efl])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [emile])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [ector])
+EFL_INTERNAL_DEPEND_PKG([EVAS], [ecore])
+
+EFL_ADD_LIBS([EVAS], [-lm])
+
+# Freetype (the version 16.2.10 equals the freetype 2.5.0.1 release)
+EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 16.2.10])
+
+## optional dependencies
+
+# FontConfig
+EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_fontconfig}],
+   [FONTCONFIG], [fontconfig >= 2.5.0])
+
+# fribidi support
+EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_fribidi}],
+   [FRIBIDI], [fribidi >= 0.19.2])
+
+# harfbuzz support
+have_harfbuzz_ft="no"
+EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_harfbuzz}],
+   [HARFBUZZ], [harfbuzz >= 0.9.0])
+
+# Pixman
+EFL_OPTIONAL_DEPEND_PKG([EVAS], [${want_pixman}], [PIXMAN], [pixman-1])
+
+if test "x${have_pixman}" = "xyes" ; then
+   if test "x${have_pixman_font}" = "xyes" ; then
+      AC_DEFINE(PIXMAN_FONT, 1, [Allow pixman to render fonts])
+   fi
+   EFL_ADD_FEATURE([EVAS_PIXMAN], [font], [${have_pixman_font}])
+
+   if test "x${have_pixman_rect}" = "xyes" ; then
+      AC_DEFINE(PIXMAN_RECT, 1, [Allow pixman to render rects])
+   fi
+   EFL_ADD_FEATURE([EVAS_PIXMAN], [rect], [${have_pixman_rect}])
+
+   if test "x${have_pixman_line}" = "xyes" ; then
+      AC_DEFINE(PIXMAN_LINE, 1, [Allow pixman to render lines])
+   fi
+   EFL_ADD_FEATURE([EVAS_PIXMAN], [line], [${have_pixman_line}])
+
+   if test "x${have_pixman_poly}" = "xyes" ; then
+      AC_DEFINE(PIXMAN_POLY, 1, [Allow pixman to render polys])
+   fi
+   EFL_ADD_FEATURE([EVAS_PIXMAN], [poly], [${have_pixman_poly}])
+
+   if test "x${have_pixman_image}" = "xyes" ; then
+      AC_DEFINE(PIXMAN_IMAGE, 1, [Allow pixman to render images])
+   fi
+   EFL_ADD_FEATURE([EVAS_PIXMAN], [image], [${have_pixman_image}])
+
+   if test "x${have_pixman_image_scale_sample}" = "xyes" ; then
+      AC_DEFINE(PIXMAN_IMAGE_SCALE_SAMPLE, 1, [Allow pixman to render image sampled scaling])
+   fi
+   EFL_ADD_FEATURE([EVAS_PIXMAN], [scale_sample], [${have_pixman_scale_sample}])
+fi
+
+## Engines
+
+define([EVAS_ENGINE_DEP_CHECK_FB], [
+AC_CHECK_HEADER([linux/fb.h], [:], [AC_MSG_ERROR([Missing linux/fb.h])])
+])
+
+EVAS_ENGINE([buffer], [static])
+EVAS_ENGINE([fb], [${want_fb}], [EVAS_ENGINE_DEP_CHECK_FB])
+
+# XXX TODO:
+EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa])
+EVAS_CHECK_ENGINE([gl-sdl], [${want_gl_sdl}], [no], [OpenGL SDL])
+EVAS_CHECK_ENGINE([software-gdi], [${want_evas_engine_software_gdi}], [no], [Software GDI])
+EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw])
+EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl])
+EVAS_CHECK_ENGINE([wayland-shm], [${want_wayland}], [no], [Wayland Shm])
+EVAS_CHECK_ENGINE([drm], [${want_drm}], [no], [Drm])
+EVAS_CHECK_ENGINE([gl-drm], [${want_gl_drm}], [no], [OpenGL Drm])
+EVAS_CHECK_ENGINE([eglfs], [${want_eglfs}], [no], [OpenGL Fb])
+
+
+# Software Xlib
+
+have_evas_engine_software_xlib="no"
+EVAS_CHECK_ENGINE([software-xlib], [${want_x11_xlib}], [no], [Software Xlib])
+AC_MSG_CHECKING([whether to build Software Xlib Engine])
+AC_MSG_RESULT([${have_evas_engine_software_xlib}])
+
+# If software_x11 is available, define everything needed for X11
+
+have_evas_engine_software_x11="no"
+if test "x${have_evas_engine_software_xlib}" = "xyes" || test "x${have_evas_engine_software_xlib}" = "xstatic"; then
+   have_evas_engine_software_x11="yes"
+   AC_DEFINE_UNQUOTED([BUILD_ENGINE_SOFTWARE_X11], [1], [Build software X11 engine])
+fi
+AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [test "x${have_evas_engine_software_x11}" = "xyes"])
+
+if test "x${have_evas_engine_software_xlib}" = "xstatic"; then
+   AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_SOFTWARE_X11], [1], [Build software X11 engine as part of libevas])
+fi
+AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [test "x${have_evas_engine_software_xlib}" = "xstatic"])
+
+# Needed for evas-software-x11.pc
+
+AC_SUBST([have_evas_engine_software_xlib])
+
+# Software generic
+AC_DEFINE([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [1], [Build software generic engine as part of libevas])
+AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [true])
+
+# OpenGL
+
+if test "${with_opengl}" = "es" ; then
+   AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
+fi
+
+# OpenGL Xlib
+
+have_evas_engine_gl_xlib="no"
+EVAS_CHECK_ENGINE([gl-xlib], [${want_x11_xlib_opengl}], [no], [OpenGL XLib])
+
+AC_MSG_CHECKING([whether to build OpenGL Xlib Engine])
+AC_MSG_RESULT([${have_evas_engine_gl_xlib}])
+
+# If opengl_x11 is available, define everything needed for X11
+
+have_evas_engine_gl_x11="no"
+if test "x${have_evas_engine_gl_xlib}" = "xyes" || test "x${have_evas_engine_gl_xlib}" = "xstatic"; then
+   have_evas_engine_gl_x11="yes"
+   AC_DEFINE_UNQUOTED([BUILD_ENGINE_GL_X11], [1], [Build OpenGL X11 engine])
+fi
+AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [test "x${have_evas_engine_gl_x11}" = "xyes"])
+
+if test "x${have_evas_engine_gl_xlib}" = "xstatic"; then
+   AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_GL_X11], [1], [Build OpenGL X11 engine as part of libevas])
+fi
+AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [test "x${have_evas_engine_gl_xlib}" = "xstatic"])
+
+# Needed for evas-opengl-x11.pc
+
+AC_SUBST([have_evas_engine_gl_xlib])
+
+# OpenGL SDL
+
+if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then
+   AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION],
+      [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],,
+      [#include <SDL2/SDL_video.h>])
+fi
+
+if test "${with_opengl}" = "es"; then
+   AC_CHECK_DECL([SDL_OPENGLES],
+      [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is present])],,
+      [#include <SDL2/SDL_video.h>])
+fi
+
+# OpenGL common
+evas_engine_gl_common_cflags=""
+if test "x${have_egl}" = "xyes"; then
+   evas_engine_gl_common_libs="-lEGL -lGLESv2 -lm"
+else
+   evas_engine_gl_common_libs="-lGL -lm"
+fi
+
+# The lines below fix compiling/linking of gl_generic on OSX
+if test "x${have_darwin}" = "xyes"; then
+   if test "x${have_evas_engine_gl_cocoa}" = "xyes"; then
+      # If gl_cocoa is enabled, Apple's Core OpenGL (CGL) should be the default OpenGL.
+      # CFLAGS and LIBS are determined by evas-gl_cocoa.
+      evas_engine_gl_common_libs="${evas_engine_gl_cocoa_libs}"
+      evas_engine_gl_common_cflags="${evas_engine_gl_cocoa_cflags}"
+   else
+      # If evas-gl_cocoa is disabled, the only supported OpenGL engine on OSX (for now)
+      # is evas-gl_x11. Without its CFLAGS and LIBS explicitely set, gl_generic
+      # cannot compile (nor link).
+      evas_engine_gl_common_libs=""
+      evas_engine_gl_common_cflags=""
+
+      if test "x${have_evas_engine_gl_xlib}" = "xyes"; then
+         evas_engine_gl_common_libs="${evas_engine_gl_xlib_libs}"
+         evas_engine_gl_common_cflags="${evas_engine_gl_xlib_cflags}"
+      fi
+      ### XXX Check for other supported engines supported on OSX (dec. 2014: NONE)
+   fi
+fi
+
+AC_SUBST([evas_engine_gl_common_cflags])
+AC_SUBST([evas_engine_gl_common_libs])
+
+have_evas_engine_gl_common="no"
+have_static_evas_engine_gl_common="no"
+if test "x$have_evas_engine_gl_xlib" = "xyes" || \
+   test "x$have_evas_engine_gl_sdl" = "xyes" || \
+   test "x$have_evas_engine_gl_cocoa" = "xyes" || \
+   test "x$have_evas_engine_gl_drm" = "xyes" || \
+   test "x$have_evas_engine_eglfs" = "xyes" || \
+   test "x$have_evas_engine_wayland_egl" = "xyes"; then
+   have_evas_engine_gl_common="yes"
+fi
+if test "x$have_evas_engine_gl_xlib" = "xstatic" || \
+   test "x$have_evas_engine_gl_sdl" = "xstatic" || \
+   test "x$have_evas_engine_gl_cocoa" = "xstatic" || \
+   test "x$have_evas_engine_gl_drm" = "xstatic" || \
+   test "x$have_evas_engine_eglfs" = "xstatic" || \
+   test "x$have_evas_engine_wayland_egl" = "xstatic"; then
+   have_evas_engine_gl_common="yes"
+   have_static_evas_engine_gl_common="yes"
+fi
+
+if test "x${have_evas_engine_gl_common}" = "xyes"; then
+   AC_DEFINE([BUILD_ENGINE_GL_COMMON], [1], [Generic OpenGL Rendering Support])
+fi
+
+AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [test "x$have_evas_engine_gl_common" = "xyes"])
+
+if test "x${have_static_evas_engine_gl_common}" = "xyes"; then
+   AC_DEFINE([EVAS_STATIC_BUILD_GL_COMMON], [1], [Build GL generic engine as part of libevas])
+fi
+
+AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test "x${have_static_evas_engine_gl_common}" = "xyes"])
+
+have_evas_engine_wayland_common="no"
+if test "x$have_evas_engine_wayland_egl" = "xstatic" || \
+   test "x$have_evas_engine_wayland_shm" = "xstatic" || \
+   test "x$have_evas_engine_wayland_egl" = "xyes" || \
+   test "x$have_evas_engine_wayland_shm" = "xyes"; then
+   have_evas_engine_wayland_common="yes"
+fi
+
+if test "x$have_evas_engine_wayland_common" = "xyes"; then
+   AC_DEFINE([BUILD_ENGINE_WAYLAND_COMMON], [1], [Building any wayland evas engine])
+fi
+AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_COMMON], [test "x${have_evas_engine_wayland_common}" = "xyes"])
+
+## Vg Loaders
+
+EVAS_CHECK_VG_LOADER([SVG], [${want_evas_vg_loader_svg}])
+EVAS_CHECK_VG_LOADER([EET], [${want_evas_vg_loader_eet}])
+
+## Image Loaders
+
+EVAS_CHECK_IMAGE_LOADER([BMP],     [${want_evas_image_loader_bmp}])
+EVAS_CHECK_IMAGE_LOADER([Eet],     [${want_evas_image_loader_eet}])
+EVAS_CHECK_IMAGE_LOADER([Generic], [${want_evas_image_loader_generic}])
+EVAS_CHECK_IMAGE_LOADER([Gif],     [${want_evas_image_loader_gif}])
+EVAS_CHECK_IMAGE_LOADER([ICO],     [${want_evas_image_loader_ico}])
+EVAS_CHECK_IMAGE_LOADER([JPEG],    [${want_evas_image_loader_jpeg}])
+EVAS_CHECK_IMAGE_LOADER([JP2K],    [${want_evas_image_loader_jp2k}])
+EVAS_CHECK_IMAGE_LOADER([PMAPS],   [${want_evas_image_loader_pmaps}])
+EVAS_CHECK_IMAGE_LOADER([PNG],     [${want_evas_image_loader_png}])
+EVAS_CHECK_IMAGE_LOADER([PSD],     [${want_evas_image_loader_psd}])
+EVAS_CHECK_IMAGE_LOADER([Tga],     [${want_evas_image_loader_tga}])
+EVAS_CHECK_IMAGE_LOADER([Tiff],    [${want_evas_image_loader_tiff}])
+EVAS_CHECK_IMAGE_LOADER([WBMP],    [${want_evas_image_loader_wbmp}])
+EVAS_CHECK_IMAGE_LOADER([WEBP],    [${want_evas_image_loader_webp}])
+EVAS_CHECK_IMAGE_LOADER([XPM],     [${want_evas_image_loader_xpm}])
+EVAS_CHECK_IMAGE_LOADER([TGV],     [${want_evas_image_loader_tgv}])
+EVAS_CHECK_IMAGE_LOADER([DDS],     [${want_evas_image_loader_dds}])
+
+EFL_EVAL_PKGS([EVAS])
+
+### Checks for header files
+
+if test "x$want_hyphen" = "xyes" ; then
+
+   EFL_CHECK_LIB_CODE([EVAS], [-lhyphen], [have_fct], [[
+   #include <string.h>
+   #include <stdlib.h>
+   #include <ctype.h>
+   #include <stdio.h>
+   #include <hyphen.h>
+   ]], [[
+   HyphenDict *dict;
+   ]])
+
+   if test "${have_fct}" = "no"; then
+     AC_MSG_ERROR([Cannot find the hyphen library.])
+   else
+     AC_DEFINE([HAVE_HYPHEN], [1], [have hunspell hyphen support])
+   fi
+fi
+
+if test "x$have_harfbuzz" = "xyes" ; then
+
+   CPPFLAGS_SAVE="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS"
+# must have for usage with harfbuzz although harfbuzz may not have it.
+
+   AC_CHECK_HEADER([hb-ft.h],
+      [
+       have_harfbuzz_ft="yes"
+       #Depend on harfbuzz ft for harfbuzz support
+       AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support])
+      ],
+      [AC_MSG_ERROR([Harfbuzz-ft (hb-ft.h) not found])])
+
+   CPPFLAGS="$CPPFLAGS_SAVE"
+fi
+
+### Checks for types
+
+CPPFLAGS_SAVE="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS -Isrc/lib/eina"
+AC_CHECK_SIZEOF([Eina_Unicode], [], [#include <Eina.h>])
+CPPFLAGS="$CPPFLAGS_SAVE"
+
+
+if test "x$have_fribidi" = "xyes" ; then
+   CPPFLAGS_SAVE="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS"
+   AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi.h>])
+   CPPFLAGS="$CPPFLAGS_SAVE"
+fi
+
+### Checks for structures
+
+AC_CHECK_TYPES([struct sigaction], [], [],
+               [[#include <signal.h>]])
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+AC_CHECK_FUNCS([siglongjmp])
+
+AC_CHECK_LIB([m], [lround],
+[AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists])],
+[EFL_CHECK_GCC_BUILTIN([lround], [HAVE_LROUND])]
+)
+
+
+### Configuration
+
+## dither options
+
+AC_ARG_WITH([evas-dither-mask],
+   [AS_HELP_STRING([--with-evas-dither-mask=TYPE],[use the specified dither mask to convert bitdepths in Evas, one of: big, small, line or none.
+                    @<:@default=big@:>@])],
+   [build_evas_dither_mask=${withval}],
+   [build_evas_dither_mask=big])
+
+case "${build_evas_dither_mask}" in
+   big)
+     AC_DEFINE([BUILD_BIG_DITHER_MASK], [1], [Use biggest dither mask while converting in Evas])
+     ;;
+   small)
+     AC_DEFINE([BUILD_SMALL_DITHER_MASK], [1], [Use smaller dither mask while converting in Evas])
+     ;;
+   line)
+     AC_DEFINE([BUILD_LINE_DITHER_MASK], [1], [Use simpler line-only dither mask while converting in Evas])
+     ;;
+   none)
+     AC_DEFINE([BUILD_NO_DITHER_MASK], [1], [Do not use dither masks while converting in Evas])
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown Evas dither mask --with-evas-dither-mask=${build_evas_dither_mask}])
+     ;;
+esac
+EFL_ADD_FEATURE([EVAS], [fontconfig])
+EFL_ADD_FEATURE([EVAS], [fribidi])
+EFL_ADD_FEATURE([EVAS], [harfbuzz])
+EFL_ADD_FEATURE([EVAS], [tile-rotate])
+EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}])
+EFL_ADD_FEATURE([EVAS], [hyphen])
+
+#### Generic backend
+
+### Options to turn off generic loaders for evas
+AC_ARG_ENABLE([poppler],
+   [AS_HELP_STRING([--disable-poppler],[disable pdf support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_poppler="yes"
+    else
+       want_poppler="no"
+    fi
+   ])
+
+AC_ARG_ENABLE([spectre],
+   [AS_HELP_STRING([--disable-spectre],[disable postscript support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_spectre="yes"
+    else
+       want_spectre="no"
+    fi
+   ])
+
+AC_ARG_ENABLE([libraw],
+   [AS_HELP_STRING([--disable-libraw],[disable libraw support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_libraw="yes"
+    else
+       want_libraw="no"
+    fi
+   ])
+
+AC_ARG_ENABLE([librsvg],
+   [AS_HELP_STRING([--disable-librsvg],[disable svg support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_rsvg="yes"
+    else
+       want_rsvg="no"
+    fi
+   ])
+
+AC_ARG_ENABLE([xcf],
+   [AS_HELP_STRING([--disable-xcf],[disable xcf support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xcf="yes"
+    else
+       want_xcf="no"
+    fi
+   ])
+
+have_poppler="no"
+have_spectre="no"
+have_raw="no"
+have_rsvg="no"
+
+### Check needed dependency for each generic loader
+if test "x${want_poppler}" = "xyes"; then
+   PKG_CHECK_MODULES([POPPLER], [poppler-cpp >= 0.12], [have_poppler="yes"])
+fi
+
+if test "x${have_poppler}" = "xyes" ; then
+   # We should be using ${CXX} here, but there is a bug in
+   # autotools macro and CXX is always set to g++ even if
+   # it's not found. So we are using an internal variable
+   # that does the work for now, may get broken in the future.
+   if test "x${ac_ct_CXX}" = "x" -a "x${CXX}" = "xg++"; then
+      AC_MSG_ERROR([efl requires a C++ compiler got ${ac_ct_CXX} and ${CXX}.])
+   fi
+fi
+
+if test "x${want_spectre}" = "xyes"; then
+   PKG_CHECK_MODULES([SPECTRE], [libspectre], [have_spectre="yes"])
+fi
+
+if test "x${want_libraw}" = "xyes"; then
+   PKG_CHECK_MODULES([LIBRAW], [libraw], [have_raw="yes"])
+fi
+
+if test "x${want_rsvg}" = "xyes"; then
+   PKG_CHECK_MODULES([RSVG],  [librsvg-2.0 >= 2.14.0 cairo >= 1.0.0], [have_rsvg="yes"])
+   PKG_CHECK_MODULES(
+      [SVG_2_36], [librsvg-2.0 >= 2.36.0 cairo >= 1.0.0],
+      [
+       have_rsvg_2_36="yes"
+       AC_DEFINE(HAVE_SVG_2_36, 1, [Have librsvg >= 2.36])
+      ],
+      [have_rsvg_2_36="no"])
+fi
+
+AM_CONDITIONAL([HAVE_POPPLER], [test "x${have_poppler}" = "xyes"])
+AM_CONDITIONAL([HAVE_SPECTRE], [test "x${have_spectre}" = "xyes"])
+AM_CONDITIONAL([HAVE_LIBRAW], [test "x${have_raw}" = "xyes"])
+AM_CONDITIONAL([HAVE_RSVG], [test "x${have_rsvg}" = "xyes"])
+AM_CONDITIONAL([HAVE_XCF], [test "x${want_xcf}" = "xyes"])
+
+EFL_ADD_FEATURE([EVAS_LOADER], [poppler], [${have_poppler}])
+EFL_ADD_FEATURE([EVAS_LOADER], [spectre], [${have_spectre}])
+EFL_ADD_FEATURE([EVAS_LOADER], [raw], [${have_raw}])
+EFL_ADD_FEATURE([EVAS_LOADER], [rsvg], [${have_rsvg}])
+EFL_ADD_FEATURE([EVAS_LOADER], [xcf], [${want_xcf}])
+
+EFL_LIB_END([Evas])
+#### End of Evas
+
+#### Edje CXX
+EFL_LIB_START([Evas_Cxx])
+
+EFL_EVAL_PKGS([EVAS_CXX])
+
+EFL_LIB_END([Evas_Cxx])
+#### End of Edje CXX
+
+#### Embryo
+
+EFL_LIB_START([Embryo])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([EMBRYO], [all])
+EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina])
+
+EFL_ADD_LIBS([EMBRYO], [-lm])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+if ! test "x${efl_func_fnmatch}" = "xyes" ; then
+   AC_MSG_ERROR([Cannot find fnmatch()])
+fi
+
+if ! test "x${efl_func_gettimeofday}" = "xyes" ; then
+   AC_MSG_ERROR([Cannot find gettimeofday()])
+fi
+
+### Check availability
+
+EFL_LIB_END([Embryo])
+#### End of Embryo
+
+
+#### Ecore CXX
+EFL_LIB_START([Ecore_Cxx])
+
+EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eina_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Efl])
+
+EFL_EVAL_PKGS([ECORE_CXX])
+
+EFL_LIB_END([Ecore_Cxx])
+#### End of Ecore CXX
+
+#### Ecore_Con
+
+EFL_LIB_START([Ecore_Con])
+
+### Default values
+
+want_ecore_con_local_sockets="yes"
+want_ecore_con_abstract_sockets="yes"
+
+if test "${have_win32}" = "yes"; then
+   want_ecore_con_abstract_sockets="no"
+elif test "${have_darwin}" = "yes"; then
+   want_ecore_con_abstract_sockets="yes"
+elif test "${have_ps3}" = "yes"; then
+   want_ecore_con_local_sockets="no"
+   want_ecore_con_abstract_sockets="no"
+fi
+
+AC_DEFINE_IF([HAVE_LOCAL_SOCKETS],
+   [test "x${want_ecore_con_local_sockets}" = "xyes"],
+   [1], [Have local sockets support])
+AC_DEFINE_IF([HAVE_ABSTRACT_SOCKETS],
+   [test "x${want_ecore_con_abstract_sockets}" = "xyes"],
+   [1], [Have abstract sockets namespace])
+
+EFL_NET_CONTROL_BACKEND=none
+if test "${have_linux}" = "yes"; then
+   EFL_NET_CONTROL_BACKEND=connman
+fi
+
+AC_MSG_CHECKING([net-control backend to use])
+AC_ARG_WITH([net-control],
+   [AS_HELP_STRING([--with-net-control=BACKEND],[Specify which network control backend to be used by Efl.Net.Session and Efl.Net.Control. One of: connman or none])],
+   [EFL_NET_CONTROL_BACKEND="${withval}"])
+
+case "${EFL_NET_CONTROL_BACKEND}" in
+   connman|none)
+     ;;
+   *)
+     AC_MSG_ERROR([Unknown net-control backend --with-net-control=${EFL_NET_CONTROL_BACKEND}])
+     ;;
+esac
+AC_MSG_RESULT([${EFL_NET_CONTROL_BACKEND}])
+AC_SUBST(EFL_NET_CONTROL_BACKEND)
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ECORE_CON], [all])
+if test "$build_crypto" != "none" ; then
+   EFL_CRYPTO_DEPEND([ECORE_CON])
+fi
+EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eet])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [emile])
+
+if test "${EFL_NET_CONTROL_BACKEND}" = "connman"; then
+   EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eldbus])
+fi
+AM_CONDITIONAL([EFL_NET_CONTROL_BACKEND_CONNMAN], [test "${EFL_NET_CONTROL_BACKEND}" = "connman"])
+AM_CONDITIONAL([EFL_NET_CONTROL_BACKEND_NONE], [test "${EFL_NET_CONTROL_BACKEND}" = "none"])
+
+EFL_ADD_LIBS([ECORE_CON], [${requirement_nsl} -lm])
+
+EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd])
+
+EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}])
+EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}])
+EFL_ADD_FEATURE([ECORE_CON], [systemd-daemon], [${want_systemd}])
+EFL_ADD_FEATURE([ECORE_CON], [net-control], [${EFL_NET_CONTROL_BACKEND}])
+
+EFL_EVAL_PKGS([ECORE_CON])
+
+### Checks for header files
+
+AC_CHECK_HEADERS([netdb.h sys/filio.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
+
+if test "x${have_win32}" = "xyes" ; then
+   have_ipv6="yes"
+else
+   have_ipv6="no"
+   AC_CHECK_TYPES([struct ipv6_mreq],
+      [have_ipv6="yes"],
+      [have_ipv6="no"],
+      [[
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+      ]])
+fi
+
+AC_DEFINE_IF([HAVE_IPV6],
+   [test "x${have_ipv6}" = "xyes"],
+   [1], [Define if IPV6 is supported])
+AM_CONDITIONAL([HAVE_IPV6], [test "x${have_ipv6}" = "xyes"])
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+AC_CHECK_FUNCS([accept4], ,
+   [AC_CHECK_LIB([socket], [accept4],
+   [AC_DEFINE([HAVE_ACCEPT4], [1])])])
+
+EFL_LIB_END([Ecore_Con])
+#### End of Ecore_Con
+
+
+#### Ecore_Ipc
+
+EFL_LIB_START([Ecore_Ipc])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_IPC], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina])
+
+EFL_ADD_LIBS([ECORE_IPC], [-lm])
+
+### 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
+
+EFL_LIB_END([Ecore_Ipc])
+#### End of Ecore_Ipc
+
+
+#### Ecore_File
+
+EFL_LIB_START([Ecore_File])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_FILE], [evil])
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ECORE_FILE], [escape])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Ecore_File])
+#### End of Ecore_File
+
+
+#### Eeze
+have_libmount_new="no"
+have_libmount_old="no"
+have_eeze_mount="no"
+
+EFL_LIB_START_OPTIONAL([Eeze], [test "x${build_libeeze}" = "xyes"])
+
+### Additional options to configure
+AC_ARG_WITH([mount],
+  [AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])],
+  [with_eeze_mount=$withval], [with_eeze_mount="detect"])
+AC_ARG_WITH([umount],
+  [AS_HELP_STRING([--with-umount], [specify umount bin @<:@default=detect@:>@])],
+  [with_eeze_umount=$withval], [with_eeze_umount="detect"])
+AC_ARG_WITH([eject],
+  [AS_HELP_STRING([--with-eject], [specify eject bin @<:@default=detect@:>@])],
+  [with_eeze_eject=$withval], [with_eeze_eject="detect"])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [efl])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [eet])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [emile])
+
+EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
+
+AC_ARG_ENABLE([libmount],
+   [AS_HELP_STRING([--disable-libmount],[disable libmount support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_libmount="yes"
+    else
+       want_libmount="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_libmount="yes"])
+
+EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_libmount}],
+   [EEZE_MOUNT], [mount >= 2.18.0])
+EFL_ADD_FEATURE([EEZE], [libmount], [${have_eeze_mount}])
+
+PKG_CHECK_EXISTS([libudev < 199],
+                 [have_libudev_old="yes"],
+                 [have_libudev_old="no"])
+AC_MSG_CHECKING([Use old libudev API (before 199)])
+AC_MSG_RESULT([${have_libudev_old}])
+
+PKG_CHECK_EXISTS([mount < 2.19.0],
+                 [have_libmount_old="yes"],
+                 [have_libmount_old="no"])
+AC_MSG_CHECKING([Use old libmount API (before 2.19.0)])
+AC_MSG_RESULT([${have_libmount_old}])
+
+PKG_CHECK_EXISTS([mount == 2.19.0],
+                 [have_libmount_219="yes"],
+                 [have_libmount_219="no"])
+AC_MSG_CHECKING([Use libmount 2.19.0 API])
+AC_MSG_RESULT([${have_libmount_219}])
+
+PKG_CHECK_EXISTS([mount > 2.19.0],
+                 [have_libmount_new="yes"],
+                 [have_libmount_new="no"])
+AC_MSG_CHECKING([Use new libmount API (newer than 2.19.0)])
+AC_MSG_RESULT([${have_libmount_new}])
+
+if test "x${have_libudev_old}" = "xyes"; then
+  AC_DEFINE_UNQUOTED([OLD_LIBUDEV], [1], [using older version of libudev])
+fi
+
+if test "x${have_libmount_old}" = "xyes"; then
+  AC_DEFINE_UNQUOTED([OLD_LIBMOUNT], [1], [using first version of libmount])
+fi
+
+## modules
+if test "${want_tizen}"  = "yes"; then
+  PKG_CHECK_MODULES([TIZEN_SENSOR], [capi-system-sensor >= 0.1.17])
+fi
+EFL_ADD_FEATURE([EEZE], [tizen])
+
+EFL_EVAL_PKGS([EEZE])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Checks for binaries
+if test "x$with_eeze_mount" = "xdetect"; then
+  AC_PATH_PROG([with_eeze_mount], [mount], [])
+fi
+AC_DEFINE_UNQUOTED([EEZE_MOUNT_BIN], ["$with_eeze_mount"], [mount bin to use])
+
+if test "x$with_eeze_umount" = "xdetect";then
+  AC_PATH_PROG([with_eeze_umount], [umount], [])
+fi
+AC_DEFINE_UNQUOTED([EEZE_UNMOUNT_BIN], ["$with_eeze_umount"], [umount bin to use])
+
+if test "x$with_eeze_eject" = "xdetect";then
+  AC_PATH_PROG([with_eeze_eject], [eject], [])
+fi
+AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eeze_eject"], [eject bin to use])
+
+EFL_LIB_END_OPTIONAL([Eeze])
+
+AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219],
+               [test "x${have_libmount_new}" = "xyes"])
+AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219],
+               [test "x${have_libmount_old}" = "xyes"])
+AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xyes"])
+AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
+#### End of Eeze
+
+
+#### Ecore_Input
+EFL_LIB_START([Ecore_Input])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_INPUT], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
+
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [${efl_lib_optional_eeze}], [eeze])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Ecore_Input])
+#### End of Ecore_Input
+
+
+#### Ecore_Input_Evas
+EFL_LIB_START([Ecore_Input_Evas])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_INPUT_EVAS], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [emile])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Ecore_Input_Evas])
+#### End of Ecore_Input_Evas
+
+
+#### Ecore_Cocoa
+EFL_LIB_START_OPTIONAL([Ecore_Cocoa], [test "${have_cocoa}" = "yes"])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina])
+
+### Checks for header files
+
+EFL_ADD_LIBS([ECORE_COCOA], [-framework Cocoa])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_Cocoa])
+#### End of Ecore_Cocoa
+
+
+#### Ecore_FB
+EFL_LIB_START_OPTIONAL([Ecore_FB], [test "${want_fb}" = "yes"])
+
+### Additional options to configure
+AC_ARG_ENABLE([tslib],
+   [AS_HELP_STRING([--disable-tslib],[disable tslib for touchscreen events.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_tslib="yes"
+    else
+       want_tslib="no"
+    fi
+   ], [want_tslib="yes"])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina])
+
+EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib])
+EFL_ADD_FEATURE([ECORE_FB], [tslib])
+
+EFL_EVAL_PKGS([ECORE_FB])
+
+### Checks for header files
+
+have_ecore_fb="no"
+AC_CHECK_HEADER([linux/fb.h],
+   [AC_CHECK_HEADER([linux/input.h], [have_ecore_fb="yes"])])
+if test "${have_ecore_fb}" = "no"; then
+   AC_MSG_ERROR([Missing linux/input.h or linux/fb.h])
+fi
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_FB])
+#### End of Ecore_FB
+
+
+#### Ecore_SDL
+EFL_LIB_START_OPTIONAL([Ecore_SDL], [test "${want_sdl}" = "yes"])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ECORE_SDL], [all])
+EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina])
+
+EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl2 >= 2.0.0])
+
+EFL_EVAL_PKGS([ECORE_SDL])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_SDL])
+#### End of Ecore_SDL
+
+
+#### Ecore_Wayland
+EFL_LIB_START_OPTIONAL([Ecore_Wayland], [test "${want_ecore_wayland}" = "yes"])
+
+if test "x${want_wayland_ivi_shell}" = "xyes" ; then
+   AC_DEFINE(USE_IVI_SHELL, 1, [Ecore_Wayland IVI-Shell Support])
+fi
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina])
+
+EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND],
+   [wayland-client >= 1.8.0 wayland-cursor >= 1.8.0 xkbcommon >= 0.5.0 uuid])
+
+EFL_EVAL_PKGS([ECORE_WAYLAND])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_Wayland])
+#### End of Ecore_Wayland
+
+#### Ecore_Wl2
+EFL_LIB_START_OPTIONAL([Ecore_Wl2], [test "${want_wayland}" = "yes"])
+
+if test "x${want_wayland_ivi_shell}" = "xyes" ; then
+   AC_DEFINE(USE_IVI_SHELL, 1, [Ecore_Wl2 IVI-Shell Support])
+fi
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eina])
+
+EFL_DEPEND_PKG([ECORE_WL2], [WAYLAND],
+   [wayland-server >= 1.11.0 wayland-client >= 1.11.0 xkbcommon >= 0.6.0])
+
+EFL_EVAL_PKGS([ECORE_WL2])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_Wl2])
+#### End of Ecore_Wl2
+
+#### Efl_Wl
+EFL_LIB_START_OPTIONAL([Efl_Wl], [test -n "${ECORE_WL2_CFLAGS}"])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [ecore-wl2])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [ecore-evas])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [evas])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [emile])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [eo])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [efl])
+EFL_INTERNAL_DEPEND_PKG([EFL_WL], [eina])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EFL_WL], [${want_x11_any}], [ecore_x])
+
+EFL_DEPEND_PKG([EFL_WL], [WAYLAND],
+               [wayland-server >= 1.11.0 xkbcommon >= 0.6.0])
+EFL_OPTIONAL_DEPEND_PKG([EFL_WL], [${want_x11_any}], [XKBCOMMONX11], [xkbcommon-x11])
+
+EFL_EVAL_PKGS([EFL_WL])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Efl_Wl])
+#### End of Efl_Wl
+
+#### Eldbus
+EFL_LIB_START([Eldbus])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ELDBUS], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [efl])
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELDBUS], [eina])
+
+EFL_DEPEND_PKG([ELDBUS], [DBUS], [dbus-1])
+
+EFL_EVAL_PKGS([ELDBUS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Eldbus])
+#### End of Eldbus
+
+
+
+#### Ecore_Drm
+EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_ecore_drm}" = "yes"])
+
+### Additional options to configure
+SUID_CFLAGS=-fPIE
+SUID_LDFLAGS=-pie
+AC_SUBST([SUID_CFLAGS])
+AC_SUBST([SUID_LDFLAGS])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eldbus])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eeze])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina])
+
+EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 gbm])
+EFL_DEPEND_PKG([ECORE_DRM], [LIBINPUT], [libinput >= 1.6.0])
+
+EFL_ADD_LIBS([ECORE_DRM], [-lm])
+
+EFL_EVAL_PKGS([ECORE_DRM])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_Drm])
+#### End of Ecore_Drm
+
+
+#### Elput
+EFL_LIB_START_OPTIONAL([Elput], [test "${want_elput}" = "yes"])
+
+### Additional options to configure
+SUID_CFLAGS=-fPIE
+SUID_LDFLAGS=-pie
+AC_SUBST([SUID_CFLAGS])
+AC_SUBST([SUID_LDFLAGS])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ELPUT], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ELPUT], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ELPUT], [eldbus])
+EFL_INTERNAL_DEPEND_PKG([ELPUT], [eeze])
+EFL_INTERNAL_DEPEND_PKG([ELPUT], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELPUT], [eina])
+
+EFL_DEPEND_PKG([ELPUT], [LIBINPUT], [libinput >= 1.7.0 xkbcommon >= 0.3.0 libudev])
+
+AC_ARG_ENABLE([elogind],
+   [AS_HELP_STRING([--enable-elogind],[enable elogind support.@<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_elogind="yes"
+    else
+       want_elogind="no"
+    fi
+   ], [
+    want_elogind="no"
+   ])
+
+EFL_OPTIONAL_DEPEND_PKG([ELPUT], [${want_systemd}], [SYSTEMD], [libsystemd])
+EFL_OPTIONAL_DEPEND_PKG([ELPUT], [${want_elogind}], [ELOGIND], [libelogind])
+EFL_ADD_FEATURE([ELPUT], [systemd-logind], [${want_systemd}])
+EFL_ADD_FEATURE([ELPUT], [elogind], [${want_elogind}])
+
+EFL_ADD_LIBS([ELPUT], [-lm])
+
+
+EFL_EVAL_PKGS([ELPUT])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Elput])
+#### End of Elput
+
+#### Ecore_Drm2
+EFL_LIB_START_OPTIONAL([Ecore_Drm2], [test "${want_drm}" = "yes"])
+
+### Additional options to configure
+SUID_CFLAGS=-fPIE
+SUID_LDFLAGS=-pie
+AC_SUBST([SUID_CFLAGS])
+AC_SUBST([SUID_LDFLAGS])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM2], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM2], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM2], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM2], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM2], [elput])
+EFL_INTERNAL_DEPEND_PKG([ECORE_DRM2], [eeze])
+
+EFL_DEPEND_PKG([ECORE_DRM2], [DRM], [gbm])
+
+EFL_ADD_LIBS([ECORE_DRM2], [-lm])
+EFL_ADD_LIBS([ECORE_DRM2], [-ldl])
+
+EFL_EVAL_PKGS([ECORE_DRM2])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_Drm2])
+#### End of Ecore_Drm2
+
+
+#### Ecore_Audio
+
+AC_ARG_ENABLE([audio],
+   [AS_HELP_STRING([--disable-audio],[disable audio support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_audio="yes"
+    else
+       want_audio="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_audio="yes"])
+
+EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"])
+
+### Additional options to configure
+
+# ALSA support is still not there, thus no option for it yet.
+want_alsa="no"
+
+# sndfile is mandatory otherwise it won't read from/write to files.
+# TODO: if confirmed sndfile is mandatory, remove this variable
+# TODO: and the EFL_OPTIONAL_DEPEND_PKG(), use EFL_DEPEND_PKG()
+want_sndfile="yes"
+
+want_wasapiaudio="no"
+
+AC_ARG_ENABLE([pulseaudio],
+   [AS_HELP_STRING([--disable-pulseaudio],[disable pulseaudio sound support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_pulseaudio="yes"
+    else
+       want_pulseaudio="no"
+       if test "x${have_win32}" = "xyes" ; then
+         want_wasapiaudio="yes"
+       else
+          want_wasapiaudio="no"
+          CFOPT_WARNING="xyes"
+       fi
+    fi
+   ],
+   [want_pulseaudio="yes"])
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_AUDIO], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [emile])
+
+EFL_ADD_LIBS([ECORE_AUDIO], [-lm])
+
+if test "x${want_alsa}" = "xyes" ; then
+  PKG_CHECK_MODULES([ECORE_AUDIO_ALSA], [alsa])
+  AC_DEFINE([HAVE_ALSA], [1], [Alsa support])
+fi
+if test "x${want_pulseaudio}" = "xyes" ; then
+  PKG_CHECK_MODULES([ECORE_AUDIO_PULSE], [libpulse])
+  AC_DEFINE([HAVE_PULSE], [1], [Pulseaudio support])
+fi
+if test "x${want_sndfile}" = "xyes" ; then
+  PKG_CHECK_MODULES([ECORE_AUDIO_SNDFILE], [sndfile])
+  AC_DEFINE([HAVE_SNDFILE], [1], [Sndfile support])
+fi
+if test "x${want_wasapiaudio}" = "xyes" ; then
+  EFL_ADD_LIBS([ECORE_AUDIO], [-luuid -lwinmm -lksuser])
+fi
+
+dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_ALSA], [${want_alsa}], [ALSA], [alsa])
+dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_PULSE], [${want_pulseaudio}], [PULSE], [libpulse])
+dnl EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO_SNDFILE], [${want_sndfile}], [SNDFILE], [sndfile])
+
+EFL_EVAL_PKGS([ECORE_AUDIO])
+
+EFL_ADD_FEATURE([ECORE_AUDIO], [alsa])
+EFL_ADD_FEATURE([ECORE_AUDIO], [pulseaudio])
+EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
+EFL_ADD_FEATURE([ECORE_AUDIO], [wasapiaudio])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([Ecore_Audio])
+AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"])
+AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])
+
+#### End of Ecore_Audio
+
+#### Ecore Audio CXX
+EFL_LIB_START([Ecore_Audio_Cxx])
+
+EFL_EVAL_PKGS([ECORE_AUDIO_CXX])
+
+EFL_LIB_END([Ecore_Audio_Cxx])
+#### End of Ecore Audio CXX
+
+#### Ecore_Win32
+EFL_LIB_START_OPTIONAL([Ecore_Win32], [test "${have_win32}" = "yes"])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina])
+
+EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32])
+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
+
+EFL_LIB_END_OPTIONAL([Ecore_Win32])
+#### End of Ecore_Win32
+
+#### Ecore_Avahi
+
+EFL_LIB_START([Ecore_Avahi])
+
+### Default values
+
+### Additional options to configure
+
+want_avahi="yes"
+
+AC_ARG_ENABLE([avahi],
+   [AS_HELP_STRING([--disable-avahi],[disable avahi support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_avahi="yes"
+    else
+       want_avahi="no"
+    fi
+   ], [
+    want_avahi="yes"
+   ])
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_AVAHI], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [efl])
+
+EFL_OPTIONAL_DEPEND_PKG([ECORE_AVAHI], [${want_avahi}], [AVAHI], [avahi-client], [have_avahi=yes], [have_avahi=no])
+
+EFL_ADD_FEATURE([ECORE_AVAHI], [avahi-client], [${have_avahi}])
+
+# Needed bu example as they use avahi directly in that case
+if test "x${have_avahi}" = "xyes"; then
+   PKG_CHECK_MODULES([AVAHI_CLIENT], [avahi-client])
+fi
+
+EFL_EVAL_PKGS([ECORE_AVAHI])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Ecore_Avahi])
+
+#### End of Ecore_Avahi
+
+
+#### Ecore_X
+EFL_LIB_START_OPTIONAL([Ecore_X], [test "${want_x11_any}" = "yes"])
+
+### Additional options to configure
+
+AC_ARG_ENABLE([gesture],
+   [AS_HELP_STRING([--enable-gesture],[enable X11 Gesture extension support])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_gesture="yes"
+    else
+       want_gesture="no"
+    fi
+   ],
+   [want_gesture="no"])
+
+AC_ARG_ENABLE([xpresent],
+   [AS_HELP_STRING([--enable-xpresent],[enable X11 XPresent extension support])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xpresent="yes"
+    else
+       want_xpresent="no"
+    fi
+   ],
+   [want_xpresent="no"])
+
+AC_ARG_ENABLE([xinput2],
+   [AS_HELP_STRING([--disable-xinput2],[disable X11 XInput v2.x support])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xinput2="yes"
+    else
+       want_xinput2="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_xinput2="yes"])
+
+AC_ARG_ENABLE([xinput22],
+   [AS_HELP_STRING([--enable-xinput22],[enable X11 XInput v2.2+ support])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xinput22="yes"
+    else
+       want_xinput22="no"
+    fi
+   ],
+   [want_xinput22="no"])
+
+AC_ARG_ENABLE([xim],
+   [AS_HELP_STRING([--disable-xim],[disable X Input Method.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xim="yes"
+    else
+       want_xim="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_xim="yes"])
+
+AC_ARG_ENABLE([scim],
+   [AS_HELP_STRING([--disable-scim],[disable SCIM.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_scim="yes"
+    else
+       want_scim="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [want_scim="yes"])
+
+AC_ARG_ENABLE([ibus],
+   [AS_HELP_STRING([--disable-ibus],[disable IBUS.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_ibus="yes"
+    else
+       want_ibus="no"
+    fi
+   ],
+   [want_ibus="yes"])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_X], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina])
+
+## Xlib
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+## Xlib
+if test "x${want_x11_xlib}" = "xyes"; then
+   EFL_FIND_X(ECORE_X_XLIB,
+     [X11/Xlib.h X11/Xcursor/Xcursor.h],
+     [X11 XOpenDisplay Xcursor XcursorImageLoadCursor],
+     [
+       use_Xcursor="yes"
+       AC_DEFINE([ECORE_XCURSOR], 1, [Build support for Xcursor])
+       EFL_ADD_LIBS([ECORE_X], [$ECORE_X_XLIB_libs])
+       EFL_ADD_CFLAGS([ECORE_X], [$ECORE_X_XLIB_cflags])
+     ],[
+       AC_MSG_ERROR([Xcursor is missing])
+     ])
+fi
+
+if test "x${want_x11_xlib}" = "xyes" ; then
+   ECORE_CHECK_X_EXTENSION([Xkb], [XKB.h], [X11], [XkbSetDetectableAutoRepeat])
+   ECORE_CHECK_X_EXTENSION([Xcomposite], [Xcomposite.h], [Xcomposite], [XCompositeQueryExtension])
+   ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract])
+   ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
+   ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
+   ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
+   ECORE_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRGetScreenResourcesCurrent])
+   ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
+   ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
+   ECORE_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput])
+
+   PKG_CHECK_EXISTS([xrandr > 1.3.2], [AC_DEFINE([XRANDR_GOOD], [1], [good xrandr])], [])
+
+   if test "${want_xpresent}" = "yes"; then
+      ECORE_CHECK_X_EXTENSION([Xpresent], [Xpresent.h], [Xpresent], [XPresentQueryExtension])
+   fi
+   EFL_ADD_FEATURE([ECORE_X], [xpresent])
+
+   if test "${want_gesture}" = "yes"; then
+      ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension])
+   fi
+   EFL_ADD_FEATURE([ECORE_X], [gesture])
+
+   if test "${want_xinput2}" = "yes"; then
+      ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice])
+   fi
+   EFL_ADD_FEATURE([ECORE_X], [xinput2])
+
+   if test "${want_xinput22}" = "yes"; then
+      ECORE_CHECK_X_EXTENSION([Xi2_2], [XInput2.h], [Xi],[XIGrabTouchBegin])
+   fi
+   EFL_ADD_FEATURE([ECORE_X], [xinput22])
+
+   EFL_EVAL_PKGS([ECORE_X])
+   EFL_CHECK_FUNCS([ECORE_X], [dlopen dlsym])
+fi
+
+EFL_ADD_LIBS([ECORE_X], [${ECORE_X_LIBS}])
+
+EFL_LIB_END_OPTIONAL([Ecore_X])
+
+AM_CONDITIONAL([HAVE_ECORE_X_XLIB], [test "${want_x11_xlib}" = "yes"])
+#### End of Ecore_X
+
+
+#### Ecore_Imf
+EFL_LIB_START([Ecore_Imf])
+
+### 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"
+want_ecore_imf_wayland="no"
+want_ecore_imf="yes"
+
+if test "${have_windows}" = "no" && test "${have_darwin}" = "no"; then
+   want_ecore_imf="yes"
+   want_ecore_imf_xim="yes"
+   want_ecore_imf_scim="yes"
+   want_ecore_imf_ibus="yes"
+   if test "${want_wayland}" = "yes"; then
+      want_ecore_imf_wayland="yes"
+   fi
+fi
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_IMF], [evil])
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ECORE_IMF], [escape])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina])
+
+if test "x${want_ecore_imf}" = "xyes" ; then
+   AC_DEFINE([HAVE_ECORE_IMF], [1], [Ecore IMF Support])
+fi
+
+## modules
+
+# ibus
+
+have_ecore_imf_ibus="no"
+if test "x${want_ibus}" = "xyes" && test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
+   PKG_CHECK_MODULES([IBUS],
+      [ibus-1.0 >= 1.4 glib-2.0],
+      [
+       have_ecore_imf_ibus="yes"
+       AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
+      ],
+      [have_ecore_imf_ibus="no"])
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"])
+EFL_ADD_FEATURE([ECORE_IMF], [ibus], [${have_ecore_imf_ibus}])
+
+# scim
+
+have_ecore_imf_scim="no"
+if test "x${want_scim}" = "xyes" && 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"])
+EFL_ADD_FEATURE([ECORE_IMF], [scim], [${have_ecore_imf_scim}])
+
+# xim
+
+have_ecore_imf_xim="no"
+if test "x${want_xim}" = "xyes" && test "x${want_ecore_imf_xim}" = "xyes" ; then
+
+ EFL_FIND_X(ecore_imf_xim,
+   [X11/Xlib.h],
+   [X11 XOpenIM],
+   [
+     have_ecore_imf_xim=yes
+     AC_DEFINE([BUILD_ECORE_IMF_XIM], [1], [Enable X Input Method])
+   ])
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [test "x${have_ecore_imf_xim}" = "xyes"])
+EFL_ADD_FEATURE([ECORE_IMF], [xim])
+
+# wayland
+if test "x${want_ecore_imf_wayland}" = "xyes" ; then
+   PKG_CHECK_MODULES([WAYLAND],
+      [wayland-client >= 1.11.0],
+      [
+       have_ecore_imf_wayland="yes"
+       AC_DEFINE([BUILD_ECORE_IMF_WAYLAND], [1], [Ecore Imf Wayland Support])
+      ],
+      [have_ecore_imf_wayland="no"])
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_IMF_WAYLAND], [test "x${have_ecore_imf_wayland}" = "xyes"])
+EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${want_ecore_imf_wayland}])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Ecore_Imf])
+#### End of Ecore_Imf
+
+
+#### Ecore_Imf_Evas
+EFL_LIB_START([Ecore_Imf_Evas])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [evil])
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [emile])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Ecore_Imf_Evas])
+#### End of Ecore_Imf_Evas
+
+
+#### Ecore_Evas
+EFL_LIB_START([Ecore_Evas])
+
+### Additional options to configure
+
+### Default values
+
+want_ecore_evas_software_gdi="${have_evas_engine_software_gdi}"
+want_ecore_evas_software_ddraw="${have_evas_engine_software_ddraw}"
+want_ecore_evas_gl_cocoa="${have_evas_engine_gl_cocoa}"
+want_ecore_evas_wayland_egl="${have_evas_engine_wayland_egl}"
+want_ecore_evas_extn="yes"
+want_ecore_evas_drm="${have_evas_engine_drm}"
+
+if test "x${have_ecore_ipc}" = "xno" || \
+   test "x${efl_func_shm_open}" = "xno" || \
+   test "x${have_windows}" = "xyes" ; then
+   want_ecore_evas_extn="no"
+fi
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_EVAS], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eet])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [emile])
+
+## modules
+ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}])
+ECORE_EVAS_MODULE([ews], [yes])
+ECORE_EVAS_MODULE([fb], [${want_fb}])
+ECORE_EVAS_MODULE([drm], [${want_drm}])
+ECORE_EVAS_MODULE([gl-drm], [${want_gl_drm}])
+
+ECORE_EVAS_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}])
+
+ECORE_EVAS_MODULE([software-sdl], [${want_sdl}])
+ECORE_EVAS_MODULE([opengl-sdl], [${want_gl_sdl}])
+
+build_ecore_evas_sdl="no"
+if test "x${have_ecore_evas_software_sdl}" = "xyes" || \
+   test "x${have_ecore_evas_opengl_sdl}" = "xyes" ; then
+   build_ecore_evas_sdl="yes"
+   AC_DEFINE(BUILD_ECORE_EVAS_SDL, 1, [Support for SDL Engine in Ecore_Evas])
+fi
+AM_CONDITIONAL([BUILD_ECORE_EVAS_SDL],
+   [test "${build_ecore_evas_sdl}" = "yes"])
+
+ECORE_EVAS_MODULE([wayland-shm], [${want_wayland}])
+ECORE_EVAS_MODULE([wayland-egl], [${want_ecore_evas_wayland_egl}])
+
+build_ecore_evas_wayland="no"
+if test "x${have_ecore_evas_wayland_shm}" = "xyes" || \
+   test "x${have_ecore_evas_wayland_egl}" = "xyes" ; then
+   build_ecore_evas_wayland="yes"
+   AC_DEFINE(BUILD_ECORE_EVAS_WAYLAND, 1, [Support for Wayland Engine in Ecore_Evas])
+fi
+AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND],
+   [test "${build_ecore_evas_wayland}" = "yes"])
+
+ECORE_EVAS_MODULE([software-gdi], [${want_ecore_evas_software_gdi}])
+ECORE_EVAS_MODULE([software-ddraw], [${want_ecore_evas_software_ddraw}])
+
+build_ecore_evas_win32="no"
+if test "x${have_ecore_evas_software_gdi}" = "xyes" || \
+   test "x${have_ecore_evas_software_ddraw}" = "xyes" ; then
+   build_ecore_evas_win32="yes"
+   AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
+fi
+AM_CONDITIONAL([BUILD_ECORE_EVAS_WIN32],
+   [test "${build_ecore_evas_win32}" = "yes"])
+
+
+# XXX TODO: ecore_evas_x11
+ECORE_EVAS_MODULE([software-x11], [${want_x11_any}])
+
+have_ecore_evas_software_xlib="no"
+if test "x$have_ecore_evas_software_x11" = "xyes" ; then
+   have_ecore_evas_software_xlib=${have_evas_engine_software_xlib}
+   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"; then
+      AC_DEFINE([BUILD_ECORE_EVAS_SOFTWARE_XLIB], [1], [Evas Software Xlib Engine Support])
+   fi
+fi
+
+# XXX TODO: ecore_evas_opengl_x11
+
+ECORE_EVAS_MODULE([opengl-x11], [${want_x11_any_opengl}])
+
+have_ecore_evas_opengl_xlib="no"
+if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test "x${have_ecore_evas_opengl_x11}" = "xstatic" ; then
+   have_ecore_evas_opengl_xlib=${have_evas_engine_gl_xlib}
+   if test "x${have_ecore_evas_opengl_xlib}" = "xyes" ; then
+      AC_DEFINE([BUILD_ECORE_EVAS_OPENGL_XLIB], [1], [OpenGL Xlib rendering backend])
+   fi
+fi
+
+build_ecore_evas_x11="no"
+if test "x$have_ecore_evas_software_x11" = "xyes" || \
+   test "x$have_ecore_evas_opengl_x11" = "xyes"; then
+   AC_DEFINE([BUILD_ECORE_EVAS_X11], [1], [Support for X Window Engines in Ecore_Evas])
+   build_ecore_evas_x11="yes"
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [test "${build_ecore_evas_x11}" = "yes"])
+
+build_ecore_evas_vnc="no"
+if test "${want_vnc_server}" = "yes" && \
+   (test "${build_ecore_evas_x11}" = "yes" || \
+   test "${want_fb}" = "yes"); then
+   AC_DEFINE([BUILD_ECORE_EVAS_VNC_SERVER], [1], [Build Ecore_Evas VNC module])
+   build_ecore_evas_vnc="yes"
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_EVAS_VNC_SERVER], [test "${build_ecore_evas_vnc}" = "yes"])
+AC_DEFINE_IF([BUILD_ECORE_EVAS_VNC_SERVER], [test "${build_ecore_evas_vnc}" = "yes"], [1], [Build Ecore_Evas VNC module])
+EFL_ADD_FEATURE([ECORE_EVAS], [vnc_server], [${build_ecore_evas_vnc}])
+
+EFL_EVAL_PKGS([ECORE_EVAS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+if test "x${want_gl_drm}" = "xyes" ; then
+   EFL_CHECK_FUNCS([ECORE_EVAS], [dlopen])
+fi
+
+EFL_LIB_END([Ecore_Evas])
+#### End of Ecore_Evas
+
+#### Eio
+EFL_LIB_START([Eio])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EIO], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EIO], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
+EFL_INTERNAL_DEPEND_PKG([EIO], [eo])
+EFL_INTERNAL_DEPEND_PKG([EIO], [eina])
+EFL_INTERNAL_DEPEND_PKG([EIO], [efl])
+EFL_INTERNAL_DEPEND_PKG([EIO], [emile])
+EFL_INTERNAL_DEPEND_PKG([EIO], [efreet-mime])
+
+EFL_ADD_LIBS([EIO], [-lm])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+have_inotify="${ac_cv_header_sys_inotify_h}"
+AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
+
+have_notify_win32="${have_win32}"
+AC_DEFINE_IF([HAVE_NOTIFY_WIN32],
+   [test "x${have_notify_win32}" = "xyes"], [1],
+   [File monitoring with Windows notification])
+AM_CONDITIONAL([HAVE_NOTIFY_WIN32], [test "x${have_notify_win32}" = "xyes"])
+
+AC_DEFINE_IF([HAVE_NOTIFY_COCOA],
+   [test "x${have_darwin}" = "xyes"], [1],
+   [File monitoring with fsevent notification])
+AM_CONDITIONAL([HAVE_NOTIFY_COCOA], [test "x${have_darwin}" = "xyes"])
+
+AC_CHECK_FUNC([kevent])
+have_notify_kevent="${ac_cv_func_kevent}"
+AC_DEFINE_IF([HAVE_NOTIFY_KEVENT],
+   [test "x${have_notify_kevent}" = "xyes"], [1],
+   [File monitoring with kqueue/kevent mechanism])
+AM_CONDITIONAL([HAVE_NOTIFY_KEVENT], [test "x${have_notify_kevent}" = "xyes"])
+
+
+EFL_LIB_END([Eio])
+dnl TODO: remove these ifdefs from code!
+AC_DEFINE([HAVE_EIO], [1], [Have eio library])
+#### End of Eio
+
+#### Efreet
+EFL_LIB_START([Efreet])
+
+### Additional options to configure
+
+### Default values
+
+AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EFREET], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [efl])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [emile])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-ipc])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Efreet])
+#### End of Efreet
+
+
+#### EPhysics
+AC_ARG_ENABLE([physics],
+   [AS_HELP_STRING([--disable-physics],[disable physics effects and support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_physics="yes"
+    else
+       CFOPT_WARNING="xyes"
+       want_physics="no"
+    fi
+   ],
+   [want_physics="yes"])
+
+if test "x${want_physics}" = "xyes" ; then
+  # We should be using ${CXX} here, but there is a bug in
+  # autotools macro and CXX is always set to g++ even if
+  # it's not found. So we are using an internal variable
+  # that does the work for now, may get broken in the future.
+  if test "x${ac_ct_CXX}" = "x" -a "x${CXX}" = "xg++"; then
+     AC_MSG_ERROR([efl requires a C++ compiler got ${ac_ct_CXX} and ${CXX}.])
+  fi
+fi
+
+EFL_LIB_START_OPTIONAL([EPhysics], [test "${want_physics}" = "yes"])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([EPHYSICS], [evil])
+
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [efl])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [emile])
+
+EFL_DEPEND_PKG([EPHYSICS], [BULLET], [bullet >= 2.80])
+
+EFL_EVAL_PKGS([EPHYSICS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END_OPTIONAL([EPhysics])
+#### End of EPhysics
+
+
+#### Edje
+EFL_LIB_START([Edje])
+
+### Additional options to configure
+
+### Default values
+
+AC_ARG_ENABLE([multisense],
+   [AS_HELP_STRING([--enable-multisense],[Enable multisense support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_multisense="yes"
+    else
+       want_multisense="no"
+       CFOPT_WARNING="xyes"
+    fi
+   ],
+   [
+    if test "x${want_pulseaudio}" = "xyes"; then
+       want_multisense="yes"
+    else
+       if test "x${want_wasapiaudio}" = "xyes"; then
+          want_multisense="yes"
+       else
+          want_multisense="no"
+       fi
+    fi
+
+   ])
+
+# TODO: should we keep or remove these?
+want_edje_program_cache="no"
+want_edje_calc_cache="yes"
+want_fixed_point="no"
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([EDJE], [evil])
+
+EFL_INTERNAL_DEPEND_PKG([EDJE], [eina])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [eo])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [efl])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [eet])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [evas])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-evas])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [emile])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [efreet])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [eio])
+
+if test "x${want_physics}" = "xyes" ; then
+  AC_DEFINE([HAVE_EPHYSICS], [1], [EPhysics Support])
+  EDJE_CFLAGS="-I\$(top_srcdir)/src/lib/ephysics ${EDJE_CFLAGS}"
+fi
+dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics])
+
+if test "x${want_lua_old}" = "xyes"; then
+   EFL_CHECK_LUA_OLD([EDJE])
+else
+   PKG_CHECK_MODULES([EDJE_LUA], [luajit >= 2.0.0])
+fi
+
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
+
+EFL_ADD_FEATURE([EDJE], [physics])
+EFL_ADD_FEATURE([EDJE], [multisense])
+EFL_ADD_FEATURE([EDJE], [lua-old])
+
+EFL_ADD_LIBS([EDJE], [-lm])
+
+EFL_EVAL_PKGS([EDJE])
+
+AC_DEFINE_IF([EDJE_PROGRAM_CACHE], [test "${want_edje_program_cache}" = "yes"],
+   [1], [Cache result of program glob matches])
+AC_DEFINE_IF([EDJE_CALC_CACHE], [test "${want_edje_calc_cache}" = "yes"],
+   [1], [Cache result of calc glob matches])
+AC_DEFINE_IF([BUILD_EDJE_FP], [test "${want_fixed_point}" = "yes"],
+   [1], [Use Fixed Point instead of FPU])
+
+AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
+AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
+  [1], [Use Multisense])
+AC_SUBST([want_multisense])
+AC_SUBST([want_physics])
+
+### Checks for header files
+
+AC_CHECK_HEADERS([ \
+sys/wait.h \
+])
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+EFL_LIB_END([Edje])
+#### End of Edje
+
+#### Edje CXX
+EFL_LIB_START([Edje_Cxx])
+
+EFL_EVAL_PKGS([EDJE_CXX])
+
+EFL_LIB_END([Edje_Cxx])
+#### End of Edje CXX
+
+#### Emotion
+EFL_LIB_START([Emotion])
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([Emotion], [evil])
+
+### Default values
+if test "${efl_func_shm_open}" = "yes"; then
+   want_emotion_generic="static"
+else
+   want_emotion_generic="no"
+fi
+
+### Additional options to configure
+AC_ARG_ENABLE([xine],
+   [AS_HELP_STRING([--enable-xine],[enable xine support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xine="yes"
+    else
+       want_xine="no"
+    fi
+   ],
+   [want_xine="no"])
+
+AC_ARG_ENABLE([v4l2],
+   [AS_HELP_STRING([--enable-v4l2],[enable v4l2 support.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_v4l2="yes"
+    else
+       want_v4l2="no"
+    fi
+   ],
+   [want_v4l2="${efl_lib_optional_eeze}"])
+
+AC_ARG_ENABLE([libvlc],
+   [AS_HELP_STRING([--enable-libvlc],[enable libvlc support. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_libvlc="yes"
+    else
+       want_libvlc="no"
+    fi
+   ],
+   [want_libvlc="no"])
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eina])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eo])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eet])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [efl])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [emile])
+
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${efl_lib_optional_eeze}], [eeze])
+EFL_ADD_FEATURE([EMOTION], [v4l2])
+
+## modules
+
+have_gst_xoverlay="no"
+
+EMOTION_MODULE([xine], [${want_xine}])
+EMOTION_MODULE([gstreamer], [${want_gstreamer}])
+EMOTION_MODULE([gstreamer1], [${want_gstreamer1}])
+EMOTION_MODULE([libvlc], [${want_libvlc}])
+EMOTION_MODULE([generic], [${want_emotion_generic}])
+
+EFL_ADD_FEATURE([EMOTION], [xine])
+EFL_ADD_FEATURE([EMOTION], [gstreamer])
+EFL_ADD_FEATURE([EMOTION], [gstreamer1])
+EFL_ADD_FEATURE([EMOTION], [libvlc])
+EFL_ADD_FEATURE([EMOTION], [generic], [${want_emotion_generic}])
+
+EFL_EVAL_PKGS([EMOTION])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+if test "${want_v4l2}" = "yes"; then
+   AC_CHECK_DECL([V4L2_CAP_VIDEO_CAPTURE],
+      [AC_DEFINE([HAVE_V4L2], [1], [Define to 1 if you have Video4Linux 2 available])],
+      [AC_MSG_ERROR([Video4Linux 2 desired but not found. See --disable-v4l2.])],
+      [#include <linux/videodev2.h>])
+fi
+
+### Check availability
+
+## Generic player
+EMOTION_GENERIC_PLAYER([GENERIC_VLC], [no], [libvlc >= 2.0])
+EFL_ADD_FEATURE([EMOTION], [generic_vlc], [${with_generic_vlc}])
+
+EFL_LIB_END([Emotion])
+#### End of Emotion
+
+#### Ethumb
+EFL_LIB_START([Ethumb])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ETHUMB], [evil])
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([EINA], [evil])
+
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eet])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [efl])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-imf])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [edje])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [emile])
+
+## modules
+
+EFL_EVAL_PKGS([ETHUMB])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([Ethumb])
+#### End of Ethumb
+
+#### Ethumb_Client
+EFL_LIB_START([Ethumb_Client])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ETHUMB_CLIENT], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [efl])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eet])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore-imf])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edje])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eldbus])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [evas])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [emile])
+
+EFL_EVAL_PKGS([ETHUMB_CLIENT])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([Ethumb_Client])
+#### End of Ethumb_Client
+
+#### Elua
+AC_ARG_ENABLE([elua],
+   [AS_HELP_STRING([--enable-elua],[enable ELUA support. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_elua="yes"
+    else
+       want_elua="no"
+    fi
+   ],
+   [want_elua="yes"])
+
+# turn this into an AC_ARG_ENABLE when bindings are reenabled
+want_lua_bindings="no"
+
+have_elua="yes"
+have_lua_bindings="yes"
+
+if test "${want_lua_old}" = "yes" -o "x$want_elua" = "xno"; then
+  have_elua="no"
+fi
+
+if test "x$have_elua" = "xno" -o "x$want_lua_bindings" = "xno"; then
+  have_lua_bindings="no"
+fi
+
+AM_CONDITIONAL([HAVE_ELUA], [test "x${have_elua}" = "xyes"])
+AM_CONDITIONAL([HAVE_LUA_BINDINGS], [test "x${have_lua_bindings}" = "xyes"])
+
+EFL_LIB_START_OPTIONAL([Elua], [test "${have_elua}" = "yes"])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ELUA], [evil])
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ELUA], [eina])
+EFL_INTERNAL_DEPEND_PKG([ELUA], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELUA], [efl])
+EFL_INTERNAL_DEPEND_PKG([ELUA], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ELUA], [ecore_file])
+
+EFL_DEPEND_PKG([ELUA], [LUAJIT], [luajit >= 2.0.0])
+
+EFL_EVAL_PKGS([ELUA])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END_OPTIONAL([Elua])
+#### End of Elua
+
+#### Elocation
+
+EFL_LIB_START([Elocation])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+EFL_PLATFORM_DEPEND([ELOCATION], [evil])
+EFL_INTERNAL_DEPEND_PKG([ELOCATION], [eina])
+EFL_INTERNAL_DEPEND_PKG([ELOCATION], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELOCATION], [efl])
+EFL_INTERNAL_DEPEND_PKG([ELOCATION], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ELOCATION], [eldbus])
+
+EFL_ADD_LIBS([ELOCATION], [-lm])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END([Elocation])
+#### End of Elocation
+
+
+
+#### Efl_Js
+EFL_LIB_START_OPTIONAL([Efl_Js], [test "x${have_js}" = "xyes"])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Eina])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Eo])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Eet])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Ecore_Evas])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Ecore_Con])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Ecore_Audio])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Efl])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Evas])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Edje])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Emotion])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Eldbus])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Emile])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Ethumb_Client])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Eio])
+EFL_INTERNAL_DEPEND_PKG([EFL_JS], [Elementary])
+
+AM_COND_IF([HAVE_NODEJS], [], [ EFL_ADD_LIBS([EFL_JS], [-lv8]) ])
+
+EFL_EVAL_PKGS([EFL_JS])
+
+AM_COND_IF([HAVE_NODEJS], [EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -DHAVE_NODEJS"], [])
+AM_COND_IF([HAVE_LIBUV], [EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -DHAVE_LIBUV"], [])
+AM_COND_IF([HAVE_JS], [EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -DHAVE_JS"], [])
+
+AM_COND_IF([HAVE_V8_CREATE_PARAMS], [EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -DHAVE_V8_CREATE_PARAMS"], [])
+AM_COND_IF([HAVE_V8_GLOBAL], [EFLJS_CXXFLAGS="$EFLJS_CXXFLAGS -DHAVE_V8_GLOBAL"], [])
+AC_SUBST([EFLJS_CXXFLAGS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END_OPTIONAL([Efl_Js])
+#### End of Efl_Js
+
+### Add Wayland server library if test is enabled
+if test "x${want_tests}" = "xyes" -a "x${want_wayland}" = "xyes"; then
+   EFL_DEPEND_PKG([ECORE_WAYLAND_SRV], [WAYLAND], [wayland-server >= 1.11.0])
+   EFL_EVAL_PKGS([ECORE_WAYLAND_SRV])
+fi
+
+AC_ARG_ENABLE([always-build-examples],
+   [AS_HELP_STRING([--enable-always-build-examples],[always build examples. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_always_build_examples="yes"
+    else
+       want_always_build_examples="no"
+    fi
+   ],
+   [want_always_build_examples="no"])
+AM_CONDITIONAL([ALWAYS_BUILD_EXAMPLES], [test "${want_always_build_examples}" = "yes"])
+
+#### Ecore_Buffer
+build_ecore_buffer_x11_dri2="no"
+build_ecore_buffer_x11_dri3="no"
+EFL_LIB_START_OPTIONAL([Ecore_Buffer], [test "${want_ecore_buffer}" = "yes"])
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [eo])
+EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [efl])
+EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [ecore])
+EFL_DEPEND_PKG([ECORE_BUFFER], [WAYLAND],
+               [wayland-server >= 1.11.0 wayland-client >= 1.11.0])
+
+PKG_CHECK_MODULES([X11_DRI_COMMON],
+   [
+      libtbm >= 1.1.0,
+      libdrm >= 2.4.35,
+   ],
+   [have_x11_dri_common_pkgs="yes"],
+   [have_x11_dri_common_pkgs="no"]
+)
+
+if test "x$have_x11_dri_common_pkgs" = "xyes" ; then
+   EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [ecore_x])
+
+   PKG_CHECK_MODULES([X11_DRI2], [libdri2],
+                     [have_x11_dri2_pkgs="yes"],
+                     [have_x11_dri2_pkgs="no"])
+   PKG_CHECK_MODULES([X11_DRI3],
+      [
+         xshmfence,
+         xcb,
+         x11-xcb,
+         xcb-sync,
+         xcb-dri3
+      ],
+      [have_x11_dri3_pkgs="yes"],
+      [have_x11_dri3_pkgs="no"])
+fi
+
+if test "x${have_x11_dri2_pkgs}" = "xyes" ; then
+   build_ecore_buffer_x11_dri2="yes"
+   AC_DEFINE(BUILD_ECORE_BUFFER_X11_DRI2, 1, [Support for X11_DRI2 Backend in Ecore_Buffer])
+fi
+
+if test "x${have_x11_dri3_pkgs}" = "xyes" ; then
+   build_ecore_buffer_x11_dri3="yes"
+   AC_DEFINE(BUILD_ECORE_BUFFER_X11_DRI3, 1, [Support for X11_DRI3 Backend in Ecore_Buffer])
+fi
+EFL_EVAL_PKGS([ECORE_BUFFER])
+
+EFL_ADD_FEATURE([ECORE_BUFFER], [shm], ["yes"])
+EFL_ADD_FEATURE([ECORE_BUFFER], [x11_dri2], [${build_ecore_buffer_x11_dri2}])
+EFL_ADD_FEATURE([ECORE_BUFFER], [x11_dri3], [${build_ecore_buffer_x11_dri3}])
+
+EFL_LIB_END_OPTIONAL([Ecore_Buffer])
+
+AM_CONDITIONAL([BUILD_ECORE_BUFFER_X11_DRI2], [test "${build_ecore_buffer_x11_dri2}" = "xyes"])
+AM_CONDITIONAL([BUILD_ECORE_BUFFER_X11_DRI3], [test "${build_ecore_buffer_x11_dri3}" = "xyes"])
+
+#### End of Ecore_Buffer
+
+
+#### Elementary
+
+EFL_LIB_START([Elementary])
+
+### Default values
+
+### Additional options to configure
+
+## Elementary base dir
+
+AC_ARG_WITH([elementary-base-dir],
+   [AS_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])],
+   [elementary_base_dir=${withval}],
+   [elementary_base_dir=".elementary"])
+
+AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}])
+AC_DEFINE_UNQUOTED([ELEMENTARY_BASE_DIR], ["${elementary_base_dir}"], ["subdirectory for all elementary data"])
+
+## Debug mode
+
+AC_ARG_ENABLE([debug],
+   [AS_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])],
+   [want_elementary_debug=$enableval],
+   [want_elementary_debug="no"])
+
+ELM_DEBUG_DEF="#undef"
+if test "x$want_elementary_debug" = "xyes"; then
+   AC_DEFINE([HAVE_ELEMENTARY_DEBUG], [1], [Elementary debug.])
+   ELM_DEBUG_DEF="#define"
+fi
+AC_SUBST([ELM_DEBUG_DEF])
+
+## quicklaunch support
+
+AC_ARG_ENABLE([quick-launch],
+   [AS_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])],
+   [want_quicklaunch=$enableval],
+   [want_quicklaunch="auto"])
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+
+EFL_PLATFORM_DEPEND([ELEMENTARY], [evil])
+
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eina])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [emile])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eet])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efl])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [edje])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ethumb])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ethumb_client])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [emotion])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-imf])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eldbus])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-mime])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-trash])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eio])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [elocation])
+
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_x11_any}], [ecore_x])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_fb}], [ecore_fb])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_sdl}], [ecore_sdl])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_ecore_evas_gl_cocoa}], [ecore_cocoa])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_win32}], [ecore_win32])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm2])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${build_ecore_evas_wayland}], [ecore_wl2])
+
+EFL_OPTIONAL_DEPEND_PKG([ELEMENTARY], [${want_elput}], [ELPUT], [xkbcommon])
+EFL_OPTIONAL_DEPEND_PKG([ELEMENTARY], [${want_wayland}], [WAYLAND], [wayland-client])
+
+dnl Special case deps for ecore_drm
+if test "${want_drm}" = "yes"; then
+  EFL_DEPEND_PKG([ELEMENTARY], [DRM], [libdrm])
+  EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eeze])
+fi
+
+EFL_ADD_LIBS([ELEMENTARY], [-lm])
+
+ELM_CHECK_BACKEND([X], [${want_x11_any}])
+ELM_CHECK_BACKEND([FB], [${want_fb}])
+ELM_CHECK_BACKEND([SDL], [${want_sdl}])
+ELM_CHECK_BACKEND([Cocoa], [${want_ecore_evas_gl_cocoa}])
+ELM_CHECK_BACKEND([Win32], [${build_ecore_evas_win32}])
+ELM_CHECK_BACKEND([Wl2], [${build_ecore_evas_wayland}])
+ELM_CHECK_BACKEND([DRM], [${want_drm}])
+
+EFL_EVAL_PKGS([ELEMENTARY])
+
+### Checks for header files
+
+ELM_ALLOCA_H_DEF="#undef"
+AC_CHECK_HEADER([alloca.h], [ELM_ALLOCA_H_DEF="#define"])
+AC_SUBST([ELM_ALLOCA_H_DEF])
+
+ELM_LIBINTL_H_DEF="#undef"
+AC_CHECK_HEADER([libintl.h], [ELM_LIBINTL_H_DEF="#define"])
+AC_SUBST([ELM_LIBINTL_H_DEF])
+
+ELM_DIRENT_H_DEF="#undef"
+AC_CHECK_HEADER([dirent.h], [ELM_DIRENT_H_DEF="#define"])
+AC_SUBST([ELM_DIRENT_H_DEF])
+
+AC_CHECK_HEADER([sys/mman.h], [have_mman="yes"], [have_mman="no"])
+if test "x${have_mman}" = "xyes"; then
+   AC_DEFINE([HAVE_MMAN_H], [1], [Have sys/mman.h header file])
+fi
+
+AC_CHECK_HEADERS([locale.h langinfo.h sys/times.h])
+
+case "$host_os" in
+   darwin*)
+      AC_CHECK_HEADERS([crt_externs.h])
+      ;;
+esac
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+requirements_libs_elm="${requirement_socket} ${requirements_libs_elm}"
+
+AC_SUBST([requirements_libs_elm])
+
+AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"])
+
+# Check if we can build binary with quicklaunch support
+ELM_QUICKLAUNCH
+
+### Checks for library functions
+
+EFL_CHECK_FUNCS([ELEMENTARY], [dlopen])
+
+AC_FUNC_ALLOCA
+
+AC_CHECK_FUNCS([geteuid getuid getpwent])
+
+AC_CHECK_FUNCS([fork clearenv])
+
+build_quicklaunch="no"
+if test "x${ac_cv_func_fork}" = "xyes" -a "x${efl_func_dlopen}" = "xyes"; then
+   build_quicklaunch="yes"
+fi
+
+AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${build_quicklaunch}" = "xyes"])
+EFL_ADD_FEATURE([ELEMENTARY], [quicklaunch], [${build_quicklaunch}])
+
+# environ variable
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+      [[
+# define _GNU_SOURCE 1
+#include <unistd.h>
+      ]],
+      [[
+extern char **environ;
+      ]])
+   ],
+   [AC_DEFINE([HAVE_ENVIRON], [1], [extern environ exists])])
+
+case "$host_os" in
+   darwin*)
+      AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
+      ;;
+esac
+
+### Check availability
+
+EFL_LIB_END([Elementary])
+
+#### End of Elementary
+
+
+#### Elementary CXX
+EFL_LIB_START([Elementary_Cxx])
+
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eet_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Efl])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Elementary])
+
+EFL_EVAL_PKGS([ELEMENTARY_CXX])
+
+EFL_LIB_END([Elementary_Cxx])
+#### End of Ecore CXX
+
+
+#### Elementary_Js
+EFL_LIB_START_OPTIONAL([Elementary_Js], [test "x${have_js}" = "xyes"])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eina])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eo])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eet])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore_Evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore_Con])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore_Audio])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Efl])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Edje])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Emotion])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eldbus])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Emile])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ethumb_Client])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eio])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Elementary])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Efl_Js])
+
+AM_COND_IF([HAVE_NODEJS], [], [ EFL_ADD_LIBS([ELEMENTARY_JS], [-lv8]) ])
+
+EFL_EVAL_PKGS([ELEMENTARY_JS])
+
+AM_COND_IF([HAVE_NODEJS], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_NODEJS"], [])
+AM_COND_IF([HAVE_LIBUV], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_LIBUV"], [])
+AM_COND_IF([HAVE_JS], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_JS"], [])
+
+AM_COND_IF([HAVE_V8_CREATE_PARAMS], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_V8_CREATE_PARAMS"], [])
+AM_COND_IF([HAVE_V8_GLOBAL], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_V8_GLOBAL"], [])
+AC_SUBST([ELEMENTARYJS_CXXFLAGS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END_OPTIONAL([ELEMENTARY_JS])
+#### End of Efl_Js
+
+ELM_EDJE_DEFINES=""
+AC_ARG_ENABLE([cancel-ok],
+              [AS_HELP_STRING([--enable-cancel-ok],[Enable ordering of cancel and ok buttons to be cancel first, then ok instead of ok then cancel. @<:@default=disabled@:>@])],
+              [
+                if test "x${enableval}" = "xyes" ; then
+                    ELM_EDJE_DEFINES="$ELM_EDJE_DEFINES -DELM_CANCEL_OK=1"
+                fi
+              ],[])
+AC_SUBST(ELM_EDJE_DEFINES)
+
+AC_DEFINE([NEED_RUN_IN_TREE], [1], [Need EFL_RUN_IN_TREE=1 trick])
+
+## Disable warning for OS that have a specifc configuration
+case "$host_os" in
+   mingw*|cygwin*)
+      CFOPT_WARNING=""
+      ;;
+   darwin*)
+      CFOPT_WARNING=""
+      ;;
+esac
+
+AC_CONFIG_FILES([
+Makefile
+data/Makefile
+data/elementary/config/Makefile
+data/elementary/config/default/Makefile
+data/elementary/config/default/base.src
+data/elementary/config/mobile/Makefile
+data/elementary/config/mobile/base.src
+data/elementary/config/standard/Makefile
+data/elementary/config/standard/base.src
+doc/Makefile
+doc/Doxyfile
+doc/previews/Makefile
+doc/widgets/Makefile
+src/Makefile
+src/bindings/mono/efl_mono/efl_libs.cs
+src/bindings/mono/efl_mono/efl_libs.csv
+src/benchmarks/eina/Makefile
+src/benchmarks/eo/Makefile
+src/benchmarks/evas/Makefile
+src/examples/Makefile
+src/lib/eina/eina_config.h
+src/lib/efl/Efl_Config.h
+src/lib/elementary/Elementary_Options.h
+src/scripts/eo/eo_debug
+elm_intro.h
+spec/efl.spec
+pc/evil.pc
+pc/escape.pc
+pc/eina.pc
+pc/eina-cxx.pc
+pc/emile.pc
+pc/eet.pc
+pc/eet-cxx.pc
+pc/eo.pc
+pc/eo-cxx.pc
+pc/eolian.pc
+pc/eolian-cxx.pc
+pc/eina-js.pc
+pc/efl-js.pc
+pc/eolian-js.pc
+pc/eo-js.pc
+pc/efl.pc
+pc/efl-cxx.pc
+pc/efl-mono.pc
+pc/efl-wl.pc
+pc/efl-core.pc
+pc/efl-net.pc
+pc/efl-ui.pc
+pc/evas-fb.pc
+pc/evas-eglfs.pc
+pc/evas-opengl-x11.pc
+pc/evas-opengl-sdl.pc
+pc/evas-opengl-cocoa.pc
+pc/evas-software-buffer.pc
+pc/evas-software-x11.pc
+pc/evas-software-gdi.pc
+pc/evas-software-ddraw.pc
+pc/evas-software-sdl.pc
+pc/evas-wayland-shm.pc
+pc/evas-wayland-egl.pc
+pc/evas-drm.pc
+pc/evas.pc
+pc/evas-cxx.pc
+pc/ecore.pc
+pc/ecore-cxx.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-drm.pc
+pc/ecore-fb.pc
+pc/ecore-sdl.pc
+pc/ecore-wayland.pc
+pc/ecore-wl2.pc
+pc/ecore-win32.pc
+pc/ecore-x.pc
+pc/ecore-evas.pc
+pc/ecore-imf.pc
+pc/ecore-imf-evas.pc
+pc/ecore-audio.pc
+pc/ecore-audio-cxx.pc
+pc/ecore-avahi.pc
+pc/ecore-buffer.pc
+pc/ector.pc
+pc/embryo.pc
+pc/eio.pc
+pc/eio-cxx.pc
+pc/eldbus.pc
+pc/efreet.pc
+pc/efreet-mime.pc
+pc/efreet-trash.pc
+pc/eeze.pc
+pc/ephysics.pc
+pc/edje.pc
+pc/edje-cxx.pc
+pc/emotion.pc
+pc/ethumb.pc
+pc/ethumb_client.pc
+pc/elocation.pc
+pc/elua.pc
+pc/elementary.pc
+pc/elementary-cxx.pc
+pc/elput.pc
+pc/ecore-drm2.pc
+dbus-services/org.enlightenment.Ethumb.service
+systemd-services/ethumb.service
+$po_makefile_in
+cmakeconfig/EflConfig.cmake
+cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EinaConfig.cmake
+cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EioConfig.cmake
+cmakeconfig/EioConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EezeConfig.cmake
+cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EoConfig.cmake
+cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EolianConfig.cmake
+cmakeconfig/EolianConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EolianHelper.cmake
+cmakeconfig/EolianCxxConfig.cmake
+cmakeconfig/EolianCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EinaCxxConfig.cmake
+cmakeconfig/EinaCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EoCxxConfig.cmake
+cmakeconfig/EoCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EcoreCxxConfig.cmake
+cmakeconfig/EcoreCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EvasCxxConfig.cmake
+cmakeconfig/EvasCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EetCxxConfig.cmake
+cmakeconfig/EetCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EetConfig.cmake
+cmakeconfig/EetConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EvasConfig.cmake
+cmakeconfig/EvasConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EcoreConfig.cmake
+cmakeconfig/EcoreConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EdjeConfig.cmake
+cmakeconfig/EdjeConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EldbusConfig.cmake
+cmakeconfig/EldbusConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EfreetConfig.cmake
+cmakeconfig/EfreetConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EthumbConfig.cmake
+cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EthumbClientConfig.cmake
+cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EmotionConfig.cmake
+cmakeconfig/EmotionConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EluaConfig.cmake
+cmakeconfig/EluaConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/EmileConfig.cmake
+cmakeconfig/EmileConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
+cmakeconfig/ElementaryConfigVersion.cmake
+cmakeconfig/ElementaryConfig.cmake
+])
+
+AC_OUTPUT
+
+#### Info
+
+case $host_cpu in
+  i*86|x86_64|amd64)
+    EFL_ADD_FEATURE([cpu], [mmx], [${build_cpu_mmx}])
+    EFL_ADD_FEATURE([cpu], [sse3], [${build_cpu_sse3}])
+    ;;
+  *power* | *ppc*)
+    EFL_ADD_FEATURE([cpu], [altivec], [${build_cpu_altivec}])
+    ;;
+  arm*)
+    EFL_ADD_FEATURE([cpu], [neon], [${build_cpu_neon}])
+    ;;
+  aarch64*)
+    EFL_ADD_FEATURE([cpu], [neon], [${build_cpu_neon}])
+    ;;
+esac
+
+if test "${have_linux}" = "yes"; then
+   EFL_ADD_FEATURE([system], [inotify])
+   EFL_ADD_FEATURE([system], [atfile_source])
+elif test "${have_windows}" = "yes"; then
+   EFL_ADD_FEATURE([system], [notify_win32])
+fi
+EFL_ADD_FEATURE([system], [ipv6])
+
+if test "x${efl_have_posix_threads_spinlock}" = "xyes" || test "x${efl_have_osx_spinlock}" = "xyes"; then
+   efl_have_spinlock="yes"
+else
+   efl_have_spinlock="no"
+fi
+EFL_ADD_FEATURE([thread], [spinlocks], [${efl_have_spinlock}])
+EFL_ADD_FEATURE([thread], [barrier], [${efl_have_pthread_barrier}])
+EFL_ADD_FEATURE([thread], [affinity], [${efl_have_setaffinity}])
+EFL_ADD_FEATURE([thread], [setname], [${efl_have_setname}])
+EFL_ADD_FEATURE([thread], [__thread], [${have_thread_specifier}])
+
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE_NAME $PACKAGE_VERSION"
+echo "------------------------------------------------------------------------"
+echo
+
+if test "x${have_windows}" = "xyes" ; then
+   osname="${host_os}(${_efl_windows_version})"
+else
+   osname="${host_os}"
+fi
+
+if test "x${want_egl}" = "xyes" ; then
+   opengl_egl="(EGL)"
+else
+   opengl_egl=""
+fi
+
+echo "Configuration...: ${COLOR_OTHER}profile=${build_profile} os=${osname}${COLOR_RESET}"
+echo "  EFL API Set...: ${efl_api}"
+echo "  CPU Extensions: ${host_cpu} (${features_cpu})"
+echo "  System Feature: ${features_system}"
+echo "  Threads.......: ${efl_have_threads} (${features_thread})"
+echo "  Cryptography..: ${build_crypto}"
+echo "  X11...........: ${with_x11}"
+echo "  OpenGL........: ${with_opengl} ${opengl_egl}"
+echo "  C++11.........: ${have_cxx11}"
+echo "  C#............: ${want_csharp}"
+echo "  JavaScript....: ${want_js}"
+echo "  JavaScript flg: $EINA_JS_LIBS"
+echo "Eina............: yes (${features_eina} unwind=$have_unwind)"
+echo "Eo..............: yes (${features_eo})"
+echo "Eolian..........: yes (${features_eolian})"
+echo "Emile...........: yes (${features_emile})"
+echo "Eet.............: yes"
+echo "Evas............: yes (${features_evas})"
+echo "  Engines.......: ${features_evas_engine}"
+echo "  Vg Loaders    : ${features_evas_vg_loader}"
+echo "  Image Loaders.: ${features_evas_loader}"
+if test "x${have_pixman}" = "xyes" ; then
+echo "  Pixman........: ${features_evas_pixman}"
+fi
+echo "Ecore...........: yes (${features_ecore})"
+echo "Ecore_Con.......: yes (${features_ecore_con})"
+echo "Ecore_File......: yes"
+echo "Ecore_IMF.......: yes (${features_ecore_imf})"
+echo "Ecore_X.........: ${with_x11} (${features_ecore_x})"
+echo "Ecore_SDL.......: $want_sdl"
+echo "Ecore_Drm.......: $want_ecore_drm"
+echo "Ecore_Drm2......: $want_drm"
+echo "Ecore_Wayland...: $want_ecore_wayland"
+echo "Ecore_Wl2.......: $want_wayland"
+echo "IVI-Shell.......: $want_wayland_ivi_shell"
+echo "Ecore_Buffer....: $want_ecore_buffer (${features_ecore_buffer})"
+if test "${have_linux}" = "yes"; then
+echo "Ecore_FB........: $want_fb (${features_ecore_fb})"
+elif test "${have_darwin}" = "yes"; then
+echo "Ecore_Cocoa.....: $efl_lib_optional_ecore_cocoa"
+elif test "${have_windows}" = "yes"; then
+echo "Ecore_Win32.....: $have_win32"
+fi
+echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})"
+echo "Ecore_Avahi.....: yes (${features_ecore_avahi})"
+echo "Ecore_Evas......: yes (${features_ecore_evas})"
+echo "Elput...........: $want_elput (${features_elput})"
+echo "Ector...........: yes"
+echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})"
+echo "EPhysics........: ${efl_lib_optional_ephysics}"
+echo "Edje............: yes (${features_edje})"
+echo "Emotion.........: yes (${features_emotion})"
+echo "Ethumb..........: yes"
+echo "Ethumb_Client...: yes"
+echo "Elua............: $have_elua"
+echo "Elementary......: yes (${features_elementary})"
+echo 
+
+echo
+
+if test "${build_tests}" = "none"; then
+echo "Tests...........: no"
+elif test "${build_tests}" = "auto"; then
+echo "Tests...........: make check (inexplicitly enabled)"
+elif test "${build_tests}" = "regular"; then
+echo "Tests...........: make check"
+elif test "${build_tests}" = "coverage"; then
+echo "Tests...........: make lcov-check"
+fi
+echo "Examples........: make examples (make install-examples)"
+if test "x${build_doc}" = "xyes"; then
+echo "Documentation...: make doc"
+else
+echo "Documentation...: no"
+fi
+echo "Compilation.....: make (or gmake)"
+echo "  CPPFLAGS......: $CPPFLAGS"
+echo "  CFLAGS........: $CFLAGS"
+echo "  CXXFLAGS......: $CXXFLAGS"
+echo "  LDFLAGS.......: $LDFLAGS"
+echo "  EFLJS_CXXFLAGS: $EFLJS_CXXFLAGS"
+
+if test "x${with_binary_edje_cc}" != "x"; then
+echo "  edje_cc.......: ${with_binary_edje_cc}"
+fi
+
+if test "x${with_binary_eolian_gen}" != "x"; then
+echo "  eolian_gen....: ${with_binary_eolian_gen}"
+fi
+
+if test "x${with_binary_eolian_cxx}" != "x"; then
+echo "  eolian_cxx....: ${with_binary_eolian_cxx}"
+fi
+
+if test "x${with_binary_elua_bin}" != "x"; then
+echo "  elua..........: ${with_binary_elua_bin}"
+fi
+
+echo "  "
+echo "Installation....: make install (as root if needed, with 'su' or 'sudo')"
+echo "  prefix........: $prefix"
+echo "  dbus units....: $dbusservicedir"
+if test "${have_systemd_user_session}" = "yes"; then
+echo "  systemd units.: $USER_SESSION_DIR"
+fi
+echo
+
+if test -n "$CFOPT_WARNING"; then
+  echo "_____________________________________________________________________"
+  echo ""
+  echo "==-- WARNING --=="
+  echo ""
+  echo "_____________________________________________________________________"
+  if test "x${want_physics}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You have chosen to disable physics support. This disables lots of"
+    echo "core functionality and is effectively never tested. You are going"
+    echo "to find features that suddenly don't work and as a result cause"
+    echo "a series of breakages. This is simply not tested so you are on"
+    echo "your own in terms of ensuring everything works if you do this"
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${efl_have_threads}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You have disabled threading support. A lot of code is literally"
+    echo "written to need threading. We never test or even build with"
+    echo "threading disabled, so doing this is entering uncharted territory."
+    echo "There is a very good chance things may not compile at all, or if"
+    echo "the do, they will break at runtime in weird and wonderful ways."
+    echo "Highly reconsider what you are doing here, or be prepared to deal"
+    echo "with the fallout yourself."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_fontconfig}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You have disabled fontconfig. This is going to make general font"
+    echo "searching not work, and only some very direct 'load /path/file.ttf'"
+    echo "will work alongside some old-school ttf file path searching. This"
+    echo "is very likely not what you want, so highly reconsider turning"
+    echo "fontconfig off. Having it off will lead to visual problems like"
+    echo "missing text in many UI areas etc."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_fribidi}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "Fribidi is used for handling right-to-left text (like Arabic,"
+    echo "Hebrew, Farsi, Persian etc.) and is very likely not a feature"
+    echo "you want to disable unless you know for absolute certain you"
+    echo "will never encounter and have to display such scripts. Also"
+    echo "note that we don't test with fribidi disabled so you may also"
+    echo "trigger code paths with bugs that are never normally used."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_pixman}" = "xyes"; then
+    echo "_____________________________________________________________________"
+    echo "Pixman allows you to replace some rendering paths in Evas with"
+    echo "Pixman. Pixman may or may not be faster (probably slower), and"
+    echo "the rendering paths with Pixman enabled are not tested often so"
+    echo "this may introduce rendering bugs. Do not turn Pixman on unless"
+    echo "you wish to deal with these bugs."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${have_tile_rotate}" = "xyes"; then
+    echo "_____________________________________________________________________"
+    echo "Tiled rotation code is not tested much, so be aware that you"
+    echo "may introduce bugs by enabling this."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_g_main_loop}" = "xyes"; then
+    echo "_____________________________________________________________________"
+    echo "Using the Glib mainloop as the mainloop in Ecore is not tested"
+    echo "regularly, but the glib mainloop integration (on by default) is."
+    echo "You can use apps that use glib mainloop constructs by default"
+    echo "this way, but the Ecore mainloop is not built on top of glib."
+    echo "You have enabled ecore to be built on top of glib and thus you"
+    echo "may experience bugs that normally would not be there. Be prepared"
+    echo "to fix these if they arise."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_gstreamer}" = "xyes"; then
+    echo "_____________________________________________________________________"
+    echo "Gstreamer 0.10 is no longer supported, and EFL has moved to use"
+    echo "Gstreamer 1.x. The old Gstremaer code is not tested or maintained"
+    echo "and will eventually be removed entirely. Don't enable the old"
+    echo "Gstreamer support unless you want to deal with the issues yourself."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_gstreamer1}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You disabled Gstreamer 1.x support. You likely don't want to do"
+    echo "this as it will heavily limit your media support options and render"
+    echo "some functionality as useless, leading to visible application bugs."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_audio}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You disabled audio support in Ecore. This is not tested and may"
+    echo "Create bugs for you due to it creating untested code paths."
+    echo "Reconsider disabling audio."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_pulseaudio}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "The only audio output method supported by Ecore right now on your"
+    echo "system is via Pulseaudio. You have disabled that and likely have"
+    echo "broken a whole bunch of things in the process. Reconsider your"
+    echo "configure options."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_xinput2}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You have disabled xinput2 support. This means a whole lot of input"
+    echo "devices in X11 will not work correctly. You likely do not want to"
+    echo "do this."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_xim}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "You disabled XIM input method support. This is the most basic and"
+    echo "core input method protocol supported in X11 and you almost certainly"
+    echo "want the support for it. Input methods allow for complex text input"
+    echo "like for Chinese, Japanese and Korean as well as virtual keyboards"
+    echo "on touch/mobile devices."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_scim}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "SCIM is a modern and very common input method framework and you"
+    echo "disabled support for it. You very likely want the support for"
+    echo "complex language input, so please reconsider this. Input methods"
+    echo "allow for complex text input like for Chinese, Japanese and Korean"
+    echo "as well as virtual keyboards on touch/mobile devices."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_libmount}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "Libmount has been disabled, and it is used heavily inside Eeze"
+    echo "for support of removable devices etc. and disabling this will"
+    echo "hurt support for Enlightenment and its filemanager."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_multisense}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "Multisense has been disabled. This causes Edje audio suport to"
+    echo "Simply not work, and will break applications and libraries"
+    echo "that rely on it with users then reporting bugs."
+    echo "If you want to mute audio, there are APIs and policies to do"
+    echo "that, as opposed to compiling it out."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${efl_api}" = "xeo"; then
+    echo "_____________________________________________________________________"
+    echo "Using the EO based EFL API only does not work at the moment. We still"
+    echo "have a lot code that depends on the legacy interfaces. We provide"
+    echo "this option for testing once we are able to migrate to the EO based"
+    echo "API."
+    echo "If you are not working on this migration please leave the option set"
+    echo "to both as it will break your build if set to eo."
+    echo "_____________________________________________________________________"
+  fi
+  if test "x${want_libeeze}" = "xno"; then
+    echo "_____________________________________________________________________"
+    echo "Libeeze has been disabled, and it is used heavily for support of"
+    echo "removable devices etc. and disabling this will hurt support for"
+    echo "Enlightenment and its filemanager."
+    echo "_____________________________________________________________________"
+  fi
+  echo "_____________________________________________________________________"
+  echo ""
+  echo "==-- WARNING --=="
+  echo ""
+  echo "_____________________________________________________________________"
+fi
+
+if test "x$prefix" != "x/usr"; then
+  old=
+  path=$dbusservicedir
+  while test "x$old" != "x$path"; do
+    old=$path
+    eval path="\"$path\""
+  done
+  resolved_dbusservicedir=$path
+
+  old=
+  path=$USER_SESSION_DIR
+  while test "x$old" != "x$path"; do
+    old=$path
+    eval path="\"$path\""
+  done
+  resolved_USER_SESSION_DIR=$path
+  base_USER_SESSION_DIR=`echo "$resolved_USER_SESSION_DIR" | sed -e 's:^\(.*\)/systemd/user/*$:\1:g'`
+
+  old=
+  path=$datadir
+  while test "x$old" != "x$path"; do
+    old=$path
+    eval path="\"$path\""
+  done
+  resolved_datadir=$path
+
+  needs_alert_dbus=0
+  if test "$resolved_dbusservicedir" = "${HOME}/.local/share/dbus-1/services"; then
+    AC_MSG_NOTICE([installing DBus services in user local "$resolved_dbusservicedir". Only accessible to user $USER])
+  elif echo "$resolved_dbusservicedir" | grep -e '^/usr/s' >/dev/null 2>/dev/null; then
+    AC_MSG_NOTICE([installing DBus serivces in $resolved_dbusservicedir])
+  else
+    needs_alert_dbus=1
+  fi
+
+  needs_alert_systemd=0
+  if test "$have_systemd_user_session" = "yes"; then
+    if test "$resolved_USER_SESSION_DIR" = "${HOME}/.config/systemd/user"; then
+      AC_MSG_NOTICE([installing systemd services in user local "$resolved_USER_SESSION_DIR". Only accessible to user $USER])
+    elif echo "$resolved_USER_SESSION_DIR" | grep -e '^/usr/s' >/dev/null 2>/dev/null; then
+      AC_MSG_NOTICE([installing systemd serivces in $resolved_USER_SESSION_DIR])
+    else
+       needs_alert_systemd=1
+    fi
+  fi
+
+  if test $needs_alert_dbus -eq 1 -o $needs_alert_systemd -eq 1; then
+    if test $needs_alert_dbus -eq 1 -a $needs_alert_systemd -eq 1; then
+      what_alert="dbus and systemd"
+    elif test $needs_alert_dbus -eq 1; then
+      what_alert="dbus"
+    else
+      what_alert="systemd"
+    fi
+
+    echo ""
+    echo "#-------------------------------------------------------------------#"
+    echo "##==--                          ALERT                          --==##"
+    echo "#-------------------------------------------------------------------#"
+    echo ""
+    echo "  Your installation prefix is *NOT* /usr so this means you need"
+    echo "to ensure some files are visible to $what_alert otherwise services cannot"
+    echo "be started when needed. You will need to do the following:"
+    if test $needs_alert_dbus -eq 1; then
+      echo ""
+      echo "System-wide installation:"
+      echo "  ln -s ${resolved_dbusservicedir}/org.enlightenment.Ethumb.service /usr/share/dbus-1/services/org.enlightenment.Ethumb.service"
+      echo ""
+      echo "  or add \"${resolved_datadir}\" to \$XDG_DATA_DIRS"
+      echo ""
+      echo "User installation:"
+      echo "  ln -s ${resolved_dbusservicedir}/org.enlightenment.Ethumb.service ~/.local/share/dbus-1/services/org.enlightenment.Ethumb.service"
+    fi
+    if test $needs_alert_systemd -eq 1; then
+      echo ""
+      echo "System-wide installation:"
+      echo "  ln -s ${resolved_USER_SESSION_DIR}/ethumb.service /usr/lib/systemd/user/ethumb.service"
+      echo ""
+      echo "  or add \"${base_USER_SESSION_DIR}\" to \$XDG_DATA_DIRS or \$XDG_CONFIG_DIRS"
+      echo ""
+      echo "User installation:"
+      echo "  ln -s ${resolved_USER_SESSION_DIR}/ethumb.service ~/.config/systemd/user/ethumb.service"
+    fi
+    echo ""
+    echo "#-------------------------------------------------------------------#"
+  fi
+
+elif test "x${have_darwin}" = "xyes"; then
+    echo ""
+    echo "#-------------------------------------------------------------------#"
+    echo "##==--                          ALERT                          --==##"
+    echo "#-------------------------------------------------------------------#"
+    echo ""
+    echo "  If you are running Mac OS X >= 10.11 (starting from El Capitan)"
+    echo "  you will have TROUBLE with the prefix you have chosen (/usr)..."
+    echo "  Don't make it double and consider to use the default prefix"
+    echo "  (/usr/local). This is because of Apple's SIP that provides MAC"
+    echo "  and prevents ANYONE modifying the system."
+    echo ""
+    echo "#-------------------------------------------------------------------#"
+fi
+
+if test "x${efl_deprecated_option}" = "xyes"; then
+  echo ""
+  echo "#-------------------------------------------------------------------#"
+  echo "##==--                          ALERT                          --==##"
+  echo "#-------------------------------------------------------------------#"
+  echo ""
+  echo "  Your build script is using a deprecated option. It will get b0rken"
+  echo "with the next release of EFL. You better update it now than later."
+  echo ""
+  echo "#-------------------------------------------------------------------#"
+fi
+
+
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000000..b1ba8de91a
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,308 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST =
+CLEANFILES =
+SUBDIRS =
+
+########################################################################
+# Embryo
+embryofilesdir = $(datadir)/embryo/include
+embryofiles_DATA = embryo/default.inc
+EXTRA_DIST += $(embryofiles_DATA)
+
+########################################################################
+# Evas
+evasfilesdir = $(datadir)/evas
+evasfiles_DATA = evas/checkme
+EXTRA_DIST += $(evasfiles_DATA)
+
+########################################################################
+# Eeze
+eezefilesdir = $(datadir)/eeze
+eezefiles_DATA = eeze/checkme
+EXTRA_DIST += $(eezefiles_DATA)
+
+########################################################################
+# Ecore
+ecorefilesdir = $(datadir)/ecore
+ecorefiles_DATA = ecore/checkme
+EXTRA_DIST += $(ecorefiles_DATA)
+
+########################################################################
+# Ecore_X
+ecore_xfilesdir = $(datadir)/ecore_x
+ecore_xfiles_DATA = ecore_x/checkme
+EXTRA_DIST += $(ecore_xfiles_DATA)
+
+########################################################################
+# Ecore_Imf
+ecoreimffilesdir = $(datadir)/ecore_imf
+ecoreimffiles_DATA = ecore_imf/checkme
+EXTRA_DIST += $(ecoreimffiles_DATA)
+
+########################################################################
+# Efreet
+efreetfilesdir = $(datadir)/efreet
+efreetfiles_DATA = efreet/checkme
+EXTRA_DIST += $(efreetfiles_DATA)
+
+########################################################################
+# Eo
+eogdbdir = $(datadir)/eo/gdb
+eogdb_DATA = eo/eo_gdb.py
+EXTRA_DIST += $(eogdb_DATA)
+
+# Borrowed from gobject
+libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py: eo/libeo-gdb.py.in
+	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/eo/libeo-gdb.py.in > $(builddir)/libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
+
+eogdbloaddir = $(datadir)/gdb/auto-load/$(libdir)
+eogdbload_DATA = libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
+EXTRA_DIST += $(eogdbload_DATA)
+
+CLEANFILES += libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
+
+EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in
+
+########################################################################
+# Edje
+edjefilesdir = $(datadir)/edje/include
+edjefiles_DATA = edje/include/edje.inc
+EXTRA_DIST += $(edjefiles_DATA)
+
+mimedir = $(datadir)/mime/packages
+mime_DATA = edje/edje.xml
+EXTRA_DIST += $(mime_DATA)
+
+# Helper for people using EDJ
+include ../src/Makefile_Edje_Helper.am
+
+########################################################################
+# Emotion
+emotionfilesdir = $(datadir)/emotion
+emotionfiles_DATA = emotion/checkme
+EXTRA_DIST += $(emotionfiles_DATA)
+
+########################################################################
+# Ethumb
+ethumbfilesdir = $(datadir)/ethumb
+ethumbfiles_DATA = ethumb/checkme
+EXTRA_DIST += $(ethumbfiles_DATA)
+
+ethumbframesdir = $(datadir)/ethumb/frames
+ethumbframes_DATA = ethumb/frames/default.edj
+CLEANFILES += ethumb/frames/default.edj
+
+ethumb/frames/default.edj: ethumb/frames/default.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) ethumb/frames/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/ethumb/frames/ $< $@
+
+
+EXTRA_DIST += \
+ethumb/frames/default.edc \
+ethumb/frames/border-0.jpg
+
+########################################################################
+# Ethumb_Client
+ethumb_clientfilesdir = $(datadir)/ethumb_client
+ethumb_clientfiles_DATA = ethumb_client/checkme
+EXTRA_DIST += $(ethumb_clientfiles_DATA)
+
+########################################################################
+# Elua
+eluafilesdir = $(datadir)/elua
+eluafiles_DATA = elua/checkme
+EXTRA_DIST += $(eluafiles_DATA)
+
+#######################################################################
+# Elementary
+
+# themes
+
+SUBDIRS += elementary/config
+
+elementaryfilesdir = $(datadir)/elementary/themes
+elementaryfiles_DATA = elementary/themes/default.edj
+CLEANFILES += elementary/themes/default.edj
+
+include elementary/themes/Makefile.am
+
+elementary/themes/default.edj: elementary/themes/default.edc $(elementary_themes_files) $(efl_ui_themes_files) $(elementary_fdo_files) $(top_builddir)/src/bin/edje/edje_cc${EXEEXT}
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/themes/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $(EDJE_CC_ELM_FLAGS) -N $< $@
+
+# desktop files
+
+elementarydesktopdir = $(datadir)/applications
+elementarydesktop_DATA = elementary/desktop/elementary_test.desktop elementary/desktop/elementary_config.desktop
+
+elementaryicondir = $(datadir)/icons/hicolor/128x128/apps
+elementaryicon_DATA = elementary/desktop/elementary.png
+
+EXTRA_DIST += $(elementarydesktop_DATA) $(elementaryicon_DATA)
+
+# fdo icon theme
+
+elementaryfdodir = $(datadir)/icons/Enlightenment-X/
+elementaryfdo_DATA = elementary/themes/fdo/index.theme elementary/themes/fdo/README
+
+EXTRA_DIST += $(elementaryfdo_DATA)
+
+elementaryfdo_actions_128dir = $(datadir)/icons/Enlightenment-X/actions/128
+elementaryfdo_actions_128_DATA = $(elementary_fdo_actions_128_files)
+
+elementaryfdo_categories_16dir = $(datadir)/icons/Enlightenment-X/categories/16
+elementaryfdo_categories_16_DATA = $(elementary_fdo_categories_16_files)
+
+elementaryfdo_categories_128dir = $(datadir)/icons/Enlightenment-X/categories/128
+elementaryfdo_categories_128_DATA = $(elementary_fdo_categories_128_files)
+
+elementaryfdo_emblems_96dir = $(datadir)/icons/Enlightenment-X/emblems/96
+elementaryfdo_emblems_96_DATA = $(elementary_fdo_emblems_96_files)
+
+elementaryfdo_places_16dir = $(datadir)/icons/Enlightenment-X/places/16
+elementaryfdo_places_16_DATA = $(elementary_fdo_places_16_files)
+
+elementaryfdo_places_128dir = $(datadir)/icons/Enlightenment-X/places/128
+elementaryfdo_places_128_DATA = $(elementary_fdo_places_128_files)
+
+elementaryfdo_status_128dir = $(datadir)/icons/Enlightenment-X/status/128
+elementaryfdo_status_128_DATA = $(elementary_fdo_status_128_files)
+
+elementaryfdo_devices_128dir = $(datadir)/icons/Enlightenment-X/devices/128
+elementaryfdo_devices_128_DATA = $(elementary_fdo_devices_128_files)
+
+elementaryfdo_apps_64dir = $(datadir)/icons/Enlightenment-X/apps/64
+elementaryfdo_apps_64_DATA = $(elementary_fdo_apps_64_files)
+
+elementaryfdo_intl_128dir = $(datadir)/icons/Enlightenment-X/intl/128
+elementaryfdo_intl_128_DATA = $(elementary_fdo_intl_128_files)
+
+elementaryfdo_mimetypes_16dir = $(datadir)/icons/Enlightenment-X/mimetypes/16
+elementaryfdo_mimetypes_16_DATA = $(elementary_fdo_mimetypes_16_files)
+
+elementaryfdo_mimetypes_128dir = $(datadir)/icons/Enlightenment-X/mimetypes/128
+elementaryfdo_mimetypes_128_DATA = $(elementary_fdo_mimetypes_128_files)
+
+# edje_externals
+
+elementaryedje_externalsdir = $(datadir)/elementary/edje_externals
+elementaryedje_externals_DATA = elementary/edje_externals/icons.edj
+CLEANFILES += $(elementaryedje_externals_DATA)
+
+include elementary/edje_externals/Makefile.am
+
+elementary/edje_externals/icons.edj: elementary/edje_externals/icons.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/edje_externals/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+# images
+
+include elementary/images/Makefile.am
+
+elementaryimagesdir = $(datadir)/elementary/images
+elementaryimages_DATA = $(elementary_images_files)
+
+elementaryimages_glayerdir = $(datadir)/elementary/images/g_layer
+elementaryimages_glayer_DATA = $(elementary_images_glayer_files)
+
+EXTRA_DIST += $(elementary_images_files) $(elementary_images_glayer_files)
+
+# objects
+
+include ../Makefile_Elm_Helpers.am
+
+elementaryobjectsdir = $(datadir)/elementary/objects
+elementaryobjects_DATA = \
+elementary/objects/test.edj \
+elementary/objects/test_external.edj \
+elementary/objects/test_masking.edj \
+elementary/objects/multip.edj \
+elementary/objects/cursors.edj \
+elementary/objects/font_preview.edj \
+elementary/objects/postit_ent.edj \
+elementary/objects/multibuttonentry.edj \
+elementary/objects/test_pager.edj \
+elementary/objects/test_prefs.edj \
+elementary/objects/test_prefs.epb \
+elementary/objects/test_focus_style.edj \
+elementary/objects/test_tooltip.edj \
+elementary/objects/test_tab_pager.edj \
+$(NULL)
+
+CLEANFILES += $(elementaryobjects_DATA)
+
+include elementary/objects/Makefile.am
+
+elementary/objects/test.edj: elementary/objects/test.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_external.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_masking.edj: elementary/objects/test_masking.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multip.edj: elementary/objects/multip.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/cursors.edj: elementary/objects/cursors.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/font_preview.edj: elementary/objects/font_preview.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/postit_ent.edj: elementary/objects/postit_ent.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multibuttonentry.edj: elementary/objects/multibuttonentry.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_pager.edj: elementary/objects/test_pager.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_prefs.edj: elementary/objects/test_prefs.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_focus_style.edj: elementary/objects/test_focus_style.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+
+elementary/objects/test_tooltip.edj: elementary/objects/test_tooltip.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+
+elementary/objects/test_prefs.epb: elementary/objects/test_prefs.epc
+	$(AM_V_EPB) \
+	$(MKDIR_P) elementary/objects/; \
+	$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) $< $@
+
+elementary/objects/test_tab_pager.edj: elementary/objects/test_tab_pager.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
diff --git a/data/elementary/config/Makefile.am b/data/elementary/config/Makefile.am
new file mode 100644
index 0000000000..692651353e
--- /dev/null
+++ b/data/elementary/config/Makefile.am
@@ -0,0 +1,18 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = default standard mobile
+
+include ../../../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = profile.src
+
+filesdir = $(datadir)/elementary/config
+
+files_DATA = profile.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/; \
+	$(EET) -i $(top_builddir)/data/elementary/config/$@ config $< 0
+
+clean-local:
+	rm -rf *.cfg *~
diff --git a/data/elementary/config/mobile/Makefile.am b/data/elementary/config/mobile/Makefile.am
new file mode 100644
index 0000000000..2c6c9e2ef7
--- /dev/null
+++ b/data/elementary/config/mobile/Makefile.am
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../../../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/mobile
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/; \
+	$(EET) -e $(top_builddir)/data/elementary/config/mobile/$@ config $< 1
+
+clean-local:
+	rm -rf *.cfg *~
diff --git a/data/elementary/config/standard/Makefile.am b/data/elementary/config/standard/Makefile.am
new file mode 100644
index 0000000000..7ab55d0f80
--- /dev/null
+++ b/data/elementary/config/standard/Makefile.am
@@ -0,0 +1,23 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../../../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/standard
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/standard/; \
+	$(EET) -e $(top_builddir)/data/elementary/config/standard/$@ config $< 1
+
+clean-local:
+	rm -rf *.cfg *~
+
diff --git a/data/elementary/desktop/Makefile.am b/data/elementary/desktop/Makefile.am
new file mode 100644
index 0000000000..19d9f8c777
--- /dev/null
+++ b/data/elementary/desktop/Makefile.am
@@ -0,0 +1,10 @@
+AUTOMAKE_OPTIONS     = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+
+desktopdir = $(datadir)/applications
+desktop_DATA = elementary_test.desktop elementary_config.desktop
+
+icondir = $(datadir)/icons/hicolor/128x128/apps
+icon_DATA = elementary.png
+
+EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
diff --git a/data/elementary/edje_externals/Makefile.am b/data/elementary/edje_externals/Makefile.am
new file mode 100644
index 0000000000..7042035629
--- /dev/null
+++ b/data/elementary/edje_externals/Makefile.am
@@ -0,0 +1,26 @@
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/edje_externals -fd $(top_srcdir)/data/elementary/edje_externals
+
+EXTRA_DIST += \
+	elementary/edje_externals/icons.edc \
+	elementary/edje_externals/ico_anchorblock.png \
+	elementary/edje_externals/ico_anchorview.png \
+	elementary/edje_externals/ico_bubble.png \
+	elementary/edje_externals/ico_button.png \
+	elementary/edje_externals/ico_check.png \
+	elementary/edje_externals/ico_clock.png \
+	elementary/edje_externals/ico_fileselector.png \
+	elementary/edje_externals/ico_fileselector_button.png \
+	elementary/edje_externals/ico_genlist.png \
+	elementary/edje_externals/ico_hoversel.png \
+	elementary/edje_externals/ico_list.png \
+	elementary/edje_externals/ico_map.png \
+	elementary/edje_externals/ico_notepad.png \
+	elementary/edje_externals/ico_photocam.png \
+	elementary/edje_externals/ico_progressbar.png \
+	elementary/edje_externals/ico_radio.png \
+	elementary/edje_externals/ico_scrolled_entry.png \
+	elementary/edje_externals/ico_slider.png \
+	elementary/edje_externals/ico_slideshow.png \
+	elementary/edje_externals/ico_spinner.png \
+	elementary/edje_externals/ico_thumb.png \
+	elementary/edje_externals/ico_toolbar.png
diff --git a/data/elementary/images/Makefile.am b/data/elementary/images/Makefile.am
new file mode 100644
index 0000000000..6f028257cb
--- /dev/null
+++ b/data/elementary/images/Makefile.am
@@ -0,0 +1,93 @@
+elementary_images_files = \
+	elementary/images/insanely_huge_test_image.jpg \
+	elementary/images/panel_01.jpg \
+	elementary/images/plant_01.jpg \
+	elementary/images/pol_shadow.png \
+	elementary/images/pol_sky.png \
+	elementary/images/pol_twofish.png \
+	elementary/images/rock_01.jpg \
+	elementary/images/rock_02.jpg \
+	elementary/images/sky_01.jpg \
+	elementary/images/sky_02.jpg \
+	elementary/images/sky_03.jpg \
+	elementary/images/sky_04.jpg \
+	elementary/images/wood_01.jpg \
+	elementary/images/logo.png \
+	elementary/images/logo_small.png \
+	elementary/images/animated_logo.gif \
+	elementary/images/fire.gif \
+	elementary/images/parking.png \
+	elementary/images/icon_00.png \
+	elementary/images/icon_01.png \
+	elementary/images/icon_02.png \
+	elementary/images/icon_03.png \
+	elementary/images/icon_04.png \
+	elementary/images/icon_05.png \
+	elementary/images/icon_06.png \
+	elementary/images/icon_07.png \
+	elementary/images/icon_08.png \
+	elementary/images/icon_09.png \
+	elementary/images/icon_10.png \
+	elementary/images/icon_11.png \
+	elementary/images/icon_12.png \
+	elementary/images/icon_13.png \
+	elementary/images/icon_14.png \
+	elementary/images/icon_15.png \
+	elementary/images/icon_16.png \
+	elementary/images/icon_17.png \
+	elementary/images/icon_18.png \
+	elementary/images/icon_19.png \
+	elementary/images/icon_20.png \
+	elementary/images/icon_21.png \
+	elementary/images/icon_22.png \
+	elementary/images/icon_23.png \
+	elementary/images/icon_right_arrow.png \
+	elementary/images/bubble.png \
+	elementary/images/bubble_sh.png \
+	elementary/images/mystrale.jpg \
+	elementary/images/mystrale_2.jpg \
+	elementary/images/twofish.jpg \
+	elementary/images/pm_fill.png \
+	elementary/images/pt.png \
+	elementary/images/earth_normal.png \
+	elementary/images/space.png \
+	elementary/images/image_items.eet
+
+elementary_images_glayer_files = \
+	elementary/images/g_layer/double_tap_1.png \
+	elementary/images/g_layer/line_1.png \
+	elementary/images/g_layer/momentum_1.png \
+	elementary/images/g_layer/tap_5.png \
+	elementary/images/g_layer/double_tap_2.png \
+	elementary/images/g_layer/line_2.png \
+	elementary/images/g_layer/momentum_2.png \
+	elementary/images/g_layer/triple_tap_1.png \
+	elementary/images/g_layer/double_tap_3.png \
+	elementary/images/g_layer/line_3.png \
+	elementary/images/g_layer/momentum_3.png \
+	elementary/images/g_layer/triple_tap_2.png \
+	elementary/images/g_layer/double_tap_4.png \
+	elementary/images/g_layer/line_4.png \
+	elementary/images/g_layer/momentum_4.png \
+	elementary/images/g_layer/triple_tap_3.png \
+	elementary/images/g_layer/double_tap_5.png \
+	elementary/images/g_layer/line_5.png \
+	elementary/images/g_layer/momentum_5.png \
+	elementary/images/g_layer/triple_tap_4.png \
+	elementary/images/g_layer/flick_1.png \
+	elementary/images/g_layer/long_tap_1.png \
+	elementary/images/g_layer/rotate_1.png \
+	elementary/images/g_layer/triple_tap_5.png \
+	elementary/images/g_layer/flick_2.png \
+	elementary/images/g_layer/long_tap_2.png \
+	elementary/images/g_layer/tap_1.png \
+	elementary/images/g_layer/zoom_1.png \
+	elementary/images/g_layer/flick_3.png \
+	elementary/images/g_layer/long_tap_3.png \
+	elementary/images/g_layer/tap_2.png \
+	elementary/images/g_layer/flick_4.png \
+	elementary/images/g_layer/long_tap_4.png \
+	elementary/images/g_layer/tap_3.png \
+	elementary/images/g_layer/flick_5.png \
+	elementary/images/g_layer/long_tap_5.png \
+	elementary/images/g_layer/tap_4.png
diff --git a/data/elementary/objects/Makefile.am b/data/elementary/objects/Makefile.am
new file mode 100644
index 0000000000..c1325b8865
--- /dev/null
+++ b/data/elementary/objects/Makefile.am
@@ -0,0 +1,29 @@
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/objects -fd $(top_srcdir)/data/elementary/objects
+
+EXTRA_DIST += \
+elementary/objects/test.edc \
+elementary/objects/test_external.edc \
+elementary/objects/test_masking.edc \
+elementary/objects/test_pager.edc \
+elementary/objects/test_prefs.edc \
+elementary/objects/test_prefs.epc \
+elementary/objects/test_tab_pager.edc \
+elementary/objects/multip.edc \
+elementary/objects/cursors.edc \
+elementary/objects/font_preview.edc \
+elementary/objects/postit_ent.edc \
+elementary/objects/multibuttonentry.edc \
+elementary/objects/test_focus_style.edc \
+elementary/objects/test_tooltip.edc \
+elementary/objects/over.png \
+elementary/objects/under.png \
+elementary/objects/sky.jpg \
+elementary/objects/clo.png \
+elementary/objects/cross.png \
+elementary/objects/border.png \
+elementary/objects/border2.png \
+elementary/objects/border3.png \
+elementary/objects/border4.png \
+elementary/objects/border5.png \
+elementary/objects/border6.png \
+elementary/objects/roundedrect.png
diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
new file mode 100644
index 0000000000..dc31d80805
--- /dev/null
+++ b/data/elementary/themes/Makefile.am
@@ -0,0 +1,1528 @@
+EDJE_CC_ELM_FLAGS = \
+@ELM_EDJE_DEFINES@ \
+-id $(top_srcdir)/data/elementary/themes/img \
+-id $(top_srcdir)/data/elementary/themes/fdo \
+-fd $(top_srcdir)/data/elementary/themes/fnt \
+-sd $(top_srcdir)/data/elementary/themes/snd \
+-l $(top_srcdir)/COPYING \
+-a $(top_srcdir)/AUTHORS \
+-fastcomp
+
+
+elementary_themes_files = \
+elementary/themes/default.edc \
+\
+elementary/themes/colorclasses.edc \
+elementary/themes/fonts.edc \
+elementary/themes/macros.edc \
+\
+elementary/themes/edc/about-e.edc \
+elementary/themes/edc/about-theme.edc \
+elementary/themes/edc/appmenu.edc \
+elementary/themes/edc/background.edc \
+elementary/themes/edc/backlight.edc \
+elementary/themes/edc/battery.edc \
+elementary/themes/edc/batman.edc \
+elementary/themes/edc/bluez4.edc \
+elementary/themes/edc/border.edc \
+elementary/themes/edc/border-icons.edc \
+elementary/themes/edc/bryce.edc \
+elementary/themes/edc/bryce_editor.edc \
+elementary/themes/edc/button.edc \
+elementary/themes/edc/check.edc \
+elementary/themes/edc/clock.edc \
+elementary/themes/edc/colors.edc \
+elementary/themes/edc/colorwell.edc \
+elementary/themes/edc/comp.edc \
+elementary/themes/edc/comp_compat.edc \
+elementary/themes/edc/comp_effects.edc \
+elementary/themes/edc/conf.edc \
+elementary/themes/edc/connman.edc \
+elementary/themes/edc/cpufreq.edc \
+elementary/themes/edc/cpumonitor.edc \
+elementary/themes/edc/cslider.edc \
+elementary/themes/edc/desklock.edc \
+elementary/themes/edc/deskmirror.edc \
+elementary/themes/edc/deskpreview.edc \
+elementary/themes/edc/dialog.edc \
+elementary/themes/edc/edgebindings.edc \
+elementary/themes/edc/entry.edc \
+elementary/themes/edc/evrything.edc \
+elementary/themes/edc/fileman.edc \
+elementary/themes/edc/fontpreview.edc \
+elementary/themes/edc/frame.edc \
+elementary/themes/edc/gadman.edc \
+elementary/themes/edc/ibar-ibox.edc \
+elementary/themes/edc/icons.edc \
+elementary/themes/edc/ilist.edc \
+elementary/themes/edc/illume.edc \
+elementary/themes/edc/init.edc \
+elementary/themes/edc/label.edc \
+elementary/themes/edc/luncher.edc \
+elementary/themes/edc/memusage.edc \
+elementary/themes/edc/menu.edc \
+elementary/themes/edc/mixer.edc \
+elementary/themes/edc/music_control.edc \
+elementary/themes/edc/netstatus.edc \
+elementary/themes/edc/notification.edc \
+elementary/themes/edc/packagekit.edc \
+elementary/themes/edc/pager.edc \
+elementary/themes/edc/pager16.edc \
+elementary/themes/edc/pointer.edc \
+elementary/themes/edc/preview.edc \
+elementary/themes/edc/radio.edc \
+elementary/themes/edc/randr.edc \
+elementary/themes/edc/scrollframe.edc \
+elementary/themes/edc/shelf.edc \
+elementary/themes/edc/slider.edc \
+elementary/themes/edc/spectrum.edc \
+elementary/themes/edc/start.edc \
+elementary/themes/edc/syscon.edc \
+elementary/themes/edc/sys.edc \
+elementary/themes/edc/systray.edc \
+elementary/themes/edc/tasks.edc \
+elementary/themes/edc/temperature.edc \
+elementary/themes/edc/textblock.edc \
+elementary/themes/edc/time.edc \
+elementary/themes/edc/toolbar.edc \
+elementary/themes/edc/transitions.edc \
+elementary/themes/edc/wallpaper.edc \
+elementary/themes/edc/winlist.edc \
+elementary/themes/edc/wireless.edc \
+elementary/themes/edc/wizard.edc \
+elementary/themes/edc/xkbswitch.edc \
+\
+elementary/themes/edc/elm/access.edc \
+elementary/themes/edc/elm/actionslider.edc \
+elementary/themes/edc/elm/bg.edc \
+elementary/themes/edc/elm/border.edc \
+elementary/themes/edc/elm/bubble.edc \
+elementary/themes/edc/elm/button.edc \
+elementary/themes/edc/elm/calendar.edc \
+elementary/themes/edc/elm/check.edc \
+elementary/themes/edc/elm/clock.edc \
+elementary/themes/edc/elm/code.edc \
+elementary/themes/edc/elm/colorsel.edc \
+elementary/themes/edc/elm/colorclass.edc \
+elementary/themes/edc/elm/conform.edc \
+elementary/themes/edc/elm/ctxpopup.edc \
+elementary/themes/edc/elm/cursor.edc \
+elementary/themes/edc/elm/dayselector.edc \
+elementary/themes/edc/elm/diskselector.edc \
+elementary/themes/edc/elm/entry.edc \
+elementary/themes/edc/elm/ews.edc \
+elementary/themes/edc/elm/fileselector.edc \
+elementary/themes/edc/elm/flipselector.edc \
+elementary/themes/edc/elm/focus.edc \
+elementary/themes/edc/elm/frame.edc \
+elementary/themes/edc/elm/gengrid.edc \
+elementary/themes/edc/elm/genlist.edc \
+elementary/themes/edc/elm/hover.edc \
+elementary/themes/edc/elm/icon.edc \
+elementary/themes/edc/elm/icon_fdo.edc \
+elementary/themes/edc/elm/index.edc \
+elementary/themes/edc/elm/inwin.edc \
+elementary/themes/edc/elm/label.edc \
+elementary/themes/edc/elm/layout.edc \
+elementary/themes/edc/elm/list.edc \
+elementary/themes/edc/elm/map.edc \
+elementary/themes/edc/elm/menu.edc \
+elementary/themes/edc/elm/multibuttonentry.edc \
+elementary/themes/edc/elm/naviframe.edc \
+elementary/themes/edc/elm/notify.edc \
+elementary/themes/edc/elm/panel.edc \
+elementary/themes/edc/elm/panes.edc \
+elementary/themes/edc/elm/photocam.edc \
+elementary/themes/edc/elm/photo.edc \
+elementary/themes/edc/elm/player.edc \
+elementary/themes/edc/elm/pointer.edc \
+elementary/themes/edc/elm/popup.edc \
+elementary/themes/edc/elm/progress.edc \
+elementary/themes/edc/elm/radio.edc \
+elementary/themes/edc/elm/scroller.edc \
+elementary/themes/edc/elm/segment_control.edc \
+elementary/themes/edc/elm/separator.edc \
+elementary/themes/edc/elm/slider.edc \
+elementary/themes/edc/elm/slideshow.edc \
+elementary/themes/edc/elm/spinner.edc \
+elementary/themes/edc/elm/textpath.edc \
+elementary/themes/edc/elm/thumb.edc \
+elementary/themes/edc/elm/toolbar.edc \
+elementary/themes/edc/elm/tooltip.edc \
+elementary/themes/edc/elm/uiclock.edc \
+elementary/themes/edc/elm/video.edc \
+elementary/themes/edc/elm/win.edc \
+\
+elementary/themes/edc/O/efm_icons.edc \
+elementary/themes/edc/O/icons.edc \
+\
+elementary/themes/img/access_glow.png \
+elementary/themes/img/add_glow_small.png \
+elementary/themes/img/ball_small_glow_intense.png \
+elementary/themes/img/ball_small_glow.png \
+elementary/themes/img/bar_shine.png \
+elementary/themes/img/bat_base.png \
+elementary/themes/img/bat_bottom0.png \
+elementary/themes/img/bat_bottom1.png \
+elementary/themes/img/bat_shadow.png \
+elementary/themes/img/bat_shine.png \
+elementary/themes/img/bat_top0.png \
+elementary/themes/img/bat_top1.png \
+elementary/themes/img/batman_overlay.png \
+elementary/themes/img/bevel_curved_horiz_out.png \
+elementary/themes/img/bevel_curved_vert_out.png \
+elementary/themes/img/bevel_dark_in.png \
+elementary/themes/img/bevel_dark_out.png \
+elementary/themes/img/bevel_horiz_out.png \
+elementary/themes/img/bevel_in.png \
+elementary/themes/img/bevel_out.png \
+elementary/themes/img/bg_glow_in.png \
+elementary/themes/img/bg_radgrad.png \
+elementary/themes/img/big_arrow_down.png \
+elementary/themes/img/big_arrow_down_shadow.png \
+elementary/themes/img/big_arrow_left.png \
+elementary/themes/img/big_arrow_left_shadow.png \
+elementary/themes/img/big_arrow_right.png \
+elementary/themes/img/big_arrow_right_shadow.png \
+elementary/themes/img/big_arrow_up.png \
+elementary/themes/img/big_arrow_up_shadow.png \
+elementary/themes/img/box_glow.png \
+elementary/themes/img/box_outline.png \
+elementary/themes/img/bt_base.png \
+elementary/themes/img/bt_sig_1.png \
+elementary/themes/img/bt_sig_2.png \
+elementary/themes/img/btn_round_0.png \
+elementary/themes/img/btn_round_1.png \
+elementary/themes/img/btn_round_2.png \
+elementary/themes/img/bub_base_b0.png \
+elementary/themes/img/bub_base_b1.png \
+elementary/themes/img/bub_base_b2.png \
+elementary/themes/img/bub_base_bl.png \
+elementary/themes/img/bub_base_br.png \
+elementary/themes/img/bub_base_tl.png \
+elementary/themes/img/bub_base_tr.png \
+elementary/themes/img/bub_over_bot.png \
+elementary/themes/img/bub_over_top.png \
+elementary/themes/img/bulb_glow.png \
+elementary/themes/img/bulb_off.png \
+elementary/themes/img/bulb_on.png \
+elementary/themes/img/bulb_over.png \
+elementary/themes/img/button_clicked.png \
+elementary/themes/img/button_normal.png \
+elementary/themes/img/cell_base.png \
+elementary/themes/img/cell_sig_1.png \
+elementary/themes/img/cell_sig_2.png \
+elementary/themes/img/cell_sig_3.png \
+elementary/themes/img/cell_sig_4.png \
+elementary/themes/img/clock_base.png \
+elementary/themes/img/color_picker_alpha.png \
+elementary/themes/img/color_picker_brightness.png \
+elementary/themes/img/color_picker_color.png \
+elementary/themes/img/color_picker_opacity.png \
+elementary/themes/img/col_sel_end_bottom.png \
+elementary/themes/img/col_sel_end_left.png \
+elementary/themes/img/col_sel_end_right.png \
+elementary/themes/img/col_sel_end_top.png \
+elementary/themes/img/cpu_bar.png \
+elementary/themes/img/cpu_green_on.png \
+elementary/themes/img/cpu_red_on.png \
+elementary/themes/img/cpu_yellow_on.png \
+elementary/themes/img/cpu_bar_vert.png \
+elementary/themes/img/cpu_green_on_vert.png \
+elementary/themes/img/cpu_red_on_vert.png \
+elementary/themes/img/cpu_yellow_on_vert.png \
+elementary/themes/img/darken_rounded_square_half_h.png \
+elementary/themes/img/darken_rounded_square_half.png \
+elementary/themes/img/darken_rounded_square.png \
+elementary/themes/img/darken_square.png \
+elementary/themes/img/day_left_normal.png \
+elementary/themes/img/day_left_press.png \
+elementary/themes/img/day_left_selected.png \
+elementary/themes/img/day_middle_normal.png \
+elementary/themes/img/day_middle_press.png \
+elementary/themes/img/day_middle_selected.png \
+elementary/themes/img/day_right_normal.png \
+elementary/themes/img/day_right_press.png \
+elementary/themes/img/day_right_selected.png \
+elementary/themes/img/day_single_normal.png \
+elementary/themes/img/day_single_press.png \
+elementary/themes/img/day_single_selected.png \
+elementary/themes/img/diagonal_stripes.png \
+elementary/themes/img/digit_0.png \
+elementary/themes/img/digit_1.png \
+elementary/themes/img/digit_2.png \
+elementary/themes/img/digit_3.png \
+elementary/themes/img/digit_4.png \
+elementary/themes/img/digit_5.png \
+elementary/themes/img/digit_6.png \
+elementary/themes/img/digit_7.png \
+elementary/themes/img/digit_8.png \
+elementary/themes/img/digit_9.png \
+elementary/themes/img/digit_am.png \
+elementary/themes/img/digit_na.png \
+elementary/themes/img/digit_nm.png \
+elementary/themes/img/digit_pm.png \
+elementary/themes/img/O/digit_0.png \
+elementary/themes/img/O/digit_1.png \
+elementary/themes/img/O/digit_2.png \
+elementary/themes/img/O/digit_3.png \
+elementary/themes/img/O/digit_4.png \
+elementary/themes/img/O/digit_5.png \
+elementary/themes/img/O/digit_6.png \
+elementary/themes/img/O/digit_7.png \
+elementary/themes/img/O/digit_8.png \
+elementary/themes/img/O/digit_9.png \
+elementary/themes/img/O/digit_am.png \
+elementary/themes/img/O/digit_na.png \
+elementary/themes/img/O/digit_nm.png \
+elementary/themes/img/O/digit_pm.png \
+elementary/themes/img/dot_pattern.png \
+elementary/themes/img/downlight_glow_left.png \
+elementary/themes/img/downlight_glow.png \
+elementary/themes/img/downlight_glow_right.png \
+elementary/themes/img/downlight_glow_up.png \
+elementary/themes/img/efm_generic_icon_base_empty.png \
+elementary/themes/img/efm_generic_icon_base.png \
+elementary/themes/img/efm_generic_icon_content_audio.png \
+elementary/themes/img/efm_generic_icon_content_cad.png \
+elementary/themes/img/efm_generic_icon_content_code.png \
+elementary/themes/img/efm_generic_icon_content_db.png \
+elementary/themes/img/efm_generic_icon_content_doc.png \
+elementary/themes/img/efm_generic_icon_content_draw.png \
+elementary/themes/img/efm_generic_icon_content_executable.png \
+elementary/themes/img/efm_generic_icon_content_font.png \
+elementary/themes/img/efm_generic_icon_content_formula.png \
+elementary/themes/img/efm_generic_icon_content_image.png \
+elementary/themes/img/efm_generic_icon_content_inode_block.png \
+elementary/themes/img/efm_generic_icon_content_inode_char.png \
+elementary/themes/img/efm_generic_icon_content_inode_dir.png \
+elementary/themes/img/efm_generic_icon_content_inode_fifo.png \
+elementary/themes/img/efm_generic_icon_content_inode_file.png \
+elementary/themes/img/efm_generic_icon_content_inode_socket.png \
+elementary/themes/img/efm_generic_icon_content_install.png \
+elementary/themes/img/efm_generic_icon_content_iso.png \
+elementary/themes/img/efm_generic_icon_content_lib.png \
+elementary/themes/img/efm_generic_icon_content_logo.png \
+elementary/themes/img/efm_generic_icon_content_lo.png \
+elementary/themes/img/efm_generic_icon_content_pdf.png \
+elementary/themes/img/efm_generic_icon_content_perl.png \
+elementary/themes/img/efm_generic_icon_content_pres.png \
+elementary/themes/img/efm_generic_icon_content_ps.png \
+elementary/themes/img/efm_generic_icon_content_python.png \
+elementary/themes/img/efm_generic_icon_content_ruby.png \
+elementary/themes/img/efm_generic_icon_content_script.png \
+elementary/themes/img/efm_generic_icon_content_spread.png \
+elementary/themes/img/efm_generic_icon_content_template.png \
+elementary/themes/img/efm_generic_icon_content_text.png \
+elementary/themes/img/efm_generic_icon_content_translate.png \
+elementary/themes/img/efm_generic_icon_content_trash.png \
+elementary/themes/img/efm_generic_icon_content_unknown.png \
+elementary/themes/img/efm_generic_icon_content_video.png \
+elementary/themes/img/efm_generic_icon_content_web.png \
+elementary/themes/img/efm_generic_icon_over_empty.png \
+elementary/themes/img/efm_generic_icon_over.png \
+elementary/themes/img/efm_generic_icon_shadow_empty.png \
+elementary/themes/img/efm_generic_icon_shadow.png \
+elementary/themes/img/efm_generic_icon_content_cad.png \
+elementary/themes/img/efm_generic_icon_content_iso.png \
+elementary/themes/img/efm_generic_icon_content_lib.png \
+elementary/themes/img/efm_generic_icon_content_ruby.png \
+elementary/themes/img/efm_generic_icon_content_trash.png \
+elementary/themes/img/emo-angry.png \
+elementary/themes/img/emo-angry-shout.png \
+elementary/themes/img/emo-crazy-laugh.png \
+elementary/themes/img/emo-evil-laugh.png \
+elementary/themes/img/emo-evil.png \
+elementary/themes/img/emo-goggle-smile.png \
+elementary/themes/img/emo-grumpy.png \
+elementary/themes/img/emo-grumpy-smile.png \
+elementary/themes/img/emo-guilty.png \
+elementary/themes/img/emo-guilty-smile.png \
+elementary/themes/img/emo-haha.png \
+elementary/themes/img/emo-half-smile.png \
+elementary/themes/img/emo-happy-panting.png \
+elementary/themes/img/emo-happy.png \
+elementary/themes/img/emo-indifferent.png \
+elementary/themes/img/emo-kiss.png \
+elementary/themes/img/emo-knowing-grin.png \
+elementary/themes/img/emo-laugh.png \
+elementary/themes/img/emo-little-bit-sorry.png \
+elementary/themes/img/emo-love-lots.png \
+elementary/themes/img/emo-love.png \
+elementary/themes/img/emo-minimal-smile.png \
+elementary/themes/img/emo-not-happy.png \
+elementary/themes/img/emo-not-impressed.png \
+elementary/themes/img/emo-omg.png \
+elementary/themes/img/emo-opensmile.png \
+elementary/themes/img/emo-smile.png \
+elementary/themes/img/emo-sorry.png \
+elementary/themes/img/emo-squint-laugh.png \
+elementary/themes/img/emo-surprised.png \
+elementary/themes/img/emo-suspicious.png \
+elementary/themes/img/emo-tongue-dangling.png \
+elementary/themes/img/emo-tongue-poke.png \
+elementary/themes/img/emo-uh.png \
+elementary/themes/img/emo-unhappy.png \
+elementary/themes/img/emo-very-sorry.png \
+elementary/themes/img/emo-what.png \
+elementary/themes/img/emo-wink.png \
+elementary/themes/img/emo-worried.png \
+elementary/themes/img/emo-wtf.png \
+elementary/themes/img/eth.png \
+elementary/themes/img/exlclam.png \
+elementary/themes/img/flip_base_shad.png \
+elementary/themes/img/flip_shad.png \
+elementary/themes/img/frame_rounded.png \
+elementary/themes/img/glow_exclam.png \
+elementary/themes/img/glow_lock_double.png \
+elementary/themes/img/glow_lock_locked.png \
+elementary/themes/img/glow_lock_unlocked.png \
+elementary/themes/img/glow_med_white.png \
+elementary/themes/img/glow_round_corners.png \
+elementary/themes/img/glow_round_corners_small.png \
+elementary/themes/img/glow_small.png \
+elementary/themes/img/handle_pick_up_left.png \
+elementary/themes/img/handle_pick_up_right.png \
+elementary/themes/img/hole_pixel.png \
+elementary/themes/img/holes_horiz.png \
+elementary/themes/img/holes_tiny_glow_horiz.png \
+elementary/themes/img/holes_tiny_glow_vert.png \
+elementary/themes/img/holes_tiny_horiz.png \
+elementary/themes/img/holes_tiny_vert.png \
+elementary/themes/img/holes_vert.png \
+elementary/themes/img/hole_tiny.png \
+elementary/themes/img/home_glow.png \
+elementary/themes/img/home_hilight.png \
+elementary/themes/img/home_inset.png \
+elementary/themes/img/horiz_bar_inset.png \
+elementary/themes/img/horiz_glow_run_big.png \
+elementary/themes/img/horiz_glow_run.png \
+elementary/themes/img/horiz_glow_range.png \
+elementary/themes/img/horiz_glow_run_rev.png \
+elementary/themes/img/horizontal_separated_bar_glow.png \
+elementary/themes/img/horizontal_separated_bar_small_glow.png \
+elementary/themes/img/icon_apps.png \
+elementary/themes/img/icon_arrow_down_left.png \
+elementary/themes/img/icon_arrow_down.png \
+elementary/themes/img/icon_arrow_down_right.png \
+elementary/themes/img/icon_arrow_left.png \
+elementary/themes/img/icon_arrow_right.png \
+elementary/themes/img/icon_arrow_up_left.png \
+elementary/themes/img/icon_arrow_up.png \
+elementary/themes/img/icon_arrow_up_right.png \
+elementary/themes/img/icon_border_border.png \
+elementary/themes/img/icon_border_close.png \
+elementary/themes/img/icon_border_kill.png \
+elementary/themes/img/icon_border_lock.png \
+elementary/themes/img/icon_border_maximize.png \
+elementary/themes/img/icon_border_minimize.png \
+elementary/themes/img/icon_border_more.png \
+elementary/themes/img/icon_border_move.png \
+elementary/themes/img/icon_border_pager.png \
+elementary/themes/img/icon_border_pin.png \
+elementary/themes/img/icon_border_properties.png \
+elementary/themes/img/icon_border_remember.png \
+elementary/themes/img/icon_border_resize.png \
+elementary/themes/img/icon_border_sendto.png \
+elementary/themes/img/icon_border_shaded.png \
+elementary/themes/img/icon_border_skip.png \
+elementary/themes/img/icon_border_stack_bot.png \
+elementary/themes/img/icon_border_stack_norm.png \
+elementary/themes/img/icon_border_stack_top.png \
+elementary/themes/img/icon_chat.png \
+elementary/themes/img/icon_check_flat.png \
+elementary/themes/img/icon_clock.png \
+elementary/themes/img/icon_close.png \
+elementary/themes/img/icon_delete.png \
+elementary/themes/img/icon_edit.png \
+elementary/themes/img/icon_eject_mono.png \
+elementary/themes/img/icon_eject.png \
+elementary/themes/img/icon_enlightenment.png \
+elementary/themes/img/icon_file.png \
+elementary/themes/img/icon_folder.png \
+elementary/themes/img/icon_forward_mono.png \
+elementary/themes/img/icon_forward.png \
+elementary/themes/img/icon_head.png \
+elementary/themes/img/icon_home.png \
+elementary/themes/img/icon_info_mono.png \
+elementary/themes/img/icon_info.png \
+elementary/themes/img/icon_mute_mono.png \
+elementary/themes/img/icon_mute.png \
+elementary/themes/img/icon_next_mono.png \
+elementary/themes/img/icon_next.png \
+elementary/themes/img/icon_pause_mono.png \
+elementary/themes/img/icon_pause.png \
+elementary/themes/img/icon_play_mono.png \
+elementary/themes/img/icon_play.png \
+elementary/themes/img/icon_preferences-applications-personal.png \
+elementary/themes/img/icon_preferences-applications-screen-lock.png \
+elementary/themes/img/icon_preferences-applications-screen-unlock.png \
+elementary/themes/img/icon_preferences-composite.png \
+elementary/themes/img/icon_preferences-desklock-locale.png \
+elementary/themes/img/icon_preferences-desktop-environments.png \
+elementary/themes/img/icon_preferences-desktop-signal-bindings.png \
+elementary/themes/img/icon_preferences-interaction.png \
+elementary/themes/img/icon_preferences-variables.png \
+elementary/themes/img/icon_prev_mono.png \
+elementary/themes/img/icon_prev.png \
+elementary/themes/img/icon_refresh.png \
+elementary/themes/img/icon_rewind_mono.png \
+elementary/themes/img/icon_rewind.png \
+elementary/themes/img/icon_search.png  \
+elementary/themes/img/icon_spanner.png  \
+elementary/themes/img/icon_splat.png \
+elementary/themes/img/icon_splat_half.png \
+elementary/themes/img/icon_stop_mono.png \
+elementary/themes/img/icon_stop.png \
+elementary/themes/img/icon_system-lock-screen.png \
+elementary/themes/img/icon_system-log-out.png \
+elementary/themes/img/icon_system.png \
+elementary/themes/img/icon_system-restart.png \
+elementary/themes/img/icon_system-shutdown.png \
+elementary/themes/img/icon_system-suspend-hibernate.png \
+elementary/themes/img/icon_system-suspend.png \
+elementary/themes/img/icon_volume_mono.png \
+elementary/themes/img/icon_volume.png \
+elementary/themes/img/icon_wallpaper_center.png \
+elementary/themes/img/icon_wallpaper_fill.png \
+elementary/themes/img/icon_wallpaper_pan.png \
+elementary/themes/img/icon_wallpaper_stretch.png \
+elementary/themes/img/icon_wallpaper_tile.png \
+elementary/themes/img/icon_wallpaper_within.png \
+elementary/themes/img/icon_warning.png \
+elementary/themes/img/ic_win_move.png \
+elementary/themes/img/ic_win_resize.png \
+elementary/themes/img/img_example_1.png \
+elementary/themes/img/img_example_2.png \
+elementary/themes/img/inset_bar_horiz_base.png \
+elementary/themes/img/inset_bar_horiz_glow_base_double.png \
+elementary/themes/img/inset_bar_horiz_glow_base.png \
+elementary/themes/img/inset_bar_horiz_glow_inv_base_double.png \
+elementary/themes/img/inset_bar_horiz_glow_inv_base.png \
+elementary/themes/img/inset_bar_horiz_glow_inv_light.png \
+elementary/themes/img/inset_bar_horiz_glow_light.png \
+elementary/themes/img/inset_bar_horiz_glow_mid_base.png \
+elementary/themes/img/inset_bar_horiz_glow_mid_light.png \
+elementary/themes/img/inset_bar_horiz_inside_base.png \
+elementary/themes/img/inset_bar_horiz_inside_light.png \
+elementary/themes/img/inset_bar_horiz_light.png \
+elementary/themes/img/inset_bar_vert_base.png \
+elementary/themes/img/inset_bar_vert_glow_base_double.png \
+elementary/themes/img/inset_bar_vert_glow_base.png \
+elementary/themes/img/inset_bar_vert_glow_inv_base_double.png \
+elementary/themes/img/inset_bar_vert_glow_inv_base.png \
+elementary/themes/img/inset_bar_vert_glow_inv_light.png \
+elementary/themes/img/inset_bar_vert_glow_light.png \
+elementary/themes/img/inset_bar_vert_glow_mid_base.png \
+elementary/themes/img/inset_bar_vert_glow_mid_light.png \
+elementary/themes/img/inset_bar_vert_inside_base.png \
+elementary/themes/img/inset_bar_vert_inside_light.png \
+elementary/themes/img/inset_bar_vert_light.png \
+elementary/themes/img/inset_circle_tiny.png \
+elementary/themes/img/inset_round_hilight.png \
+elementary/themes/img/inset_round_shading.png \
+elementary/themes/img/inset_round_shadow.png \
+elementary/themes/img/inset_shadow_circle_tiny.png \
+elementary/themes/img/inset_shadow.png \
+elementary/themes/img/inset_shadow_tiny.png \
+elementary/themes/img/kbd_glow.png \
+elementary/themes/img/kbd_hilight.png \
+elementary/themes/img/kbd_inset.png \
+elementary/themes/img/knob_round_busy.png \
+elementary/themes/img/knob_round_small_busy.png \
+elementary/themes/img/knob_round_small_normal.png \
+elementary/themes/img/knob_round_small_selected.png \
+elementary/themes/img/knob_sz_04.png \
+elementary/themes/img/knob_sz_06.png \
+elementary/themes/img/knob_sz_08.png \
+elementary/themes/img/knob_sz_10.png \
+elementary/themes/img/knob_sz_12.png \
+elementary/themes/img/knob_sz_14.png \
+elementary/themes/img/knob_sz_16.png \
+elementary/themes/img/knob_sz_18.png \
+elementary/themes/img/knob_sz_20.png \
+elementary/themes/img/knob_sz_22.png \
+elementary/themes/img/knob_sz_24.png \
+elementary/themes/img/led_dark.png \
+elementary/themes/img/led_dot_white.png \
+elementary/themes/img/led_light.png \
+elementary/themes/img/led_red_light.png \
+elementary/themes/img/led_square_base.png \
+elementary/themes/img/led_square_glow.png \
+elementary/themes/img/led_square_shading.png \
+elementary/themes/img/led_square_shadow.png \
+elementary/themes/img/led_square_shine.png \
+elementary/themes/img/led_strobe.png \
+elementary/themes/img/led_tiny_blue.png \
+elementary/themes/img/led_tiny_green.png \
+elementary/themes/img/led_tiny_orange.png \
+elementary/themes/img/lock_insecure.png \
+elementary/themes/img/lock_locked.png \
+elementary/themes/img/logo_blue_bottom.png \
+elementary/themes/img/logo_blue_small_glow.png \
+elementary/themes/img/logo_blue_small.png \
+elementary/themes/img/map_circle.png \
+elementary/themes/img/map_marker.png \
+elementary/themes/img/map_scale.png \
+elementary/themes/img/media_busy_progress.png \
+elementary/themes/img/mem_bar.png \
+elementary/themes/img/mem_on.png \
+elementary/themes/img/mem_bar_vert.png \
+elementary/themes/img/mem_on_vert.png \
+elementary/themes/img/mini_blue_glow_arrow_0.png \
+elementary/themes/img/mini_blue_glow_arrow_1.png \
+elementary/themes/img/mini_blue_glow_arrow_2.png \
+elementary/themes/img/mini_blue_glow_arrow_3.png \
+elementary/themes/img/mini_box_bevel_shadow.png \
+elementary/themes/img/mini_box_glow.png \
+elementary/themes/img/music_control_icon.png \
+elementary/themes/img/netstatus_base.png \
+elementary/themes/img/netstatus_over.png \
+elementary/themes/img/netstatus_tx.png \
+elementary/themes/img/netstatus_rx.png \
+elementary/themes/img/outline_glow.png \
+elementary/themes/img/packagekit_base.png \
+elementary/themes/img/pointer_entry_bar.png \
+elementary/themes/img/pointer_glow.png \
+elementary/themes/img/pointer_mono.png \
+elementary/themes/img/pointer.png \
+elementary/themes/img/pointer_hand1.png \
+elementary/themes/img/ring_shadow.png \
+elementary/themes/img/ring_white_blue_glow.png \
+elementary/themes/img/ring_white_middle.png \
+elementary/themes/img/rounded_square.png \
+elementary/themes/img/runner_glow_horiz.png \
+elementary/themes/img/runner_glow_vert.png \
+elementary/themes/img/runner_horiz.png \
+elementary/themes/img/runner_vert.png \
+elementary/themes/img/screen_base.png \
+elementary/themes/img/screen_bg.png \
+elementary/themes/img/screen_circular_shadow.png \
+elementary/themes/img/screen_fg.png \
+elementary/themes/img/separator_horiz.png \
+elementary/themes/img/shadow_angled_in_light.png \
+elementary/themes/img/shadow_angled_in_sides.png \
+elementary/themes/img/shadow_horiz.png \
+elementary/themes/img/shadow_inset_bevels.png \
+elementary/themes/img/shadow_inset_light.png \
+elementary/themes/img/shadow_rounded_horiz.png \
+elementary/themes/img/shadow_rounded_vert.png \
+elementary/themes/img/shadow_square_tiny.png \
+elementary/themes/img/shadow_vertical_dark.png \
+elementary/themes/img/shadow_vert.png \
+elementary/themes/img/shine.png \
+elementary/themes/img/slider_run_base_horiz.png \
+elementary/themes/img/slider_run_base_light_horiz.png \
+elementary/themes/img/slider_run_base_light_vert.png \
+elementary/themes/img/slider_run_base_vert.png \
+elementary/themes/img/slider_run_bevel_horiz.png \
+elementary/themes/img/slider_run_bevel_vert.png \
+elementary/themes/img/slot_horiz_bottom.png \
+elementary/themes/img/slot_horiz_top.png \
+elementary/themes/img/spanner_glow.png \
+elementary/themes/img/spanner_hilight.png \
+elementary/themes/img/spanner_inset.png \
+elementary/themes/img/speaker.png \
+elementary/themes/img/split_h_glow.png \
+elementary/themes/img/split_h_hilight.png \
+elementary/themes/img/split_h_inset.png \
+elementary/themes/img/split_none_glow.png \
+elementary/themes/img/split_none_hilight.png \
+elementary/themes/img/split_none_inset.png \
+elementary/themes/img/split_v_glow.png \
+elementary/themes/img/split_v_hilight.png \
+elementary/themes/img/split_v_inset.png \
+elementary/themes/img/sym_check_alum.png \
+elementary/themes/img/sym_close_dark_normal.png \
+elementary/themes/img/sym_close_dark_selected.png \
+elementary/themes/img/sym_close_light_normal.png \
+elementary/themes/img/sym_close_light_selected.png \
+elementary/themes/img/sym_down_dark_normal.png \
+elementary/themes/img/sym_down_dark_selected.png \
+elementary/themes/img/sym_down_glow_normal.png \
+elementary/themes/img/sym_down_light_normal.png \
+elementary/themes/img/sym_down_light_selected.png \
+elementary/themes/img/sym_heart_glow_normal.png \
+elementary/themes/img/sym_heart_light_normal.png \
+elementary/themes/img/sym_icon_op_ask.png \
+elementary/themes/img/sym_icon_op_copy.png \
+elementary/themes/img/sym_icon_op_move.png \
+elementary/themes/img/sym_left_dark_normal.png \
+elementary/themes/img/sym_left_glow_normal.png \
+elementary/themes/img/sym_left_light_normal.png \
+elementary/themes/img/sym_radio_alum.png \
+elementary/themes/img/sym_reload_glow_normal.png \
+elementary/themes/img/sym_reload_light_normal.png \
+elementary/themes/img/sym_right_dark_normal.png \
+elementary/themes/img/sym_right_glow_normal.png \
+elementary/themes/img/sym_right_light_normal.png \
+elementary/themes/img/sym_up_dark_normal.png \
+elementary/themes/img/sym_up_dark_selected.png \
+elementary/themes/img/sym_up_glow_normal.png \
+elementary/themes/img/sym_up_light_normal.png \
+elementary/themes/img/sym_up_light_selected.png \
+elementary/themes/img/tacho_base.png \
+elementary/themes/img/tacho_hand_big2.png \
+elementary/themes/img/tacho_hand_big3.png \
+elementary/themes/img/tacho_hand_big4.png \
+elementary/themes/img/tacho_hand_big.png \
+elementary/themes/img/tacho_hand_big_shadow.png \
+elementary/themes/img/tacho_hand_small_min2.png \
+elementary/themes/img/tacho_hand_small_min3.png \
+elementary/themes/img/tacho_hand_small_min4.png \
+elementary/themes/img/tacho_hand_small_min.png \
+elementary/themes/img/tacho_hand_small_shadow.png \
+elementary/themes/img/therm_content.png \
+elementary/themes/img/therm_shadow.png \
+elementary/themes/img/therm_shine.png \
+elementary/themes/img/tooltip-base.png \
+elementary/themes/img/tooltip-corner-bottom-left-tip.png \
+elementary/themes/img/tooltip-corner-bottom-right-tip.png \
+elementary/themes/img/tooltip-corner-top-left-tip.png \
+elementary/themes/img/tooltip-corner-top-right-tip.png \
+elementary/themes/img/tooltip-edge-bottom-tip.png \
+elementary/themes/img/tooltip-edge-left-tip.png \
+elementary/themes/img/tooltip-edge-right-tip.png \
+elementary/themes/img/tooltip-edge-top-tip.png \
+elementary/themes/img/vert_bar_inset.png \
+elementary/themes/img/vert_glow_run.png \
+elementary/themes/img/vert_glow_range.png \
+elementary/themes/img/vert_glow_run_rev.png \
+elementary/themes/img/vertical_separated_bar_glow.png \
+elementary/themes/img/vertical_separated_bar_disabled.png \
+elementary/themes/img/vgrad_med_curved.png \
+elementary/themes/img/vgrad_med_darker.png \
+elementary/themes/img/vgrad_med_dark.png \
+elementary/themes/img/vgrad_med_dark_sparkle.png \
+elementary/themes/img/vgrad_med_lighter.png \
+elementary/themes/img/vgrad_med_lighter_sparkle.png \
+elementary/themes/img/vgrad_med.png \
+elementary/themes/img/vgrad_shadow_bi.png \
+elementary/themes/img/vgrad_tall.png \
+elementary/themes/img/white_bar_vert_glow.png \
+elementary/themes/img/wifi_base.png \
+elementary/themes/img/wifi_shadow.png \
+elementary/themes/img/wifi_sig_1.png \
+elementary/themes/img/wifi_sig_2.png \
+elementary/themes/img/wifi_sig_3.png \
+elementary/themes/img/win_glow.png \
+elementary/themes/img/win_shadow.png \
+elementary/themes/img/win_menu_shadow.png \
+\
+elementary/themes/img/O/about_bot.png \
+elementary/themes/img/O/about_mid.png \
+elementary/themes/img/O/about_top.png \
+elementary/themes/img/O/arrow_down.png \
+elementary/themes/img/O/arrow_up.png \
+elementary/themes/img/O/batt_base.png \
+elementary/themes/img/O/batt_level.png \
+elementary/themes/img/O/batt_over.png \
+elementary/themes/img/O/batt_power.png \
+elementary/themes/img/O/bg_shadow.png \
+elementary/themes/img/O/big_arrow_up.png \
+elementary/themes/img/O/bnw.png \
+elementary/themes/img/O/bt_base1.png \
+elementary/themes/img/O/bt_base2.png \
+elementary/themes/img/O/bt_dis_base.png \
+elementary/themes/img/O/bt_dis_hilight.png \
+elementary/themes/img/O/bt_dis_shine.png \
+elementary/themes/img/O/bt_glow.png \
+elementary/themes/img/O/bt_hilight.png \
+elementary/themes/img/O/bt_shine.png \
+elementary/themes/img/O/bt_sm_base1.png \
+elementary/themes/img/O/bt_sm_base2.png \
+elementary/themes/img/O/bt_sm_hilight.png \
+elementary/themes/img/O/bt_sm_shine.png \
+elementary/themes/img/O/bulb-0.png \
+elementary/themes/img/O/bulb-1.png \
+elementary/themes/img/O/bulb-2.png \
+elementary/themes/img/O/busy-1.png \
+elementary/themes/img/O/busy-2.png \
+elementary/themes/img/O/busy-3.png \
+elementary/themes/img/O/busy-4.png \
+elementary/themes/img/O/busy-5.png \
+elementary/themes/img/O/busy-6.png \
+elementary/themes/img/O/busy-7.png \
+elementary/themes/img/O/busy-8.png \
+elementary/themes/img/O/busy-9.png \
+elementary/themes/img/O/dia_botshad.png \
+elementary/themes/img/O/dia_grad.png \
+elementary/themes/img/O/e17_mini_button_shadow2.png \
+elementary/themes/img/O/everything_box.png \
+elementary/themes/img/O/everything_item_bg.png \
+elementary/themes/img/O/exq-bglight.png \
+elementary/themes/img/O/exq-dot-glow.png \
+elementary/themes/img/O/exq-dot.png \
+elementary/themes/img/O/exq-logo.png \
+elementary/themes/img/O/exq-vgrad.png \
+elementary/themes/img/O/gadman_border.png \
+elementary/themes/img/O/gadman_bottom.png \
+elementary/themes/img/O/gadman_frame.png \
+elementary/themes/img/O/gadman_left.png \
+elementary/themes/img/O/gadman_right.png \
+elementary/themes/img/O/gadman_top.png \
+elementary/themes/img/O/glow.png \
+elementary/themes/img/O/icon_active.png \
+elementary/themes/img/O/icon_add_fav.png \
+elementary/themes/img/O/icon_add.png \
+elementary/themes/img/O/icon_advanced.png \
+elementary/themes/img/O/icon_applications_ibar.png \
+elementary/themes/img/O/icon_applications_new.png \
+elementary/themes/img/O/icon_applications.png \
+elementary/themes/img/O/icon_applications_restart.png \
+elementary/themes/img/O/icon_applications_startup.png \
+elementary/themes/img/O/icon_autoscroll.png \
+elementary/themes/img/O/icon_behavior.png \
+elementary/themes/img/O/icon_border_border.png \
+elementary/themes/img/O/icon_border_close.png \
+elementary/themes/img/O/icon_border_kill.png \
+elementary/themes/img/O/icon_border_lock.png \
+elementary/themes/img/O/icon_border_maximize.png \
+elementary/themes/img/O/icon_border_minimize.png \
+elementary/themes/img/O/icon_border_more.png \
+elementary/themes/img/O/icon_border_pager.png \
+elementary/themes/img/O/icon_border_pin.png \
+elementary/themes/img/O/icon_border_properties.png \
+elementary/themes/img/O/icon_border_remember.png \
+elementary/themes/img/O/icon_border_sendto.png \
+elementary/themes/img/O/icon_border_shaded.png \
+elementary/themes/img/O/icon_border_skip.png \
+elementary/themes/img/O/icon_border_stack_bot.png \
+elementary/themes/img/O/icon_border_stack_norm.png \
+elementary/themes/img/O/icon_border_stack_top.png \
+elementary/themes/img/O/icon_check.png \
+elementary/themes/img/O/icon_close.png \
+elementary/themes/img/O/icon_colors.png \
+elementary/themes/img/O/icon_config.png \
+elementary/themes/img/O/icon_configuration.png \
+elementary/themes/img/O/icon_del.png \
+elementary/themes/img/O/icon_desklock_menu.png \
+elementary/themes/img/O/icon_desklock.png \
+elementary/themes/img/O/icon_desktops.png \
+elementary/themes/img/O/icon_directories.png \
+elementary/themes/img/O/icon_down_arrow.png \
+elementary/themes/img/O/icon_dummy.png \
+elementary/themes/img/O/icon_efm_arrange_name.png \
+elementary/themes/img/O/icon_efm_arrange.png \
+elementary/themes/img/O/icon_efm_arrange_time.png \
+elementary/themes/img/O/icon_efm_cd.png \
+elementary/themes/img/O/icon_efm_copy.png \
+elementary/themes/img/O/icon_efm_cut.png \
+elementary/themes/img/O/icon_efm_delete.png \
+elementary/themes/img/O/icon_efm_desktop.png \
+elementary/themes/img/O/icon_efm_dnd_ask.png \
+elementary/themes/img/O/icon_efm_dnd_copy.png \
+elementary/themes/img/O/icon_efm_dnd_move.png \
+elementary/themes/img/O/icon_efm_eject.png \
+elementary/themes/img/O/icon_efm_file_del.png \
+elementary/themes/img/O/icon_efm_file.png \
+elementary/themes/img/O/icon_efm_flash.png \
+elementary/themes/img/O/icon_efm_folder.png \
+elementary/themes/img/O/icon_efm_hdd.png \
+elementary/themes/img/O/icon_efm_home.png \
+elementary/themes/img/O/icon_efm_new_dir.png \
+elementary/themes/img/O/icon_efm_new.png \
+elementary/themes/img/O/icon_efm_open.png \
+elementary/themes/img/O/icon_efm_paste.png \
+elementary/themes/img/O/icon_efm_properties.png \
+elementary/themes/img/O/icon_efm_refresh.png \
+elementary/themes/img/O/icon_efm_rename.png \
+elementary/themes/img/O/icon_efm_root.png \
+elementary/themes/img/O/icon_efm_select.png \
+elementary/themes/img/O/icon_efm_sort.png \
+elementary/themes/img/O/icon_efm_tmp.png \
+elementary/themes/img/O/icon_efm_usbmedia.png \
+elementary/themes/img/O/icon_efm_view_details.png \
+elementary/themes/img/O/icon_efm_view_name.png \
+elementary/themes/img/O/icon_efm_view.png \
+elementary/themes/img/O/icon_efm_vol_mounted.png \
+elementary/themes/img/O/icon_efm_vol_unmounted.png \
+elementary/themes/img/O/icon_engine.png \
+elementary/themes/img/O/icon_evry_clipboard.png \
+elementary/themes/img/O/icon_extensions.png \
+elementary/themes/img/O/icon_favorites.png \
+elementary/themes/img/O/icon_file_icons.png \
+elementary/themes/img/O/icon_fonts.png \
+elementary/themes/img/O/icon_gadget.png \
+elementary/themes/img/O/icon_globe.png \
+elementary/themes/img/O/icon_gradient.png \
+elementary/themes/img/O/icon_halt.png \
+elementary/themes/img/O/icon_hibernate.png \
+elementary/themes/img/O/icon_icon_theme.png \
+elementary/themes/img/O/icon_illume.png \
+elementary/themes/img/O/icon_imc.png \
+elementary/themes/img/O/icon_interaction.png \
+elementary/themes/img/O/icon_intl.png \
+elementary/themes/img/O/icon_keyboard.png \
+elementary/themes/img/O/icon_keys.png \
+elementary/themes/img/O/icon_left_arrow.png \
+elementary/themes/img/O/icon_logout.png \
+elementary/themes/img/O/icon_look.png \
+elementary/themes/img/O/icon_lost_windows.png \
+elementary/themes/img/O/icon_menu_settings.png \
+elementary/themes/img/O/icon_menus.png \
+elementary/themes/img/O/icon_mime_audio_generic.png \
+elementary/themes/img/O/icon_mime_bdf.png \
+elementary/themes/img/O/icon_mime_c.png \
+elementary/themes/img/O/icon_mime_css.png \
+elementary/themes/img/O/icon_mime_deb.png \
+elementary/themes/img/O/icon_mime_doc.png \
+elementary/themes/img/O/icon_mime_executable_generic.png \
+elementary/themes/img/O/icon_mime_font_generic.png \
+elementary/themes/img/O/icon_mime_h.png \
+elementary/themes/img/O/icon_mime_html.png \
+elementary/themes/img/O/icon_mime_image_generic.png \
+elementary/themes/img/O/icon_mime_o.png \
+elementary/themes/img/O/icon_mime_package.png \
+elementary/themes/img/O/icon_mime_patch.png \
+elementary/themes/img/O/icon_mime_pcf.png \
+elementary/themes/img/O/icon_mime_pdf.png \
+elementary/themes/img/O/icon_mime_plain.png \
+elementary/themes/img/O/icon_mime_sh.png \
+elementary/themes/img/O/icon_mime_text_generic.png \
+elementary/themes/img/O/icon_mime_ttf.png \
+elementary/themes/img/O/icon_mime_video_generic.png \
+elementary/themes/img/O/icon_mime_xcf.png \
+elementary/themes/img/O/icon_mixer.png \
+elementary/themes/img/O/icon_modules.png \
+elementary/themes/img/O/icon_mouse_clean.png \
+elementary/themes/img/O/icon_mouse_extra.png \
+elementary/themes/img/O/icon_mouse_left.png \
+elementary/themes/img/O/icon_mouse_middle.png \
+elementary/themes/img/O/icon_mouse.png \
+elementary/themes/img/O/icon_mouse_right.png \
+elementary/themes/img/O/icon_mouse_wheel.png \
+elementary/themes/img/O/icon_new.png \
+elementary/themes/img/O/icon_pager.png \
+elementary/themes/img/O/icon_performance.png \
+elementary/themes/img/O/icon_power_management.png \
+elementary/themes/img/O/icon_profiles.png \
+elementary/themes/img/O/icon_reboot.png \
+elementary/themes/img/O/icon_reset.png \
+elementary/themes/img/O/icon_resize.png \
+elementary/themes/img/O/icon_right_arrow.png \
+elementary/themes/img/O/icon_run.png \
+elementary/themes/img/O/icon_scale.png \
+elementary/themes/img/O/icon_screen_around.png \
+elementary/themes/img/O/icon_screen_hflip.png \
+elementary/themes/img/O/icon_screen_left.png \
+elementary/themes/img/O/icon_screen_normal.png \
+elementary/themes/img/O/icon_screen_resolution.png \
+elementary/themes/img/O/icon_screen_right.png \
+elementary/themes/img/O/icon_screensaver.png \
+elementary/themes/img/O/icon_screen_setup.png \
+elementary/themes/img/O/icon_screenshot.png \
+elementary/themes/img/O/icon_screen_vflip.png \
+elementary/themes/img/O/icon_shelf_bottom_desk.png \
+elementary/themes/img/O/icon_shelf_bottom_left.png \
+elementary/themes/img/O/icon_shelf_bottom.png \
+elementary/themes/img/O/icon_shelf_bottom_right.png \
+elementary/themes/img/O/icon_shelf_custom.png \
+elementary/themes/img/O/icon_shelf_dock.png \
+elementary/themes/img/O/icon_shelf_left_bottom.png \
+elementary/themes/img/O/icon_shelf_left.png \
+elementary/themes/img/O/icon_shelf_left_top.png \
+elementary/themes/img/O/icon_shelf_menu_bar.png \
+elementary/themes/img/O/icon_shelf_panel.png \
+elementary/themes/img/O/icon_shelf.png \
+elementary/themes/img/O/icon_shelf_right_bottom.png \
+elementary/themes/img/O/icon_shelf_right.png \
+elementary/themes/img/O/icon_shelf_right_top.png \
+elementary/themes/img/O/icon_shelf_top_desk.png \
+elementary/themes/img/O/icon_shelf_top_left.png \
+elementary/themes/img/O/icon_shelf_top.png \
+elementary/themes/img/O/icon_shelf_top_right.png \
+elementary/themes/img/O/icon_startup.png \
+elementary/themes/img/O/icon_suspend.png \
+elementary/themes/img/O/icon_swap.png \
+elementary/themes/img/O/icon_system.png \
+elementary/themes/img/O/icon_theme.png \
+elementary/themes/img/O/icon_toolbar.png \
+elementary/themes/img/O/icon_transitions.png \
+elementary/themes/img/O/icon_up_arrow.png \
+elementary/themes/img/O/icon_wallpaper_center_flat.png \
+elementary/themes/img/O/icon_wallpaper_center.png \
+elementary/themes/img/O/icon_wallpaper_grad_screen.png \
+elementary/themes/img/O/icon_wallpaper.png \
+elementary/themes/img/O/icon_wallpaper_screen.png \
+elementary/themes/img/O/icon_warning.png \
+elementary/themes/img/O/icon_window_focus.png \
+elementary/themes/img/O/icon_window_geometry.png \
+elementary/themes/img/O/icon_window_manipulation.png \
+elementary/themes/img/O/icon_window_process_management.png \
+elementary/themes/img/O/icon_window_remembers.png \
+elementary/themes/img/O/icon_windows.png \
+elementary/themes/img/O/icon_winlist.png \
+elementary/themes/img/O/icon_win_move.png \
+elementary/themes/img/O/icon_win_resize.png \
+elementary/themes/img/O/illume-home.png \
+elementary/themes/img/O/illume-kbd-on.png \
+elementary/themes/img/O/illume-kbd.png \
+elementary/themes/img/O/illume-mode-dual-left.png \
+elementary/themes/img/O/illume-mode-dual-top.png \
+elementary/themes/img/O/illume-mode-single.png \
+elementary/themes/img/O/inset_raised.png \
+elementary/themes/img/O/inset_sunk.png \
+elementary/themes/img/O/logo_black_128.png \
+elementary/themes/img/O/logo_white_128.png \
+elementary/themes/img/O/mixer_high_left.png \
+elementary/themes/img/O/mixer_high_right.png \
+elementary/themes/img/O/mixer_low_left.png \
+elementary/themes/img/O/mixer_low_right.png \
+elementary/themes/img/O/mixer_med_left.png \
+elementary/themes/img/O/mixer_med_right.png \
+elementary/themes/img/O/mixer.png \
+elementary/themes/img/O/outline.png \
+elementary/themes/img/O/randr_icon_off.png \
+elementary/themes/img/O/randr_icon_on.png \
+elementary/themes/img/O/randr_monitor.png \
+elementary/themes/img/O/randr_stand.png \
+elementary/themes/img/O/sb_runnerh.png \
+elementary/themes/img/O/sb_runnerv.png \
+elementary/themes/img/O/silk.png \
+elementary/themes/img/O/t0.png \
+elementary/themes/img/O/t0-sh.png \
+elementary/themes/img/O/t1.png \
+elementary/themes/img/O/t1-sh.png \
+elementary/themes/img/O/t2.png \
+elementary/themes/img/O/tacho_bg.png \
+elementary/themes/img/O/tacho_fg.png \
+elementary/themes/img/O/temp_base.png \
+elementary/themes/img/O/temp_mid.png \
+elementary/themes/img/O/temp_over.png \
+elementary/themes/img/O/theme-label.png \
+elementary/themes/img/O/toolbar_sel.png \
+elementary/themes/img/O/topsh.png \
+elementary/themes/img/O/transition_vswipe.png \
+elementary/themes/img/O/vgrad_dark.png \
+elementary/themes/img/O/vgrad_light.png \
+elementary/themes/img/O/wizard_bt1.png \
+elementary/themes/img/O/wizard_bt2.png \
+elementary/themes/img/O/wizard_pattern.png \
+elementary/themes/img/O/wp-bot1.png \
+elementary/themes/img/O/wp-bot2.png \
+elementary/themes/img/O/wp-tb1.png \
+elementary/themes/img/O/wp-tb2.png \
+elementary/themes/img/O/wp-tb3.png \
+elementary/themes/img/O/wp-tbs.png \
+\
+elementary/themes/snd/kbd-tap2.wav \
+elementary/themes/snd/kbd-tap3.wav \
+elementary/themes/snd/kbd-tap4.wav \
+elementary/themes/snd/kbd-tap5.wav \
+elementary/themes/snd/kbd-tap.wav
+
+efl_ui_themes_files = \
+elementary/themes/edc/efl/bg.edc \
+elementary/themes/edc/efl/border.edc \
+elementary/themes/edc/efl/button.edc \
+elementary/themes/edc/efl/calendar.edc \
+elementary/themes/edc/efl/check.edc \
+elementary/themes/edc/efl/uiclock.edc \
+elementary/themes/edc/efl/cursor.edc \
+elementary/themes/edc/efl/focus.edc \
+elementary/themes/edc/efl/frame.edc \
+elementary/themes/edc/efl/grid.edc \
+elementary/themes/edc/efl/navigation_bar.edc \
+elementary/themes/edc/efl/navigation_layout.edc \
+elementary/themes/edc/efl/tags.edc \
+elementary/themes/edc/efl/panel.edc \
+elementary/themes/edc/efl/nstate.edc \
+elementary/themes/edc/efl/panes.edc \
+elementary/themes/edc/efl/photocam.edc \
+elementary/themes/edc/efl/popup.edc \
+elementary/themes/edc/efl/pointer.edc \
+elementary/themes/edc/efl/progress.edc \
+elementary/themes/edc/efl/radio.edc \
+elementary/themes/edc/efl/scroller.edc \
+elementary/themes/edc/efl/slider.edc \
+elementary/themes/edc/efl/spin.edc \
+elementary/themes/edc/efl/spin_button.edc \
+elementary/themes/edc/efl/datepicker.edc \
+elementary/themes/edc/efl/timepicker.edc \
+elementary/themes/edc/efl/text.edc \
+elementary/themes/edc/efl/textpath.edc \
+elementary/themes/edc/efl/tooltip.edc \
+elementary/themes/edc/efl/video.edc \
+elementary/themes/edc/efl/list.edc \
+elementary/themes/edc/efl/win.edc \
+elementary/themes/edc/efl/pager.edc \
+elementary/themes/edc/efl/tab_pager.edc \
+elementary/themes/edc/efl/tab_bar.edc \
+elementary/themes/edc/efl/tab_page.edc
+
+elementary_fdo_actions_128_files = \
+	elementary/themes/fdo/actions/128/address-book-new.png \
+	elementary/themes/fdo/actions/128/application-exit.png \
+	elementary/themes/fdo/actions/128/appointment-new.png \
+	elementary/themes/fdo/actions/128/call-start.png \
+	elementary/themes/fdo/actions/128/call-stop.png \
+	elementary/themes/fdo/actions/128/contact-new.png \
+	elementary/themes/fdo/actions/128/document-close.png \
+	elementary/themes/fdo/actions/128/document-export.png \
+	elementary/themes/fdo/actions/128/document-import.png \
+	elementary/themes/fdo/actions/128/document-new.png \
+	elementary/themes/fdo/actions/128/document-open.png \
+	elementary/themes/fdo/actions/128/document-open-recent.png \
+	elementary/themes/fdo/actions/128/document-page-setup.png \
+	elementary/themes/fdo/actions/128/document-print.png \
+	elementary/themes/fdo/actions/128/document-print-preview.png \
+	elementary/themes/fdo/actions/128/document-properties.png \
+	elementary/themes/fdo/actions/128/document-revert.png \
+	elementary/themes/fdo/actions/128/document-save-as.png \
+	elementary/themes/fdo/actions/128/document-save.png \
+	elementary/themes/fdo/actions/128/document-send.png \
+	elementary/themes/fdo/actions/128/edit-clear.png \
+	elementary/themes/fdo/actions/128/edit-copy.png \
+	elementary/themes/fdo/actions/128/edit-cut.png \
+	elementary/themes/fdo/actions/128/edit-delete.png \
+	elementary/themes/fdo/actions/128/edit-find.png \
+	elementary/themes/fdo/actions/128/edit-find-replace.png \
+	elementary/themes/fdo/actions/128/edit-paste.png \
+	elementary/themes/fdo/actions/128/edit-redo.png \
+	elementary/themes/fdo/actions/128/edit-select-all.png \
+	elementary/themes/fdo/actions/128/edit-undo.png \
+	elementary/themes/fdo/actions/128/folder-copy.png \
+	elementary/themes/fdo/actions/128/folder-move.png \
+	elementary/themes/fdo/actions/128/folder-new.png \
+	elementary/themes/fdo/actions/128/format-indent-less.png \
+	elementary/themes/fdo/actions/128/format-indent-more.png \
+	elementary/themes/fdo/actions/128/format-justify-center.png \
+	elementary/themes/fdo/actions/128/format-justify-fill.png \
+	elementary/themes/fdo/actions/128/format-justify-left.png \
+	elementary/themes/fdo/actions/128/format-justify-right.png \
+	elementary/themes/fdo/actions/128/format-text-bold.png \
+	elementary/themes/fdo/actions/128/format-text-direction-ltr.png \
+	elementary/themes/fdo/actions/128/format-text-direction-rtl.png \
+	elementary/themes/fdo/actions/128/format-text-italic.png \
+	elementary/themes/fdo/actions/128/format-text-strikethrough.png \
+	elementary/themes/fdo/actions/128/format-text-underline.png \
+	elementary/themes/fdo/actions/128/go-bottom.png \
+	elementary/themes/fdo/actions/128/go-down.png \
+	elementary/themes/fdo/actions/128/go-first.png \
+	elementary/themes/fdo/actions/128/go-home.png \
+	elementary/themes/fdo/actions/128/go-jump.png \
+	elementary/themes/fdo/actions/128/go-last.png \
+	elementary/themes/fdo/actions/128/go-next.png \
+	elementary/themes/fdo/actions/128/go-previous.png \
+	elementary/themes/fdo/actions/128/go-top.png \
+	elementary/themes/fdo/actions/128/go-up.png \
+	elementary/themes/fdo/actions/128/help-about.png \
+	elementary/themes/fdo/actions/128/help-contents.png \
+	elementary/themes/fdo/actions/128/help-faq.png \
+	elementary/themes/fdo/actions/128/insert-image.png \
+	elementary/themes/fdo/actions/128/insert-link.png \
+	elementary/themes/fdo/actions/128/insert-object.png \
+	elementary/themes/fdo/actions/128/insert-text.png \
+	elementary/themes/fdo/actions/128/list-add.png \
+	elementary/themes/fdo/actions/128/list-remove.png \
+	elementary/themes/fdo/actions/128/mail-forward.png \
+	elementary/themes/fdo/actions/128/mail-mark-important.png \
+	elementary/themes/fdo/actions/128/mail-mark-junk.png \
+	elementary/themes/fdo/actions/128/mail-mark-notjunk.png \
+	elementary/themes/fdo/actions/128/mail-mark-read.png \
+	elementary/themes/fdo/actions/128/mail-mark-unread.png \
+	elementary/themes/fdo/actions/128/mail-message-new.png \
+	elementary/themes/fdo/actions/128/mail-reply-all.png \
+	elementary/themes/fdo/actions/128/mail-reply-sender.png \
+	elementary/themes/fdo/actions/128/mail-send.png \
+	elementary/themes/fdo/actions/128/mail-send-receive.png \
+	elementary/themes/fdo/actions/128/media-eject.png \
+	elementary/themes/fdo/actions/128/media-playback-pause.png \
+	elementary/themes/fdo/actions/128/media-playback-start.png \
+	elementary/themes/fdo/actions/128/media-playback-stop.png \
+	elementary/themes/fdo/actions/128/media-record.png \
+	elementary/themes/fdo/actions/128/media-seek-backward.png \
+	elementary/themes/fdo/actions/128/media-seek-forward.png \
+	elementary/themes/fdo/actions/128/media-skip-backward.png \
+	elementary/themes/fdo/actions/128/media-skip-forward.png \
+	elementary/themes/fdo/actions/128/object-flip-horizontal.png \
+	elementary/themes/fdo/actions/128/object-flip-vertical.png \
+	elementary/themes/fdo/actions/128/object-rotate-left.png \
+	elementary/themes/fdo/actions/128/object-rotate-right.png \
+	elementary/themes/fdo/actions/128/process-stop.png \
+	elementary/themes/fdo/actions/128/system-lock-screen.png \
+	elementary/themes/fdo/actions/128/system-log-out.png \
+	elementary/themes/fdo/actions/128/system-reboot.png \
+	elementary/themes/fdo/actions/128/system-run.png \
+	elementary/themes/fdo/actions/128/system-search.png \
+	elementary/themes/fdo/actions/128/system-shutdown.png \
+	elementary/themes/fdo/actions/128/tools-check-spelling.png \
+	elementary/themes/fdo/actions/128/view-close.png \
+	elementary/themes/fdo/actions/128/view-fullscreen.png \
+	elementary/themes/fdo/actions/128/view-list-compact.png \
+	elementary/themes/fdo/actions/128/view-list-details.png \
+	elementary/themes/fdo/actions/128/view-list-icons.png \
+	elementary/themes/fdo/actions/128/view-refresh.png \
+	elementary/themes/fdo/actions/128/view-restore.png \
+	elementary/themes/fdo/actions/128/view-sort-ascending.png \
+	elementary/themes/fdo/actions/128/view-sort-descending.png \
+	elementary/themes/fdo/actions/128/window-close.png \
+	elementary/themes/fdo/actions/128/window-new.png \
+	elementary/themes/fdo/actions/128/zoom-fill.png \
+	elementary/themes/fdo/actions/128/zoom-fit-best.png \
+	elementary/themes/fdo/actions/128/zoom-fit.png \
+	elementary/themes/fdo/actions/128/zoom-in.png \
+	elementary/themes/fdo/actions/128/zoom-original.png \
+	elementary/themes/fdo/actions/128/zoom-out.png
+
+elementary_fdo_categories_16_files = \
+	elementary/themes/fdo/categories/16/applications-accessories.png \
+	elementary/themes/fdo/categories/16/applications-development.png \
+	elementary/themes/fdo/categories/16/applications-games.png \
+	elementary/themes/fdo/categories/16/applications-graphics.png \
+	elementary/themes/fdo/categories/16/applications-internet.png \
+	elementary/themes/fdo/categories/16/applications-multimedia.png \
+	elementary/themes/fdo/categories/16/applications-office.png \
+	elementary/themes/fdo/categories/16/applications-other.png \
+	elementary/themes/fdo/categories/16/applications-science.png \
+	elementary/themes/fdo/categories/16/applications-system.png \
+	elementary/themes/fdo/categories/16/applications-utilities.png \
+	elementary/themes/fdo/categories/16/preferences-desktop.png \
+	elementary/themes/fdo/categories/16/preferences-other.png \
+	elementary/themes/fdo/categories/16/preferences-system.png
+
+elementary_fdo_categories_128_files = \
+	elementary/themes/fdo/categories/128/applications-accessories.png \
+	elementary/themes/fdo/categories/128/applications-development.png \
+	elementary/themes/fdo/categories/128/applications-games.png \
+	elementary/themes/fdo/categories/128/applications-graphics.png \
+	elementary/themes/fdo/categories/128/applications-internet.png \
+	elementary/themes/fdo/categories/128/applications-multimedia.png \
+	elementary/themes/fdo/categories/128/applications-office.png \
+	elementary/themes/fdo/categories/128/applications-other.png \
+	elementary/themes/fdo/categories/128/applications-science.png \
+	elementary/themes/fdo/categories/128/applications-system.png \
+	elementary/themes/fdo/categories/128/applications-utilities.png \
+	elementary/themes/fdo/categories/128/preferences-desktop.png \
+	elementary/themes/fdo/categories/128/preferences-other.png \
+	elementary/themes/fdo/categories/128/preferences-system.png
+
+elementary_fdo_emblems_96_files = \
+	elementary/themes/fdo/emblems/96/emblem-default.png \
+	elementary/themes/fdo/emblems/96/emblem-documents.png \
+	elementary/themes/fdo/emblems/96/emblem-downloads.png \
+	elementary/themes/fdo/emblems/96/emblem-favorite.png \
+	elementary/themes/fdo/emblems/96/emblem-important.png \
+	elementary/themes/fdo/emblems/96/emblem-mail.png \
+	elementary/themes/fdo/emblems/96/emblem-photos.png \
+	elementary/themes/fdo/emblems/96/emblem-readonly.png \
+	elementary/themes/fdo/emblems/96/emblem-shared.png \
+	elementary/themes/fdo/emblems/96/emblem-symbolic-link.png \
+	elementary/themes/fdo/emblems/96/emblem-synchronized.png \
+	elementary/themes/fdo/emblems/96/emblem-synchronizing.png \
+	elementary/themes/fdo/emblems/96/emblem-system.png \
+	elementary/themes/fdo/emblems/96/emblem-unreadable.png
+
+elementary_fdo_places_16_files = \
+	elementary/themes/fdo/places/16/folder-documents.png \
+	elementary/themes/fdo/places/16/folder-download.png \
+	elementary/themes/fdo/places/16/folder-drag-accept.png \
+	elementary/themes/fdo/places/16/folder-home.png \
+	elementary/themes/fdo/places/16/folder-music.png \
+	elementary/themes/fdo/places/16/folder-open.png \
+	elementary/themes/fdo/places/16/folder-pictures.png \
+	elementary/themes/fdo/places/16/folder.png \
+	elementary/themes/fdo/places/16/folder-recent.png \
+	elementary/themes/fdo/places/16/folder-remote.png \
+	elementary/themes/fdo/places/16/folder-videos.png \
+	elementary/themes/fdo/places/16/folder-visiting.png \
+	elementary/themes/fdo/places/16/network-server.png \
+	elementary/themes/fdo/places/16/network-workgroup.png \
+	elementary/themes/fdo/places/16/start-here.png \
+	elementary/themes/fdo/places/16/user-desktop.png
+
+elementary_fdo_places_128_files = \
+	elementary/themes/fdo/places/128/folder-documents.png \
+	elementary/themes/fdo/places/128/folder-drag-accept.png \
+	elementary/themes/fdo/places/128/folder-download.png \
+	elementary/themes/fdo/places/128/folder-home.png \
+	elementary/themes/fdo/places/128/folder-music.png \
+	elementary/themes/fdo/places/128/folder-open.png \
+	elementary/themes/fdo/places/128/folder-pictures.png \
+	elementary/themes/fdo/places/128/folder.png \
+	elementary/themes/fdo/places/128/folder-publicshare.png \
+	elementary/themes/fdo/places/128/folder-recent.png \
+	elementary/themes/fdo/places/128/folder-remote.png \
+	elementary/themes/fdo/places/128/folder-templates.png \
+	elementary/themes/fdo/places/128/folder-videos.png \
+	elementary/themes/fdo/places/128/folder-visiting.png \
+	elementary/themes/fdo/places/128/network-server.png \
+	elementary/themes/fdo/places/128/network-workgroup.png \
+	elementary/themes/fdo/places/128/start-here.png \
+	elementary/themes/fdo/places/128/user-bookmarks.png \
+	elementary/themes/fdo/places/128/user-desktop.png \
+	elementary/themes/fdo/places/128/user-home.png \
+	elementary/themes/fdo/places/128/user-trash.png
+
+elementary_fdo_status_128_files = \
+	elementary/themes/fdo/status/128/appointment-missed.png \
+	elementary/themes/fdo/status/128/appointment-soon.png \
+	elementary/themes/fdo/status/128/audio-volume-high.png \
+	elementary/themes/fdo/status/128/audio-volume-low.png \
+	elementary/themes/fdo/status/128/audio-volume-medium.png \
+	elementary/themes/fdo/status/128/audio-volume-muted.png \
+	elementary/themes/fdo/status/128/audio-volume.png \
+	elementary/themes/fdo/status/128/battery-caution-charging.png \
+	elementary/themes/fdo/status/128/battery-caution.png \
+	elementary/themes/fdo/status/128/battery-empty-charging.png \
+	elementary/themes/fdo/status/128/battery-empty.png \
+	elementary/themes/fdo/status/128/battery-full-charging.png \
+	elementary/themes/fdo/status/128/battery-full.png \
+	elementary/themes/fdo/status/128/battery-good-charging.png \
+	elementary/themes/fdo/status/128/battery-good.png \
+	elementary/themes/fdo/status/128/battery-low-charging.png \
+	elementary/themes/fdo/status/128/battery-low.png \
+	elementary/themes/fdo/status/128/bluetooth-active.png \
+	elementary/themes/fdo/status/128/bluetooth-disabled.png \
+	elementary/themes/fdo/status/128/changes-allow.png \
+	elementary/themes/fdo/status/128/changes-prevent.png \
+	elementary/themes/fdo/status/128/dialog-error.png \
+	elementary/themes/fdo/status/128/dialog-information.png \
+	elementary/themes/fdo/status/128/dialog-password.png \
+	elementary/themes/fdo/status/128/dialog-question.png \
+	elementary/themes/fdo/status/128/dialog-warning.png \
+	elementary/themes/fdo/status/128/mail-attachment.png \
+	elementary/themes/fdo/status/128/mail-read.png \
+	elementary/themes/fdo/status/128/mail-replied.png \
+	elementary/themes/fdo/status/128/mail-unread.png \
+	elementary/themes/fdo/status/128/mail-signed.png \
+	elementary/themes/fdo/status/128/mail-signed-verified.png \
+	elementary/themes/fdo/status/128/media-playlist-repeat.png \
+	elementary/themes/fdo/status/128/media-playlist-shuffle.png \
+	elementary/themes/fdo/status/128/network-cellular-3g.png \
+	elementary/themes/fdo/status/128/network-cellular-4g.png \
+	elementary/themes/fdo/status/128/network-cellular-connected.png \
+	elementary/themes/fdo/status/128/network-cellular-edge.png \
+	elementary/themes/fdo/status/128/network-cellular-gprs.png \
+	elementary/themes/fdo/status/128/network-cellular-signal-acquiring.png \
+	elementary/themes/fdo/status/128/network-cellular-signal-excellent.png \
+	elementary/themes/fdo/status/128/network-cellular-signal-good.png \
+	elementary/themes/fdo/status/128/network-cellular-signal-none.png \
+	elementary/themes/fdo/status/128/network-cellular-signal-ok.png \
+	elementary/themes/fdo/status/128/network-cellular-signal-weak.png \
+	elementary/themes/fdo/status/128/network-cellular-umts.png \
+	elementary/themes/fdo/status/128/network-error.png \
+	elementary/themes/fdo/status/128/network-idle.png \
+	elementary/themes/fdo/status/128/network-offline.png \
+	elementary/themes/fdo/status/128/network-receive.png \
+	elementary/themes/fdo/status/128/network-transmit.png \
+	elementary/themes/fdo/status/128/network-transmit-receive.png \
+	elementary/themes/fdo/status/128/network-vpn-acquiring.png \
+	elementary/themes/fdo/status/128/network-vpn.png \
+	elementary/themes/fdo/status/128/network-wireless-acquiring.png \
+	elementary/themes/fdo/status/128/network-wireless-encrypted.png \
+	elementary/themes/fdo/status/128/network-wireless-signal-excellent.png \
+	elementary/themes/fdo/status/128/network-wireless-signal-good.png \
+	elementary/themes/fdo/status/128/network-wireless-signal-none.png \
+	elementary/themes/fdo/status/128/network-wireless-signal-ok.png \
+	elementary/themes/fdo/status/128/network-wireless-signal-weak.png \
+	elementary/themes/fdo/status/128/non-starred.png \
+	elementary/themes/fdo/status/128/printer-error.png \
+	elementary/themes/fdo/status/128/printer-printing.png \
+	elementary/themes/fdo/status/128/printer-warning.png \
+	elementary/themes/fdo/status/128/security-high.png \
+	elementary/themes/fdo/status/128/security-low.png \
+	elementary/themes/fdo/status/128/security-medium.png \
+	elementary/themes/fdo/status/128/software-update-available.png \
+	elementary/themes/fdo/status/128/software-update-urgent.png \
+	elementary/themes/fdo/status/128/task-due.png \
+	elementary/themes/fdo/status/128/task-past-due.png \
+	elementary/themes/fdo/status/128/starred.png \
+	elementary/themes/fdo/status/128/user-available.png \
+	elementary/themes/fdo/status/128/user-away.png \
+	elementary/themes/fdo/status/128/user-busy.png \
+	elementary/themes/fdo/status/128/user-idle.png \
+	elementary/themes/fdo/status/128/user-invisible.png \
+	elementary/themes/fdo/status/128/user-offline.png \
+	elementary/themes/fdo/status/128/user-trash-full.png \
+	elementary/themes/fdo/status/128/weather-clear-night.png \
+	elementary/themes/fdo/status/128/weather-clear.png \
+	elementary/themes/fdo/status/128/weather-clouds-night.png \
+	elementary/themes/fdo/status/128/weather-clouds.png \
+	elementary/themes/fdo/status/128/weather-few-clouds-night.png \
+	elementary/themes/fdo/status/128/weather-few-clouds.png \
+	elementary/themes/fdo/status/128/weather-fog.png \
+	elementary/themes/fdo/status/128/weather-overcast.png \
+	elementary/themes/fdo/status/128/weather-severe-alert.png \
+	elementary/themes/fdo/status/128/weather-showers.png \
+	elementary/themes/fdo/status/128/weather-showers-scattered.png \
+	elementary/themes/fdo/status/128/weather-snow.png \
+	elementary/themes/fdo/status/128/weather-storm.png
+
+elementary_fdo_devices_128_files = \
+	elementary/themes/fdo/devices/128/audio-card.png \
+	elementary/themes/fdo/devices/128/audio-input-microphone.png \
+	elementary/themes/fdo/devices/128/battery.png \
+	elementary/themes/fdo/devices/128/camera-photo.png \
+	elementary/themes/fdo/devices/128/camera.png \
+	elementary/themes/fdo/devices/128/camera-web.png \
+	elementary/themes/fdo/devices/128/camera-video.png \
+	elementary/themes/fdo/devices/128/computer-laptop.png \
+	elementary/themes/fdo/devices/128/computer.png \
+	elementary/themes/fdo/devices/128/drive-harddisk-ieee1394.png \
+	elementary/themes/fdo/devices/128/drive-harddisk.png \
+	elementary/themes/fdo/devices/128/drive-harddisk-usb.png \
+	elementary/themes/fdo/devices/128/drive-optical.png \
+	elementary/themes/fdo/devices/128/drive-removable-media-ieee1394.png \
+	elementary/themes/fdo/devices/128/drive-removable-media.png \
+	elementary/themes/fdo/devices/128/drive-removable-media-usb.png \
+	elementary/themes/fdo/devices/128/input-gaming.png \
+	elementary/themes/fdo/devices/128/input-keyboard.png \
+	elementary/themes/fdo/devices/128/input-mouse.png \
+	elementary/themes/fdo/devices/128/input-tablet.png \
+	elementary/themes/fdo/devices/128/media-flash-cf.png \
+	elementary/themes/fdo/devices/128/media-flash-ms.png \
+	elementary/themes/fdo/devices/128/media-flash.png \
+	elementary/themes/fdo/devices/128/media-flash-sd.png \
+	elementary/themes/fdo/devices/128/media-flash-sm.png \
+	elementary/themes/fdo/devices/128/media-floppy.png \
+	elementary/themes/fdo/devices/128/media-memory.png \
+	elementary/themes/fdo/devices/128/media-optical-audio.png \
+	elementary/themes/fdo/devices/128/media-optical-bd.png \
+	elementary/themes/fdo/devices/128/media-optical-cd.png \
+	elementary/themes/fdo/devices/128/media-optical-dvd.png \
+	elementary/themes/fdo/devices/128/media-optical.png \
+	elementary/themes/fdo/devices/128/media-tape.png \
+	elementary/themes/fdo/devices/128/media-zip.png \
+	elementary/themes/fdo/devices/128/modem.png \
+	elementary/themes/fdo/devices/128/multimedia-player.png \
+	elementary/themes/fdo/devices/128/network-wired.png \
+	elementary/themes/fdo/devices/128/network-wireless.png \
+	elementary/themes/fdo/devices/128/pda.png \
+	elementary/themes/fdo/devices/128/phone.png \
+	elementary/themes/fdo/devices/128/printer.png \
+	elementary/themes/fdo/devices/128/processor.png \
+	elementary/themes/fdo/devices/128/scanner.png \
+	elementary/themes/fdo/devices/128/video-display.png
+
+elementary_fdo_apps_64_files = \
+	elementary/themes/fdo/apps/64/preferences-color.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-display.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-font.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-keyboard.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-locale.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-multimedia.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-screensaver.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-theme.png \
+	elementary/themes/fdo/apps/64/preferences-desktop-wallpaper.png \
+	elementary/themes/fdo/apps/64/preferences-profile.png \
+	elementary/themes/fdo/apps/64/system-file-manager.png
+
+elementary_fdo_intl_128_files = \
+	elementary/themes/fdo/intl/128/flag-ad.png \
+	elementary/themes/fdo/intl/128/flag-af.png \
+	elementary/themes/fdo/intl/128/flag-al.png \
+	elementary/themes/fdo/intl/128/flag-am.png \
+	elementary/themes/fdo/intl/128/flag-ar.png \
+	elementary/themes/fdo/intl/128/flag-at.png \
+	elementary/themes/fdo/intl/128/flag-au.png \
+	elementary/themes/fdo/intl/128/flag-az.png \
+	elementary/themes/fdo/intl/128/flag-ba.png \
+	elementary/themes/fdo/intl/128/flag-bd.png \
+	elementary/themes/fdo/intl/128/flag-be.png \
+	elementary/themes/fdo/intl/128/flag-bg.png \
+	elementary/themes/fdo/intl/128/flag-br.png \
+	elementary/themes/fdo/intl/128/flag-bt.png \
+	elementary/themes/fdo/intl/128/flag-bw.png \
+	elementary/themes/fdo/intl/128/flag-by.png \
+	elementary/themes/fdo/intl/128/flag-ca.png \
+	elementary/themes/fdo/intl/128/flag-cd.png \
+	elementary/themes/fdo/intl/128/flag-ch.png \
+	elementary/themes/fdo/intl/128/flag-cm.png \
+	elementary/themes/fdo/intl/128/flag-cn.png \
+	elementary/themes/fdo/intl/128/flag-cz.png \
+	elementary/themes/fdo/intl/128/flag-de.png \
+	elementary/themes/fdo/intl/128/flag-dk.png \
+	elementary/themes/fdo/intl/128/flag-ee.png \
+	elementary/themes/fdo/intl/128/flag-es.png \
+	elementary/themes/fdo/intl/128/flag-et.png \
+	elementary/themes/fdo/intl/128/flag-fi.png \
+	elementary/themes/fdo/intl/128/flag-fo.png \
+	elementary/themes/fdo/intl/128/flag-fr.png \
+	elementary/themes/fdo/intl/128/flag-gb.png \
+	elementary/themes/fdo/intl/128/flag-ge.png \
+	elementary/themes/fdo/intl/128/flag-gh.png \
+	elementary/themes/fdo/intl/128/flag-gn.png \
+	elementary/themes/fdo/intl/128/flag-gr.png \
+	elementary/themes/fdo/intl/128/flag-hr.png \
+	elementary/themes/fdo/intl/128/flag-hu.png \
+	elementary/themes/fdo/intl/128/flag-ie.png \
+	elementary/themes/fdo/intl/128/flag-il.png \
+	elementary/themes/fdo/intl/128/flag-in.png \
+	elementary/themes/fdo/intl/128/flag-iq.png \
+	elementary/themes/fdo/intl/128/flag-ir.png \
+	elementary/themes/fdo/intl/128/flag-is.png \
+	elementary/themes/fdo/intl/128/flag-it.png \
+	elementary/themes/fdo/intl/128/flag-jp.png \
+	elementary/themes/fdo/intl/128/flag-ke.png \
+	elementary/themes/fdo/intl/128/flag-kg.png \
+	elementary/themes/fdo/intl/128/flag-kh.png \
+	elementary/themes/fdo/intl/128/flag-kr.png \
+	elementary/themes/fdo/intl/128/flag-ku.png \
+	elementary/themes/fdo/intl/128/flag-kz.png \
+	elementary/themes/fdo/intl/128/flag-la.png \
+	elementary/themes/fdo/intl/128/flag-lk.png \
+	elementary/themes/fdo/intl/128/flag-lt.png \
+	elementary/themes/fdo/intl/128/flag-lv.png \
+	elementary/themes/fdo/intl/128/flag-ma.png \
+	elementary/themes/fdo/intl/128/flag-md.png \
+	elementary/themes/fdo/intl/128/flag-me.png \
+	elementary/themes/fdo/intl/128/flag-mk.png \
+	elementary/themes/fdo/intl/128/flag-ml.png \
+	elementary/themes/fdo/intl/128/flag-mm.png \
+	elementary/themes/fdo/intl/128/flag-mn.png \
+	elementary/themes/fdo/intl/128/flag-mt.png \
+	elementary/themes/fdo/intl/128/flag-mv.png \
+	elementary/themes/fdo/intl/128/flag-my.png \
+	elementary/themes/fdo/intl/128/flag-ng.png \
+	elementary/themes/fdo/intl/128/flag-nl.png \
+	elementary/themes/fdo/intl/128/flag-no.png \
+	elementary/themes/fdo/intl/128/flag-np.png \
+	elementary/themes/fdo/intl/128/flag-ph.png \
+	elementary/themes/fdo/intl/128/flag-pk.png \
+	elementary/themes/fdo/intl/128/flag-pl.png \
+	elementary/themes/fdo/intl/128/flag-pt.png \
+	elementary/themes/fdo/intl/128/flag-ro.png \
+	elementary/themes/fdo/intl/128/flag-rs.png \
+	elementary/themes/fdo/intl/128/flag-ru.png \
+	elementary/themes/fdo/intl/128/flag-se.png \
+	elementary/themes/fdo/intl/128/flag-si.png \
+	elementary/themes/fdo/intl/128/flag-sk.png \
+	elementary/themes/fdo/intl/128/flag-sn.png \
+	elementary/themes/fdo/intl/128/flag-sy.png \
+	elementary/themes/fdo/intl/128/flag-th.png \
+	elementary/themes/fdo/intl/128/flag-tj.png \
+	elementary/themes/fdo/intl/128/flag-tm.png \
+	elementary/themes/fdo/intl/128/flag-tr.png \
+	elementary/themes/fdo/intl/128/flag-tw.png \
+	elementary/themes/fdo/intl/128/flag-tz.png \
+	elementary/themes/fdo/intl/128/flag-ua.png \
+	elementary/themes/fdo/intl/128/flag-us.png \
+	elementary/themes/fdo/intl/128/flag-uz.png \
+	elementary/themes/fdo/intl/128/flag-vn.png \
+	elementary/themes/fdo/intl/128/flag-za.png
+
+elementary_fdo_mimetypes_16_files = \
+	elementary/themes/fdo/mimetypes/16/inode-directory.png 
+
+elementary_fdo_mimetypes_128_files = \
+	elementary/themes/fdo/mimetypes/128/inode-directory.png 
+
+
+elementary_fdo_files = \
+	$(elementary_fdo_actions_128_files) \
+	$(elementary_fdo_categories_16_files) \
+	$(elementary_fdo_categories_128_files) \
+	$(elementary_fdo_emblems_96_files) \
+	$(elementary_fdo_places_16_files) \
+	$(elementary_fdo_places_128_files) \
+	$(elementary_fdo_status_128_files) \
+	$(elementary_fdo_devices_128_files) \
+	$(elementary_fdo_apps_64_files) \
+	$(elementary_fdo_intl_128_files) \
+	$(elementary_fdo_mimetypes_16_files) \
+	$(elementary_fdo_mimetypes_128_files)
+
+
+EXTRA_DIST += $(elementary_themes_files) $(efl_ui_themes_files) $(elementary_fdo_files)
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000000..17adf520c1
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,263 @@
+SUBDIRS = previews widgets
+
+MAINTAINERCLEANFILES = Makefile.in 
+
+.PHONY: doc
+
+PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
+
+if EFL_BUILD_DOC
+
+doc-clean:
+	rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
+
+previews-build:
+	@$(MAKE) -C previews
+
+previews-data:
+	@$(MAKE) -C previews doc
+# dir:file name:executable:width:height
+WGT_PREVIEW = \
+	actionslider:preview-00.png:widget_preview_actionslider:120:30 \
+	bg:preview-00.png:widget_preview_bg:50:50 \
+	box:preview-00.png:widget_preview_box:200:160 \
+	bubble:preview-00.png:widget_preview_bubble1:160:50 \
+	bubble:preview-01.png:widget_preview_bubble2:160:50 \
+	bubble:preview-02.png:widget_preview_bubble3:160:50 \
+	button:preview-00.png:widget_preview_button1:160:50 \
+	button:preview-01.png:widget_preview_button2:160:50 \
+	button:preview-02.png:widget_preview_button3:160:50 \
+	calendar:preview-00.png:widget_preview_calendar:300:300 \
+	check:preview-00.png:widget_preview_check1:160:50 \
+	check:preview-01.png:widget_preview_check2:160:50 \
+	check:preview-02.png:widget_preview_check3:160:50 \
+	clock:preview-00.png:widget_preview_clock:200:100 \
+	colorselector:preview-00.png:widget_preview_colorselector:320:300 \
+	conformant:preview-00.png:widget_preview_conformant:200:400 \
+	combobox:preview-00.png:widget_preview_combobox:300:300 \
+	ctxpopup:preview-00.png:widget_preview_ctxpopup:200:130 \
+	datetime:preview-00.png:widget_preview_datetime1:360:60 \
+	datetime:preview-01.png:widget_preview_datetime2:200:60 \
+	datetime:preview-02.png:widget_preview_datetime3:200:60 \
+	dayselector:preview-00.png:widget_preview_dayselector:350:50 \
+	diskselector:preview-00.png:widget_preview_diskselector:120:50 \
+	entry:preview-00.png:widget_preview_entry1:160:50 \
+	entry:preview-01.png:widget_preview_entry2:160:50 \
+	entry:preview-02.png:widget_preview_entry3:160:50 \
+	entry:preview-03.png:widget_preview_entry4:160:50 \
+	fileselector:preview-00.png:widget_preview_fileselector:300:300 \
+	fileselector_button:preview-00.png:widget_preview_fileselector_button1:200:50 \
+	fileselector_button:preview-01.png:widget_preview_fileselector_button2:200:50 \
+	fileselector_button:preview-02.png:widget_preview_fileselector_button3:160:50 \
+	fileselector_entry:preview-00.png:widget_preview_fileselector_entry:70:50 \
+	flip:preview-00.png:widget_preview_flip:100:100 \
+	flipselector:preview-00.png:widget_preview_flipselector:100:60 \
+	frame:preview-00.png:widget_preview_frame:100:50 \
+	gengrid:preview-00.png:widget_preview_gengrid:200:160 \
+	genlist:preview-00.png:widget_preview_genlist1:200:200 \
+	genlist:preview-01.png:widget_preview_genlist2:200:160 \
+	genlist:preview-02.png:widget_preview_genlist3:200:160 \
+	genlist:preview-03.png:widget_preview_genlist4:200:160 \
+	genlist:preview-04.png:widget_preview_genlist5:200:160 \
+	hover:preview-00.png:widget_preview_hover:90:170 \
+	hoversel:preview-00.png:widget_preview_hoversel:90:170 \
+	icon:preview-00.png:widget_preview_icon:50:50 \
+	image:preview-00.png:widget_preview_image:50:50 \
+	index:preview-00.png:widget_preview_index:200:160 \
+	inwin:preview-00.png:widget_preview_inwin1:200:160 \
+	inwin:preview-01.png:widget_preview_inwin2:200:160 \
+	inwin:preview-02.png:widget_preview_inwin3:200:160 \
+	label:preview-00.png:widget_preview_label:70:30 \
+	layout:preview-00.png:widget_preview_layout:200:160 \
+	list:preview-00.png:widget_preview_list:200:200 \
+	map:preview-00.png:widget_preview_map:256:256 \
+	mapbuf:preview-00.png:widget_preview_mapbuf:200:200 \
+	menu:preview-00.png:widget_preview_menu:100:100 \
+	notify:preview-00.png:widget_preview_notify:60:30 \
+	nstate:preview-00.png:widget_preview_nstate:45:28 \
+	panel:preview-00.png:widget_preview_panel:150:50 \
+	panes:preview-00.png:widget_preview_panes:200:100 \
+	photocam:preview-00.png:widget_preview_photocam:243:162 \
+	popup:preview-00.png:widget_preview_popup:480:400 \
+	prefs:preview-00.png:widget_preview_prefs:200:160 \
+	prefs:preview-00.png:widget_preview_prefs:280:250 \
+	progressbar:preview-00.png:widget_preview_progressbar:150:50 \
+	radio:preview-00.png:widget_preview_radio:60:20 \
+	scroller:preview-00.png:widget_preview_scroller:100:30 \
+	segment_control:preview-00.png:widget_preview_segment_control:240:120 \
+	separator:preview-00.png:widget_preview_separator:10:80 \
+	slider:preview-00.png:widget_preview_slider:200:100 \
+	slideshow:preview-00.png:widget_preview_slideshow:50:50 \
+	spinner:preview-00.png:widget_preview_spinner:160:30 \
+	table::preview-00.png:widget_preview_table:100:100 \
+	table:preview-00.png:widget_preview_table:100:100 \
+	thumb:preview-00.png:widget_preview_thumb:100:100 \
+	toolbar:preview-00.png:widget_preview_toolbar:300:100 \
+	web:preview-00.png:widget_preview_web:300:300 \
+	win:preview-00.png:widget_preview_win:200:200
+
+# put in here every elm widget, so that it gets its hierarchy tree built
+# then, make a reference to the generated image, in the form
+# @image html <WGTNAME>_inheritance_tree.{png,eps}
+WGT_TREE = \
+	actionslider \
+	bg \
+	box \
+	bubble \
+	button \
+	calendar \
+	check \
+	clock \
+	colorselector \
+	conformant \
+	container \
+	combobox \
+	ctxpopup \
+	datetime \
+	dayselector \
+	diskselector \
+	entry \
+	fileselector \
+	fileselector_button \
+	fileselector_entry \
+	flip \
+	flipselector \
+	frame \
+	gengrid \
+	genlist \
+	gesture_layer \
+	glview \
+	grid \
+	hover \
+	hoversel \
+	icon \
+	image \
+	index \
+	inwin \
+	label \
+	layout \
+	list \
+	map \
+	mapbuf \
+	menu \
+	multibuttonentry \
+	naviframe \
+	notify \
+	panel \
+	panes \
+	photo \
+	photocam \
+	player \
+	plug \
+	popup \
+	prefs \
+	progressbar \
+	radio \
+	route \
+	scroller \
+	segment_control \
+	separator \
+	slider \
+	slideshow \
+	spinner \
+	table \
+	thumb \
+	toolbar \
+	video \
+	web \
+	win
+
+widget-build:
+	@$(MAKE) -C widgets
+
+widget-preview: widget-build
+	@for ss in $(WGT_PREVIEW); do \
+		ENTRY=($${ss//:/ }) ; \
+		DIR=$${ENTRY[0]} ; \
+		SS=$${ENTRY[1]} ; \
+		BIN=$${ENTRY[2]} ; \
+		X=$${ENTRY[3]} ; \
+		Y=$${ENTRY[4]} ; \
+		echo "Generating widget preview image" $${SS} "for widget" $${DIR}; \
+		$(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/$${DIR} $${SS} $(top_builddir)/doc/widgets/$${BIN} $${X} $${Y} ; \
+		mkdir -p $(top_builddir)/doc/latex/img/widget/$${DIR} ; \
+		convert $(top_builddir)/doc/html/img/widget/$${DIR}/$${SS} $(top_builddir)/doc/latex/img/widget/$${DIR}/$${SS/.png/.eps} ; \
+	done
+
+widget-tree-figures: doc
+	$(srcdir)/widget_hierarchy.py --scan $(top_srcdir)/src/lib -o $(builddir)/widget_tree.p;
+	$(srcdir)/widget_hierarchy.py --tree -i $(builddir)/widget_tree.p > $(builddir)/widgets_tree.dot;
+	dot -Tpng -o $(top_srcdir)/doc/img/elm-widget-tree.png $(top_builddir)/doc/widgets_tree.dot;
+	convert $(top_srcdir)/doc/img/elm-widget-tree.png $(top_srcdir)/doc/img/"elm-widget-tree.eps";
+	@for wgt in $(WGT_TREE); do \
+		WGT_FILE_NAME="WNAME_inheritance_tree.dot"; \
+		WGT_FILE_NAME=$${WGT_FILE_NAME/WNAME/$${wgt}}; \
+		echo "Generating widget inheritance tree image for widget" $${wgt}; \
+		$(srcdir)/widget_hierarchy.py --widget=$${wgt} -i $(top_builddir)/doc/widget_tree.p > $(top_builddir)/doc/$${WGT_FILE_NAME}; \
+		dot -Tpng -o $(top_srcdir)/doc/img/$${WGT_FILE_NAME/.dot/.png} $(top_builddir)/doc/$${WGT_FILE_NAME}; \
+		convert $(top_srcdir)/doc/img/$${WGT_FILE_NAME/.dot/.png} $(top_srcdir)/doc/img/$${WGT_FILE_NAME/.dot/.eps}; \
+		rm $${WGT_FILE_NAME}; \
+	done
+
+doc: all previews-build previews-data widget-preview
+	$(efl_doxygen)
+	@echo "$(efl_doxygen) done !"
+	@echo "copying $(srcdir)/img/*.png to html/"
+	cp $(srcdir)/img/*.png html/
+	@echo "copying $(srcdir)/img/*.eps to latex/"
+	cp $(srcdir)/img/*.eps latex/
+	@echo "Removing older tarball $(PACKAGE_DOCNAME).tar*"
+	rm -rf $(PACKAGE_DOCNAME).tar*
+	@echo "Generating new tarball"
+	$(MKDIR_P) $(PACKAGE_DOCNAME)/doc
+	cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+	tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
+	bzip2 -9 $(PACKAGE_DOCNAME).tar
+	@echo "Removing temporary directory"
+	rm -rf $(PACKAGE_DOCNAME)/
+	@echo "Moving tarball $(PACKAGE_DOCNAME).tar.bz2 to $(top_builddir)"
+	mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
+	@echo "Documentation Package: doc/$(PACKAGE_DOCNAME).tar.bz2"
+	@echo "Documentation HTML: doc/html"
+
+clean-local: doc-clean
+
+else
+
+doc:
+	@echo "Documentation not built. Run ./configure --help"
+
+endif
+
+EXTRA_DIST = \
+Doxyfile.in \
+e.css \
+head.html \
+foot.html \
+ecore_examples.dox \
+eldbus_examples.dox \
+edje_examples.dox \
+eet_examples.dox \
+eina_examples.dox \
+eio_examples.dox \
+emotion_examples.dox \
+eo_tutorial.dox \
+ephysics_examples.dox \
+evas_examples.dox \
+main.dox \
+pkgconfig.dox \
+shot.sh
+
+include images.mk
+
+all-local:
+	@rm -f images.tmp; \
+	echo 'EXTRA_DIST += \' > images.tmp; \
+	(cd $(srcdir) && find ./img -type f -print | cut -d/ -f2- | grep -v '~' | LANG=C LANGUAGE=C LC_ALL=C LC_CTYPE=C LC_NUMERIC=C LC_TIME=C LC_COLLATE=C LC_MONETARY=C LC_MESSAGES=C LC_PAPER=C LC_NAME=C LC_ADDRESS=C LC_TELEPHONE=C LC_MEASUREMENT=C LC_IDENTIFICATION=C sort | tr '\n' ' ') >> images.tmp && \
+	echo >> images.tmp && \
+	if ! cmp "$(srcdir)/images.mk" images.tmp >/dev/null; then \
+	   echo "warning: new images added to '$(srcdir)/images.mk'"; \
+	   mv -f images.tmp "$(srcdir)/images.mk"; \
+	else \
+	   rm images.tmp; \
+	fi
diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am
new file mode 100644
index 0000000000..ba952dd154
--- /dev/null
+++ b/doc/previews/Makefile.am
@@ -0,0 +1,73 @@
+if EFL_BUILD_DOC
+
+.PHONY: doc
+
+AM_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/efl \
+-I. \
+-I$(builddir) \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil \
+-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/eet \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/ecore_evas \
+-DEFL_BETA_API_SUPPORT=1 \
+-DEFL_EO_API_SUPPORT=1 \
+@ECORE_EVAS_CFLAGS@
+
+LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/efl/libefl.la \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/evas/libevas.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+@ECORE_EVAS_LDFLAGS@
+
+noinst_PROGRAMS = preview_text_filter
+
+DATADIR = ${abs_top_srcdir}/doc/previews/img
+HTMLDIR = ${abs_top_srcdir}/doc/html
+
+PREVIEWS = blend blur bump curve grow mask transform \
+example_1 padding
+
+previews-data: preview_text_filter
+	$(MKDIR_P) $(DATADIR)
+	$(MKDIR_P) $(HTMLDIR)
+	@for a in $(PREVIEWS) ; do \
+		echo "  GEN      filter_$${a}.png" ; \
+		FONT="Sans" ; \
+		SIZE=24 ; \
+		TEXT="TEXT" ; \
+		FILTER=`cat ${top_srcdir}/src/examples/evas/filters/filter_$${a}.lua` ; \
+		if [ -e ${top_srcdir}/doc/previews/filter_$${a}.sh ] ; then \
+			source ${top_srcdir}/doc/previews/filter_$${a}.sh ; \
+		fi ; \
+		EVAS_DATA_DIR="$(top_srcdir)/src/lib/evas" $(top_builddir)/doc/previews/preview_text_filter "$${TEXT}" "$${FILTER}" "$(DATADIR)/filter_$${a}.png" "$${FONT}" "$${SIZE}" ; \
+		cp "$(DATADIR)/filter_$${a}.png" "$(HTMLDIR)/" ; \
+	done
+
+if BUILD_EFL_NATIVE
+doc: Makefile previews-data
+endif
+
+
+endif
+
+EXTRA_DIST = preview_text_filter.c
+
+clean-local:
+	rm -rf $(DATADIR)
+
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
new file mode 100644
index 0000000000..e2e75b5ac4
--- /dev/null
+++ b/doc/widgets/Makefile.am
@@ -0,0 +1,196 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+if EFL_BUILD_DOC
+
+include ../../Makefile_Elm_Helpers.am
+
+AM_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/bin/elementary \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
+-DDOCW_DIR=\"$(abs_top_builddir)/doc/widgets\" \
+@ELEMENTARY_CFLAGS@
+
+noinst_DATA = widget_preview_prefs.epb
+
+widget_preview_prefs.epb: Makefile widget_preview_prefs.epc
+	$(AM_V_EPB)$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \
+	$(top_srcdir)/doc/widgets/widget_preview_prefs.epc \
+	$(top_builddir)/doc/widgets/widget_preview_prefs.epb
+
+noinst_PROGRAMS = \
+widget_preview_actionslider \
+widget_preview_bg \
+widget_preview_box \
+widget_preview_bubble1 \
+widget_preview_bubble2 \
+widget_preview_bubble3 \
+widget_preview_button1 \
+widget_preview_button2 \
+widget_preview_button3 \
+widget_preview_calendar \
+widget_preview_check1 \
+widget_preview_check2 \
+widget_preview_check3 \
+widget_preview_clock \
+widget_preview_colorselector \
+widget_preview_combobox \
+widget_preview_conformant \
+widget_preview_ctxpopup \
+widget_preview_datetime1 \
+widget_preview_datetime2 \
+widget_preview_datetime3 \
+widget_preview_dayselector \
+widget_preview_diskselector \
+widget_preview_entry1 \
+widget_preview_entry2 \
+widget_preview_entry3 \
+widget_preview_entry4 \
+widget_preview_fileselector \
+widget_preview_fileselector_button1 \
+widget_preview_fileselector_button2 \
+widget_preview_fileselector_button3 \
+widget_preview_fileselector_entry \
+widget_preview_flip \
+widget_preview_flipselector \
+widget_preview_frame \
+widget_preview_gengrid \
+widget_preview_genlist1 \
+widget_preview_genlist2 \
+widget_preview_genlist3 \
+widget_preview_genlist4 \
+widget_preview_genlist5 \
+widget_preview_hover \
+widget_preview_hoversel \
+widget_preview_icon \
+widget_preview_image \
+widget_preview_index \
+widget_preview_inwin1 \
+widget_preview_inwin2 \
+widget_preview_inwin3 \
+widget_preview_label \
+widget_preview_layout \
+widget_preview_list \
+widget_preview_map \
+widget_preview_mapbuf \
+widget_preview_menu \
+widget_preview_notify \
+widget_preview_nstate \
+widget_preview_panel \
+widget_preview_panes \
+widget_preview_photocam \
+widget_preview_popup \
+widget_preview_prefs \
+widget_preview_progressbar \
+widget_preview_radio \
+widget_preview_scroller \
+widget_preview_segment_control \
+widget_preview_separator \
+widget_preview_slider \
+widget_preview_slideshow \
+widget_preview_spinner \
+widget_preview_table \
+widget_preview_thumb \
+widget_preview_toolbar \
+widget_preview_web \
+widget_preview_win
+
+LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/efl/libefl.la \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/evas/libevas.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(top_builddir)/src/lib/edje/libedje.la \
+$(top_builddir)/src/lib/elementary/libelementary.la \
+@ECORE_EVAS_LDFLAGS@
+
+endif
+
+EXTRA_DIST = \
+	widget_preview_actionslider.c \
+	widget_preview_bg.c \
+	widget_preview_bubble1.c \
+	widget_preview_bubble2.c \
+	widget_preview_bubble3.c \
+	widget_preview_button1.c \
+	widget_preview_button2.c \
+	widget_preview_button3.c \
+	widget_preview_calendar.c \
+	widget_preview_check1.c \
+	widget_preview_check2.c \
+	widget_preview_check3.c \
+	widget_preview_spinner.c \
+	widget_preview_clock.c \
+	widget_preview_colorselector.c \
+	widget_preview_conformant.c \
+	widget_preview_combobox.c \
+	widget_preview_slider.c \
+	widget_preview_panes.c \
+	widget_preview_toolbar.c \
+	widget_preview_mapbuf.c \
+	widget_preview_map.c \
+	widget_preview_ctxpopup.c \
+	widget_preview_datetime1.c \
+	widget_preview_datetime2.c \
+	widget_preview_datetime3.c \
+	widget_preview_dayselector.c \
+	widget_preview_diskselector.c \
+	widget_preview_entry1.c \
+	widget_preview_entry2.c \
+	widget_preview_entry3.c \
+	widget_preview_entry4.c \
+	widget_preview_fileselector_button1.c \
+	widget_preview_fileselector_button2.c \
+	widget_preview_fileselector_button3.c \
+	widget_preview_fileselector.c \
+	widget_preview_fileselector_entry.c \
+	widget_preview_flip.c \
+	widget_preview_flipselector.c \
+	widget_preview_frame.c \
+	widget_preview_hover.c \
+	widget_preview_hoversel.c \
+	widget_preview_icon.c \
+	widget_preview_image.c \
+	widget_preview_index.c \
+	widget_preview_label.c \
+	widget_preview_layout.c \
+	widget_preview_list.c \
+	widget_preview_segment_control.c \
+	widget_preview_popup.c \
+	widget_preview_separator.c \
+	widget_preview_radio.c \
+	widget_preview_panel.c \
+	widget_preview_gengrid.c \
+	widget_preview_genlist1.c \
+	widget_preview_genlist2.c \
+	widget_preview_genlist3.c \
+	widget_preview_genlist4.c \
+	widget_preview_genlist5.c \
+	widget_preview_prefs.c \
+	widget_preview_prefs.epc \
+	widget_preview_progressbar.c \
+	widget_preview_box.c \
+	widget_preview_notify.c \
+	widget_preview_nstate.c \
+	widget_preview_slideshow.c \
+	widget_preview_photocam.c \
+	widget_preview_inwin1.c \
+	widget_preview_inwin2.c \
+	widget_preview_inwin3.c \
+	widget_preview_scroller.c \
+	widget_preview_table.c \
+	widget_preview_win.c \
+	widget_preview_menu.c \
+	widget_preview_thumb.c \
+	widget_preview_web.c \
+	widget_preview_tmpl_foot.c \
+	widget_preview_tmpl_head.c
+
+clean-local:
+	rm -f widget_preview_prefs.epb
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000000..53b4209599
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,36 @@
+/libtool.m4
+/ltoptions.m4
+/ltsugar.m4
+/ltversion.m4
+/lt~obsolete.m4
+/codeset.m4
+/fcntl-o.m4
+/gettext.m4
+/glibc2.m4
+/glibc21.m4
+/iconv.m4
+/intdiv0.m4
+/intl.m4
+/intldir.m4
+/intlmacosx.m4
+/intmax.m4
+/inttypes-pri.m4
+/inttypes_h.m4
+/lcmessage.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
+/lock.m4
+/longlong.m4
+/nls.m4
+/po.m4
+/printf-posix.m4
+/progtest.m4
+/size_max.m4
+/stdint_h.m4
+/uintmax_t.m4
+/visibility.m4
+/threadlib.m4
+/wchar_t.m4
+/wint_t.m4
+/xsize.m4
diff --git a/m4/ac_define_if.m4 b/m4/ac_define_if.m4
new file mode 100644
index 0000000000..961ca64452
--- /dev/null
+++ b/m4/ac_define_if.m4
@@ -0,0 +1,7 @@
+dnl use: AC_DEFINE_IF(id, testcond, val, comment)
+AC_DEFUN([AC_DEFINE_IF],
+[
+if $2; then
+   AC_DEFINE($1, $3, $4)
+fi
+])
diff --git a/m4/ac_path_generic.m4 b/m4/ac_path_generic.m4
new file mode 100644
index 0000000000..d42724115f
--- /dev/null
+++ b/m4/ac_path_generic.m4
@@ -0,0 +1,137 @@
+dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS
+dnl
+dnl The script must support `--cflags' and `--libs' args.
+dnl If MINIMUM-VERSION is specified, the script must also support the
+dnl `--version' arg.
+dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given,
+dnl it must also support `--prefix' and `--exec-prefix'.
+dnl (In other words, it must be like gtk-config.)
+dnl
+dnl For example:
+dnl
+dnl    AC_PATH_GENERIC(Foo, 1.0.0)
+dnl
+dnl would run `foo-config --version' and check that it is at least 1.0.0
+dnl
+dnl If so, the following would then be defined:
+dnl
+dnl    FOO_CFLAGS to `foo-config --cflags`
+dnl    FOO_LIBS   to `foo-config --libs`
+dnl
+dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
+dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
+dnl
+dnl @author Angus Lees <gusl@cse.unsw.edu.au>
+
+AC_DEFUN([AC_PATH_GENERIC],
+[dnl
+dnl we're going to need uppercase, lowercase and user-friendly versions of the
+dnl string `LIBRARY'
+pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
+pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
+
+dnl
+dnl Get the cflags and libraries from the LIBRARY-config script
+dnl
+AC_ARG_WITH(DOWN-prefix,
+        [  --with-]DOWN[-prefix=PFX       Prefix where $1 is installed (optional)],
+        DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="")
+AC_ARG_WITH(DOWN-exec-prefix,
+        [  --with-]DOWN[-exec-prefix=PFX  Exec prefix where $1 is installed (optional)],
+        DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="")
+
+  if test x$DOWN[]_config_exec_prefix != x ; then
+     DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix"
+     if test x${UP[]_CONFIG+set} != xset ; then
+       UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config
+     fi
+  fi
+  if test x$DOWN[]_config_prefix != x ; then
+     DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix"
+     if test x${UP[]_CONFIG+set} != xset ; then
+       UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config
+     fi
+  fi
+
+  AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no)
+  ifelse([$2], ,
+     AC_MSG_CHECKING(for $1),
+     AC_MSG_CHECKING(for $1 - version >= $2)
+  )
+  no_[]DOWN=""
+  if test "$UP[]_CONFIG" = "no" ; then
+     no_[]DOWN=yes
+  else
+     UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`"
+     UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`"
+     ifelse([$2], , ,[
+        DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \
+         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+        DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \
+         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+        DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \
+         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+        DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])"
+        DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])"
+        DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])"
+
+        # Compare wanted version to what config script returned.
+        # If I knew what library was being run, i'd probably also compile
+        # a test program at this point (which also extracted and tested
+        # the version in some library-specific way)
+        if test "$DOWN[]_config_major_version" -lt \
+                        "$DOWN[]_wanted_major_version" \
+          -o \( "$DOWN[]_config_major_version" -eq \
+                        "$DOWN[]_wanted_major_version" \
+            -a "$DOWN[]_config_minor_version" -lt \
+                        "$DOWN[]_wanted_minor_version" \) \
+          -o \( "$DOWN[]_config_major_version" -eq \
+                        "$DOWN[]_wanted_major_version" \
+            -a "$DOWN[]_config_minor_version" -eq \
+                        "$DOWN[]_wanted_minor_version" \
+            -a "$DOWN[]_config_micro_version" -lt \
+                        "$DOWN[]_wanted_micro_version" \) ; then
+          # older version found
+          no_[]DOWN=yes
+          echo -n "*** An old version of $1 "
+          echo -n "($DOWN[]_config_major_version"
+          echo -n ".$DOWN[]_config_minor_version"
+          echo    ".$DOWN[]_config_micro_version) was found."
+          echo -n "*** You need a version of $1 newer than "
+          echo -n "$DOWN[]_wanted_major_version"
+          echo -n ".$DOWN[]_wanted_minor_version"
+          echo    ".$DOWN[]_wanted_micro_version."
+          echo "***"
+          echo "*** If you have already installed a sufficiently new version, this error"
+          echo "*** probably means that the wrong copy of the DOWN-config shell script is"
+          echo "*** being found. The easiest way to fix this is to remove the old version"
+          echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the"
+          echo "*** correct copy of DOWN-config. (In this case, you will have to"
+          echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
+          echo "*** so that the correct libraries are found at run-time)"
+        fi
+     ])
+  fi
+  if test "x$no_[]DOWN" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$3], , :, [$3])
+  else
+     AC_MSG_RESULT(no)
+     if test "$UP[]_CONFIG" = "no" ; then
+       echo "*** The DOWN-config script installed by $1 could not be found"
+       echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the UP[]_CONFIG environment variable to the"
+       echo "*** full path to DOWN-config."
+     fi
+     UP[]_CFLAGS=""
+     UP[]_LIBS=""
+     ifelse([$4], , :, [$4])
+  fi
+  AC_SUBST(UP[]_CFLAGS)
+  AC_SUBST(UP[]_LIBS)
+
+  popdef([UP])
+  popdef([DOWN])
+])
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 100644
index 0000000000..af37acdb5c
--- /dev/null
+++ b/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1,133 @@
+# ============================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++11
+#   standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+#   The first argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The second argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline C++11 support is required and that the macro
+#   should error out if no mode with that support is found.  If specified
+#   'optional', then configuration proceeds regardless, after defining
+#   HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 3
+
+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = static_cast<check_type&&>(c);
+
+    auto d = a;
+])
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
+  m4_if([$1], [], [],
+        [$1], [ext], [],
+        [$1], [noext], [],
+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+  ax_cv_cxx_compile_cxx11,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+    [ax_cv_cxx_compile_cxx11=yes],
+    [ax_cv_cxx_compile_cxx11=no])])
+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$1], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++11 -std=gnu++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$1], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=c++11 -std=c++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX11=0
+      AC_MSG_NOTICE([No compiler with C++11 support was found])
+    else
+      HAVE_CXX11=1
+      AC_DEFINE(HAVE_CXX11,1,
+                [define if the compiler supports basic C++11 syntax])
+    fi
+
+    AC_SUBST(HAVE_CXX11)
+  fi
+])
diff --git a/m4/ecore_check_c_extension.m4 b/m4/ecore_check_c_extension.m4
new file mode 100644
index 0000000000..da4b44fe0c
--- /dev/null
+++ b/m4/ecore_check_c_extension.m4
@@ -0,0 +1,25 @@
+dnl use: ECORE_CHECK_X_EXTENSION(Foo, header, lib, func)
+AC_DEFUN([ECORE_CHECK_X_EXTENSION],
+[
+pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
+
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS $ECORE_X_XLIB_cflags"
+  AC_CHECK_HEADER(X11/extensions/$2,
+    [
+     SAVE_LIBS=$LIBS
+     LIBS="$LIBS $ECORE_X_XLIB_libs"
+     AC_CHECK_LIB($3, $4,
+       [AC_DEFINE(ECORE_[]UP, 1, [Build support for $1])],
+       [AC_MSG_ERROR([Missing support for X extension: $1])])
+     LIBS=$SAVE_LIBS
+    ],
+    [AC_MSG_ERROR([Missing X11/extensions/$2])],
+    [ #include <X11/Xlib.h> ]
+  )
+  CFLAGS=$SAVE_CFLAGS
+
+ECORE_X_LIBS="${ECORE_X_LIBS} -l$3"
+
+popdef([UP])
+])
diff --git a/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4
new file mode 100644
index 0000000000..8fdec9bdc4
--- /dev/null
+++ b/m4/ecore_check_module.m4
@@ -0,0 +1,35 @@
+dnl use: ECORE_EVAS_MODULE(name, want, [DEPENDENCY-CHECK-CODE])
+AC_DEFUN([ECORE_EVAS_MODULE],
+[dnl
+m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
+
+have_ecore_evas_[]m4_defn([DOWN])="no"
+want_module="$2"
+
+ecore_evas_engines_[]m4_defn([DOWN])[]_cflags=""
+ecore_evas_engines_[]m4_defn([DOWN])[]_libs=""
+
+if test "x$want_module" = "xyes" || test "x$want_module" = "xstatic"; then
+   $3
+
+   AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $1 Engine in Ecore_Evas])
+   have_ecore_evas_[]m4_defn([DOWN])="yes"
+
+   case "$1" in
+      xgl-drm)
+         PKG_CHECK_MODULES([GBM], [gbm])
+         ecore_evas_engines_[]m4_defn([DOWN])[]_cflags="${GBM_CFLAGS}"
+         ecore_evas_engines_[]m4_defn([DOWN])[]_libs="${GBM_LIBS}"
+	 ;;
+   esac
+fi
+
+AC_SUBST([ecore_evas_engines_]m4_defn([DOWN])[_cflags])
+AC_SUBST([ecore_evas_engines_]m4_defn([DOWN])[_libs])
+
+EFL_ADD_FEATURE([ECORE_EVAS], [$1], [${want_module}])dnl
+AM_CONDITIONAL([BUILD_ECORE_EVAS_]UP, [test "x$have_ecore_evas_]m4_defn([DOWN])[" = "xyes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/m4/efl.m4 b/m4/efl.m4
new file mode 100644
index 0000000000..a01c5b401c
--- /dev/null
+++ b/m4/efl.m4
@@ -0,0 +1,509 @@
+dnl file to manage modules in efl
+
+dnl EFL_VERSION(major, minor, micro, release)
+dnl This setup EFL version information and should be called BEFORE AC_INIT().
+dnl
+dnl release parameter is 'dev' to use from SVN or libtool -release field.
+dnl It may be empty if not dev (svn/live build) and no -release is to be used.
+dnl
+dnl Examples:
+dnl     EFL_VERSION(1, 7, 99, dev)
+dnl     EFL_VERSION(1, 7, 99, ver-1234)
+dnl This will define couple of m4 symbols:
+dnl     v_maj = given major number (first parameter)
+dnl     v_min = given minor number (second parameter)
+dnl     v_mic = given micro number (third parameter)
+dnl     v_rev = if release, it's 0, otherwise it's dev_version.
+dnl     v_rel = if release, it's -release followed by fourth parameter,
+dnl             otherwise it's empty. (mostly for libtool)
+dnl     efl_version = if release, it's major.minor.micro, otherwise it's
+dnl             major.minor.micro.dev_version
+dnl     dev_version = development version (svn revision).
+dnl     def_build_profile = dev or release based on 'dev' release parameter.
+AC_DEFUN([EFL_VERSION],
+[dnl
+m4_define([v_maj], [$1])dnl
+m4_define([v_min], [$2])dnl
+m4_define([v_mic], [$3])dnl
+m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
+m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
+m4_define([v_rel], [])dnl
+m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
+m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
+dnl m4_define([efl_version], [v_maj.v_min.v_mic])dnl
+])
+
+dnl EFL_COLOR
+dnl will check if terminal supports color and if color is wanted by user.
+dnl
+dnl Used Variables:
+dnl     WANT_COLOR: if no, forces no color output.
+dnl     TERM: used to check if color should be enabled.
+dnl
+dnl Defined Variables:
+dnl     COLOR_YES: to be used in positive/yes conditions
+dnl     COLOR_NO: to be used in negative/no conditions
+dnl     COLOR_OTHER: to be used to highlight some other condition
+dnl     COLOR_RESET: to reset color
+dnl     want_color: yes or no
+AC_DEFUN([EFL_COLOR],
+[dnl
+case "$TERM" in
+   xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
+      want_color="${WANT_COLOR:-yes}"
+      ;;
+   *)
+      want_color="no"
+      ;;
+esac
+
+### echo compatibility
+
+## the BSD echo does not have the -e option (it is the default behaviour)
+echo_e=
+if test "`echo -e x`" = "x"; then
+   echo_e=-e
+fi
+AC_SUBST([ECHO_E], [${echo_e}])
+
+if test "${want_color}" = "yes"; then
+   COLOR_YES=`echo $echo_e "\033@<:@1;32m"`
+   COLOR_NO=`echo $echo_e "\033@<:@1;31m"`
+   COLOR_OTHER=`echo $echo_e "\033@<:@1;36m"`
+   COLOR_RESET=`echo $echo_e "\033@<:@0m"`
+else
+   COLOR_YES=""
+   COLOR_NO=""
+   COLOR_OTHER=""
+   COLOR_RESET=""
+fi
+])
+
+dnl EFL_INIT()
+dnl Will AC_DEFINE() the following:
+dnl     VMAJ = v_maj
+dnl     VMIN = v_min
+dnl     VMIC = v_mic
+dnl     VREV = v_rev
+dnl Will AC_SUBST() the following:
+dnl     VMAJ = v_maj
+dnl     VMIN = v_min
+dnl     VMIC = v_mic
+dnl     EFL_LTLIBRARY_FLAGS="-no-undefined -version-info ..."
+dnl     EFL_LTMODULE_FLAGS="-no-undefined -avoid-version"
+dnl Will define the following m4:
+dnl     lt_cur = libtool 'current' field of libtool's -version-info
+dnl     lt_rev = libtool 'revision' field of libtool's -version-info
+dnl     lt_age = libtool 'age' field of libtool's -version-info
+AC_DEFUN([EFL_INIT],
+[dnl
+AC_REQUIRE([EFL_COLOR])dnl
+AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])dnl
+AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])dnl
+AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])dnl
+AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison])dnl
+VMAJ=v_maj
+VMIN=v_min
+VMIC=v_mic
+AC_SUBST([VMAJ])dnl
+AC_SUBST([VMIN])dnl
+AC_SUBST([VMIC])dnl
+dnl
+dnl TODO: warning - lt_cur:
+dnl the previous code assumed v_maj + v_min, but this will be a problem when
+dnl we bump v_maj and reset v_min. 1 + 7 == 7 + 1, so if v_maj is bumped
+dnl we multiply it by 100.
+m4_define([lt_cur], m4_if(m4_cmp(v_maj, 1), 0, m4_eval(v_maj + v_min), m4_eval(v_maj * 100 + v_min)))dnl
+m4_define([lt_rev], v_mic)dnl
+m4_define([lt_age], v_min)dnl
+dnl
+EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel"
+AC_SUBST(EFL_LTLIBRARY_FLAGS)dnl
+EFL_LTMODULE_FLAGS="-no-undefined -avoid-version"
+AC_SUBST([EFL_LTMODULE_FLAGS])dnl
+AC_MSG_NOTICE([Initialized AC_PACKAGE_NAME (AC_PACKAGE_VERSION) development=dev_version v_rel])
+])
+
+dnl EFL_EVAL_PKGS(EFL)
+dnl does PKG_CHECK_MODULES() for given EFL
+AC_DEFUN([EFL_EVAL_PKGS],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+if test "x${requirements_pc_deps_[]m4_defn([DOWNEFL])}" != "x"; then
+   PKG_CHECK_MODULES([$1], [${requirements_pc_deps_[]m4_defn([DOWNEFL])}])
+fi
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl EFL_INTERNAL_DEPEND_PKG(EFL, OTHEREFL)
+dnl Adds a pkg-config dependency on another EFL.
+AC_DEFUN([EFL_INTERNAL_DEPEND_PKG],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([DOWNOTHER], m4_translit([$2], [-A-Z], [_a-z]))dnl
+dnl TODO: we need to fix the package config names for 2.0
+dnl TODO: and make them uniform in scheme.
+depname="$2"
+libdirname="m4_defn([DOWNOTHER])"
+libname="m4_defn([DOWNOTHER])"
+case "m4_defn([DOWNOTHER])" in
+   ethumb_client)
+      depname="ethumb_client"
+      ;;
+   efreet_mime)
+      libdirname="efreet"
+      ;;
+   efreet_trash)
+      libdirname="efreet"
+      ;;
+   ecore_x)
+      depname="ecore-x"
+      ;;
+   ecore_wl2)
+      depname="ecore-wl2"
+      ;;
+   ecore_fb)
+      depname="ecore-fb"
+      ;;
+   ecore_drm)
+      depname="ecore-drm"
+      ;;
+   ecore_cocoa)
+      depname="ecore-cocoa"
+      ;;
+   ecore_win32)
+      depname="ecore-win32"
+      ;;
+   ecore_drm2)
+      depname="ecore-drm2"
+      ;;
+   ecore_sdl)
+      depname="ecore-sdl"
+      ;;
+   ecore_file)
+      depname="ecore-file"
+      ;;
+esac
+requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
+requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_[][]m4_defn([DOWNEFL])} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname}"
+requirements_internal_libs_[]m4_defn([DOWNEFL])="${requirements_internal_libs_[][]m4_defn([DOWNEFL])} lib/${libdirname}/lib${libname}.la"
+requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])} ${requirements_public_libs_[]m4_defn([DOWNOTHER])}"
+m4_popdef([DOWNOTHER])dnl
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl EFL_PLATFORM_DEPEND(EFL, PLATFORM)
+dnl PLATFORM is one of: all, evil, escape, exotic
+AC_DEFUN([EFL_PLATFORM_DEPEND],
+[dnl
+m4_pushdef([DOWNOTHER], m4_translit([$2], [-A-Z], [_a-z]))dnl
+case "m4_defn([DOWNOTHER])" in
+  all)
+    if test "x${efl_lib_optional_evil}" = "xyes"; then
+       EFL_INTERNAL_DEPEND_PKG([$1], [evil])
+    elif test "x${efl_lib_optional_escape}" = "xyes"; then
+       EFL_INTERNAL_DEPEND_PKG([$1], [escape])
+    elif test "x${efl_lib_optional_exotic}" = "xyes"; then
+       EFL_INTERNAL_DEPEND_PKG([$1], [exotic])
+    fi
+    ;;
+  *)
+    if test "x${efl_lib_optional_[]m4_defn([DOWNOTHER])}" = "xyes"; then
+       EFL_INTERNAL_DEPEND_PKG([$1], [$2])
+    fi
+    ;;
+esac
+m4_popdef([DOWNOTHER])dnl
+])
+
+dnl EFL_CRYPTO_DEPEND(EFL)
+dnl the given EFL will use/depend on system crypto settings
+AC_DEFUN([EFL_CRYPTO_DEPEND],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[][]m4_defn([DOWNEFL])} ${requirements_pc_crypto}"
+requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[][]m4_defn([DOWNEFL])} ${requirements_pc_deps_crypto}"
+requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[][]m4_defn([DOWNEFL])} ${requirements_libs_crypto}"
+requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_[][]m4_defn([DOWNEFL])} ${requirements_cflags_crypto}"
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl EFL_DEPEND_PKG(EFL, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl Adds a pkg-config dependency to an efl, AC_DEFINE() HAVE_NAME,
+dnl and inserts dependencies in proper variables
+AC_DEFUN([EFL_DEPEND_PKG],
+[dnl
+m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UPNAME], m4_translit([$2], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl
+
+   have_[]m4_defn([DOWNNAME])="no"
+
+   EFL_PKG_CHECK_STRICT([$3], [
+      AC_DEFINE([HAVE_]m4_defn([UPNAME]), [1], [Have `]m4_defn([DOWNNAME])[' pkg-config installed.])
+      requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[][]m4_defn([DOWNEFL])} $3"
+      requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} $3"
+      have_[]m4_defn([DOWNNAME])="yes"
+
+      $4
+
+      ], [$5])
+
+m4_popdef([DOWNNAME])
+m4_popdef([UPNAME])
+m4_popdef([DOWNEFL])
+m4_popdef([UPEFL])
+])
+
+dnl EFL_OPTIONAL_DEPEND_PKG(EFL, VARIABLE, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([EFL_OPTIONAL_DEPEND_PKG],
+[dnl
+m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
+
+   have_[]m4_defn([DOWN])="no"
+   if test "x$2" = "xyes"; then
+      EFL_DEPEND_PKG([$1], [$3], [$4], [$5], [$6])
+   fi
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME)
+AC_DEFUN([EFL_OPTIONAL_INTERNAL_DEPEND_PKG],
+[dnl
+   if test "x$2" = "xyes"; then
+      EFL_INTERNAL_DEPEND_PKG([$1], [$3])
+   fi
+])
+
+dnl EFL_ADD_LIBS(PKG, LIBS)
+dnl Add libraries that the EFL library will depend on
+dnl See EFL_DEPEND_PKG() for pkg-config version.
+AC_DEFUN([EFL_ADD_LIBS],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_libs_[]m4_defn([DOWN])="${requirements_libs_[]m4_defn([DOWN])} $2"
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_ADD_PUBLIC_LIBS(PKG, PUBLIC_LIBS)
+dnl Add libraries that the EFL library will depend on when used.
+dnl
+dnl Unlike EFL_ADD_LIBS(), that is only used when generating PKG,
+dnl this one is used when linking PKG to other libraries or applications.
+dnl
+dnl For instance if you use some other library in your header that user
+dnl inclues.
+AC_DEFUN([EFL_ADD_PUBLIC_LIBS],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_public_libs_[]m4_defn([DOWN])="${requirements_public_libs_[]m4_defn([DOWN])} $2"
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_ADD_CFLAGS(PKG, CFLAGS)
+dnl Add CFLAGS that the EFL library will use
+dnl See EFL_DEPEND_PKG() for pkg-config version.
+AC_DEFUN([EFL_ADD_CFLAGS],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_cflags_[]m4_defn([DOWN])="${requirements_cflags_[]m4_defn([DOWN])} $2"
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_START(PKG)
+dnl start the setup of an EFL library, defines variables and prints a notice
+dnl
+dnl Exports (AC_SUBST)
+dnl     PKG_CFLAGS: what to use for CFLAGS
+dnl
+dnl     PKG_LDFLAGS: what to use for LDFLAGS
+dnl
+dnl     PKG_LIBS: what to use in automake's _LIBADD or _LDADD. Includes
+dnl             everything else.
+dnl
+dnl     PKG_INTERNAL_LIBS: all other EFL as lib/name/libname.la that this
+dnl             package depend. Used in automake's _DEPENDENCIES.
+dnl
+dnl     USE_PKG_LIBS: what to use in automake's _LIBADD or _LDADD when using
+dnl             this PKG (PKG_LIBS + libpkg.la)
+dnl
+dnl     USE_PKG_INTERNAL_LIBS: extends PKG_INTERNAL_LIBS with lib/pkg/libpkg.la
+dnl
+dnl     requirements_pc_pkg: all pkg-config (pc) files used by this pkg,
+dnl             includes internal EFL (used in 'Requires.private' in pkg.pc)
+dnl
+dnl     requirements_libs_pkg: external libraries this package needs when
+dnl             linking (used in 'Libs.private' in pkg.pc)
+dnl
+dnl     requirements_public_libs_pkg: external libraries other packages need
+dnl             when using this (used in 'Libs' in pkg.pc)
+dnl
+dnl     requirements_cflags_pkg: what to use for CFLAGS (same as PKG_CFLAGS).
+dnl
+dnl Variables:
+dnl     requirements_pc_deps_pkg: external pkg-config (pc) files used by this
+dnl             pkg (used in EFL_EVAL_PKGS())
+dnl
+dnl     requirements_internal_libs_pkg: all other EFL as lib/name/libname.la
+dnl             that this package depend.
+dnl
+dnl     requirements_internal_deps_libs_pkg: external libraries that are public
+dnl             dependencies (due internal libs).
+dnl
+AC_DEFUN([EFL_LIB_START],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+requirements_internal_libs_[]m4_defn([DOWN])=""
+requirements_internal_deps_libs_[]m4_defn([DOWN])=""
+requirements_libs_[]m4_defn([DOWN])=""
+requirements_public_libs_[]m4_defn([DOWN])=""
+requirements_cflags_[]m4_defn([DOWN])=""
+requirements_pc_[]m4_defn([DOWN])=""
+requirements_pc_deps_[]m4_defn([DOWN])=""
+
+m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}"
+m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS}"
+USE_[]m4_defn([UP])_LIBS="${USE_[]m4_defn([UP])_LIBS}"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${USE_[]m4_defn([UP])_INTERNAL_LIBS}"
+m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}"
+m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}"
+
+AC_SUBST([requirements_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_public_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_cflags_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_pc_]m4_defn([DOWN]))dnl
+AC_SUBST(m4_defn([UP])[_LIBS])dnl
+AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS])dnl
+AC_SUBST([USE_]m4_defn([UP])[_LIBS])dnl
+AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS])dnl
+AC_SUBST(m4_defn([UP])[_LDFLAGS])dnl
+AC_SUBST(m4_defn([UP])[_CFLAGS])dnl
+AC_MSG_NOTICE([Start $1 checks])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIBS_SUBBUILD(TARGET, DEPENDENCIES)
+dnl Make TARGET contain all DEPENDENCIES relative to SUBDIR build
+AC_DEFUN([EFL_LIBS_SUBBUILD],
+[dnl
+$1=""
+_SUBDIR="../../"
+
+for dep in $2; do
+   case $dep in
+      lib*.la)
+         _DEPENDENCY=$_SUBDIR$dep
+      ;;
+      *)
+         _DEPENDENCY=$dep
+      ;;
+   esac
+
+   $1=${$1}" ${_DEPENDENCY}"
+done
+
+AC_SUBST([$1])
+])
+
+dnl EFL_LIB_END(PKG)
+dnl finishes the setup of an EFL library
+AC_DEFUN([EFL_LIB_END],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+libdirname="m4_defn([DOWN])"
+libname="m4_defn([DOWN])"
+
+m4_defn([UP])_LDFLAGS="${EFLALL_COV_LDFLAGS} ${EFLALL_LDFLAGS} ${m4_defn([UP])_LDFLAGS}"
+m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS} ${m4_defn([UP])_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_internal_deps_libs_[]m4_defn([DOWN])} ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_eflall} "
+m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
+USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
+m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall}"
+requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}"
+requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}"
+
+EFL_LIBS_SUBBUILD(m4_defn([UP])_SUBBUILD_LIBS, ${m4_defn([UP])_LIBS})
+EFL_LIBS_SUBBUILD(m4_defn([UP])_SUBBUILD_INTERNAL_LIBS, ${m4_defn([UP])_INTERNAL_LIBS})
+EFL_LIBS_SUBBUILD(USE_[]m4_defn([UP])_SUBBUILD_LIBS, "USE_[]m4_defn([UP])_LIBS")
+
+AC_MSG_NOTICE([Finished $1 checks])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_START_OPTIONAL(PKG, TEST)
+dnl test if library should be build and then EFL_LIB_START()
+dnl must call EFL_LIB_END_OPTIONAL() to close it.
+AC_DEFUN([EFL_LIB_START_OPTIONAL],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+if $2; then
+   efl_lib_optional_[]m4_defn([DOWN])="yes"
+else
+   efl_lib_optional_[]m4_defn([DOWN])="no"
+   AC_MSG_NOTICE([Skipping $1 checks (disabled)])
+fi
+
+if test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"; then
+   EFL_LIB_START([$1])
+   AC_DEFINE([HAVE_]m4_defn([UP]), [1], [optional EFL $1 is enabled])
+dnl closed at EFL_LIB_END_OPTIONAL()
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_LIB_END_OPTIONAL(PKG)
+dnl closes block started by EFL_LIB_START_OPTIONAL() and then
+dnl defines AM_CONDITIONAL([HAVE_PKG]) and AC_DEFINE([HAVE_PKG])
+AC_DEFUN([EFL_LIB_END_OPTIONAL],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+dnl close if started at EFL_LIB_START_OPTIONAL()
+   EFL_LIB_END([$1])
+fi
+
+AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl EFL_ADD_FEATURE(PKG, NAME, [VALUE])
+dnl if VALUE is not specified, will use ${have_name} instead.
+dnl
+dnl Defined Variables:
+dnl     features_pkg
+AC_DEFUN([EFL_ADD_FEATURE],
+[dnl
+m4_pushdef([DOWNPKG], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl
+
+value="m4_if($3, , [${have_]m4_defn([DOWNNAME])[:-${want_]m4_defn([DOWNNAME])[}}], [$3])"
+case "${value}" in
+   yes)
+      tmp="${COLOR_YES}+$2${COLOR_RESET}"
+      ;;
+   no)
+      tmp="${COLOR_NO}-$2${COLOR_RESET}"
+      ;;
+   *)
+      tmp="${COLOR_OTHER}$2=${value}${COLOR_RESET}"
+      ;;
+esac
+if test -z "${features_[]m4_defn([DOWNPKG])}"; then
+   features_[]m4_defn([DOWNPKG])="${tmp}"
+else
+   features_[]m4_defn([DOWNPKG])="${features_[]m4_defn([DOWNPKG])} ${tmp}"
+fi
+m4_popdef([DOWNNAME])dnl
+m4_popdef([DOWNPKG])dnl
+])
diff --git a/m4/efl_attribute.m4 b/m4/efl_attribute.m4
new file mode 100644
index 0000000000..4f31d93175
--- /dev/null
+++ b/m4/efl_attribute.m4
@@ -0,0 +1,83 @@
+dnl Copyright (C) 2011 Vincent Torri <vtorri at univ-evry dot fr>
+dnl That code is public domain and can be freely used or copied.
+
+dnl Macros for checking if the compiler supports some __attribute__ uses
+
+dnl Usage: EFL_ATTRIBUTE_VECTOR
+dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available
+
+AC_DEFUN([EFL_ATTRIBUTE_VECTOR],
+[
+AC_MSG_CHECKING([for __attribute__ ((vector))])
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+typedef int v4si __attribute__ ((vector_size (16)));
+       ]],
+       [[
+if (sizeof(v4si) == 16)
+  return 0;
+else
+  return -1;
+       ]])],
+   [have_attribute_vector="yes"],
+   [have_attribute_vector="no"])
+AC_MSG_RESULT([${have_attribute_vector}])
+
+if test "x${have_attribute_vector}" = "xyes" ; then
+   AC_DEFINE([HAVE_GCC_ATTRIBUTE_VECTOR], [1], [Define to 1 if your compiler supports __attribute__ ((vector)).])
+fi
+])
+
+dnl Usage: EFL_ATTRIBUTE_ALWAYS_INLINE
+dnl call AC_DEFINE for alway_inline if __attribute__((always_inline)) is available
+
+AC_DEFUN([EFL_ATTRIBUTE_ALWAYS_INLINE],
+[
+
+have_attribute_forceinline="no"
+
+AC_MSG_CHECKING([for __forceinline])
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <windows.h>
+static __forceinline void foo(void) {}
+       ]],
+       [[
+       ]])],
+   [
+    have_attribute_always_inline="yes"
+    have_attribute_forceinline="yes"
+   ],
+   [have_attribute_always_inline="no"])
+
+AC_MSG_RESULT([${have_attribute_always_inline}])
+
+if test "x${have_attribute_always_inline}" = "xno" ; then
+   AC_MSG_CHECKING([for __attribute__ ((__always_inline__))])
+   AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+          [[
+static __attribute__((__always_inline__)) inline void foo(void) {}
+          ]],
+          [[
+          ]])],
+      [have_attribute_always_inline="yes"],
+      [have_attribute_always_inline="no"])
+   AC_MSG_RESULT([${have_attribute_always_inline}])
+fi
+
+if test "x${have_attribute_always_inline}" = "xyes" ; then
+   if test "x${have_attribute_forceinline}" = "xyes" ; then
+      AC_DEFINE([EFL_ALWAYS_INLINE], [__forceinline], [Macro declaring a function to always be inlined.])
+   else
+      AC_DEFINE([EFL_ALWAYS_INLINE], [__attribute__ ((__always_inline__)) inline], [Macro declaring a function to always be inlined.])
+   fi
+else
+   AC_DEFINE([EFL_ALWAYS_INLINE], [static inline], [Macro declaring a function to always be inlined.])
+fi
+])
+
+dnl End of efl_attribute.m4
diff --git a/m4/efl_beta.m4 b/m4/efl_beta.m4
new file mode 100644
index 0000000000..c8047299f7
--- /dev/null
+++ b/m4/efl_beta.m4
@@ -0,0 +1,5 @@
+dnl use: EFL_ENABLE_BETA_API_SUPPORT
+AC_DEFUN([EFL_ENABLE_BETA_API_SUPPORT],
+[
+  AC_DEFINE([EFL_BETA_API_SUPPORT], [1], [Enable access to unstable EFL API that are still in beta])
+])
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
new file mode 100644
index 0000000000..d11e1db297
--- /dev/null
+++ b/m4/efl_binary.m4
@@ -0,0 +1,42 @@
+dnl Usage: EFL_WITH_BIN_SUFFIX(package, binary, suffix)
+dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
+
+AC_DEFUN([EFL_WITH_BIN_SUFFIX],
+[
+
+m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl
+dnl configure option
+
+_efl_with_binary=""
+_efl_binary_define="no"
+
+AC_ARG_WITH([$2],
+   [AC_HELP_STRING([--with-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@])],
+   [
+    _efl_with_binary=${withval}
+    _efl_binary_define="yes"
+   ], [])
+
+AC_ARG_WITH([bin-$2],
+   [AC_HELP_STRING([--with-bin-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@ DEPRECATED])],
+   [
+    _efl_with_binary=${withval}
+    _efl_binary_define="yes"
+    efl_deprecated_option="yes"
+   ], [])
+
+DOWN[]$3=${_efl_with_binary}
+AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
+
+with_binary_[]m4_defn([DOWN])[]$3=${_efl_with_binary}
+
+AM_CONDITIONAL(HAVE_[]UP[]m4_translit([[$3]], [a-z], [A-Z]), [test "x${_efl_binary_define}" = "xyes"])
+AC_SUBST(DOWN[]$3)
+
+])
+
+dnl Usage: EFL_WITH_BIN(package, binary)
+dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
+
+AC_DEFUN([EFL_WITH_BIN], [EFL_WITH_BIN_SUFFIX([$1], [$2], [])])
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
new file mode 100644
index 0000000000..b44f20bc55
--- /dev/null
+++ b/m4/efl_check_funcs.m4
@@ -0,0 +1,333 @@
+dnl Copyright (C) 2012 Vincent Torri <vincent dot torri at gmail dot com>
+dnl This code is public domain and can be freely used or copied.
+
+dnl Macros that check functions availability for the EFL:
+
+dnl dirfd
+dnl dladdr
+dnl dlopen
+dnl fcntl
+dnl fnmatch
+dnl gettimeofday
+dnl iconv
+dnl setxattr (an al.)
+dnl shm_open
+
+dnl EFL_CHECK_LIB_CODE(EFL, LIB, VARIABLE, HEADER, BODY)
+dnl wrapper around AC_LINK_IFELSE(AC_LANG_PROGRAM()) to check
+dnl if some code would work with the given lib.
+dnl If the code work, EFL_ADD_LIBS(EFL, LIB) will be called
+dnl At the end VARIABLE will be "yes" or "no"
+AC_DEFUN([EFL_CHECK_LIB_CODE],
+[
+LIBS_save="${LIBS}"
+LIBS="${LIBS} $2"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([$4], [$5])],
+   [EFL_ADD_LIBS([$1], [$2])
+    $3="yes"], [$3="no"])
+LIBS="${LIBS_save}"
+])
+
+dnl EFL_FIND_LIB_FOR_CODE(EFL, LIBS, VARIABLE, HEADER, BODY)
+AC_DEFUN([EFL_FIND_LIB_FOR_CODE],
+[
+dnl first try without lib (libc)
+EFL_CHECK_LIB_CODE([$1], [], [$3], [$4], [$5])
+
+if test "${$3}" = "no" && test "x$2" != "x"; then
+dnl loop through given libraries
+  for trylib in $2; do
+     EFL_CHECK_LIB_CODE([$1], [${trylib}], [$3], [$4], [$5])
+     if test "${$3}" = "yes"; then
+       break
+     fi
+  done
+fi
+])
+
+dnl _EFL_CHECK_FUNC_DIRFD is for internal use
+dnl _EFL_CHECK_FUNC_DIRFD(EFL, VARIABLE)
+
+AC_DEFUN([_EFL_CHECK_FUNC_DIRFD],
+[EFL_CHECK_LIB_CODE([$1], [], [$2], [[
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
+]], [[DIR *dirp; return dirfd(dirp);]])
+])
+
+dnl _EFL_CHECK_FUNC_DLADDR is for internal use
+dnl _EFL_CHECK_FUNC_DLADDR(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_DLADDR],
+[
+dllibs=""
+case "$host_os" in
+   linux*)
+      dllibs="-ldl"
+   ;;
+   *)
+   ;;
+esac
+case "$host_os" in
+   mingw*)
+      $2="yes"
+   ;;
+   *)
+      EFL_FIND_LIB_FOR_CODE([$1], [$dllibs], [$2], [[
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#include <stdlib.h>
+#include <dlfcn.h>
+]], [[int res = dladdr(NULL, NULL);]])
+   ;;
+esac
+])
+
+dnl _EFL_CHECK_FUNC_DLOPEN is for internal use
+dnl _EFL_CHECK_FUNC_DLOPEN(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_DLOPEN],
+[
+dllibs=""
+case "$host_os" in
+   linux*)
+      dllibs="-ldl"
+   ;;
+   *)
+   ;;
+esac
+case "$host_os" in
+   mingw*)
+      $2="yes"
+   ;;
+   *)
+      EFL_FIND_LIB_FOR_CODE([$1], [$dllibs], [$2], [[
+#include <dlfcn.h>
+]], [[void *h = dlopen(0, 0);]])
+   ;;
+esac
+])
+
+dnl _EFL_CHECK_FUNC_DLSYM is for internal use
+dnl _EFL_CHECK_FUNC_DLSYM(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_DLSYM],
+[
+dllibs=""
+case "$host_os" in
+   linux*)
+      dllibs="-ldl"
+   ;;
+   *)
+   ;;
+esac
+case "$host_os" in
+   mingw*)
+      $2="yes"
+   ;;
+   *)
+      EFL_FIND_LIB_FOR_CODE([$1], [$dllibs], [$2], [[
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#include <stdlib.h>
+#include <dlfcn.h>
+]], [[void *res = dlsym(NULL, NULL);]])
+   ;;
+esac
+])
+
+dnl _EFL_CHECK_FUNC_FCNTL is for internal use
+dnl _EFL_CHECK_FUNC_FCNTL(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_FCNTL],
+[
+case "$host_os" in
+   mingw*)
+      $2="yes"
+   ;;
+   *)
+      EFL_FIND_LIB_FOR_CODE([$1], [], [$2], [[
+#include <fcntl.h>
+]], [[int g = fcntl(0, 0);]])
+   ;;
+esac
+])
+
+dnl _EFL_CHECK_FUNC_FNMATCH is for internal use
+dnl _EFL_CHECK_FUNC_FNMATCH(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_FNMATCH],
+[
+case "$host_os" in
+   mingw*)
+      $2="yes"
+   ;;
+   *)
+      EFL_FIND_LIB_FOR_CODE([$1], [-lfnmatch -liberty], [$2], [[
+#include <stdlib.h>
+#include <fnmatch.h>
+]], [[int g = fnmatch(NULL, NULL, 0);]])
+   ;;
+esac
+])
+
+dnl _EFL_CHECK_FUNC_SCHED_GETCPU is for internal use
+dnl _EFL_CHECK_FUNC_SCHED_GETCPU(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_SCHED_GETCPU],
+[
+   EFL_CHECK_LIB_CODE([$1], [], [$2], [[
+#include <sched.h>
+]], [[int cpu = sched_getcpu();]])
+])
+
+dnl _EFL_CHECK_FUNC_GETTIMEOFDAY is for internal use
+dnl _EFL_CHECK_FUNC_GETTIMEOFDAY(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_GETTIMEOFDAY],
+[
+case "$host_os" in
+   mingw*)
+      $2="yes"
+   ;;
+   *)
+      EFL_CHECK_LIB_CODE([$1], [], [$2], [[
+#include <stdlib.h>
+#include <sys/time.h>
+]], [[int res = gettimeofday(NULL, NULL);]])
+
+      if test "${$2}" = "no" && test "x${enable_exotic}" = "xyes"; then
+         SAVE_CFLAGS="${CFLAGS}"
+         CFLAGS="${CFLAGS} ${EXOTIC_CFLAGS}"
+         EFL_CHECK_LIB_CODE([$1], [${EXOTIC_LIBS}], [$2], [[
+#include <Exotic.h>
+]], [[int res = gettimeofday(NULL, NULL);]])
+         CFLAGS="${SAVE_CFLAGS}"
+      fi
+   ;;
+esac
+])
+
+dnl _EFL_CHECK_FUNC_ICONV is for internal use
+dnl _EFL_CHECK_FUNC_ICONV(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_ICONV],
+[dnl
+AC_ARG_WITH([iconv-link],
+   AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]),
+   [
+    $2="yes"
+    iconv_libs=${withval}
+   ],
+   [$2="no"])
+
+if test "x${iconv_libs}" = "x" ; then
+   EFL_FIND_LIB_FOR_CODE([$1], [-liconv -liconv_plug], [$2], [[
+#include <stdlib.h>
+#include <iconv.h>
+]], [[iconv_t ic; size_t count = iconv(ic, NULL, NULL, NULL, NULL);]])
+fi
+])
+
+dnl _EFL_CHECK_FUNC_SETXATTR is for internal use
+dnl _EFL_CHECK_FUNC_SETXATTR(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_SETXATTR],
+[EFL_CHECK_LIB_CODE([$1], [], [$2], [[
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/xattr.h>
+]], [[
+size_t tmp = listxattr("/", NULL, 0);
+tmp = getxattr("/", "user.ethumb.md5", NULL, 0);
+setxattr("/", "user.ethumb.md5", NULL, 0, 0);
+]])
+
+if test "${$2}" = "yes"; then
+  AC_DEFINE([HAVE_XATTR], [1], [Define to 1 if you have the `listxattr', `setxattr' and `getxattr' functions.])
+fi
+])
+
+dnl _EFL_CHECK_FUNC_SHM_OPEN is for internal use
+dnl _EFL_CHECK_FUNC_SHM_OPEN(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_SHM_OPEN],
+[
+shmlibs=""
+case "$host_os" in
+   linux*)
+      shmlibs="-lrt"
+   ;;
+   *)
+   ;;
+esac
+EFL_FIND_LIB_FOR_CODE([$1], [$shmlibs], [$2], [[
+#include <sys/mman.h>
+#include <sys/stat.h>        /* For mode constants */
+#include <fcntl.h>           /* For O_* constants */
+]], [[
+int fd = shm_open("/dev/null", O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO);
+]])
+])
+
+dnl _EFL_CHECK_FUNC_SPLICE is for internal use
+dnl _EFL_CHECK_FUNC_SPLICE(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_SPLICE],
+[EFL_FIND_LIB_FOR_CODE([$1], [], [$2], [[
+#include <unistd.h>
+#include <fcntl.h>
+]], [[
+long ret = splice(0, 0, 1, 0, 400, 0);
+]])
+])
+
+dnl _EFL_CHECK_FUNC_GETPAGESIZE is for internal use
+dnl _EFL_CHECK_FUNC_GETPAGESIZE(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_GETPAGESIZE],
+[EFL_FIND_LIB_FOR_CODE([$1], [], [$2], [[
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+]],
+[[
+long sz;
+sz = getpagesize();
+]])
+])
+
+dnl _EFL_CHECK_FUNC_PRCTL is for internal use
+dnl _EFL_CHECK_FUNC_PRCTL(EFL, VARIABLE)
+AC_DEFUN([_EFL_CHECK_FUNC_PRCTL],
+[EFL_FIND_LIB_FOR_CODE([$1], [], [$2], [[
+#include <sys/prctl.h>
+]],
+[[
+prctl(PR_SET_TIMERSLACK, 1, 0, 0, 0);
+]])
+])
+
+dnl Macro that checks function availability
+dnl
+dnl EFL_CHECK_FUNC(EFL, FUNCTION)
+dnl AC_SUBST : EFL_CFLAGS and EFL_LIBS (EFL being replaced by its value)
+dnl AC_DEFINE : HAVE_FUNCTION (FUNCTION being replaced by its value)
+dnl result in efl_func_function (function being replaced by its value)
+
+AC_DEFUN([EFL_CHECK_FUNC],
+[dnl
+m4_pushdef([UP], m4_translit([$2], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$2], [-A-Z], [_a-z]))dnl
+
+m4_default([_EFL_CHECK_FUNC_]m4_defn([UP]))($1, [have_fct])
+AC_MSG_CHECKING([for $2])
+AC_MSG_RESULT([${have_fct}])
+
+if test "x${have_fct}" = "xyes" ; then
+  AC_DEFINE([HAVE_]m4_defn([UP]), [1], [Define to 1 if you have the `]m4_defn([DOWN])[' function.])
+fi
+
+efl_func_[]m4_defn([DOWN])="${have_fct}"
+m4_popdef([DOWN])dnl
+m4_popdef([UP])dnl
+])
+
+dnl Macro that iterates over a sequence of space separated functions
+dnl and that calls EFL_CHECK_FUNC() for each of these functions
+dnl
+dnl EFL_CHECK_FUNCS(EFL, FUNCTIONS)
+
+AC_DEFUN([EFL_CHECK_FUNCS],
+[m4_foreach_w([fct], [$2], [EFL_CHECK_FUNC($1, m4_defn([fct]))])])
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
new file mode 100644
index 0000000000..c64013bf7c
--- /dev/null
+++ b/m4/efl_check_libs.m4
@@ -0,0 +1,73 @@
+dnl Copyright (C) 2012 Vincent Torri <vincent dot torri at gmail dot com>
+dnl This code is public domain and can be freely used or copied.
+
+dnl Macro that check dependencies libraries for the EFL:
+
+dnl libjpeg
+dnl zlib
+
+dnl _EFL_CHECK_LIB_LIBJPEG is for internal use
+dnl _EFL_CHECK_LIB_LIBJPEG(EFL)
+dnl it will abort (AC_MSG_ERROR) if libjpeg is not found.
+
+AC_DEFUN([_EFL_CHECK_LIB_LIBJPEG],
+[dnl
+EFL_CHECK_LIB_CODE([$1], [-ljpeg], [have_fct], [[
+#include <stdio.h>
+#include <jpeglib.h>
+]], [[
+struct jpeg_error_mgr er; void *error = jpeg_std_error(&er);
+]])
+
+if test "${have_fct}" = "no"; then
+  AC_MSG_ERROR([Cannot find libjpeg. Make sure your CFLAGS and LDFLAGS environment variable are set properly.])
+fi
+])
+
+dnl _EFL_CHECK_LIB_ZLIB is for internal use
+dnl _EFL_CHECK_LIB_ZLIB(EFL)
+dnl it will abort (AC_MSG_ERROR) if zlib is not found.
+
+AC_DEFUN([_EFL_CHECK_LIB_ZLIB],
+[dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+PKG_CHECK_EXISTS([zlib >= 1.2.3], [_efl_have_lib="yes"], [_efl_have_lib="no"])
+
+if test "${_efl_have_lib}" = "yes"; then
+   requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib >= 1.2.3"
+   requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} zlib >= 1.2.3"
+else
+   EFL_CHECK_LIB_CODE([$1], [-lz], [have_fct], [[
+#include <zlib.h>
+]], [[const char *v = zlibVersion();]])
+
+  if test "${have_fct}" = "no"; then
+    AC_MSG_ERROR([Cannot find zlib. Make sure your CFLAGS and LDFLAGS environment variable are set properly.])
+  fi
+fi
+m4_popdef([DOWNEFL])dnl
+])
+
+dnl Macro that checks for a library
+dnl
+dnl EFL_CHECK_LIB(EFL, LIBRARY)
+dnl it will abort if library is not found
+
+AC_DEFUN([EFL_CHECK_LIB],
+[dnl
+m4_pushdef([UP], m4_translit([$2], [-a-z], [_A-Z]))dnl
+m4_default([_EFL_CHECK_LIB_]m4_defn([UP]))($1)
+AC_MSG_CHECKING([for $2])
+AC_MSG_RESULT([yes])
+m4_popdef([UP])dnl
+])
+
+dnl Macro that iterates over a sequence of white separated libraries
+dnl and that calls EFL_CHECK_LIB() for each of these libraries
+dnl
+dnl EFL_CHECK_LIBS(EFL, LIBRARIES)
+dnl it will abort if libraries are not found
+
+AC_DEFUN([EFL_CHECK_LIBS],
+[m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))])])
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4
new file mode 100644
index 0000000000..1d3499222f
--- /dev/null
+++ b/m4/efl_compiler.m4
@@ -0,0 +1,90 @@
+dnl Copyright (C) 2012 Vincent Torri <vincent dot torri at gmail dot com>
+dnl This code is public domain and can be freely used or copied.
+
+dnl Macro that check if compiler of linker flags are available
+
+
+dnl Macro that checks for a compiler flag availability
+dnl
+dnl _EFL_CHECK_COMPILER_FLAGS(EFL, FLAGS)
+dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value)
+dnl have_flag: yes or no.
+AC_DEFUN([_EFL_CHECK_COMPILER_FLAGS],
+[dnl
+m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
+
+dnl store in options -Wfoo if -Wno-foo is passed
+option="m4_bpatsubst([[$2]], [-Wno-], [-W])"
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${CFLAGS} ${option}"
+AC_LANG_PUSH([C])
+
+AC_MSG_CHECKING([whether the compiler supports $2])
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM([[]])],
+   [have_flag="yes"],
+   [have_flag="no"])
+AC_MSG_RESULT([${have_flag}])
+
+AC_LANG_POP([C])
+CFLAGS="${CFLAGS_save}"
+if test "x${have_flag}" = "xyes" ; then
+   UPEFL[_CFLAGS]="${UPEFL[_CFLAGS]} [$2]"
+fi
+AC_SUBST(UPEFL[_CFLAGS])dnl
+m4_popdef([UPEFL])dnl
+])
+
+dnl EFL_CHECK_COMPILER_FLAGS(EFL, FLAGS)
+dnl Checks if FLAGS are supported and add to EFL_CLFAGS.
+dnl
+dnl It will first try every flag at once, if one fails will try them one by one.
+AC_DEFUN([EFL_CHECK_COMPILER_FLAGS],
+[dnl
+_EFL_CHECK_COMPILER_FLAGS([$1], [$2])
+if test "${have_flag}" != "yes"; then
+m4_foreach_w([flag], [$2], [_EFL_CHECK_COMPILER_FLAGS([$1], m4_defn([flag]))])
+fi
+])
+
+
+dnl Macro that checks for a linker flag availability
+dnl
+dnl _EFL_CHECK_LINKER_FLAGS(EFL, FLAGS)
+dnl AC_SUBST : EFL_LDFLAGS (EFL being replaced by its value)
+dnl have_flag: yes or no
+AC_DEFUN([_EFL_CHECK_LINKER_FLAGS],
+[dnl
+m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
+
+LDFLAGS_save="${LDFLAGS}"
+LDFLAGS="${LDFLAGS} $2"
+AC_LANG_PUSH([C])
+
+AC_MSG_CHECKING([whether the linker supports $2])
+AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM([[]])],
+   [have_flag="yes"],
+   [have_flag="no"])
+AC_MSG_RESULT([${have_flag}])
+
+AC_LANG_POP([C])
+LDFLAGS="${LDFLAGS_save}"
+if test "x${have_flag}" = "xyes" ; then
+   UPEFL[_LDFLAGS]="${UPEFL[_LDFLAGS]} [$2]"
+fi
+AC_SUBST(UPEFL[_LDFLAGS])dnl
+m4_popdef([UPEFL])dnl
+])
+
+dnl EFL_CHECK_LINKER_FLAGS(EFL, FLAGS)
+dnl Checks if FLAGS are supported and add to EFL_LDLFAGS.
+dnl
+dnl It will first try every flag at once, if one fails will try them one by one.
+AC_DEFUN([EFL_CHECK_LINKER_FLAGS],
+[dnl
+_EFL_CHECK_LINKER_FLAGS([$1], [$2])
+if test "${have_flag}" != "yes"; then
+m4_foreach_w([flag], [$2], [_EFL_CHECK_LINKER_FLAGS([$1], m4_defn([flag]))])
+fi
+])dnl
diff --git a/m4/efl_define.m4 b/m4/efl_define.m4
new file mode 100644
index 0000000000..2b73a691e8
--- /dev/null
+++ b/m4/efl_define.m4
@@ -0,0 +1,20 @@
+dnl
+dnl EFL_CHECK_DEFINE(symbol, header_file)
+dnl
+dnl NOTE: EFL_CHECK_DEFINE is strongly inspired by
+dnl       APR_CHECK_DEFINE which can be found in the
+dnl       sources of Apache's APR (under Apache Licence)
+dnl
+AC_DEFUN([EFL_CHECK_DEFINE], [
+  AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
+    AC_EGREP_CPP(YES_IS_DEFINED, [
+#include <$2>
+#ifdef $1
+YES_IS_DEFINED
+#endif
+    ], ac_cv_define_$1=yes, ac_cv_define_$1=no)
+  ])
+  if test "$ac_cv_define_$1" = "yes"; then
+    AC_DEFINE(HAVE_$1, 1, [Define if $1 is defined in $2])
+  fi
+])
diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4
new file mode 100644
index 0000000000..0c1452fee0
--- /dev/null
+++ b/m4/efl_doxygen.m4
@@ -0,0 +1,98 @@
+dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
+dnl That code is public domain and can be freely used or copied.
+
+dnl Macro that check if doxygen is available or not.
+
+dnl EFL_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for the doxygen program
+dnl Defines efl_doxygen
+dnl Defines the automake conditionnal EFL_BUILD_DOC
+dnl
+AC_DEFUN([EFL_CHECK_DOXYGEN],
+[
+
+dnl
+dnl Disable the build of the documentation
+dnl
+AC_ARG_ENABLE([doc],
+   [AC_HELP_STRING(
+       [--disable-doc],
+       [Disable documentation build @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       efl_enable_doc="yes"
+    else
+       efl_enable_doc="no"
+    fi
+   ],
+   [efl_enable_doc="yes"]
+)
+
+if test "x${efl_enable_doc}" = "xyes" ; then
+
+dnl
+dnl Specify the full file name, with path
+dnl
+
+   efl_doxygen="doxygen"
+
+   AC_ARG_WITH([doxygen],
+      [AC_HELP_STRING(
+          [--with-doxygen=FILE],
+          [doxygen program to use @<:@default=doxygen@:>@])],
+dnl
+dnl Check the given doxygen program.
+dnl
+      [efl_doxygen=${withval}
+       AC_CHECK_PROG([efl_have_doxygen],
+          [${efl_doxygen}],
+          [yes],
+          [no])
+       if test "x${efl_have_doxygen}" = "xno" ; then
+          echo "WARNING:"
+          echo "The doxygen program you specified:"
+          echo "$efl_doxygen"
+          echo "was not found.  Please check the path and make sure "
+          echo "the program exists and is executable."
+          AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
+       fi
+      ],
+      [AC_CHECK_PROG([efl_have_doxygen],
+          [${efl_doxygen}],
+          [yes],
+          [no])
+       if test "x${efl_have_doxygen}" = "xno" ; then
+          echo "WARNING:"
+          echo "The doxygen program was not found in your execute"
+          echo "You may have doxygen installed somewhere not covered by your path."
+          echo ""
+          echo "If this is the case make sure you have the packages installed, AND"
+          echo "that the doxygen program is in your execute path (see your"
+          echo "shell manual page on setting the \$PATH environment variable), OR"
+          echo "alternatively, specify the program to use with --with-doxygen."
+          AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
+       fi
+      ]
+   )
+fi
+
+dnl
+dnl Substitution
+dnl
+AC_SUBST([efl_doxygen])
+
+if ! test "x${efl_have_doxygen}" = "xyes" ; then
+   efl_enable_doc="no"
+fi
+
+AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes")
+
+if test "x${efl_enable_doc}" = "xyes" ; then
+  ifelse([$1], , :, [$1])
+else
+  ifelse([$2], , :, [$2])
+fi
+
+])
+
+dnl End of doxygen.m4
diff --git a/m4/efl_eo.m4 b/m4/efl_eo.m4
new file mode 100644
index 0000000000..864baf5fc1
--- /dev/null
+++ b/m4/efl_eo.m4
@@ -0,0 +1,6 @@
+dnl use: EFL_ENABLE_EO_API_SUPPORT
+AC_DEFUN([EFL_ENABLE_EO_API_SUPPORT],
+[
+  AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API])
+])
+
diff --git a/m4/efl_find_x.m4 b/m4/efl_find_x.m4
new file mode 100644
index 0000000000..8c9f5c3677
--- /dev/null
+++ b/m4/efl_find_x.m4
@@ -0,0 +1,194 @@
+# efl_find.x.m4 - Macros to locate X11.                       -*- Autoconf -*-
+# EFL_FIND_X(VARIABLE-PREFIX, [headers = "X11/Xlib.h"],
+#            [libs-and-functions = "X11 XOpenDisplay"],
+#            [action-if-found], [action-if-not-found])
+# checks for X11 using, in order:
+# 1) Xorg pkg-config files (using enviroment variables EFL_X11_CFLAGS
+#                           and EFL_X11_LIBS if set, but only if x11.pc exists)
+# 2) command line options: --x-includes=dir, --x-libraries=dir
+#                          assume there is an X11 in the given directories
+# 3) XMKMF environment variable if set
+# 4) xmkmf executable if found
+# 5) list of "standard" directories
+#
+# 2-5 is handled by A_PATH_X
+#
+# If a X11 is found, [action-if-success] is run and VARIABLE_cflags and
+# VARIABLE_libs and VARIABLE_libdirs are defined and substituted.
+# VARIABLE_libs will contain all of the libs listed in libs-and-functions.
+# VARIABLE_libdirs will contain all -Lpath:s found in VARIABLE_libs
+#
+# headers is a list of headers to look for. libs-and-functions is a list of
+# library and function pairs to look for.
+# Each lib and function is checked in pairs, example:
+# EFL_FIND_X([EVAS_X11], [X11/X.h], [X11 XCreateImage Xext XShmCreateImage])
+# will look for XCreateImage in X11 and XShmCreateImage in Xext and include
+# both -lX11 and -lXext in VARIABLE_libs
+#
+# action-if-found is only called if X11, all headers, all libraries and
+# all functions are found.
+# You can call EFL_FIND_X multiple times with different lists of headers, libs
+# and functions.
+
+AC_DEFUN([EFL_FIND_X],
+[
+  # Must print something as AC_CACHE_VAL writes (cached) if the value is cached
+  AC_MSG_CHECKING([how to find X])
+  efl_x11_need_result=1
+  AC_CACHE_VAL(efl_cv_x11_cache,
+    [
+      # this is ugly and breaks that AC_CACHE_VAL may not have side effects
+      # but I can't think of a better way right now
+      efl_x11_need_result=0
+      PKG_CHECK_EXISTS([x11],
+        [
+          AC_MSG_RESULT([use pkg-config])
+          PKG_CHECK_MODULES([EFL_X11],[x11],
+            [
+              efl_cv_have_x11=yes
+              efl_cv_x11_pkgconf=yes
+              efl_cv_x11_cflags=$EFL_X11_CFLAGS
+              efl_cv_x11_libs_pre=$EFL_X11_LIBS
+              efl_cv_x11_libs_post=
+            ])
+        ],
+        [
+          AC_MSG_RESULT([use xmkmf])
+          # Fallback to old AC_PATH_XTRA
+          AC_PATH_X
+          AC_PATH_XTRA
+          if test "$no_x" = yes; then
+            efl_cv_have_x11=no
+          else
+            efl_cv_have_x11=yes
+            efl_cv_x11_pkgconf=no
+            efl_cv_x11_cflags=$X_CFLAGS
+            efl_cv_x11_libs_pre="$X_PRE_LIBS $X_LIBS"
+            efl_cv_x11_libs_post=$X_EXTRA_LIBS
+          fi
+         ])
+      # Record where we found X for the cache.
+      if test "x$efl_cv_have_x11" = "xno"; then
+        efl_cv_x11_cache="efl_cv_have_x11=no"
+      else
+        efl_cv_x11_cache="efl_cv_have_x11=yes\
+          efl_cv_x11_pkgconf='$efl_cv_x11_pkgconf'\
+          efl_cv_x11_cflags='$efl_cv_x11_cflags'\
+          efl_cv_x11_libs_pre='$efl_cv_x11_libs_pre'\
+          efl_cv_x11_libs_post='$efl_cv_x11_libs_post'"
+      fi
+    ])
+  if test "x$efl_x11_need_result" = "x1"; then
+    AC_MSG_RESULT([already found])
+  fi
+  eval "$efl_cv_x11_cache"
+
+  if test "x$efl_cv_have_x11" = "xyes"; then
+    ELF_X11_CFLAGS_save="$CFLAGS"
+    ELF_X11_CPPFLAGS_save="$CPPFLAGS"
+    CFLAGS="$CFLAGS $efl_cv_x11_cflags"
+    CPPFLAGS="$CPPFLAGS $efl_cv_x11_cflags"
+    efl_x11_found_all=1
+    for efl_x11_header in ifelse([$2], , "X11/Xlib.h", [$2]); do
+      AC_CHECK_HEADER([$efl_x11_header],,[
+        efl_x11_found_all=0
+        break])
+    done
+    CPPFLAGS="$ELF_X11_CPPFLAGS_save"
+    CFLAGS="$ELF_X11_CFLAGS_save"
+
+    if test "x$efl_x11_found_all" = "x1"; then
+      EFL_X11_LIBS_save="$LIBS"
+      if test "x$efl_cv_x11_pkgconf" = "xyes"; then
+        efl_x11_modules="x11"
+        efl_x11_lib=""
+        for efl_x11_lib_function in ifelse([$3], , "X11 XOpenDisplay", [$3]); do
+          if test -z "$efl_x11_lib"; then
+            efl_x11_lib="$efl_x11_lib_function"
+            case $efl_x11_lib in
+              X11)
+                ;;
+              Xss)
+                efl_x11_modules="$efl_x11_modules xscrnsaver"
+                ;;
+              *)
+                efl_x11_lib=`echo $efl_x11_lib | tr '[A-Z]' '[a-z]'`
+                efl_x11_modules="$efl_x11_modules $efl_x11_lib"
+                ;;
+            esac
+          else
+            efl_x11_lib=
+          fi
+        done
+        efl_x11_modules="$efl_x11_modules x11-xcb"
+
+        PKG_CHECK_EXISTS([$efl_x11_modules],
+          [
+            PKG_CHECK_MODULES([$1],[$efl_x11_modules],
+              [
+                efl_x11_cflags=$[]$1[]_CFLAGS
+                efl_x11_libs=$[]$1[]_LIBS
+
+                LIBS="$LIBS $[]$1[]_LIBS"
+                efl_x11_lib=""
+                for efl_x11_lib_function in ifelse([$3], , "X11 XOpenDisplay", [$3]); do
+                  if test -z "$efl_x11_lib"; then
+                    efl_x11_lib="$efl_x11_lib_function"
+                  else
+                    # This is a ugly way of using AC_CHECK_FUNC with different
+                    # LIBS
+                    eval "unset ac_cv_func_$efl_x11_lib_function"
+                    AC_CHECK_FUNC([$efl_x11_lib_function],,
+                      [
+                        efl_x11_found_all=0
+                        break])
+                    efl_x11_lib=
+                  fi
+                done
+              ])
+           ],[efl_x11_found_all=0])
+      else
+        LIBS="$LIBS $efl_cv_x11_libs_pre"
+        efl_x11_libs="$efl_cv_x11_libs_pre"
+        efl_x11_lib=""
+        for efl_x11_lib_function in ifelse([$3], , "X11 XOpenDisplay", [$3]); do
+          if test -z "$efl_x11_lib"; then
+            efl_x11_lib="$efl_x11_lib_function"
+          else
+            AC_CHECK_LIB([$efl_x11_lib], [$efl_x11_lib_function],,[
+              efl_x11_found_all=0
+              break],["$efl_cv_x11_libs_post"])
+            efl_x11_libs="$efl_x11_libs -l$efl_x11_lib"
+            efl_x11_lib=
+          fi
+        done
+        if test -n "$efl_cv_x11_libs_post"; then
+          efl_x11_libs="$efl_x11_libs $efl_cv_x11_libs_post"
+        fi
+      fi
+      LIBS="$EFL_X11_LIBS_save"
+    fi
+  fi
+
+  if test "x$efl_x11_found_all" = "x1"; then
+    efl_x11_libdirs=""
+    for efl_x11_option in "$efl_x11_libs"; do
+      case $efl_x11_option in
+        -L*)
+          efl_x11_libdirs="$efl_x11_libdirs $efl_x11_option"
+          ;;
+        *)
+          ;;
+      esac
+    done
+
+    AC_SUBST([$1][_cflags],[$efl_cv_x11_cflags])
+    AC_SUBST([$1][_libs],[$efl_x11_libs])
+    AC_SUBST([$1][_libdirs],[$efl_x11_libdirs])
+
+    ifelse([$4], , :, [$4])
+  else
+    ifelse([$5], , :, [$5])
+  fi
+])
+
diff --git a/m4/efl_libunwind.m4 b/m4/efl_libunwind.m4
new file mode 100644
index 0000000000..e9ca682cfb
--- /dev/null
+++ b/m4/efl_libunwind.m4
@@ -0,0 +1,61 @@
+dnl This code is public domain and can be freely used or copied.
+dnl File to auto-detect libunwind
+
+dnl Macro that checks for libunwind, first by using
+dnl pkg-config, then by trying to compile and link a simple
+dnl program, to see if libunwind is distributed on the system
+dnl but has no pkg-config support
+dnl
+dnl The biggest usecase is on Mac OS X, where there are no
+dnl pkg-config files, and the libunwind headers are lost
+dnl in an obscure place on the system (but whom the compilers
+dnl distributed by Apple are aware of).
+dnl
+dnl Usage: EFL_CHECK_LIBUNWIND
+dnl  will inconditionaly set UNWIND_CFLAGS and UNWIND_LIBS
+dnl  to follow pkg-config fashion.
+dnl
+AC_DEFUN([EFL_CHECK_LIBUNWIND],
+[dnl
+   dnl First, check with pkg-config
+   PKG_CHECK_MODULES([UNWIND], [libunwind libunwind-generic],
+                     [have_unwind=yes], [have_unwind=no])
+
+   dnl No pkg-config file... maybe system built-in?
+   if test "x${have_unwind}" = "xno"; then
+      AC_LANG_PUSH([C])
+      AC_LINK_IFELSE(
+	 [AC_LANG_PROGRAM(
+	    [[
+#include <libunwind.h>
+	    ]],
+	    [[
+	       unw_context_t ctx;
+	       unw_getcontext(&ctx);
+	    ]]
+	 )],
+	 [
+	    have_unwind="yes"
+	 ],
+	 [
+	    have_unwind="no"
+	 ]
+      )
+      AC_MSG_CHECKING([for native libunwind])
+      AC_MSG_RESULT([${have_unwind}])
+      AC_LANG_POP([C])
+
+      dnl Provide dummy variables to automake.
+      dnl In case pkg-config succeeded, these will be set and
+      dnl used in other automake files. To avoid, problems,
+      dnl we define empty variables.
+      UNWIND_CFLAGS=""
+      UNWIND_LIBS=""
+      AC_SUBST([UNWIND_CFLAGS])
+      AC_SUBST([UNWIND_LIBS])
+   fi
+
+   AS_IF([test "x$have_unwind" = "xyes"],
+	 [AC_DEFINE([HAVE_UNWIND], [1], [Have libunwind])])
+   AM_CONDITIONAL(HAVE_UNWIND, test "x$have_unwind" = "xyes")
+])
diff --git a/m4/efl_lua_old.m4 b/m4/efl_lua_old.m4
new file mode 100644
index 0000000000..537a6f336b
--- /dev/null
+++ b/m4/efl_lua_old.m4
@@ -0,0 +1,36 @@
+dnl EFL_CHECK_LUA_OLD(EFL)
+dnl checks for lua 5.1 or 5.2 in pkg-config (multiple names) and -llua directly
+dnl will call EFL_ADD_LIBS() or EFL_DEPEND_PKG() as required.
+dnl this is a strict call and will abort if lua is not found
+dnl keep in mind that this is only executed if --enable-lua-old is set
+AC_DEFUN([EFL_CHECK_LUA_OLD],
+[dnl
+requirement_lua=""
+PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"],
+   [PKG_CHECK_EXISTS([lua5.1 >= 5.1.0], [requirement_lua="lua5.1 >= 5.1.0"],
+      [PKG_CHECK_EXISTS([lua-5.1 >= 5.1.0], [requirement_lua="lua-5.1 >= 5.1.0"],
+         [PKG_CHECK_EXISTS([lua51 >= 5.1.0], [requirement_lua="lua51 >= 5.1.0"],
+            [PKG_CHECK_EXISTS([lua5.2 >= 5.2.0], [requirement_lua="lua5.2 >= 5.2.0"],
+               [PKG_CHECK_EXISTS([lua-5.2 >= 5.2.0], [requirement_lua="lua-5.2 >= 5.2.0"],
+                  [PKG_CHECK_EXISTS([lua52 >= 5.2.0], [requirement_lua="lua52 >= 5.2.0"])])])])])])])
+
+if test "x${requirement_lua}" = "x"; then
+   AC_MSG_CHECKING([whether lua_newstate() is in liblua])
+   AC_CHECK_LIB([lua], [lua_newstate],
+      [have_lua="yes"
+       EFL_ADD_LIBS([$1], [-llua])],
+      [have_lua="no"])
+   AC_MSG_RESULT([${have_lua}])
+   if test "${have_lua}" = "no"; then
+      AC_MSG_ERROR([Missing lua 5.1 or 5.2 support])
+   fi
+else
+   req_found="no"
+   EFL_DEPEND_PKG([$1], [LUA], [${requirement_lua}],
+                  [ req_found="yes" ],
+                  [ req_found="no" ])
+   if test "x${req_found}" = "xyes"; then
+      PKG_CHECK_MODULES([$1]_LUA, [${requirement_lua}])
+   fi
+fi
+])
diff --git a/m4/efl_mono.m4 b/m4/efl_mono.m4
new file mode 100644
index 0000000000..807526ee24
--- /dev/null
+++ b/m4/efl_mono.m4
@@ -0,0 +1,95 @@
+# # ============================================================================
+# #  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# # ============================================================================
+# #
+# # SYNOPSIS
+# #
+# #   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+# #
+# # DESCRIPTION
+# #
+# #   Check for baseline language coverage in the compiler for the C++11
+# #   standard; if necessary, add switches to CXXFLAGS to enable support.
+# #
+# #   The first argument, if specified, indicates whether you insist on an
+# #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+# #   -std=c++11).  If neither is specified, you get whatever works, with
+# #   preference for an extended mode.
+# #
+# #   The second argument, if specified 'mandatory' or if left unspecified,
+# #   indicates that baseline C++11 support is required and that the macro
+# #   should error out if no mode with that support is found.  If specified
+# #   'optional', then configuration proceeds regardless, after defining
+# #   HAVE_CXX11 if and only if a supporting mode is found.
+# #
+# # LICENSE
+# #
+# #   Copyright (c) 2016 Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
+# #
+# #   Copying and distribution of this file, with or without modification, are
+# #   permitted in any medium without royalty provided the copyright notice
+# #   and this notice are preserved. This file is offered as-is, without any
+# #   warranty.
+
+# AC_LANG(CSHARP)
+# -----------
+AC_LANG_DEFINE([CSHARP], [csharp], [MCS], [],
+[ac_ext=cs
+ac_compile='$MCS $MCSFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
+])
+
+AU_DEFUN([AC_LANG_CSHARP], [AC_LANG(CSHARP)])
+
+m4_define([AC_LANG_PROGRAM(CSHARP)],
+[$1
+class MyClass
+{
+    static void Main(string[] args)
+    {
+        $2
+    }
+}])
+
+AC_DEFUN([AC_LANG_COMPILER(CSHARP)],
+[AC_REQUIRE([AC_PROG_MCS])])
+
+AN_MAKEVAR([MCS], [AC_PROG_MCS])
+AN_PROGRAM([mcs], [AC_PROG_MCS])
+AC_DEFUN([AC_PROG_MCS],
+[AC_LANG_PUSH(CSHARP)dnl
+AC_ARG_VAR([MCS],     [MCS (C#) compiler command])dnl
+AC_ARG_VAR([MCSFLAGS],  [MCS (C#) compiler flags])dnl
+dnl _AC_ARG_VAR_LDFLAGS()dnl
+m4_ifval([$1],
+      [AC_CHECK_TOOLS(MCS, [$1])],
+[AC_CHECK_TOOL(MCS, mcs)
+if test -z "$MCS"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(MCS, [${ac_tool_prefix}mcs], [$ac_tool_prefix}mcs])
+  fi
+fi
+if test -z "$MCS"; then
+  AC_CHECK_PROG(MCS, mcs, mcs, , , false)
+fi
+if test -z "$MCS"; then
+  HAVE_MCS=0
+  AC_MSG_NOTICE([No C sharp compiler was found])
+else
+  HAVE_MCS=1
+  AC_DEFINE(HAVE_MCS,1,
+            [define if the MCS compiler is available])
+fi
+AC_SUBST(HAVE_MCS)
+])
+
+# Provide some information about the compiler.
+_AS_ECHO_LOG([checking for _AC_LANG compiler version])
+set X $ac_compile
+ac_compiler=$[2]
+_AC_DO_LIMIT([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
+m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl
+AC_LANG_POP(CSHARP)dnl
+])# AC_PROG_MCS
+
+
diff --git a/m4/efl_path_max.m4 b/m4/efl_path_max.m4
new file mode 100644
index 0000000000..f57bfd2ab5
--- /dev/null
+++ b/m4/efl_path_max.m4
@@ -0,0 +1,36 @@
+dnl Check for PATH_MAX in limits.h, and define a default value if not found
+dnl This is a workaround for systems not providing PATH_MAX, like GNU/Hurd
+
+dnl EFL_CHECK_PATH_MAX([DEFAULT_VALUE_IF_NOT_FOUND])
+dnl
+dnl If PATH_MAX is not defined in <limits.h>, defines it
+dnl to DEFAULT_VALUE_IF_NOT_FOUND if it exists, or fallback
+dnl to using 4096
+
+AC_DEFUN([EFL_CHECK_PATH_MAX],
+[
+
+default_max=m4_default([$1], "4096")
+AC_LANG_PUSH([C])
+
+AC_MSG_CHECKING([for PATH_MAX in limits.h])
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <limits.h>
+       ]],
+       [[
+int i = PATH_MAX;
+       ]])],
+   [AC_MSG_RESULT([yes])],
+   [
+    AC_DEFINE_UNQUOTED([PATH_MAX],
+       [${default_max}],
+       [default value since PATH_MAX is not defined])
+    AC_MSG_RESULT([no: using ${default_max}])
+   ])
+
+AC_LANG_POP([C])
+
+])
+dnl end of efl_path_max.m4
diff --git a/m4/efl_pkg_config.m4 b/m4/efl_pkg_config.m4
new file mode 100644
index 0000000000..13a9516e90
--- /dev/null
+++ b/m4/efl_pkg_config.m4
@@ -0,0 +1,10 @@
+dnl file with extensions to pkg-config module
+dnl
+dnl EFL_PKG_CHECK_STRICT(MODULE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl similar to PKG_CHECK_EXISTS() that will AC_MSG_ERROR() if not found
+AC_DEFUN([EFL_PKG_CHECK_STRICT],
+[
+   PKG_CHECK_EXISTS([$1], [$2],
+      [m4_ifval([$3], [$3], [AC_MSG_ERROR([pkg-config missing $1])])]
+      )
+])
diff --git a/m4/efl_stdcxx_11.m4 b/m4/efl_stdcxx_11.m4
new file mode 100644
index 0000000000..f606bc0379
--- /dev/null
+++ b/m4/efl_stdcxx_11.m4
@@ -0,0 +1,136 @@
+# ============================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++11
+#   standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+#   The first argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The second argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline C++11 support is required and that the macro
+#   should error out if no mode with that support is found.  If specified
+#   'optional', then configuration proceeds regardless, after defining
+#   HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 3
+
+m4_define([_EFL_CXX_COMPILE_STDCXX_11_testbody], [
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = static_cast<check_type&&>(c);
+
+    struct A { A(int); };
+    struct B : A { using A::A; };  // inheriting constructors
+
+    auto d = a;
+])
+
+AC_DEFUN([EFL_CXX_COMPILE_STDCXX_11], [dnl
+  m4_if([$1], [], [],
+        [$1], [ext], [],
+        [$1], [noext], [],
+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+  ax_cv_cxx_compile_cxx11,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_EFL_CXX_COMPILE_STDCXX_11_testbody])],
+    [ax_cv_cxx_compile_cxx11=yes],
+    [ax_cv_cxx_compile_cxx11=no])])
+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$1], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++11; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_EFL_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$1], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=c++11; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_EFL_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX11=0
+      AC_MSG_NOTICE([No compiler with C++11 support was found])
+    else
+      HAVE_CXX11=1
+      AC_DEFINE(HAVE_CXX11,1,
+                [define if the compiler supports basic C++11 syntax])
+    fi
+
+    AC_SUBST(HAVE_CXX11)
+  fi
+])
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
new file mode 100644
index 0000000000..54a5fc6d77
--- /dev/null
+++ b/m4/efl_threads.m4
@@ -0,0 +1,163 @@
+dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
+dnl rwlock code added by Mike Blumenkrantz <mike at zentific dot com>
+dnl This code is public domain and can be freely used or copied.
+
+dnl Macro that check if POSIX or Win32 threads library is available or not.
+
+dnl Usage: EFL_CHECK_THREADS(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+dnl Call AC_SUBST(EFL_PTHREAD_CFLAGS)
+dnl Call AC_SUBST(EFL_PTHREAD_LIBS)
+dnl Defines EFL_HAVE_THREADS
+
+AC_DEFUN([EFL_CHECK_THREADS],
+[
+
+dnl Generic thread detection
+
+EFL_PTHREAD_CFLAGS="-D_REENTRANT"
+EFL_PTHREAD_LIBS=""
+
+_efl_have_posix_threads="no"
+
+dnl Use generic infrastructure for pthread detection (What a hell of a mess !)
+gl_LOCK
+
+AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
+
+_efl_have_posix_threads="${gl_use_threads}"
+
+dnl System specific CFLAGS
+if test "x${_efl_have_posix_threads}" = "xyes"; then
+   case "$host_os" in
+      osf*) EFL_PTHREAD_CFLAGS="-D_REENTRANT" ;;
+      aix* | freebsd*) EFL_PTHREAD_CFLAGS="-D_THREAD_SAFE" ;;
+      solaris*) EFL_PTHREAD_CFLAGS="-D_REENTRANT" ;;
+   esac
+fi
+
+dnl check if the compiler supports POSIX threads
+if test "x${_efl_have_posix_threads}" = "xyes" ; then
+
+   SAVE_LIBS=${LIBS}
+   LIBS="${LIBS} ${LIBMULTITHREAD}"
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[
+#include <pthread.h>
+                       ]],
+                       [[
+pthread_barrier_t barrier;
+pthread_barrier_init(&barrier, NULL, 1);
+                       ]])],
+      [efl_have_pthread_barrier="yes"],
+      [efl_have_pthread_barrier="no"])
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[
+#include <stdlib.h>
+#include <pthread.h>
+#include <sched.h>
+#ifndef __linux__
+#include <pthread_np.h>
+#endif
+                       ]],
+                       [[
+pthread_attr_setaffinity_np(NULL, 0, NULL);
+                       ]])],
+      [efl_have_setaffinity="yes"],
+      [efl_have_setaffinity="no"])
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <pthread.h>
+#ifndef __linux__
+#include <pthread_np.h>
+#endif
+                       ]],
+                       [[
+#ifndef __linux__
+pthread_set_name_np(NULL, NULL);
+#else
+pthread_setname_np(NULL, NULL);
+#endif
+                       ]])],
+      [efl_have_setname="yes"],
+      [efl_have_setname="no"])
+   LIBS=${SAVE_LIBS}
+fi
+
+AC_MSG_CHECKING([which threads API is used])
+if test "x${_efl_have_posix_threads}" = "xyes" ; then
+   efl_have_threads="POSIX"
+fi
+AC_MSG_RESULT([${efl_have_threads}])
+
+EFL_PTHREAD_LIBS="${LTLIBMULTITHREAD}"
+
+AC_SUBST(EFL_PTHREAD_CFLAGS)
+AC_SUBST(EFL_PTHREAD_LIBS)
+
+dnl check if the compiler supports pthreads spinlock
+
+efl_have_posix_threads_spinlock="no"
+
+if test "x${_efl_have_posix_threads}" = "xyes" ; then
+   SAVE_LIBS=${LIBS}
+   LIBS="${LIBS} ${LIBMULTITHREAD}"
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[
+#include <pthread.h>
+#include <sched.h>
+                       ]],
+                       [[
+pthread_spinlock_t lock;
+int res;
+res = pthread_spin_init(&lock, PTHREAD_PROCESS_PRIVATE);
+sched_yield();
+                       ]])],
+      [efl_have_posix_threads_spinlock="yes"],
+      [efl_have_posix_threads_spinlock="no"])
+   LIBS=${SAVE_LIBS}
+
+fi
+
+AC_MSG_CHECKING([whether to build POSIX threads spinlock code])
+AC_MSG_RESULT([${efl_have_posix_threads_spinlock}])
+
+if test "x${efl_have_posix_threads_spinlock}" = "xyes" ; then
+   AC_DEFINE([EFL_HAVE_POSIX_THREADS_SPINLOCK], [1], [Define to mention that POSIX threads spinlocks are supported])
+fi
+
+
+dnl checks if the compiler supports OSX spinlock
+
+efl_have_osx_spinlock="no"
+
+if test "x${_efl_have_posix_threads}" = "xyes" ; then
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[
+#include <libkern/OSAtomic.h>
+                       ]],
+                       [[
+OSSpinLock spin_lock = 0;
+OSSpinLockTry(&spin_lock);
+                       ]])],
+      [efl_have_osx_spinlock="yes"],
+      [efl_have_osx_spinlock="no"])
+fi
+
+AC_MSG_CHECKING([whether to build OSX spinlock code])
+AC_MSG_RESULT([${efl_have_osx_spinlock}])
+
+if test "x${efl_have_osx_spinlock}" = "xyes" ; then
+   AC_DEFINE([EFL_HAVE_OSX_SPINLOCK], [1], [Define to mention that OSX spinlocks are supported])
+fi
+
+
+
+AS_IF([test "x$_efl_have_posix_threads" = "xyes"],
+   [$1],
+   [m4_if([$2], [$2], [AC_MSG_ERROR([Threads are required.])])])
+
+
+])
+
diff --git a/m4/eina_check.m4 b/m4/eina_check.m4
new file mode 100644
index 0000000000..251d4cb559
--- /dev/null
+++ b/m4/eina_check.m4
@@ -0,0 +1,49 @@
+dnl use: EINA_CHECK_MODULE(foo-bar, have_dependency, description)
+AC_DEFUN([EINA_CHECK_MODULE],
+[
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+# AC_ARG_ENABLE([mempool-$1],
+#    [AC_HELP_STRING([--enable-mempool-$1], [enable build of $3 @<:@default=$2@:>@])],
+#    [
+#     if test "x${enableval}" = "xyes" ; then
+#        enable_module="yes"
+#     else
+#        if test "x${enableval}" = "xstatic" ; then
+#           enable_module="static"
+#        else
+#           enable_module="no"
+#        fi
+#     fi
+#    ],
+#    [enable_module=$2])
+enable_module=$2
+
+have_module="no"
+if test "x${enable_module}" = "xyes" || test "x${enable_module}" = "xstatic" ; then
+   have_module="yes"
+fi
+
+AC_MSG_CHECKING([whether to enable $3 built])
+AC_MSG_RESULT([${have_module}])
+
+static_module="no"
+if test "x${enable_module}" = "xstatic" ; then
+   static_module="yes"
+   have_static_module="yes"
+   AC_DEFINE(EINA_STATIC_BUILD_[]UP, 1, [Set to 1 if $2 is statically built])
+fi
+
+if ! test "x${enable_module}" = "xno" ; then
+   AC_DEFINE(EINA_BUILD_[]UP, 1, [Set to 1 if $2 is built])
+fi
+
+AM_CONDITIONAL(EINA_BUILD_[]UP, [test "x${have_module}" = "xyes"])
+AM_CONDITIONAL(EINA_STATIC_BUILD_[]UP, [test "x${static_module}" = "xyes"])
+
+enable_[]DOWN=${enable_module}
+
+m4_popdef([UP])
+m4_popdef([DOWN])
+])
diff --git a/m4/eina_config.m4 b/m4/eina_config.m4
new file mode 100644
index 0000000000..609e4f9c74
--- /dev/null
+++ b/m4/eina_config.m4
@@ -0,0 +1,8 @@
+dnl use: EINA_CONFIG(configsuffix, testcond)
+AC_DEFUN([EINA_CONFIG],
+[
+if $2; then
+   EINA_CONFIGURE_$1="#define EINA_$1"
+fi
+AC_SUBST([EINA_CONFIGURE_$1])
+])
diff --git a/m4/eio_check_options.m4 b/m4/eio_check_options.m4
new file mode 100644
index 0000000000..5fb901273c
--- /dev/null
+++ b/m4/eio_check_options.m4
@@ -0,0 +1,12 @@
+dnl use: EIO_CHECK_NOTIFY_WIN32([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([EIO_CHECK_NOTIFY_WIN32],
+[
+if test "x${have_win32}" = "xyes" ; then
+   AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [ File monitoring with Windows notification ])
+fi
+
+AC_MSG_CHECKING([whether Windows notification is to be used for filemonitoring])
+AC_MSG_RESULT([${have_win32}])
+
+AS_IF([test "x${have_win32}" = "xyes"], [$1], [$2])
+])
diff --git a/m4/elm_check_backend.m4 b/m4/elm_check_backend.m4
new file mode 100644
index 0000000000..a51235718a
--- /dev/null
+++ b/m4/elm_check_backend.m4
@@ -0,0 +1,27 @@
+
+dnl use: ELM_CHECK_BACKEND(engine)
+AC_DEFUN([ELM_CHECK_BACKEND],
+[dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+have_elementary_[]DOWN="no"
+want_backend="$2"
+
+AC_MSG_CHECKING([whether to enable $1 backend])
+AC_MSG_RESULT([${want_backend}])
+
+if test "x${want_backend}" != "xno"; then
+   AC_DEFINE([HAVE_ELEMENTARY_]UP, [1], [$1 support for Elementary])
+   have_elementary_[]DOWN="yes"
+   requirement_elm_pc="ecore-[]DOWN >= efl_version ${requirement_elm_pc}"
+fi
+
+AC_MSG_CHECKING([whether to build $1 backend])
+AC_MSG_RESULT([${have_elementary_[]DOWN}])
+
+EFL_ADD_FEATURE([ELEMENTARY], [$1], [${want_backend}])
+
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/m4/elm_check_option.m4 b/m4/elm_check_option.m4
new file mode 100644
index 0000000000..999636ad32
--- /dev/null
+++ b/m4/elm_check_option.m4
@@ -0,0 +1,60 @@
+
+dnl use: ELM_CHECK_OPTION_DEP(option, pkgver)
+AC_DEFUN([ELM_CHECK_OPTION_DEP],
+[dnl
+
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+ELM_[]UP[]_DEF="#undef"
+have_elementary_[]DOWN="no"
+
+AC_ARG_ENABLE(DOWN,
+   [AS_HELP_STRING([--disable-]DOWN, [disable ]DOWN[ support. @<:@default=detect@:>@])],
+   [want_option=$enableval],
+   [want_option="auto"])
+
+AC_MSG_CHECKING([whether to enable $1 option])
+AC_MSG_RESULT([${want_option}])
+
+if test "x${want_option}" != "xno"; then
+   PKG_CHECK_EXISTS(DOWN[ >= $2],
+      [
+       AC_DEFINE([HAVE_ELEMENTARY_]UP, [1], [$1 support for Elementary])
+       have_elementary_[]DOWN="yes"
+       ELM_[]UP[]_DEF="#define"
+       requirement_elm_pc="[]DOWN >= $2 ${requirement_elm_pc}"
+      ],
+      [have_elementary_]DOWN[="no"]
+   )
+fi
+
+AC_MSG_CHECKING([whether to build $1 option])
+AC_MSG_RESULT([${have_elementary_[]DOWN}])
+
+if test "x${want_elementary_[]DOWN}" = "xyes" && test "x${have_elementary_[]DOWN}" = "xno"; then
+   AC_MSG_ERROR([$1 support requested, but $1 was not found by pkg-config.])
+fi
+
+AC_SUBST([ELM_]UP[_DEF])
+
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl use: ELM_CHECK_OPTION(option, pkgver)
+AC_DEFUN([ELM_CHECK_OPTION],
+[dnl
+
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+if test "x$1" = "xeweb" ; then
+   ELM_CHECK_OPTION_DEP_EWK2
+else
+   ELM_CHECK_OPTION_DEP($1, $2)
+fi
+
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/m4/elm_quicklaunch.m4 b/m4/elm_quicklaunch.m4
new file mode 100644
index 0000000000..b51ff0f516
--- /dev/null
+++ b/m4/elm_quicklaunch.m4
@@ -0,0 +1,24 @@
+dnl Copyright (C) 2013 Cedric Bail <cedric dot bail at samsung dot com>
+dnl That code is public domain and can be freely used or copied
+
+dnl Macro that check if -pie -rdynamic can be given to ld
+
+dnl Usage: ELM_QUICKLAUNCH
+dnl add -pie -rdynamic to LDFLAGS and -fpie to CFLAGS
+
+AC_DEFUN([ELM_QUICKLAUNCH],
+[
+AC_MSG_CHECKING([If the compiler has what it takes to do quicklaunch (-pie -rdynamic)])
+old_LDFLAGS="$LDFLAGS"
+old_CFLAGS="$CFLAGS"
+
+LDFLAGS="$LDFLAGS -pie -rdynamic"
+CFLAGS="$CFLAGS -fpie"
+
+AC_LINK_IFELSE([AC_LANG_SOURCE([int main(){}])],
+        [AC_MSG_RESULT([yes])],
+        [LDFLAGS="$old_LDFLAGS"
+	CFLAGS="$old_CFLAGS"
+        AC_MSG_RESULT([no])
+        ])
+])
diff --git a/m4/emotion_generic_players.m4 b/m4/emotion_generic_players.m4
new file mode 100644
index 0000000000..d852dbaa29
--- /dev/null
+++ b/m4/emotion_generic_players.m4
@@ -0,0 +1,37 @@
+dnl EMOTION_GENERIC_PLAYER(NAME, DEFAULT_STATE, [PKG_CONFIG_DEPS])
+dnl Does the following:
+dnl  * AC_ARG_WITH(NAME)
+dnl  * define with_name to yes or no
+dnl  * PKG_CHECK_MODULES(NAME, PKG_CONFIG_DEPS)
+dnl  * AC_DEFINE([HAVE_NAME])
+dnl  * AM_CONDITIONAL([HAVE_NAME])
+AC_DEFUN([EMOTION_GENERIC_PLAYER],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+AC_ARG_WITH([DOWN],
+   [AC_HELP_STRING([--with-]m4_defn([DOWN]),
+       [build generic player ]m4_defn([UP])[. @<:@default=$2@:>@])],
+   [], [with_]m4_defn([DOWN])[="$2"])
+
+if test "${with_[]m4_defn([DOWN])}" = "yes"; then
+   m4_ifval([$3], [dnl
+      PKG_CHECK_MODULES(m4_defn([UP]), [$3])
+   ], [dnl
+      m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}"
+      m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}"
+      AC_SUBST(m4_defn([UP])[_LIBS])
+      AC_SUBST(m4_defn([UP])[_CFLAGS])
+   ])
+
+   AC_SEARCH_LIBS([shm_open], [rt], [], [AC_MSG_ERROR([unable to find the shm_open() function])])
+   if test "${ac_cv_search_shm_open}" != "none required"; then
+      m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${ac_cv_search_shm_open}"
+   fi
+fi
+AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$with_[]m4_defn([DOWN])" = "yes"])
+
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/m4/emotion_module.m4 b/m4/emotion_module.m4
new file mode 100644
index 0000000000..184533fcdc
--- /dev/null
+++ b/m4/emotion_module.m4
@@ -0,0 +1,133 @@
+dnl use: EMOTION_MODULE_DEP_CHECK_XINE(want_engine)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_XINE],
+[dnl
+   requirements="libxine >= 1.1.1"
+   if test "$1" = "static"; then
+      EFL_DEPEND_PKG([EMOTION], [EMOTION_MODULE_XINE], [${requirements}])
+   else
+      PKG_CHECK_MODULES([EMOTION_MODULE_XINE], [${requirements}])
+   fi
+])
+
+dnl use: EMOTION_MODULE_DEP_CHECK_GSTREAMER(want_static)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GSTREAMER],
+[dnl
+   GST_VER=0.10.2
+   requirements="gstreamer-0.10 >= ${GST_VER} gstreamer-plugins-base-0.10 >= ${GST_VER} gstreamer-video-0.10 >= ${GST_VER} gstreamer-interfaces-0.10 >= ${GST_VER}"
+   have_gst_xoverlay="no"
+   if test "$1" = "static"; then
+      EFL_DEPEND_PKG([EMOTION], [EMOTION_MODULE_GSTREAMER], [${requirements}])
+   else
+      PKG_CHECK_MODULES([EMOTION_MODULE_GSTREAMER], [${requirements}])
+   fi
+
+   if test "${want_x11_any}" = "yes"; then
+      if test "$1" = "static"; then # we need gstreamer cflags and libs to test xoverlay support
+         PKG_CHECK_MODULES([EMOTION_MODULE_GSTREAMER], [${requirements}])
+      fi
+      CFLAGS_save="${CFLAGS}"
+      CFLAGS="${CFLAGS} ${EMOTION_MODULE_GSTREAMER_CFLAGS}"
+      AC_CHECK_HEADER([gst/interfaces/xoverlay.h],
+         [have_gst_xoverlay="old" # will check for "new" later with AC_CHECK_LIB()
+          AC_DEFINE(HAVE_XOVERLAY_H, 1, [Build with Gstreamer Xoverlay support])],
+         [AC_MSG_WARN([Building Gstreamer with X11 but no gst/interfaces/xoverlay.h found])],
+         [#include <gst/gst.h>])
+      CFLAGS="${CFLAGS_save}"
+
+      LDFLAGS_save=${LDFLAGS}
+      LDFLAGS="${LDFLAGS} ${EMOTION_MODULE_GSTREAMER_LIBS}"
+      AC_CHECK_LIB([gstinterfaces-0.10], [gst_x_overlay_set_window_handle],
+         [have_gst_xoverlay="new"
+          AC_DEFINE([HAVE_X_OVERLAY_SET], [1], [Use gst_x_overlay_set_window_handle instead of old deprecated gst_x_overlay_set_xwindow_id])])
+      LDFLAGS="${LDFLAGS_save}"
+   fi
+])
+
+dnl use: EMOTION_MODULE_DEP_CHECK_GSTREAMER_1(want_static)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GSTREAMER1],
+[dnl
+   GST_VER=1.0
+   requirements="gstreamer-1.0 >= ${GST_VER} gstreamer-plugins-base-1.0 >= ${GST_VER} gstreamer-video-1.0 >= ${GST_VER} gstreamer-audio-1.0 >= ${GST_VER} gstreamer-tag-1.0 >= ${GST_VER} gstreamer-pbutils-1.0 >= ${GST_VER}"
+   if test "$1" = "static"; then
+      EFL_DEPEND_PKG([EMOTION], [EMOTION_MODULE_GSTREAMER1], [${requirements}])
+   else
+      PKG_CHECK_MODULES([EMOTION_MODULE_GSTREAMER1], [${requirements}])
+   fi
+])
+
+
+dnl use: EMOTION_MODULE_DEP_CHECK_LIBVLC(want_static)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_LIBVLC],
+[dnl
+   LIBVLC_VER=3.0
+   requirements="libvlc >= ${LIBVLC_VER}"
+   if test "$1" = "static"; then
+      EFL_DEPEND_PKG([EMOTION], [EMOTION_MODULE_LIBVLC], [${requirements}])
+   else
+      PKG_CHECK_MODULES([EMOTION_MODULE_LIBVLC], [${requirements}])
+   fi
+])
+
+dnl use: EMOTION_MODULE_DEP_CHECK_GENERIC(want_static)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GENERIC],
+[dnl
+   if test "$1" = "static"; then
+      EFL_ADD_LIBS([EMOTION], [${requirements_libs_shm}])
+   else
+      EMOTION_MODULE_GENERIC_CFLAGS=""
+      EMOTION_MODULE_GENERIC_LIBS="${requirements_libs_shm}"
+      AC_SUBST([EMOTION_MODULE_GENERIC_CFLAGS])
+      AC_SUBST([EMOTION_MODULE_GENERIC_LIBS])
+   fi
+])
+
+dnl use: EMOTION_MODULE(name, want_engine)
+dnl
+dnl defines EMOTION_BUILD_NAME if it should be built
+dnl defines EMOTION_STATIC_BUILD_NAME if should be built statically
+dnl
+AC_DEFUN([EMOTION_MODULE],
+[
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+want_engine="$2"
+want_static_engine="no"
+have_engine="no"
+have_emotion_module_[]DOWN="no"
+
+EMOTION_MODULE_[]m4_defn([UP])[]_CFLAGS=""
+EMOTION_MODULE_[]m4_defn([UP])[]_LIBS=""
+
+if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic"; then
+
+   m4_default([EMOTION_MODULE_DEP_CHECK_]m4_defn([UP]))([${want_engine}])
+
+   have_engine="yes"
+   if test "x${want_engine}" = "xstatic" ; then
+      have_emotion_module_[]DOWN="static"
+      want_static_engine="yes"
+   else
+      have_emotion_module_[]DOWN="yes"
+   fi
+fi
+
+AC_DEFINE_IF(EMOTION_BUILD_[]UP, [test "${have_engine}" = "yes"],
+  [1], [Build $1 Evas engine])
+AM_CONDITIONAL(EMOTION_BUILD_[]UP, [test "${have_engine}" = "yes"])
+
+AC_DEFINE_IF(EMOTION_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"],
+  [1], [Build $1 Evas engine inside libevas])
+AM_CONDITIONAL(EMOTION_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"])
+
+AC_SUBST([EMOTION_MODULE_]m4_defn([UP])[_CFLAGS])
+AC_SUBST([EMOTION_MODULE_]m4_defn([UP])[_LIBS])
+
+m4_popdef([UP])
+m4_popdef([DOWN])
+])
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
new file mode 100644
index 0000000000..d15c8d5f01
--- /dev/null
+++ b/m4/evas_check_engine.m4
@@ -0,0 +1,629 @@
+AC_DEFUN([REQUIRED_WAYLAND_VERSION], [1.11.0])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XLIB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XLIB],
+[
+
+EFL_FIND_X(evas_engine_[]$1,
+  [X11/X.h], [X11 XCreateImage Xext XShmCreateImage],
+  [
+    if test "x$3" = "xstatic"; then
+      requirements_libs_evas="$evas_engine_[]$1[]_libs $requirements_libs_evas"
+    fi
+    ifelse([$4], , :, [$4])
+  ],[
+    ifelse([$5], , :, [$5])
+  ])
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_GL_XLIB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XLIB],
+[
+
+EFL_FIND_X(evas_engine_[]$1,
+  [X11/Xlib.h X11/Xatom.h X11/Xutil.h X11/extensions/Xrender.h X11/Xresource.h],
+  [X11 XCreateColormap Xrender XRenderCreatePicture],
+  [
+    CFLAGS_save="$CFLAGS"
+    CFLAGS="$evas_engine_[]$1[]_cflags $CFLAGS"
+    CPPFLAGS_save="$CPPFLAGS"
+    CPPFLAGS="$evas_engine_[]$1[]_cflags $CPPFLAGS"
+
+    AC_CHECK_HEADER([GL/gl.h],
+      [have_dep="yes"],
+      [have_dep="no"],
+      [
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <GL/glx.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/Xresource.h>
+      ])
+
+    gl_pt_lib=""
+    have_gl_pt="no"
+
+    AC_MSG_CHECKING([whether pthread_create() is supported])
+    CFLAGS_pt_save="$CFLAGS"
+    CFLAGS="$CFLAGS -pthread"
+    LIBS_pt_save="$LIBS"
+    LIBS="$LIBS -pthread"
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[
+#include <pthread.h>
+                       ]],
+                       [[
+pthread_create(NULL, NULL, NULL, NULL);
+                       ]])],
+      [have_gl_pt="yes"],
+      [have_gl_pt="no"])
+    CFLAGS=$CFLAGS_pt_save
+    LIBS=$LIBS_pt_save
+    AC_MSG_RESULT([$have_gl_pt])
+
+    if test "x$have_gl_pt" = "xyes" ; then
+      gl_pt_lib=" -pthread"
+    fi
+
+    if test "x$have_dep" = "xyes"; then
+      LIBS_save="$LIBS"
+      LIBS="$LIBS $evas_engine_[]$1[]_libs"
+      AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lm $gl_pt_lib])
+      LIBS="$LIBS_save"
+    fi
+
+    if test "x${with_opengl}" = "xes" ; then
+      have_dep=no
+    fi
+
+    if test "x$have_dep" = "xyes" ; then
+      evas_engine_[]$1[]_libs="$evas_engine_[]$1[]_libs -lGL $gl_pt_lib"
+      evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGL $gl_pt_lib"
+    else
+      AC_CHECK_HEADER([GLES2/gl2.h],
+        [have_egl="yes"],
+        [have_egl="no"],
+        [
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <EGL/egl.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/Xresource.h>
+        ])
+      if test "x${have_egl}" = "xyes" ; then
+        AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)
+        if test "x${have_glesv2}" = "xyes" ; then
+          evas_engine_[]$1[]_libs="$evas_engine_[]$1[]_libs -lGLESv2 -lEGL -lm $gl_pt_lib"
+          evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGLESv2 -lm $gl_pt_lib"
+          have_dep="yes"
+          AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
+          gles_variety_sgx="yes"
+        fi
+      fi
+    fi
+
+    CPPFLAGS="$CPPFLAGS_save"
+    CFLAGS="$CFLAGS_save"
+
+    if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+      requirements_libs_evas="$evas_engine_[]$1[]_libs $requirements_libs_evas"
+    fi
+
+    AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+  ],[
+    ifelse([$5], , :, [$5])
+  ])
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI],
+[
+
+have_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+AC_CHECK_HEADER([windows.h],
+   [
+    have_dep="yes"
+    evas_engine_[]$1[]_libs="-lgdi32"
+   ])
+
+if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW],
+[
+
+have_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+AC_CHECK_HEADER([ddraw.h],
+   [
+    have_dep="yes"
+    evas_engine_[]$1[]_libs="-lddraw"
+   ])
+
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_GL_COCOA(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_COCOA],
+[
+
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+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_dep="yes"
+    evas_engine_[]$1[]_libs="-framework Cocoa -framework OpenGL"
+    evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs"
+   ],
+   [have_dep="no"])
+LIBS="$LIBS_save"
+
+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}"
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_GL_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_SDL],
+[
+
+requirement=""
+have_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+PKG_CHECK_EXISTS([sdl2 >= 2.0.0],
+   [
+    have_dep="yes"
+    requirement="sdl2 >= 2.0.0"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$3" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   else
+      PKG_CHECK_MODULES([SDL], [${requirement}])
+      evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
+      evas_engine_[]$1[]_libs="${SDL_LIBS}"
+   fi
+fi
+
+gl_pt_lib="";
+have_gl_pt="no"
+
+AC_MSG_CHECKING([whether pthread_create() is supported])
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${CFLAGS} -pthread"
+LIBS_save="${LIBS}"
+LIBS="${LIBS} -pthread"
+AC_LINK_IFELSE(
+  [AC_LANG_PROGRAM([[
+#include <pthread.h>
+                   ]],
+                   [[
+pthread_create(NULL, NULL, NULL, NULL);
+                   ]])],
+   [have_gl_pt="yes"],
+   [have_gl_pt="no"])
+CFLAGS=${CFLAGS_save}
+LIBS=${LIBS_save}
+AC_MSG_RESULT([${have_gl_pt}])
+
+if test "x$have_gl_pt" = "xyes" ; then
+   gl_pt_lib=" -pthread"
+fi
+
+AC_CHECK_HEADER([GL/gl.h],
+   [have_dep="yes"],
+   [have_dep="no"],
+   [
+#include <GL/gl.h>
+#include <GL/glext.h>
+   ])
+
+if test "x${with_opengl}" = "xes" ; then
+  have_dep=no
+fi
+
+if test "x${have_dep}" = "xyes" ; then
+   evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib"
+   evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib"
+else
+   AC_CHECK_HEADER([SDL2/SDL_opengles.h],
+      [have_egl="yes"],
+      [have_egl="no"],
+      [
+#include <SDL2/SDL_opengles.h>
+#include <EGL/egl.h>
+      ])
+   if test "x${have_egl}" = "xyes" ; then
+      AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)
+      if test "x${have_glesv2}" = "xyes" ; then
+         evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
+         evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
+         have_dep="yes"
+         AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
+         gles_variety_sgx="yes"
+      fi
+   fi
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+if test "x$3" = "xstatic" ; then
+   requirement_evas="${requirement} ${requirement_evas}"
+fi
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+
+dnl use: EVAS_CHECK_ENGINE_DEP_WAYLAND_SHM(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_WAYLAND_SHM],
+[
+
+requirement=""
+have_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+PKG_CHECK_EXISTS([wayland-client >= REQUIRED_WAYLAND_VERSION],
+   [
+    have_dep="yes"
+    requirement="wayland-client"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$3" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   else
+      PKG_CHECK_MODULES([WAYLAND_SHM], [${requirement}])
+      evas_engine_[]$1[]_cflags="${WAYLAND_SHM_CFLAGS}"
+      evas_engine_[]$1[]_libs="${WAYLAND_SHM_LIBS}"
+   fi
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_WAYLAND_EGL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_WAYLAND_EGL],
+[
+
+requirement=""
+have_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+if test "x${with_opengl}" = "xes" ; then
+    gl_library="glesv2"
+else
+    gl_library="gl"
+fi
+
+PKG_CHECK_EXISTS([egl ${gl_library} wayland-client >= REQUIRED_WAYLAND_VERSION wayland-egl],
+   [
+    have_dep="yes"
+    requirement="egl ${gl_library} wayland-client wayland-egl"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "${gl_library}" != "gl" ; then
+      have_egl="yes"
+   fi
+   if test "x$3" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   else
+      PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement}])
+      evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
+      evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
+      evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGLESv2 -lm -lEGL"
+   fi
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+
+dnl use: EVAS_CHECK_ENGINE_DEP_DRM(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DRM],
+[
+
+requirement=""
+have_dep="no"
+have_hw_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+PKG_CHECK_EXISTS([libdrm],
+  [
+    have_dep="yes"
+    requirement="libdrm"
+  ], [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$3" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   else
+      PKG_CHECK_MODULES([DRM], [${requirement}])
+      evas_engine_[]$1[]_cflags="${DRM_CFLAGS}"
+      evas_engine_[]$1[]_libs="${DRM_LIBS}"
+   fi
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_GL_DRM(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_DRM],
+[
+
+requirement=""
+have_dep="no"
+have_hw_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+if test "x${with_opengl}" = "xes" ; then
+   gl_library="glesv2"
+else
+   AC_MSG_ERROR([We currently do not support GL DRM without OpenGL ES. Please consider OpenGL ES if you want to use it.])
+fi
+
+PKG_CHECK_EXISTS([egl ${gl_library} libdrm gbm wayland-client >= REQUIRED_WAYLAND_VERSION],
+   [
+    have_dep="yes"
+    requirement="egl ${gl_library} libdrm gbm wayland-client >= REQUIRED_WAYLAND_VERSION"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$3" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   else
+      PKG_CHECK_MODULES([GL_DRM], [${requirement}])
+      evas_engine_[]$1[]_cflags="${GL_DRM_CFLAGS}"
+      evas_engine_[]$1[]_libs="${GL_DRM_LIBS}"
+      evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGLESv2 -lm -lEGL"
+   fi
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+dnl use: EVAS_CHECK_ENGINE_DEP_EGLFS(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_ENGINE_DEP_EGLFS],
+[
+
+requirement=""
+have_dep="no"
+have_hw_dep="no"
+evas_engine_[]$1[]_cflags=""
+evas_engine_[]$1[]_libs=""
+
+if test "x${with_opengl}" = "xes" ; then
+   gl_library="glesv2"
+else
+   AC_MSG_ERROR([We do not support Eglfs without OpenGL ES. Please consider OpenGL ES if you want to use it.])
+fi
+
+PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library}],
+   [
+    have_dep="yes"
+    requirement="egl >= 7.10 ${gl_library}"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$3" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   else
+      PKG_CHECK_MODULES([EGLFS], [${requirement}])
+      evas_engine_[]$1[]_cflags="${EGLFS_CFLAGS}"
+      evas_engine_[]$1[]_libs="${EGLFS_LIBS}"
+      evas_engine_gl_common_libs="$evas_engine_[]$1[]_libdirs -lGLESv2 -lm -lEGL"
+   fi
+fi
+
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$4], [$5])
+
+])
+
+
+dnl use: EVAS_ENGINE(name, want_engine, [DEPENDENCY-CHECK-CODE])
+dnl
+dnl defines BUILD_ENGINE_NAME if it should be built
+dnl defines BUILD_STATIC_BUILD_NAME if should be built statically
+dnl
+dnl will call DEPENDENCY-CHECK-CODE if it should be built,
+dnl if some dependency fail just call AC_MSG_ERROR() to abort.
+
+AC_DEFUN([EVAS_ENGINE],
+[dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+want_engine="$2"
+want_static_engine="no"
+have_engine="no"
+have_evas_engine_[]DOWN="no"
+
+evas_engine_[]m4_defn([DOWN])[]_cflags=""
+evas_engine_[]m4_defn([DOWN])[]_libs=""
+
+if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic"; then
+   $3
+
+   have_engine="yes"
+   if test "x${want_engine}" = "xstatic" ; then
+      have_evas_engine_[]DOWN="static"
+      want_static_engine="yes"
+   else
+      have_evas_engine_[]DOWN="yes"
+   fi
+fi
+
+AC_DEFINE_IF(BUILD_ENGINE_[]UP, [test "${have_engine}" = "yes"],
+  [1], [Build $1 Evas engine])
+AM_CONDITIONAL(BUILD_ENGINE_[]UP, [test "${have_engine}" = "yes"])
+
+AC_DEFINE_IF(EVAS_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"],
+  [1], [Build $1 Evas engine inside libevas])
+AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"])
+
+AC_SUBST([evas_engine_]m4_defn([DOWN])[_cflags])
+AC_SUBST([evas_engine_]m4_defn([DOWN])[_libs])
+
+EFL_ADD_FEATURE([EVAS_ENGINE], [$1], [${have_evas_engine_]DOWN[}])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+
+
+dnl use: EVAS_CHECK_ENGINE(engine, want_engine, simple, description)
+AC_DEFUN([EVAS_CHECK_ENGINE],
+[dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+want_engine="$2"
+want_static_engine="no"
+have_engine="no"
+have_evas_engine_[]DOWN="no"
+
+AC_MSG_CHECKING([whether to enable $4 rendering backend])
+AC_MSG_RESULT([${want_engine}])
+
+if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic"; then
+   m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, ${want_engine}, [have_engine="yes"], [have_engine="no"])
+fi
+
+if test "x${have_engine}" = "xno" -a "x${want_engine}" = "xyes"; then
+   AC_MSG_ERROR([$4 dependencies not found])
+fi
+
+AC_MSG_CHECKING([whether $4 rendering backend will be built])
+AC_MSG_RESULT([${have_engine}])
+
+if test "x${have_engine}" = "xyes" ; then
+   if test "x${want_engine}" = "xstatic" ; then
+      have_evas_engine_[]DOWN="static"
+      want_static_engine="yes"
+   else
+      have_evas_engine_[]DOWN="yes"
+   fi
+fi
+
+if test "x${have_engine}" = "xyes" ; then
+   AC_DEFINE(BUILD_ENGINE_[]UP, [1], [$4 rendering backend])
+fi
+
+AM_CONDITIONAL(BUILD_ENGINE_[]UP, [test "x${have_engine}" = "xyes"])
+
+if test "x${want_static_engine}" = "xyes" ; then
+   AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 engine inside libevas])
+   have_static_module="yes"
+fi
+
+EFL_ADD_FEATURE([EVAS_ENGINE], [$1], [${have_evas_engine_]DOWN[}])
+AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_engine}" = "xyes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
new file mode 100644
index 0000000000..ff48c3c388
--- /dev/null
+++ b/m4/evas_check_loader.m4
@@ -0,0 +1,678 @@
+
+dnl use: ARG_ENABLE_EVAS_VG_LOADER(loader, default_value)
+
+AC_DEFUN([ARG_ENABLE_EVAS_VG_LOADER],
+[dnl
+m4_pushdef([DOWN], m4_tolower([$1]))dnl
+
+AC_ARG_ENABLE([vg-loader-[]DOWN],
+   [AC_HELP_STRING([--enable-vg-loader-[]DOWN], [enable $1 vg loader. @<:@default=$2@:>@])],
+   [
+      if test "x${enableval}" = "xyes" ; then
+         want_evas_vg_loader_[]DOWN="yes"
+      else
+         if test "x${enableval}" = "xstatic" ; then
+            want_evas_vg_loader_[]DOWN="static"
+         else
+            if test "x${enableval}" = "xauto" ; then
+               want_evas_vg_loader_[]DOWN="auto"
+            else
+               want_evas_vg_loader_[]DOWN="no"
+            fi
+         fi
+      fi
+   ],
+   [want_evas_vg_loader_[]DOWN="$2"])
+m4_popdef([DOWN])dnl
+])
+
+dnl use: EVAS_CHECK_VG_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_VG_LOADER_DEP_SVG],
+[
+
+have_dep="yes"
+evas_vg_loader_[]$1[]_cflags=""
+evas_vg_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_vg_loader_$1_cflags])
+AC_SUBST([evas_vg_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_VG_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_VG_LOADER_DEP_EET],
+[
+
+have_dep="yes"
+evas_vg_loader_[]$1[]_cflags=""
+evas_vg_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_vg_loader_$1_cflags])
+AC_SUBST([evas_vg_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: ARG_ENABLE_EVAS_IMAGE_LOADER(loader, default_value)
+
+AC_DEFUN([ARG_ENABLE_EVAS_IMAGE_LOADER],
+[dnl
+m4_pushdef([DOWN], m4_tolower([$1]))dnl
+
+AC_ARG_ENABLE([image-loader-[]DOWN],
+   [AC_HELP_STRING([--enable-image-loader-[]DOWN], [enable $1 image loader. @<:@default=$2@:>@])],
+   [
+      if test "x${enableval}" = "xyes" ; then
+         want_evas_image_loader_[]DOWN="yes"
+      else
+         if test "x${enableval}" = "xstatic" ; then
+            want_evas_image_loader_[]DOWN="static"
+         else
+            if test "x${enableval}" = "xauto" ; then
+               want_evas_image_loader_[]DOWN="auto"
+            else
+               want_evas_image_loader_[]DOWN="no"
+            fi
+         fi
+      fi
+   ],
+   [want_evas_image_loader_[]DOWN="$2"])
+m4_popdef([DOWN])dnl
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_BMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_BMP],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_DDS(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_DDS],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_EET],
+[
+
+requirement=""
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+dnl Eet is required
+have_dep="yes"
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_GENERIC(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_GENERIC],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_GIF],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([gif_lib.h], [have_dep="yes"])
+
+if test "x${have_dep}"  = "xyes" ; then
+   AC_CHECK_LIB([gif],
+      [DGifOpenFileName],
+      [
+       evas_image_loader_[]$1[]_libs="-lgif"
+      ],
+      [have_dep="no"]
+   )
+
+   if test "x${have_dep}"  = "xno" ; then
+      AC_CHECK_LIB([ungif],
+         [DGifOpenFileName],
+         [
+          have_dep="yes"
+          evas_image_loader_[]$1[]_libs="-lungif"
+         ]
+      )
+   fi
+fi
+
+if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_ICO(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_ICO],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_JPEG],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([jpeglib.h], [have_dep="yes"])
+
+if test "x${have_dep}"  = "xyes" ; then
+   AC_CHECK_LIB([jpeg],
+      [jpeg_CreateDecompress],
+      [
+       evas_image_loader_[]$1[]_libs="-ljpeg"
+       AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM(
+              [[
+#include <stdio.h>
+#include <jpeglib.h>
+#include <setjmp.h>
+              ]],
+              [[
+struct jpeg_decompress_struct decomp;
+decomp.region_x = 0;
+              ]])],
+          [have_jpeg_region="yes"],
+          [have_jpeg_region="no"])
+      ],
+      [have_dep="no"]
+   )
+   if test "x${have_jpeg_region}" = "xyes" ; then
+     AC_DEFINE(BUILD_LOADER_JPEG_REGION, [1], [JPEG Region Decode Support])
+   fi
+fi
+
+if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_JP2K(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_JP2K],
+[
+
+requirement=""
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+PKG_CHECK_EXISTS([libopenjp2 >= 2.0],
+   [
+    have_dep="yes"
+    requirement="libopenjp2 >= 2.0"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$2" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   fi
+   PKG_CHECK_MODULES([JP2K], [${requirement}])
+   evas_image_loader_[]$1[]_cflags="${JP2K_CFLAGS}"
+   evas_image_loader_[]$1[]_libs="${JP2K_LIBS}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader, want_static[[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_PMAPS],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
+[
+
+requirement=""
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+dnl libpng.pc is the latest version of libpng that ahs been installed.
+dnl We check it first.
+PKG_CHECK_EXISTS([libpng >= 1.2.10],
+   [
+    have_dep="yes"
+    requirement="libpng >= 1.2.10"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xno" ; then
+   PKG_CHECK_EXISTS([libpng15],
+      [
+       have_dep="yes"
+       requirement="libpng15"
+      ],
+      [have_dep="no"])
+fi
+
+if test "x${have_dep}" = "xno" ; then
+   PKG_CHECK_EXISTS([libpng14],
+      [
+       have_dep="yes"
+       requirement="libpng14"
+      ],
+      [have_dep="no"])
+fi
+
+if test "x${have_dep}" = "xno" ; then
+   PKG_CHECK_EXISTS([libpng12 >= 1.2.10],
+      [
+       have_dep="yes"
+       requirement="libpng12 >= 1.2.10"
+      ],
+      [have_dep="no"])
+fi
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$2" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   fi
+   PKG_CHECK_MODULES([PNG], [${requirement}])
+   evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
+   evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_PSD(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_PSD],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_TGV(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGV],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
+[
+
+requirement=""
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+version_esvg="0.0.18"
+version_ender="0.0.6"
+
+PKG_CHECK_EXISTS([esvg >= ${version_esvg} ender >= ${version_ender}],
+   [
+    have_dep="yes"
+    requirement="esvg >= ${version_esvg} ender >= ${version_ender}"
+   ],
+   [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+   if test "x$2" = "xstatic" ; then
+      requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+      requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+   fi
+   PKG_CHECK_MODULES([SVG], [${requirement}])
+   evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
+   evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_TGA(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGA],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_TIFF],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([tiffio.h], [have_dep="yes"])
+
+if test "x${have_dep}"  = "xyes" ; then
+   AC_CHECK_LIB([tiff],
+      [TIFFReadScanline],
+      [
+       evas_image_loader_[]$1[]_libs="-ltiff"
+      ],
+      [have_dep="no"]
+   )
+
+   if test "x${have_dep}"  = "xno" ; then
+      AC_CHECK_LIB([tiff],
+         [TIFFReadScanline],
+         [
+          have_dep="yes"
+          evas_image_loader_[]$1[]_libs="-ltiff -ljpeg -lz -lm"
+         ]
+      )
+   fi
+
+   if test "x${have_dep}"  = "xno" ; then
+      AC_CHECK_LIB([tiff34],
+         [TIFFReadScanline],
+         [
+          have_dep="yes"
+          evas_image_loader_[]$1[]_libs="-ltiff34 -ljpeg -lz -lm"
+         ]
+      )
+   fi
+fi
+
+if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_WBMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_WBMP],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_WEBP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_WEBP],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([webp/decode.h], [have_dep="yes"])
+
+if test "x${have_dep}"  = "xyes" ; then
+   AC_CHECK_LIB([webp],
+      [WebPDecodeRGBA],
+      [
+       evas_image_loader_[]$1[]_libs="-lwebp"
+      ],
+      [have_dep="no"]
+   )
+fi
+
+if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_XPM],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
+
+])
+
+dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro)
+AC_DEFUN([EVAS_CHECK_IMAGE_LOADER],
+[dnl
+m4_pushdef([UP], m4_toupper([$1]))dnl
+m4_pushdef([DOWN], m4_tolower([$1]))dnl
+
+want_loader="$2"
+want_static_loader="no"
+have_loader="no"
+have_evas_image_loader_[]DOWN="no"
+
+AC_MSG_CHECKING([whether to enable $1 image loader])
+AC_MSG_RESULT([${want_loader}])
+
+if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
+   m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"])
+fi
+
+if test "x${have_loader}" = "xno"; then
+   if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic"; then
+      AC_MSG_ERROR([$1 dependencies not found])
+   fi
+fi
+
+AC_MSG_CHECKING([whether $1 image loader will be built])
+AC_MSG_RESULT([${have_loader}])
+
+if test "x${have_loader}" = "xyes" ; then
+   if test "x${want_loader}" = "xstatic" ; then
+      have_evas_image_loader_[]DOWN="static"
+      want_static_loader="yes"
+   else
+      have_evas_image_loader_[]DOWN="yes"
+   fi
+fi
+
+if test "x${have_loader}" = "xyes" ; then
+   AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support])
+fi
+
+AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_loader}" = "xyes"])
+
+if test "x${want_static_loader}" = "xyes" ; then
+   AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 image loader inside libevas])
+   have_static_module="yes"
+fi
+
+EFL_ADD_FEATURE([EVAS_LOADER], DOWN, [${have_evas_image_loader_]DOWN[}])dnl
+AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
+
+dnl use: EVAS_CHECK_VG_LOADER(loader, want_loader, macro)
+AC_DEFUN([EVAS_CHECK_VG_LOADER],
+[dnl
+m4_pushdef([UP], m4_toupper([$1]))dnl
+m4_pushdef([DOWN], m4_tolower([$1]))dnl
+
+want_loader="$2"
+want_static_loader="no"
+have_loader="no"
+have_evas_vg_loader_[]DOWN="no"
+
+AC_MSG_CHECKING([whether to enable $1 vg loader])
+AC_MSG_RESULT([${want_loader}])
+
+if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
+   m4_default([EVAS_CHECK_VG_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"])
+fi
+
+if test "x${have_loader}" = "xno"; then
+   if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic"; then
+      AC_MSG_ERROR([$1 dependencies not found])
+   fi
+fi
+
+AC_MSG_CHECKING([whether $1 vg loader will be built])
+AC_MSG_RESULT([${have_loader}])
+
+if test "x${have_loader}" = "xyes" ; then
+   if test "x${want_loader}" = "xstatic" ; then
+      have_evas_vg_loader_[]DOWN="static"
+      want_static_loader="yes"
+   else
+      have_evas_vg_loader_[]DOWN="yes"
+   fi
+fi
+
+if test "x${have_loader}" = "xyes" ; then
+   AC_DEFINE(BUILD_VG_LOADER_[]UP, [1], [UP Image Loader Support])
+fi
+
+AM_CONDITIONAL(BUILD_VG_LOADER_[]UP, [test "x${have_loader}" = "xyes"])
+
+if test "x${want_static_loader}" = "xyes" ; then
+   AC_DEFINE(EVAS_STATIC_BUILD_VG_[]UP, [1], [Build $1 vg loader inside libevas])
+   have_static_module="yes"
+fi
+
+EFL_ADD_FEATURE([EVAS_VG_LOADER], DOWN, [${have_evas_vg_loader_]DOWN[}])dnl
+AM_CONDITIONAL(EVAS_STATIC_BUILD_VG_[]UP, [test "x${want_static_loader}" = "xyes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4
new file mode 100644
index 0000000000..b3fb94e06b
--- /dev/null
+++ b/m4/evil_windows.m4
@@ -0,0 +1,53 @@
+dnl Copyright (C) 2011 Vincent Torri <vincent dot torri at gmail dot com>
+dnl This code is public domain and can be freely used or copied.
+
+dnl Macro that select the Windows version (XP (default), Vista, 7)
+
+dnl Usage: EFL_SELECT_WINDOWS_VERSION()
+dnl Update CPPFLAGS accordingly
+
+AC_DEFUN([EFL_SELECT_WINDOWS_VERSION],
+[
+
+dnl configure option
+
+AC_ARG_WITH([windows-version],
+   [AC_HELP_STRING([--with-windows-version], [select the target Windows version (vista, win7, win8, win81 or win10) @<:@default=win7@:>@])],
+   [_winver=${with_windows_version}],
+   [_winver="win7"])
+
+AC_MSG_CHECKING([which Windows version to target])
+AC_MSG_RESULT([${_winver}])
+
+case "${_winver}" in
+  vista)
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
+     _efl_windows_version="Windows Vista"
+     ;;
+  win7)
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601"
+     _efl_windows_version="Windows 7"
+     ;;
+  win8)
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0602 -DWINVER=0x0602"
+     _efl_windows_version="Windows 8"
+     ;;
+  win81)
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0603 -DWINVER=0x0603"
+     _efl_windows_version="Windows 8.1"
+     ;;
+  win10)
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00"
+     _efl_windows_version="Windows 10"
+     ;;
+  *)
+     AC_MSG_ERROR([Wrong Windows version passed to configure. Run ./configure --help])
+     ;;
+esac
+
+EFL_CFLAGS="${EFL_CFLAGS} ${EFL_WINDOWS_VERSION_CFLAGS}"
+AC_SUBST([EFL_WINDOWS_VERSION_CFLAGS])
+AC_SUBST([_efl_windows_version])
+AC_MSG_NOTICE([Targetting ${_efl_windows_version}])
+
+])
diff --git a/m4/gcc_check_builtin.m4 b/m4/gcc_check_builtin.m4
new file mode 100644
index 0000000000..d5122502a6
--- /dev/null
+++ b/m4/gcc_check_builtin.m4
@@ -0,0 +1,13 @@
+AC_DEFUN([EFL_CHECK_GCC_BUILTIN],
+[efl_check_gcc_builtin_save_libs=$LIBS
+EINA_CONFIGURE_$2=""
+LIBS="-lm $LIBS"
+AC_LINK_IFELSE(
+[AC_LANG_PROGRAM(
+[[]], [[return __builtin_$1(42);]]
+)],
+[EINA_CONFIGURE_$2="#define EINA_$2"
+AC_DEFINE([$2], [1], [GCC builtin $1 exists])])
+AC_SUBST(EINA_CONFIGURE_$2)
+LIBS=$efl_check_gcc_builtin_save_libs])
+
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
new file mode 100644
index 0000000000..831dc0c6f4
--- /dev/null
+++ b/m4/libgcrypt.m4
@@ -0,0 +1,123 @@
+dnl Autoconf macros for libgcrypt
+dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+dnl
+dnl This file is free software; as a special exception the author gives
+dnl unlimited permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+dnl This file is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl with the API version to also check the API compatibility. Example:
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
+dnl this features allows to prevent build against newer versions of libgcrypt
+dnl with a changed API.
+dnl
+AC_DEFUN([AM_PATH_LIBGCRYPT],
+[ AC_ARG_WITH(libgcrypt-prefix,
+            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+                           [prefix where LIBGCRYPT is installed (optional)]),
+     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+  if test x$libgcrypt_config_prefix != x ; then
+     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
+        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+     fi
+  fi
+
+  AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  tmp=ifelse([$1], ,1:1.2.0,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+  else
+     req_libgcrypt_api=0
+     min_libgcrypt_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
+  ok=no
+  if test "$LIBGCRYPT_CONFIG" != "no" ; then
+    req_major=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+    req_minor=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+    req_micro=`echo $min_libgcrypt_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    major=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+    minor=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+    micro=`echo $libgcrypt_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+    if test "$major" -gt "$req_major"; then
+        ok=yes
+    else
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -gt "$req_minor"; then
+               ok=yes
+            else
+               if test "$minor" -eq "$req_minor"; then
+                   if test "$micro" -ge "$req_micro"; then
+                     ok=yes
+                   fi
+               fi
+            fi
+        fi
+    fi
+  fi
+  if test $ok = yes; then
+    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
+  else
+    AC_MSG_RESULT(no)
+  fi
+  if test $ok = yes; then
+     # If we have a recent libgcrypt, we should also check that the
+     # API is compatible
+     if test "$req_libgcrypt_api" -gt 0 ; then
+        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           AC_MSG_CHECKING([LIBGCRYPT API version])
+           if test "$req_libgcrypt_api" -eq "$tmp" ; then
+             AC_MSG_RESULT([okay])
+           else
+             ok=no
+             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+    ifelse([$2], , :, [$2])
+    if test x"$host" != x ; then
+      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+      if test x"$libgcrypt_config_host" != xnone ; then
+        if test x"$libgcrypt_config_host" != x"$host" ; then
+  AC_MSG_WARN([[
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script.
+***]])
+        fi
+      fi
+    fi
+  else
+    LIBGCRYPT_CFLAGS=""
+    LIBGCRYPT_LIBS=""
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBGCRYPT_CFLAGS)
+  AC_SUBST(LIBGCRYPT_LIBS)
+])
diff --git a/m4/pkg_var.m4 b/m4/pkg_var.m4
new file mode 100644
index 0000000000..3d0a309bcb
--- /dev/null
+++ b/m4/pkg_var.m4
@@ -0,0 +1,14 @@
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([EFL_PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000000..9675fc193b
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,223 @@
+AUTOMAKE_OPTIONS= -Wno-portability
+MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES =
+BUILT_SOURCES =
+PHONIES =
+
+EOLIAN_FLAGS = -I$(srcdir)
+EOLIAN_GEN_FLAGS = -S
+
+LOG_COMPILER = dbus-run-session
+AM_LOG_FLAGS = --
+
+DIST_SUBDIRS =
+SUBDIRS =
+
+AM_TESTS_ENVIRONMENT =
+
+lib_LTLIBRARIES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+noinst_PROGRAMS =
+check_PROGRAMS =
+TESTS =
+EXTRA_DIST2 =
+
+noinst_LTLIBRARIES =
+noinst_DATA =
+noinst_HEADERS =
+
+GENERATED_JS_BINDINGS =
+GENERATED_LUA_BINDINGS =
+
+EFL_INSTALL_EXEC_HOOK=
+
+include Makefile_Evil.am
+include Makefile_Escape.am
+
+include Makefile_Eina.am
+include Makefile_Eo.am
+include Makefile_Efl.am
+include Makefile_Emile.am
+include Makefile_Eet.am
+include Makefile_Eolian.am
+include Makefile_Ector.am
+include Makefile_Ecore.am
+include Makefile_Evas.am
+include Makefile_Eldbus.am
+include Makefile_Ecore_Con.am
+include Makefile_Ecore_Ipc.am
+include Makefile_Ecore_File.am
+include Makefile_Eeze.am
+include Makefile_Ecore_Input.am
+include Makefile_Ecore_Input_Evas.am
+include Makefile_Ecore_Cocoa.am
+include Makefile_Ecore_FB.am
+include Makefile_Ecore_SDL.am
+include Makefile_Ecore_Wayland.am
+include Makefile_Ecore_Wl2.am
+include Makefile_Ecore_Win32.am
+include Makefile_Ecore_X.am
+include Makefile_Ecore_IMF.am
+include Makefile_Ecore_IMF_Evas.am
+include Makefile_Elput.am
+include Makefile_Ecore_Drm.am
+include Makefile_Ecore_Drm2.am
+include Makefile_Ecore_Evas.am
+include Makefile_Ecore_Audio.am
+include Makefile_Ecore_Avahi.am
+include Makefile_Embryo.am
+include Makefile_Efreet.am
+include Makefile_Eio.am
+include Makefile_Ecore_Buffer.am
+include Makefile_EPhysics.am
+include Makefile_Edje.am
+include Makefile_Emotion.am
+include Makefile_Ethumb.am
+include Makefile_Ethumb_Client.am
+include Makefile_Elocation.am
+include Makefile_Elementary.am
+include Makefile_efl_wl.am
+
+include Makefile_Cxx.am
+include Makefile_Eolian_Cxx.am
+include Makefile_Efl_Mono.am
+
+include Makefile_Elua.am
+
+include Makefile_Wayland_Protocols.am
+
+if HAVE_JS
+AM_V_CP = $(am__v_CP_@AM_V@)
+am__v_CP_ = $(am__v_CP_@AM_DEFAULT_V@)
+am__v_CP_0 = @echo "  CP  " $@;
+CP = cp
+if EFL_ENABLE_TESTS
+if HAVE_NODEJS
+AM_TESTS_ENVIRONMENT += NODE_PATH='$(abs_builddir)/bin/efl_js:$(abs_builddir)/tests/eolian_js:$(abs_builddir)/tests/efl_js'; export NODE_PATH;
+endif
+endif
+endif
+
+include Makefile_Eolian_Js.am
+include Makefile_Efl_Js.am
+
+.PHONY: benchmark examples $(PHONIES)
+
+BENCHMARK_SUBDIRS = \
+benchmarks/eina \
+benchmarks/eo \
+benchmarks/evas
+DIST_SUBDIRS += $(BENCHMARK_SUBDIRS)
+
+benchmark: all
+	@for d in $(BENCHMARK_SUBDIRS); do \
+	   echo "Making benchmark in $$d"; \
+	   $(MAKE) $(AM_MAKEFLAGS) -C $$d benchmark; \
+	done
+
+EXAMPLES_SUBDIRS = \
+examples
+
+if ALWAYS_BUILD_EXAMPLES
+SUBDIRS += . $(EXAMPLES_SUBDIRS)
+endif
+
+DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
+
+if EFL_ENABLE_TESTS
+noinst_PROGRAMS += tests/timeout
+
+$(check_PROGRAMS): tests/timeout
+
+check-build: all
+	@$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+endif
+
+examples: all
+	@for d in $(EXAMPLES_SUBDIRS); do \
+	   echo "Making examples in $$d"; \
+	   $(MAKE) $(AM_MAKEFLAGS) -C $$d examples || exit 1; \
+	done
+
+install-examples:
+	@for d in $(EXAMPLES_SUBDIRS); do \
+	   echo "Making install-examples in $$d"; \
+	   $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
+	done
+
+dist-hook:
+	@mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data
+	@mkdir -p $(distdir)/tests/evas/images $(distdir)/tests/evas/meshes
+	@mkdir -p $(distdir)/tests/evas/fonts $(distdir)/tests/eolian/data_aux
+	@mkdir -p $(distdir)/tests/efreet/data $(distdir)/tests/edje/data
+	@mkdir -p $(distdir)/tests/emotion/data $(distdir)/tests/evas/meshes/md2
+	@mkdir -p $(distdir)/tests/evas/meshes/obj $(distdir)/tests/efreet/data/sub
+	@mkdir -p $(distdir)/tests/efl_mono
+	@mkdir -p $(distdir)/scripts/eina $(distdir)/scripts/elua/modules
+	@mkdir -p $(distdir)/scripts/elua/core $(distdir)/scripts/elua/apps/docgen
+	@mkdir -p $(distdir)/lib/evas/common/evas_op_add $(distdir)/lib/evas/common/evas_op_copy
+	@mkdir -p $(distdir)/lib/evas/common/evas_op_mask $(distdir)/lib/evas/common/evas_op_mul
+	@mkdir -p $(distdir)/lib/evas/common/evas_op_sub $(distdir)/lib/evas/filters/blur
+	@mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina
+	@mkdir -p $(distdir)/wayland_protocol $(distdir)/lib/efl_wl/
+	@mkdir -p $(distdir)/modules/evas/engines/software_generic/filters/blur
+	@mkdir -p $(distdir)/bindings/mono/efl_mono
+	@mkdir -p $(distdir)/bindings/mono/eina_mono
+	@mkdir -p $(distdir)/bindings/mono/eldbus_mono
+	@mkdir -p $(distdir)/bindings/mono/eo_mono
+	for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done
+
+clean-local:
+	find . -type f -name '*.gcno' -delete
+	find . -type f -name '*.gcda' -delete
+	find . -type f -name check-results*.xml -delete
+	rm -f $(GENERATED_JS_BINDINGS)
+	rm -f $(GENERATED_LUA_BINDINGS)
+	rm -f $(BUILT_SOURCES)
+
+install-exec-hook:
+	$(MKDIR_P) $(DESTDIR)$(libdir)
+	for i in $(lib_LTLIBRARIES); do \
+	   FNAME="$(DESTDIR)$(libdir)/`echo $$i | sed "s#lib/.*/##"`"; \
+	   FNAMEEXT="$$FNAME.$$$$"; \
+	   sed "s/-luuid//" $$FNAME > $$FNAMEEXT; \
+	   mv $$FNAMEEXT $$FNAME; \
+	done
+	$(EFL_INSTALL_EXEC_HOOK)
+
+#At the bottom because .SECONDEXPANSION is applied to all following rules.
+if HAVE_WAYLAND_SCANNER
+#Stolen from weston's Makefile.am and modified for Enlightenment
+.SECONDEXPANSION:
+
+define protostability
+$(if $(findstring unstable,$1),unstable,stable)
+endef
+
+define protoname
+$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
+endef
+
+#rules for generating protocol from wayland_protocols
+%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@
+
+%-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@
+
+%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
+
+#rules for generating local protocols which must be in src/wayland_protocol
+%-protocol.c : $(top_srcdir)/src/wayland_protocol/$(notdir $$*).xml
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@
+
+%-server-protocol.h : $(top_srcdir)/src/wayland_protocol/$(notdir $$*).xml
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@
+
+%-client-protocol.h : $(top_srcdir)/src/wayland_protocol/$(notdir $$*).xml
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
+
+#End of weston stuff
+endif
diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
new file mode 100644
index 0000000000..da656af993
--- /dev/null
+++ b/src/Makefile_Cxx.am
@@ -0,0 +1,412 @@
+
+### Eo C++
+installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@
+dist_installed_eetcxxheaders_DATA = \
+bindings/cxx/eet_cxx/eet_composite.hh \
+bindings/cxx/eet_cxx/eet_register.hh \
+bindings/cxx/eet_cxx/eet_type.hh \
+bindings/cxx/eet_cxx/Eet.hh
+
+installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/
+dist_installed_eocxxheaders_DATA = \
+bindings/cxx/eo_cxx/eo_concrete.hh \
+bindings/cxx/eo_cxx/eo_cxx_interop.hh \
+bindings/cxx/eo_cxx/eo_event.hh \
+bindings/cxx/eo_cxx/Eo.hh \
+bindings/cxx/eo_cxx/eo_init.hh \
+bindings/cxx/eo_cxx/eo_ops.hh \
+bindings/cxx/eo_cxx/eo_wref.hh \
+bindings/cxx/eo_cxx/eo_private.hh \
+bindings/cxx/eo_cxx/efl_object_impl.hh
+
+installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/
+dist_installed_eflcxxmainheaders_DATA = lib/efl/Efl.hh
+
+installed_eflcxxextraheadersdir = $(includedir)/efl-cxx-@VMAJ@/cxx
+dist_installed_eflcxxextraheaders_DATA = lib/efl/cxx/efl_part_impl.hh
+
+installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
+dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Efl_Ui.hh
+
+installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
+dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh
+
+installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@
+dist_installed_eldbuscxxmainheaders_DATA = \
+bindings/cxx/eldbus_cxx/eldbus_basic.hh \
+bindings/cxx/eldbus_cxx/eldbus_error.hh \
+bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh \
+bindings/cxx/eldbus_cxx/Eldbus.hh \
+bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh \
+bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh \
+bindings/cxx/eldbus_cxx/eldbus_message.hh \
+bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh \
+bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh \
+bindings/cxx/eldbus_cxx/eldbus_service.hh \
+bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh \
+bindings/cxx/eldbus_cxx/Eldbus_Model.hh
+
+installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
+
+installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
+dist_installed_ecorecxxheaders_DATA = \
+bindings/cxx/ecore_cxx/Ecore.hh \
+bindings/cxx/ecore_cxx/Ecore_Manual.hh
+
+installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@
+dist_installed_einacxxheaders_DATA = \
+bindings/cxx/eina_cxx/eina_accessor.hh       \
+bindings/cxx/eina_cxx/eina_aligned_union.hh       \
+bindings/cxx/eina_cxx/eina_array.hh \
+bindings/cxx/eina_cxx/eina_clone_allocators.hh       \
+bindings/cxx/eina_cxx/eina_deleter.hh     \
+bindings/cxx/eina_cxx/eina_error.hh     \
+bindings/cxx/eina_cxx/eina_future.hh \
+bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh     \
+bindings/cxx/eina_cxx/eina_fold.hh     \
+bindings/cxx/eina_cxx/eina_function.hh     \
+bindings/cxx/eina_cxx/eina_inarray.hh  \
+bindings/cxx/eina_cxx/eina_inlist.hh   \
+bindings/cxx/eina_cxx/eina_integer_sequence.hh \
+bindings/cxx/eina_cxx/eina_iterator.hh \
+bindings/cxx/eina_cxx/eina_lists_auxiliary.hh \
+bindings/cxx/eina_cxx/eina_list.hh \
+bindings/cxx/eina_cxx/eina_log.hh \
+bindings/cxx/eina_cxx/eina_logical.hh \
+bindings/cxx/eina_cxx/eina_optional.hh \
+bindings/cxx/eina_cxx/eina_pp.hh \
+bindings/cxx/eina_cxx/eina_ptrarray.hh \
+bindings/cxx/eina_cxx/eina_ptrlist.hh \
+bindings/cxx/eina_cxx/eina_range_types.hh \
+bindings/cxx/eina_cxx/eina_ref.hh \
+bindings/cxx/eina_cxx/eina_stringshare.hh \
+bindings/cxx/eina_cxx/eina_strbuf.hh \
+bindings/cxx/eina_cxx/eina_string_view.hh \
+bindings/cxx/eina_cxx/eina_thread.hh \
+bindings/cxx/eina_cxx/eina_throw.hh \
+bindings/cxx/eina_cxx/eina_tuple.hh \
+bindings/cxx/eina_cxx/eina_tuple_c.hh \
+bindings/cxx/eina_cxx/eina_tuple_unwrap.hh \
+bindings/cxx/eina_cxx/eina_type_traits.hh \
+bindings/cxx/eina_cxx/eina_value.hh \
+bindings/cxx/eina_cxx/eina_workarounds.hh \
+bindings/cxx/eina_cxx/eina_copy_traits.hh \
+bindings/cxx/eina_cxx/eina_variant.hh \
+bindings/cxx/eina_cxx/Eina.hh
+
+installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/
+dist_installed_eiocxxmainheaders_DATA = lib/eio/Eio.hh
+
+if HAVE_CXX
+nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh
+nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
+nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh
+nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \
+lib/elementary/Elementary.eo.hh
+nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus.eo.hh
+
+CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
+
+### Elementary C++
+
+lib/elementary/Elementary.eo.hh: $(elm_public_eolian_files) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) lib/elementary/Elementary.eo.hh
+
+### Efl C++
+lib/efl/Efl.eo.hh: $(efl_eolian_files) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh
+
+### Evas C++
+nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh
+
+installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
+nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh)
+
+installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture
+nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh)
+
+
+lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \
+              $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \
+              lib/evas/Evas.eo.hh
+
+
+lib/eldbus/Eldbus.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus.eo.hh
+
+### Eet C++
+
+### Generated headers src/lib/edje
+dist_installed_edjecxxmainheaders_DATA = lib/edje/Edje.hh
+
+lib/edje/Edje.eo.hh: $(edje_eolian_files) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh
+
+### Ecore src/lib/ecore
+nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) \
+lib/ecore/Ecore.eo.hh
+
+lib/ecore/Ecore.eo.hh: $(ecore_eolian_files_public) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) lib/ecore/Ecore.eo.hh
+
+## Eina src/lib/eina
+
+### Eio
+nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.eo.hh
+
+lib/eio/Eio.eo.hh: $(eio_eolian_files) $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
+
+CLEANFILES += $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.eo.hh
+
+### Tests
+
+if EFL_ENABLE_TESTS
+
+### Tests for Eina and Eo
+check_PROGRAMS += tests/eina_cxx/eina_cxx_suite tests/eo_cxx/eo_cxx_suite
+TESTS += tests/eina_cxx/eina_cxx_suite tests/eo_cxx/eo_cxx_suite
+
+tests_eina_cxx_eina_cxx_suite_SOURCES = \
+tests/eina_cxx/eina_cxx_suite.cc \
+tests/eina_cxx/eina_cxx_test_inlist.cc \
+tests/eina_cxx/eina_cxx_test_log.cc \
+tests/eina_cxx/eina_cxx_test_inarray.cc \
+tests/eina_cxx/eina_cxx_test_iterator.cc \
+tests/eina_cxx/eina_cxx_test_ptrarray.cc \
+tests/eina_cxx/eina_cxx_test_ptrlist.cc \
+tests/eina_cxx/eina_cxx_test_stringshare.cc \
+tests/eina_cxx/eina_cxx_test_error.cc \
+tests/eina_cxx/eina_cxx_test_accessor.cc \
+tests/eina_cxx/eina_cxx_test_thread.cc \
+tests/eina_cxx/eina_cxx_test_optional.cc \
+tests/eina_cxx/eina_cxx_test_value.cc \
+tests/eina_cxx/simple.c \
+tests/eina_cxx/eina_cxx_suite.h
+
+if HAVE_AM_16
+TESTS_EINA_CXX_OBJNAME = 
+else
+TESTS_EINA_CXX_OBJNAME = tests_eina_cxx_
+endif
+
+
+tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
+tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
+tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
+tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
+
+tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/eina_simple.eo.c tests/eina_cxx/eina_simple.eo.h
+
+CLEANFILES += \
+tests/eina_cxx/eina_simple.eo.c \
+tests/eina_cxx/eina_simple.eo.h \
+tests/eina_cxx/eina_simple.eo.hh \
+tests/eina_cxx/eina_simple.eo.impl.hh
+
+tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_srcdir)/src/bin/eina_cxx \
+-I$(top_builddir)/src/tests/eina_cxx \
+@CHECK_CFLAGS@ \
+@EO_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
+@EO_CXX_CFLAGS@ \
+@EINA_CXX_CFLAGS@
+tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@
+tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_eo_cxx_eo_cxx_suite_SOURCES = \
+tests/eo_cxx/eo_cxx_suite.cc \
+tests/eo_cxx/eo_cxx_suite.h
+
+tests_eo_cxx_eo_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eo_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo_cxx\" \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_srcdir)/src/bin/eina_cxx \
+-I$(top_builddir)/src/tests/eina_cxx \
+@CHECK_CFLAGS@ \
+@EO_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
+@EO_CXX_CFLAGS@ \
+@EINA_CXX_CFLAGS@
+tests_eo_cxx_eo_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@ @USE_ECORE_LIBS@
+tests_eo_cxx_eo_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@
+
+### Tests for ecore
+
+check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
+TESTS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
+
+tests_ecore_cxx_ecore_cxx_suite_SOURCES = \
+tests/ecore_cxx/ecore_cxx_suite.cc \
+tests/ecore_cxx/ecore_cxx_test_safe_call.cc \
+tests/ecore_cxx/ecore_cxx_suite.h
+
+tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_builddir)/src/lib/ecore \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
+@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EINA_CFLAGS@ \
+@ECORE_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
+
+tests_ecore_cxx_ecore_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
+tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
+
+tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc
+tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_builddir)/src/lib/ecore \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
+@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
+@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
+
+tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
+tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
+
+### Tests for Eet
+check_PROGRAMS += tests/eet_cxx/eet_cxx_suite
+TESTS += tests/eet_cxx/eet_cxx_suite
+
+tests_eet_cxx_eet_cxx_suite_SOURCES = \
+tests/eet_cxx/eet_cxx_suite.cc \
+tests/eet_cxx/eet_cxx_test_descriptors.cc \
+tests/eet_cxx/eet_cxx_suite.h
+
+tests_eet_cxx_eet_cxx_suite_CPPFLAGS = 	\
+-I$(top_builddir)/src/lib/efl \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \
+@EO_CFLAGS@ @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
+tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
+tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
+
+### Tests for eldbus
+check_PROGRAMS += tests/eldbus_cxx/eldbus_cxx_suite
+TESTS += tests/eldbus_cxx/eldbus_cxx_suite
+
+tests_eldbus_cxx_eldbus_cxx_suite_SOURCES = \
+tests/eldbus_cxx/eldbus_cxx_suite.cc \
+tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc \
+tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc \
+tests/eldbus_cxx/eldbus_cxx_suite.h
+
+tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \
+-I$(top_builddir)/src/bindings/cxx/eina_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
+-I$(top_builddir)/src/bindings/cxx/ecore_cxx \
+-I$(top_srcdir)/src/bindings/cxx/ecore_cxx \
+-I$(top_builddir)/src/bindings/cxx/eldbus_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eldbus_cxx \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_builddir)/src/lib/ecore \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \
+@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
+@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@
+
+tests_eldbus_cxx_eldbus_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@
+tests_eldbus_cxx_eldbus_cxx_suite_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
+
+### Tests for Evas
+check_PROGRAMS += tests/evas_cxx/cxx_compile_test
+TESTS += tests/evas_cxx/cxx_compile_test
+
+tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc
+tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+ -I$(top_builddir)/src/lib/efl/interfaces/ \
+ -I$(top_builddir)/src/lib/evas/canvas/ \
+ -I$(top_builddir)/src/lib/evas/gesture/ \
+ -I$(top_builddir)/src/lib/evas/include/ \
+ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \
+ -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \
+ @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
+ @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@
+tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
+tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+
+### Tests for Elementary
+check_PROGRAMS += tests/elementary_cxx/cxx_dummy_compile_test
+TESTS += tests/elementary_cxx/cxx_dummy_compile_test
+
+check_LIBRARIES = tests/elementary_cxx/libcxx_compile_test.a
+tests_elementary_cxx_libcxx_compile_test_a_SOURCES = tests/elementary_cxx/cxx_compile_test.cc
+tests_elementary_cxx_libcxx_compile_test_a_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/evas/canvas/ \
+ -I$(top_builddir)/src/lib/evas/gesture/ \
+-I$(top_builddir)/src/lib/efl/interfaces/ \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
+@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
+@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@
+
+if HAVE_AM_16
+TESTS_ELM_CXX_OBJNAME = 
+else
+TESTS_ELM_CXX_OBJNAME = tests_elementary_cxx_
+endif
+
+tests/elementary_cxx/$(TESTS_ELM_CXX_OBJNAME)cxx_dummy_compile_test-cxx_dummy_compile_test.$(OBJEXT): tests/elementary_cxx/libcxx_compile_test.a
+
+tests_elementary_cxx_cxx_dummy_compile_test_SOURCES = tests/elementary_cxx/cxx_dummy_compile_test.cc
+tests_elementary_cxx_cxx_dummy_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/evas/canvas/ \
+ -I$(top_builddir)/src/lib/evas/gesture/ \
+-I$(top_builddir)/src/lib/efl/interfaces/ \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
+@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
+@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@
+
+endif
+
+endif
+
+EXTRA_DIST2 += \
+tests/eina_cxx/eina_simple.eo
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
new file mode 100644
index 0000000000..78d28d9f77
--- /dev/null
+++ b/src/Makefile_EPhysics.am
@@ -0,0 +1,29 @@
+if HAVE_EPHYSICS
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/ephysics/libephysics.la
+
+installed_ephysicsmainheadersdir = $(includedir)/ephysics-@VMAJ@
+dist_installed_ephysicsmainheaders_DATA = \
+lib/ephysics/EPhysics.h
+
+lib_ephysics_libephysics_la_SOURCES = \
+lib/ephysics/ephysics_private.h \
+lib/ephysics/ephysics_trimesh.h \
+lib/ephysics/ephysics_body_materials.h \
+lib/ephysics/ephysics_body.cpp \
+lib/ephysics/ephysics_camera.cpp \
+lib/ephysics/ephysics_constraints.cpp \
+lib/ephysics/ephysics_main.cpp \
+lib/ephysics/ephysics_quaternion.cpp \
+lib/ephysics/ephysics_shape.cpp \
+lib/ephysics/ephysics_world.cpp
+
+lib_ephysics_libephysics_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EPHYSICS_CFLAGS@ -DEFL_BUILD
+lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@
+lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@
+lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
new file mode 100644
index 0000000000..4c3b5fd937
--- /dev/null
+++ b/src/Makefile_Ecore.am
@@ -0,0 +1,456 @@
+
+### Library
+
+ecore_eolian_files_priv = \
+	lib/ecore/ecore_event_message.eo \
+	lib/ecore/ecore_event_message_handler.eo
+
+ecore_eolian_files_public = \
+	lib/ecore/efl_app.eo \
+	lib/ecore/efl_loop.eo \
+	lib/ecore/efl_loop_consumer.eo \
+	lib/ecore/efl_loop_fd.eo \
+	lib/ecore/efl_loop_handler.eo \
+	lib/ecore/efl_loop_message.eo \
+	lib/ecore/efl_loop_message_handler.eo \
+	lib/ecore/efl_loop_message_future.eo \
+	lib/ecore/efl_loop_message_future_handler.eo \
+ lib/ecore/efl_loop_timer.eo \
+	lib/ecore/efl_exe.eo \
+	lib/ecore/efl_thread.eo \
+	lib/ecore/efl_threadio.eo \
+        lib/ecore/efl_appthread.eo \
+        lib/ecore/efl_task.eo \
+	lib/ecore/efl_io_closer_fd.eo \
+	lib/ecore/efl_io_positioner_fd.eo \
+	lib/ecore/efl_io_reader_fd.eo \
+	lib/ecore/efl_io_sizer_fd.eo \
+	lib/ecore/efl_io_writer_fd.eo \
+	lib/ecore/efl_io_stdin.eo \
+	lib/ecore/efl_io_stdout.eo \
+	lib/ecore/efl_io_stderr.eo \
+	lib/ecore/efl_io_file.eo \
+        lib/ecore/efl_io_copier.eo \
+        lib/ecore/efl_io_buffered_stream.eo \
+	lib/ecore/efl_linear_interpolator.eo \
+	lib/ecore/efl_accelerate_interpolator.eo \
+	lib/ecore/efl_decelerate_interpolator.eo \
+	lib/ecore/efl_sinusoidal_interpolator.eo \
+	lib/ecore/efl_divisor_interpolator.eo \
+	lib/ecore/efl_bounce_interpolator.eo \
+	lib/ecore/efl_spring_interpolator.eo \
+	lib/ecore/efl_cubic_bezier_interpolator.eo \
+	lib/ecore/efl_loop_model.eo \
+	lib/ecore/efl_generic_model.eo \
+	lib/ecore/efl_container_model.eo \
+	lib/ecore/efl_boolean_model.eo \
+	lib/ecore/efl_select_model.eo \
+	lib/ecore/efl_composite_model.eo \
+	lib/ecore/efl_view_model.eo \
+	lib/ecore/efl_core_env.eo \
+	lib/ecore/efl_core_proc_env.eo \
+	lib/ecore/efl_core_command_line.eo \
+	lib/ecore/efl_filter_model.eo
+
+ecore_test_eolian_files = \
+	tests/ecore/efl_app_test_cml.eo \
+ tests/ecore/ecore_audio_out_test.eo
+
+ecore_eolian_files = \
+	$(ecore_eolian_files_public)
+
+ecore_eolian_c = $(ecore_eolian_files:%.eo=%.eo.c)
+ecore_eolian_h = $(ecore_eolian_files:%.eo=%.eo.h)
+ecore_test_c = $(ecore_test_eolian_files:%.eo=%.eo.c)
+ecore_test_h = $(ecore_test_eolian_files:%.eo=%.eo.h)
+
+ecore_priv_c = $(ecore_eolian_files_priv:%.eo=%.eo.c)
+ecore_priv_h = $(ecore_eolian_files_priv:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+                 $(ecore_eolian_c) \
+                 $(ecore_eolian_h) \
+                 $(ecore_test_c) \
+                 $(ecore_test_h) \
+                 $(ecore_priv_c) \
+                 $(ecore_priv_h)
+
+if INSTALL_EO_FILES
+ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
+ecoreeolianfiles_DATA = $(ecore_eolian_files_public) lib/ecore/efl_loop_timer.eo
+endif
+
+ecore_legacy_eo_c = \
+lib/ecore/ecore_exe_eo.c \
+lib/ecore/ecore_exe_eo.h \
+lib/ecore/efl_loop_timer_eo.legacy.c
+
+ecore_legacy_eo_h = \
+lib/ecore/ecore_exe_eo.legacy.h \
+lib/ecore/efl_loop_timer_eo.legacy.h
+
+EXTRA_DIST2 += $(ecore_eolian_files)
+EXTRA_DIST2 += $(ecore_eolian_files_priv)
+EXTRA_DIST2 += $(ecore_test_eolian_files)
+EXTRA_DIST2 += $(ecore_legacy_eo_c)
+
+lib_LTLIBRARIES += lib/ecore/libecore.la
+
+installed_ecoremainheadersdir = $(includedir)/ecore-@VMAJ@
+dist_installed_ecoremainheaders_DATA = \
+lib/ecore/Ecore.h \
+lib/ecore/Ecore_Common.h \
+lib/ecore/Ecore_Legacy.h \
+lib/ecore/Ecore_Eo.h \
+lib/ecore/Efl_Core.h \
+lib/ecore/efl_general.h \
+lib/ecore/Ecore_Getopt.h \
+$(ecore_legacy_eo_h)
+
+nodist_installed_ecoremainheaders_DATA = \
+                                         $(ecore_eolian_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_event_message.c \
+lib/ecore/ecore_event_message_handler.c \
+lib/ecore/efl_core_command_line.c \
+lib/ecore/efl_core_env.c \
+lib/ecore/efl_core_proc_env.c \
+lib/ecore/efl_app.c \
+lib/ecore/efl_loop.c \
+lib/ecore/efl_loop_consumer.c \
+lib/ecore/efl_loop_fd.c \
+lib/ecore/efl_loop_handler.c \
+lib/ecore/efl_loop_message.c \
+lib/ecore/efl_loop_message_handler.c \
+lib/ecore/efl_loop_message_future.c \
+lib/ecore/efl_loop_message_future_handler.c \
+lib/ecore/efl_io_closer_fd.c \
+lib/ecore/efl_io_positioner_fd.c \
+lib/ecore/efl_io_reader_fd.c \
+lib/ecore/efl_io_sizer_fd.c \
+lib/ecore/efl_io_writer_fd.c \
+lib/ecore/efl_io_stdin.c \
+lib/ecore/efl_io_stdout.c \
+lib/ecore/efl_io_stderr.c \
+lib/ecore/efl_io_file.c \
+lib/ecore/efl_io_copier.c \
+lib/ecore/efl_io_buffered_stream.c \
+lib/ecore/efl_loop_model.c \
+lib/ecore/efl_generic_model.c \
+lib/ecore/efl_container_model.c \
+lib/ecore/efl_composite_model.c \
+lib/ecore/efl_boolean_model.c \
+lib/ecore/efl_select_model.c \
+lib/ecore/efl_composite_model_private.h \
+lib/ecore/efl_model_accessor_view.c \
+lib/ecore/efl_model_accessor_view_private.h \
+lib/ecore/efl_view_model.c \
+lib/ecore/efl_filter_model.c \
+lib/ecore/efl_linear_interpolator.c \
+lib/ecore/efl_accelerate_interpolator.c \
+lib/ecore/efl_decelerate_interpolator.c \
+lib/ecore/efl_sinusoidal_interpolator.c \
+lib/ecore/efl_divisor_interpolator.c \
+lib/ecore/efl_bounce_interpolator.c \
+lib/ecore/efl_spring_interpolator.c \
+lib/ecore/efl_cubic_bezier_interpolator.c \
+lib/ecore/efl_task.c \
+lib/ecore/efl_exe.c \
+lib/ecore/efl_thread.c \
+lib/ecore/efl_threadio.c \
+lib/ecore/efl_appthread.c \
+lib/ecore/ecore_main_timechanges.c \
+lib/ecore/ecore_pipe.c \
+lib/ecore/ecore_poller.c \
+lib/ecore/ecore_time.c \
+lib/ecore/ecore_timer.c \
+lib/ecore/ecore_thread.c \
+lib/ecore/ecore_throttle.c \
+lib/ecore/ecore_exe.c \
+lib/ecore/ecore_exe_private.h \
+lib/ecore/ecore_private.h \
+lib/ecore/ecore_internal.h \
+lib/ecore/ecore_main_common.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+
+if HAVE_WIN32
+lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_win32.c
+else
+EXTRA_DIST2 += lib/ecore/ecore_exe_ps3.c
+#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_posix.c
+#endif
+#endif
+endif
+
+lib_ecore_libecore_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@ECORE_CFLAGS@
+lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@ @EVIL_LIBS@
+lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
+lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+
+### Modules
+
+# systemd
+
+if WANT_SYSTEMD
+ecoresystemdpkgdir = $(libdir)/ecore/system/systemd/$(MODULE_ARCH)
+ecoresystemdpkg_LTLIBRARIES = modules/ecore/system/systemd/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoresystemdpkgLTLIBRARIES = install-ecoresystemdpkgLTLIBRARIES
+$(install_ecoresystemdpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_system_systemd_module_la_SOURCES = \
+modules/ecore/system/systemd/ecore_system_systemd.c
+modules_ecore_system_systemd_module_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+@ECORE_CFLAGS@ \
+@ELDBUS_CFLAGS@
+modules_ecore_system_systemd_module_la_LIBADD = \
+@USE_ECORE_LIBS@ \
+@USE_ELDBUS_LIBS@
+modules_ecore_system_systemd_module_la_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ELDBUS_INTERNAL_LIBS@
+modules_ecore_system_systemd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_system_systemd_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# upower
+if ! HAVE_WIN32
+ecoreupowerpkgdir = $(libdir)/ecore/system/upower/$(MODULE_ARCH)
+ecoreupowerpkg_LTLIBRARIES = modules/ecore/system/upower/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreupowerpkgLTLIBRARIES = install-ecoreupowerpkgLTLIBRARIES
+$(install_ecoreupowerpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_system_upower_module_la_SOURCES = \
+modules/ecore/system/upower/ecore_system_upower.c
+modules_ecore_system_upower_module_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+@ECORE_CFLAGS@ \
+@ELDBUS_CFLAGS@
+modules_ecore_system_upower_module_la_LIBADD = \
+@USE_ECORE_LIBS@ \
+@USE_ELDBUS_LIBS@
+modules_ecore_system_upower_module_la_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ELDBUS_INTERNAL_LIBS@
+modules_ecore_system_upower_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_system_upower_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# tizen
+
+if HAVE_TIZEN_CONFIGURATION_MANAGER
+ecoretizenpkgdir = $(libdir)/ecore/system/tizen/$(MODULE_ARCH)
+ecoretizenpkg_LTLIBRARIES = modules/ecore/system/tizen/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoretizenpkgLTLIBRARIES = install-ecoretizenpkgLTLIBRARIES
+$(install_ecoretizenpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_system_tizen_module_la_SOURCES = \
+modules/ecore/system/tizen/ecore_system_tizen.c
+modules_ecore_system_tizen_module_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+@ECORE_CFLAGS@ \
+@TIZEN_CONFIGURATION_MANAGER_CFLAGS@
+modules_ecore_system_tizen_module_la_LIBADD = \
+@USE_ECORE_LIBS@ \
+@TIZEN_CONFIGURATION_MANAGER_LIBS@
+modules_ecore_system_tizen_module_la_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@
+modules_ecore_system_tizen_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_system_tizen_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/ecore/ecore_suite tests/ecore/efl_app_suite
+TESTS += tests/ecore/ecore_suite tests/ecore/efl_app_suite
+
+tests_ecore_ecore_suite_SOURCES = \
+tests/ecore/ecore_suite.c \
+tests/ecore/ecore_test_ecore.c \
+tests/ecore/ecore_test_ecore_imf.c \
+tests/ecore/ecore_test_idle.c \
+tests/ecore/ecore_test_poller.c \
+tests/ecore/ecore_test_timer.c \
+tests/ecore/ecore_test_ecore_evas.c \
+tests/ecore/ecore_test_animator.c \
+tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c \
+tests/ecore/ecore_test_ecore_input.c \
+tests/ecore/ecore_test_ecore_file.c \
+tests/ecore/ecore_test_job.c \
+tests/ecore/ecore_test_args.c \
+tests/ecore/ecore_test_pipe.c \
+tests/ecore/ecore_suite.h
+
+tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/tests/ecore \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
+@CHECK_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_AUDIO_CFLAGS@ \
+@ECORE_FILE_CFLAGS@ \
+@ECORE_IMF_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_FB_CFLAGS@ \
+@ECORE_INPUT_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@ECORE_WAYLAND_CFLAGS@ \
+@ECORE_WAYLAND_SRV_CFLAGS@
+
+tests_ecore_ecore_suite_LDADD = \
+@CHECK_LIBS@ \
+@USE_ECORE_LIBS@ \
+@USE_ECORE_AUDIO_LIBS@ \
+@USE_ECORE_FILE_LIBS@ \
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_FB_LIBS@ \
+@USE_ECORE_INPUT_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@USE_ECORE_WAYLAND_LIBS@ \
+@ECORE_WAYLAND_SRV_LIBS@
+tests_ecore_ecore_suite_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
+@USE_ECORE_FILE_INTERNAL_LIBS@ \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_FB_INTERNAL_LIBS@ \
+@USE_ECORE_INPUT_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@ \
+@USE_ECORE_WAYLAND_INTERNAL_LIBS@
+
+tests_ecore_efl_app_suite_SOURCES = \
+tests/ecore/efl_app_test_loop.c \
+tests/ecore/efl_app_test_loop_fd.c \
+tests/ecore/efl_app_test_loop_timer.c \
+tests/ecore/efl_app_test_promise.c \
+tests/ecore/efl_app_test_cml.c \
+tests/ecore/efl_app_test_env.c \
+tests/ecore/efl_app_suite.c \
+tests/ecore/efl_app_suite.h
+
+tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/tests/ecore \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
+@CHECK_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_AUDIO_CFLAGS@ \
+@ECORE_FILE_CFLAGS@ \
+@ECORE_IMF_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_FB_CFLAGS@ \
+@ECORE_INPUT_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@ECORE_WAYLAND_CFLAGS@ \
+@ECORE_WAYLAND_SRV_CFLAGS@
+
+tests_ecore_efl_app_suite_LDADD = \
+@CHECK_LIBS@ \
+@USE_ECORE_LIBS@ \
+@USE_ECORE_AUDIO_LIBS@ \
+@USE_ECORE_FILE_LIBS@ \
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_FB_LIBS@ \
+@USE_ECORE_INPUT_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@USE_ECORE_WAYLAND_LIBS@ \
+@ECORE_WAYLAND_SRV_LIBS@
+tests_ecore_efl_app_suite_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
+@USE_ECORE_FILE_INTERNAL_LIBS@ \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_FB_INTERNAL_LIBS@ \
+@USE_ECORE_INPUT_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@ \
+@USE_ECORE_WAYLAND_INTERNAL_LIBS@
+
+if HAVE_ECORE_X
+tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_x.c
+endif
+
+if HAVE_ECORE_AUDIO
+tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c
+endif
+
+if HAVE_ECORE_FB
+tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_fb.c
+endif
+
+endif
+
+EXTRA_DIST2 += \
+tests/ecore/sample.wav \
+tests/ecore/sample.ogg
+
+if HAVE_LUA_BINDINGS
+
+ecore_eolian_lua = $(ecore_eolian_files:%.eo=%.eo.lua)
+
+generated_ecore_lua_all = $(ecore_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_ecore_lua_all)
+
+installed_ecoreluadir = $(datadir)/elua/modules/ecore
+nodist_installed_ecorelua_DATA = $(generated_ecore_lua_all)
+
+endif
+
+if HAVE_JS
+
+generated_ecore_js_bindings = $(ecore_eolian_files_public:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_ecore_js_bindings)
+
+endif
+
+if HAVE_CXX
+
+ecore_eolian_cxx_hh = $(ecore_eolian_files_public:%.eo=%.eo.hh)
+ecore_eolian_cxx_impl_hh = $(ecore_eolian_files_public:%.eo=%.eo.impl.hh)
+
+endif
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
new file mode 100644
index 0000000000..695879f170
--- /dev/null
+++ b/src/Makefile_Ecore_Audio.am
@@ -0,0 +1,101 @@
+if HAVE_ECORE_AUDIO
+
+### Library
+
+ecore_audio_eolian_files = \
+	lib/ecore_audio/ecore_audio.eo \
+	lib/ecore_audio/ecore_audio_in.eo \
+	lib/ecore_audio/ecore_audio_out.eo \
+	lib/ecore_audio/ecore_audio_in_sndfile.eo \
+	lib/ecore_audio/ecore_audio_out_sndfile.eo \
+	lib/ecore_audio/ecore_audio_out_pulse.eo \
+	lib/ecore_audio/ecore_audio_in_tone.eo \
+	lib/ecore_audio/ecore_audio_out_wasapi.eo
+
+
+ecore_audio_eolian_c = $(ecore_audio_eolian_files:%.eo=%.eo.c)
+ecore_audio_eolian_h = $(ecore_audio_eolian_files:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+                 $(ecore_audio_eolian_c) \
+                 $(ecore_audio_eolian_h)
+
+if INSTALL_EO_FILES
+ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
+ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
+endif
+
+EXTRA_DIST2 += \
+              $(ecore_audio_eolian_files)
+
+lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la
+
+installed_ecoreaudiomainheadersdir = $(includedir)/ecore-audio-@VMAJ@
+dist_installed_ecoreaudiomainheaders_DATA = \
+lib/ecore_audio/Ecore_Audio.h \
+lib/ecore_audio/ecore_audio_obj.h \
+lib/ecore_audio/ecore_audio_obj_in.h \
+lib/ecore_audio/ecore_audio_obj_out.h \
+lib/ecore_audio/ecore_audio_obj_in_tone.h \
+lib/ecore_audio/ecore_audio_protected.h \
+lib/ecore_audio/ecore_audio_obj_out_pulse.h \
+lib/ecore_audio/ecore_audio_obj_in_sndfile.h \
+lib/ecore_audio/ecore_audio_obj_out_sndfile.h \
+lib/ecore_audio/ecore_audio_obj_out_wasapi.h
+
+nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h)
+
+lib_ecore_audio_libecore_audio_la_SOURCES = \
+lib/ecore_audio/ecore_audio.c \
+lib/ecore_audio/ecore_audio_obj.c \
+lib/ecore_audio/ecore_audio_obj_in.c \
+lib/ecore_audio/ecore_audio_obj_out.c \
+lib/ecore_audio/ecore_audio_obj_in_tone.c \
+lib/ecore_audio/ecore_audio_private.h
+
+lib_ecore_audio_libecore_audio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AUDIO_CFLAGS@ @ECORE_AUDIO_ALSA_CFLAGS@ @ECORE_AUDIO_PULSE_CFLAGS@ @ECORE_AUDIO_SNDFILE_CFLAGS@ -DEFL_BUILD
+lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@ @ECORE_AUDIO_ALSA_LIBS@
+lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
+lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+if HAVE_ECORE_AUDIO_PULSE
+lib_ecore_audio_libecore_audio_la_SOURCES += \
+lib/ecore_audio/ecore_audio_pulse_ml.c \
+lib/ecore_audio/ecore_audio_obj_out_pulse.c
+endif
+
+if HAVE_WIN32
+lib_ecore_audio_libecore_audio_la_SOURCES += \
+lib/ecore_audio/ecore_audio_obj_out_wasapi.c
+endif
+
+if HAVE_ECORE_AUDIO_SNDFILE
+lib_ecore_audio_libecore_audio_la_SOURCES += \
+lib/ecore_audio/ecore_audio_obj_in_sndfile.c \
+lib/ecore_audio/ecore_audio_obj_out_sndfile.c \
+lib/ecore_audio/ecore_audio_sndfile_vio.c
+endif
+
+
+if HAVE_LUA_BINDINGS
+
+ecore_audio_eolian_lua = $(ecore_audio_eolian_files:%.eo=%.eo.lua)
+
+generated_ecore_audio_lua_all = $(ecore_audio_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_ecore_audio_lua_all)
+
+installed_ecoreaudioluadir = $(datadir)/elua/modules/ecore_audio
+nodist_installed_ecoreaudiolua_DATA = $(generated_ecore_audio_lua_all)
+
+endif
+
+if HAVE_JS
+
+generated_ecore_audio_js_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_ecore_audio_js_bindings)
+
+endif
+
+endif
diff --git a/src/Makefile_Ecore_Avahi.am b/src/Makefile_Ecore_Avahi.am
new file mode 100644
index 0000000000..0390020c78
--- /dev/null
+++ b/src/Makefile_Ecore_Avahi.am
@@ -0,0 +1,16 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_avahi/libecore_avahi.la
+
+installed_ecoreavahimainheadersdir = $(includedir)/ecore-avahi-@VMAJ@
+dist_installed_ecoreavahimainheaders_DATA = \
+lib/ecore_avahi/Ecore_Avahi.h
+
+lib_ecore_avahi_libecore_avahi_la_SOURCES = \
+lib/ecore_avahi/ecore_avahi.c
+
+lib_ecore_avahi_libecore_avahi_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AVAHI_CFLAGS@ -DEFL_BUILD
+lib_ecore_avahi_libecore_avahi_la_LIBADD = @ECORE_AVAHI_LIBS@
+lib_ecore_avahi_libecore_avahi_la_DEPENDENCIES = @ECORE_AVAHI_INTERNAL_LIBS@
+lib_ecore_avahi_libecore_avahi_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Buffer.am b/src/Makefile_Ecore_Buffer.am
new file mode 100644
index 0000000000..c357c5cd00
--- /dev/null
+++ b/src/Makefile_Ecore_Buffer.am
@@ -0,0 +1,113 @@
+if HAVE_ECORE_BUFFER
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_buffer/libecore_buffer.la
+
+installed_ecorebuffermainheadersdir = $(includedir)/ecore-buffer-@VMAJ@
+dist_installed_ecorebuffermainheaders_DATA = \
+lib/ecore_buffer/Ecore_Buffer.h \
+lib/ecore_buffer/Ecore_Buffer_Queue.h
+
+lib_ecore_buffer_libecore_buffer_la_SOURCES = \
+lib/ecore_buffer/bq_mgr_protocol.c \
+lib/ecore_buffer/buffer_queue.c \
+lib/ecore_buffer/shared_buffer.c \
+lib/ecore_buffer/ecore_buffer.c \
+lib/ecore_buffer/ecore_buffer_queue_main.c \
+lib/ecore_buffer/ecore_buffer_con.c \
+lib/ecore_buffer/ecore_buffer_provider.c \
+lib/ecore_buffer/ecore_buffer_consumer.c
+
+lib_ecore_buffer_libecore_buffer_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+@ECORE_BUFFER_CFLAGS@
+
+lib_ecore_buffer_libecore_buffer_la_LIBADD = @ECORE_BUFFER_LIBS@
+lib_ecore_buffer_libecore_buffer_la_DEPENDENCIES = @ECORE_BUFFER_INTERNAL_LIBS@
+lib_ecore_buffer_libecore_buffer_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Binary
+bqmgr_bindir=$(libdir)/ecore_buffer/bin/$(MODULE_ARCH)
+bqmgr_bin_PROGRAMS = bin/ecore_buffer/bq_mgr
+
+bin_ecore_buffer_bq_mgr_SOURCES = \
+bin/ecore_buffer/bq_mgr_protocol.c \
+bin/ecore_buffer/bq_mgr.c
+
+bin_ecore_buffer_bq_mgr_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+@ECORE_BUFFER_CFLAGS@
+bin_ecore_buffer_bq_mgr_LDADD = @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_BUFFER_LIBS@
+bin_ecore_buffer_bq_mgr_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_BUFFER_INTERNAL_LIBS@
+
+### Backends
+
+ecorebuffershmdir = $(libdir)/ecore_buffer/modules/shm/$(MODULE_ARCH)
+ecorebuffershm_LTLIBRARIES = modules/ecore_buffer/shm/module.la
+
+modules_ecore_buffer_shm_module_la_SOURCES = \
+   modules/ecore_buffer/shm/ecore_buffer_shm.c
+modules_ecore_buffer_shm_module_la_CPPFLAGS = \
+   -I$(top_builddir)/src/lib/efl \
+   @ECORE_BUFFER_CFLAGS@ \
+   -I$(top_srcdir)/src/modules/ecore_buffer/shm
+modules_ecore_buffer_shm_module_la_LIBADD = \
+   @ECORE_BUFFER_LIBS@ \
+   @USE_ECORE_BUFFER_INTERNAL_LIBS@
+modules_ecore_buffer_shm_module_la_DEPENDENCIES = \
+   @USE_ECORE_BUFFER_INTERNAL_LIBS@
+modules_ecore_buffer_shm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_buffer_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+if BUILD_ECORE_BUFFER_X11_DRI2
+ecorebufferx11dri2dir = $(libdir)/ecore_buffer/modules/x11_dri2/$(MODULE_ARCH)
+ecorebufferx11dri2_LTLIBRARIES = modules/ecore_buffer/x11_dri2/module.la
+
+modules_ecore_buffer_x11_dri2_module_la_SOURCES = \
+   modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
+modules_ecore_buffer_x11_dri2_module_la_CPPFLAGS = \
+   -I$(top_builddir)/src/lib/efl \
+   @ECORE_BUFFER_CFLAGS@ \
+   @X11_DRI_COMMON_CFLAGS@ \
+   @X11_DRI2_CFLAGS@ \
+   -I$(top_srcdir)/src/modules/ecore_buffer/x11_dri2
+modules_ecore_buffer_x11_dri2_module_la_LIBADD = \
+   @ECORE_BUFFER_LIBS@ \
+   @USE_ECORE_BUFFER_INTERNAL_LIBS@ \
+   @X11_DRI_COMMON_LIBS@ \
+   @X11_DRI2_LIBS@
+modules_ecore_buffer_x11_dri2_module_la_DEPENDENCIES = \
+   @USE_ECORE_X_INTERNAL_LIBS@ \
+   @USE_ECORE_BUFFER_INTERNAL_LIBS@
+modules_ecore_buffer_x11_dri2_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_buffer_x11_dri2_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_BUFFER_X11_DRI3
+ecorebufferx11dri3dir = $(libdir)/ecore_buffer/modules/x11_dri3/$(MODULE_ARCH)
+ecorebufferx11dri3_LTLIBRARIES = modules/ecore_buffer/x11_dri3/module.la
+
+modules_ecore_buffer_x11_dri3_module_la_SOURCES = \
+   modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
+modules_ecore_buffer_x11_dri3_module_la_CPPFLAGS = \
+   -I$(top_builddir)/src/lib/efl \
+   @ECORE_BUFFER_CFLAGS@ \
+   @X11_DRI_COMMON_CFLAGS@ \
+   @X11_DRI3_CFLAGS@ \
+   -I$(top_srcdir)/src/modules/ecore_buffer/x11_dri3
+modules_ecore_buffer_x11_dri3_module_la_LIBADD = \
+   @ECORE_BUFFER_LIBS@ \
+   @USE_ECORE_BUFFER_INTERNAL_LIBS@ \
+   @X11_DRI_COMMON_LIBS@ \
+   @X11_DRI3_LIBS@
+modules_ecore_buffer_x11_dri3_module_la_DEPENDENCIES = \
+   @USE_ECORE_X_INTERNAL_LIBS@ \
+   @USE_ECORE_BUFFER_INTERNAL_LIBS@
+modules_ecore_buffer_x11_dri3_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_buffer_x11_dri3_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+endif
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
new file mode 100644
index 0000000000..1283125d4f
--- /dev/null
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -0,0 +1,26 @@
+if HAVE_ECORE_COCOA
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_cocoa/libecore_cocoa.la
+
+installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@
+dist_installed_ecorecocoamainheaders_DATA = \
+lib/ecore_cocoa/Ecore_Cocoa.h
+
+lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
+lib/ecore_cocoa/ecore_cocoa.m \
+lib/ecore_cocoa/ecore_cocoa_keys.h \
+lib/ecore_cocoa/ecore_cocoa_window.h \
+lib/ecore_cocoa/ecore_cocoa_window.m \
+lib/ecore_cocoa/ecore_cocoa_cnp.m \
+lib/ecore_cocoa/ecore_cocoa_app.m \
+lib/ecore_cocoa/ecore_cocoa_app.h \
+lib/ecore_cocoa/ecore_cocoa_private.h
+
+lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_COCOA_CFLAGS@
+lib_ecore_cocoa_libecore_cocoa_la_LIBADD = @ECORE_COCOA_LIBS@
+lib_ecore_cocoa_libecore_cocoa_la_DEPENDENCIES = @ECORE_COCOA_INTERNAL_LIBS@
+lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ @cocoa_ldflags@
+lib_ecore_cocoa_libecore_cocoa_la_LIBTOOLFLAGS = --tag=disable-static
+endif
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
new file mode 100644
index 0000000000..594046b3c5
--- /dev/null
+++ b/src/Makefile_Ecore_Con.am
@@ -0,0 +1,278 @@
+
+### Library
+
+ecore_con_eolian_files_common = \
+        lib/ecore_con/efl_net_socket.eo \
+        lib/ecore_con/efl_net_socket_simple.eo \
+        lib/ecore_con/efl_net_socket_fd.eo \
+        lib/ecore_con/efl_net_socket_tcp.eo \
+        lib/ecore_con/efl_net_socket_udp.eo \
+        lib/ecore_con/efl_net_dialer.eo \
+        lib/ecore_con/efl_net_dialer_simple.eo \
+        lib/ecore_con/efl_net_dialer_tcp.eo \
+        lib/ecore_con/efl_net_dialer_udp.eo \
+        lib/ecore_con/efl_net_dialer_http.eo \
+        lib/ecore_con/efl_net_dialer_websocket.eo \
+        lib/ecore_con/efl_net_server.eo \
+        lib/ecore_con/efl_net_server_simple.eo \
+        lib/ecore_con/efl_net_server_fd.eo \
+        lib/ecore_con/efl_net_server_ip.eo \
+        lib/ecore_con/efl_net_server_tcp.eo \
+        lib/ecore_con/efl_net_server_udp.eo \
+        lib/ecore_con/efl_net_server_udp_client.eo \
+        lib/ecore_con/efl_net_socket_ssl.eo \
+        lib/ecore_con/efl_net_ssl_context.eo \
+        lib/ecore_con/efl_net_dialer_ssl.eo \
+        lib/ecore_con/efl_net_server_ssl.eo \
+        lib/ecore_con/efl_net_control_access_point.eo \
+        lib/ecore_con/efl_net_control_technology.eo \
+        lib/ecore_con/efl_net_control_manager.eo \
+        lib/ecore_con/efl_net_session.eo \
+        lib/ecore_con/efl_net_ip_address.eo
+
+ecore_con_eolian_files_windows = \
+        lib/ecore_con/efl_net_socket_windows.eo \
+        lib/ecore_con/efl_net_dialer_windows.eo \
+        lib/ecore_con/efl_net_server_windows.eo
+
+ecore_con_eolian_files_unix = \
+        lib/ecore_con/efl_net_socket_unix.eo \
+        lib/ecore_con/efl_net_dialer_unix.eo \
+        lib/ecore_con/efl_net_server_unix.eo
+
+ecore_con_eolian_files = $(ecore_con_eolian_files_common)
+
+if HAVE_WINDOWS
+ecore_con_eolian_files += $(ecore_con_eolian_files_windows)
+else
+ecore_con_eolian_files += $(ecore_con_eolian_files_unix)
+endif
+
+ecore_con_eolian_type_files = \
+	lib/ecore_con/efl_net_types.eot \
+        lib/ecore_con/efl_net_http_types.eot \
+	lib/ecore_con/efl_net_ssl_types.eot
+
+
+ecore_con_eolian_c = $(ecore_con_eolian_files:%.eo=%.eo.c)
+ecore_con_eolian_h = $(ecore_con_eolian_files:%.eo=%.eo.h) \
+                     $(ecore_con_eolian_type_files:%.eot=%.eot.h)
+
+BUILT_SOURCES += \
+                 $(ecore_con_eolian_c) \
+                 $(ecore_con_eolian_h)
+
+if INSTALL_EO_FILES
+ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
+ecoreconeolianfiles_DATA = \
+                           $(ecore_con_eolian_files) \
+			   $(ecore_con_eolian_type_files)
+endif
+
+EXTRA_DIST2 += \
+$(ecore_con_eolian_files_common) \
+$(ecore_con_eolian_files_unix) \
+$(ecore_con_eolian_files_windows) \
+$(ecore_con_eolian_type_files)
+
+
+lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
+
+installed_ecoreconmainheadersdir = $(includedir)/ecore-con-@VMAJ@
+dist_installed_ecoreconmainheaders_DATA = \
+lib/ecore_con/Ecore_Con.h \
+lib/ecore_con/Efl_Net.h \
+lib/ecore_con/Ecore_Con_Eet.h \
+lib/ecore_con/Ecore_Con_Eet_Legacy.h \
+lib/ecore_con/Ecore_Con_Eet_Eo.h \
+lib/ecore_con/ecore_con_eet_base_eo.h \
+lib/ecore_con/ecore_con_eet_base_eo.legacy.h \
+lib/ecore_con/ecore_con_eet_client_obj_eo.h \
+lib/ecore_con/ecore_con_eet_client_obj_eo.legacy.h \
+lib/ecore_con/ecore_con_eet_server_obj_eo.h \
+lib/ecore_con/ecore_con_eet_server_obj_eo.legacy.h
+
+
+nodist_installed_ecoreconmainheaders_DATA = \
+                                            $(ecore_con_eolian_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_proxy_helper.c \
+lib/ecore_con/ecore_con_legacy.c \
+lib/ecore_con/ecore_con_eet.c \
+lib/ecore_con/ecore_con_socks.c \
+lib/ecore_con/ecore_con_url.c \
+lib/ecore_con/ecore_con_url_curl.c \
+lib/ecore_con/ecore_con_url_curl.h \
+static_libs/http-parser/http_parser.c \
+static_libs/http-parser/http_parser.h \
+lib/ecore_con/ecore_con_private.h \
+lib/ecore_con/efl_net_socket.c \
+lib/ecore_con/efl_net_socket_simple.c \
+lib/ecore_con/efl_net_socket_fd.c \
+lib/ecore_con/efl_net_socket_tcp.c \
+lib/ecore_con/efl_net_socket_udp.c \
+lib/ecore_con/efl_net_dialer.c \
+lib/ecore_con/efl_net_dialer_simple.c \
+lib/ecore_con/efl_net_dialer_tcp.c \
+lib/ecore_con/efl_net_dialer_udp.c \
+lib/ecore_con/efl_net_dialer_http.c \
+lib/ecore_con/efl_net_dialer_websocket.c \
+lib/ecore_con/efl_net_server.c \
+lib/ecore_con/efl_net_server_simple.c \
+lib/ecore_con/efl_net_server_fd.c \
+lib/ecore_con/efl_net_server_ip.c \
+lib/ecore_con/efl_net_server_tcp.c \
+lib/ecore_con/efl_net_server_udp.c \
+lib/ecore_con/efl_net_server_udp_client.c \
+lib/ecore_con/efl_net_socket_ssl.c \
+lib/ecore_con/efl_net_ssl_context.c \
+lib/ecore_con/efl_net_dialer_ssl.c \
+lib/ecore_con/efl_net_server_ssl.c \
+lib/ecore_con/ecore_con_local.c \
+lib/ecore_con/efl_net_ip_address.c \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+if EFL_NET_CONTROL_BACKEND_CONNMAN
+lib_ecore_con_libecore_con_la_SOURCES += \
+lib/ecore_con/efl_net-connman.h \
+lib/ecore_con/efl_net-connman.c \
+lib/ecore_con/efl_net_control_access_point-connman.c \
+lib/ecore_con/efl_net_control_technology-connman.c \
+lib/ecore_con/efl_net_control-connman.c \
+lib/ecore_con/efl_net_session-connman.c
+endif
+
+if EFL_NET_CONTROL_BACKEND_NONE
+lib_ecore_con_libecore_con_la_SOURCES += \
+lib/ecore_con/efl_net_control_access_point-none.c \
+lib/ecore_con/efl_net_control_technology-none.c \
+lib/ecore_con/efl_net_control-none.c \
+lib/ecore_con/efl_net_session-none.c
+endif
+
+# these are included rather than compiled out
+# so the structures can be embedded into the
+# object Private Data and allows functions to
+# be all static
+EXTRA_DIST2 += \
+lib/ecore_con/ecore_con_eet_base_eo.c \
+lib/ecore_con/ecore_con_eet_base_eo.legacy.c \
+lib/ecore_con/ecore_con_eet_client_obj_eo.c \
+lib/ecore_con/ecore_con_eet_server_obj_eo.c \
+lib/ecore_con/efl_net_ssl_conn-openssl.c \
+lib/ecore_con/efl_net_ssl_conn-gnutls.c \
+lib/ecore_con/efl_net_ssl_conn-none.c \
+lib/ecore_con/efl_net_ssl_ctx-openssl.c \
+lib/ecore_con/efl_net_ssl_ctx-gnutls.c \
+lib/ecore_con/efl_net_ssl_ctx-none.c
+
+if HAVE_WINDOWS
+lib_ecore_con_libecore_con_la_SOURCES += \
+lib/ecore_con/efl_net_socket_windows.c \
+lib/ecore_con/efl_net_dialer_windows.c \
+lib/ecore_con/efl_net_server_windows.c
+else
+lib_ecore_con_libecore_con_la_SOURCES += \
+lib/ecore_con/efl_net_socket_unix.c \
+lib/ecore_con/efl_net_dialer_unix.c \
+lib/ecore_con/efl_net_server_unix.c
+endif
+
+lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@ECORE_CON_CFLAGS@
+lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ @EVIL_LIBS@
+lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
+lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser
+
+EXTRA_DIST2 += \
+tests/ecore_con/server.key \
+tests/ecore_con/server.pem \
+static_libs/http-parser/AUTHORS \
+static_libs/http-parser/CONTRIBUTIONS \
+static_libs/http-parser/README.md \
+static_libs/http-parser/test.c \
+static_libs/http-parser/contrib/parsertrace.c \
+static_libs/http-parser/contrib/url_parser.c
+
+### Binary
+proxyhelperdir = \
+$(libdir)/ecore_con/utils/$(MODULE_ARCH)
+proxyhelper_PROGRAMS = bin/ecore_con/efl_net_proxy_helper
+
+bin_ecore_con_efl_net_proxy_helper_SOURCES = \
+bin/ecore_con/efl_net_proxy_helper.c
+
+bin_ecore_con_efl_net_proxy_helper_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
+@EINA_CFLAGS@
+bin_ecore_con_efl_net_proxy_helper_LDADD = @USE_EINA_LIBS@
+bin_ecore_con_efl_net_proxy_helper_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/ecore_con/ecore_con_suite
+TESTS += tests/ecore_con/ecore_con_suite
+
+tests_ecore_con_ecore_con_suite_SOURCES = \
+tests/ecore_con/ecore_con_suite.c \
+tests/ecore_con/ecore_con_test_ecore_con.c \
+tests/ecore_con/ecore_con_test_ecore_con_url.c \
+tests/ecore_con/ecore_con_test_ecore_con_eet.c \
+tests/ecore_con/ecore_con_test_efl_net_ip_address.c \
+tests/ecore_con/ecore_con_suite.h
+
+tests_ecore_con_ecore_con_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_con\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_con\" \
+@CHECK_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_CON_CFLAGS@
+
+tests_ecore_con_ecore_con_suite_LDADD = \
+@CHECK_LIBS@ \
+@USE_ECORE_LIBS@ \
+@USE_ECORE_CON_LIBS@
+
+tests_ecore_con_ecore_con_suite_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ECORE_CON_INTERNAL_LIBS@
+
+endif
+
+if HAVE_LUA_BINDINGS
+
+ecore_con_eolian_lua = $(ecore_con_eolian_files:%.eo=%.eo.lua)
+
+generated_ecore_con_lua_all = $(ecore_con_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_ecore_con_lua_all)
+
+installed_ecoreconluadir = $(datadir)/elua/modules/ecore_con
+nodist_installed_ecoreconlua_DATA = $(generated_ecore_con_lua_all)
+
+endif
+
+if HAVE_JS
+
+generated_ecore_con_js_bindings = $(ecore_con_eolian_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_ecore_con_js_bindings)
+
+endif
diff --git a/src/Makefile_Ecore_Drm.am b/src/Makefile_Ecore_Drm.am
new file mode 100644
index 0000000000..5a6b40ded4
--- /dev/null
+++ b/src/Makefile_Ecore_Drm.am
@@ -0,0 +1,39 @@
+if HAVE_ECORE_DRM
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_drm/libecore_drm.la
+
+installed_ecoredrmmainheadersdir = $(includedir)/ecore-drm-@VMAJ@
+dist_installed_ecoredrmmainheaders_DATA = \
+  lib/ecore_drm/Ecore_Drm.h
+
+lib_ecore_drm_libecore_drm_la_SOURCES = \
+lib/ecore_drm/ecore_drm_sprites.c \
+lib/ecore_drm/ecore_drm_fb.c \
+lib/ecore_drm/ecore_drm_evdev.c \
+lib/ecore_drm/ecore_drm_inputs.c \
+lib/ecore_drm/ecore_drm_output.c \
+lib/ecore_drm/ecore_drm_tty.c \
+lib/ecore_drm/ecore_drm_device.c \
+lib/ecore_drm/ecore_drm_launcher.c \
+lib/ecore_drm/ecore_drm_dbus.c \
+lib/ecore_drm/ecore_drm_logind.c \
+lib/ecore_drm/ecore_drm.c \
+lib/ecore_drm/ecore_drm_private.h
+
+
+lib_ecore_drm_libecore_drm_la_CPPFLAGS = \
+  -I$(top_builddir)/src/lib/efl \
+  @ECORE_DRM_CFLAGS@ @EFL_CFLAGS@ \
+  -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+  -DMODULE_ARCH=\"$(MODULE_ARCH)\"
+
+lib_ecore_drm_libecore_drm_la_LIBADD = @ECORE_DRM_LIBS@
+if HAVE_SYSTEMD
+lib_ecore_drm_libecore_drm_la_LIBADD += @SYSTEMD_LIBS@
+endif
+lib_ecore_drm_libecore_drm_la_DEPENDENCIES = @ECORE_DRM_INTERNAL_LIBS@
+lib_ecore_drm_libecore_drm_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
diff --git a/src/Makefile_Ecore_Drm2.am b/src/Makefile_Ecore_Drm2.am
new file mode 100644
index 0000000000..dcb5dde757
--- /dev/null
+++ b/src/Makefile_Ecore_Drm2.am
@@ -0,0 +1,36 @@
+if HAVE_ECORE_DRM2
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_drm2/libecore_drm2.la
+
+installed_ecoredrm2mainheadersdir = $(includedir)/ecore-drm2-@VMAJ@
+dist_installed_ecoredrm2mainheaders_DATA = \
+  lib/ecore_drm2/Ecore_Drm2.h
+
+lib_ecore_drm2_libecore_drm2_la_SOURCES = \
+static_libs/libdrm/drm.h \
+static_libs/libdrm/drm_fourcc.h \
+static_libs/libdrm/drm_mode.h \
+static_libs/libdrm/xf86drm.h \
+static_libs/libdrm/xf86drmMode.h \
+static_libs/libdrm/LICENSE \
+lib/ecore_drm2/ecore_drm2_plane.c \
+lib/ecore_drm2/ecore_drm2_fb.c \
+lib/ecore_drm2/ecore_drm2_outputs.c \
+lib/ecore_drm2/ecore_drm2_device.c \
+lib/ecore_drm2/ecore_drm2.c \
+lib/ecore_drm2/ecore_drm2_private.h
+
+lib_ecore_drm2_libecore_drm2_la_CPPFLAGS = \
+  -I$(top_builddir)/src/lib/efl \
+  -I$(top_srcdir)/src/static_libs/libdrm \
+  @ECORE_DRM2_CFLAGS@ @EFL_CFLAGS@ \
+  -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+  -DMODULE_ARCH=\"$(MODULE_ARCH)\"
+
+lib_ecore_drm2_libecore_drm2_la_LIBADD = @ECORE_DRM2_LIBS@
+lib_ecore_drm2_libecore_drm2_la_DEPENDENCIES = @ECORE_DRM2_INTERNAL_LIBS@
+lib_ecore_drm2_libecore_drm2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
new file mode 100644
index 0000000000..8f74f95b0b
--- /dev/null
+++ b/src/Makefile_Ecore_Evas.am
@@ -0,0 +1,317 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_evas/libecore_evas.la
+
+installed_ecoreevasmainheadersdir = $(includedir)/ecore-evas-@VMAJ@
+dist_installed_ecoreevasmainheaders_DATA = \
+lib/ecore_evas/Ecore_Evas_Types.h \
+lib/ecore_evas/Ecore_Evas.h
+
+lib_ecore_evas_libecore_evas_la_SOURCES = \
+lib/ecore_evas/ecore_evas.c \
+lib/ecore_evas/ecore_evas_buffer.c \
+lib/ecore_evas/ecore_evas_buffer.h \
+lib/ecore_evas/ecore_evas_deprecated.c \
+lib/ecore_evas/ecore_evas_drm.h \
+lib/ecore_evas/ecore_evas_ews.c \
+lib/ecore_evas/ecore_evas_module.c \
+lib/ecore_evas/ecore_evas_private.h \
+lib/ecore_evas/ecore_evas_extn.h \
+lib/ecore_evas/ecore_evas_extn.c \
+lib/ecore_evas/ecore_evas_wayland.h \
+lib/ecore_evas/ecore_evas_cocoa.h \
+lib/ecore_evas/ecore_evas_win32.h \
+lib/ecore_evas/ecore_evas_x11.h \
+lib/ecore_evas/ecore_evas_util.c \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+lib_ecore_evas_libecore_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/modules/evas/engines/buffer \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_evas\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@ECORE_EVAS_CFLAGS@
+lib_ecore_evas_libecore_evas_la_LIBADD = @ECORE_EVAS_LIBS@
+lib_ecore_evas_libecore_evas_la_DEPENDENCIES = @ECORE_EVAS_INTERNAL_LIBS@
+lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+# Engines
+
+if BUILD_ECORE_EVAS_EXTN
+EXTNSOURCES = \
+modules/ecore_evas/engines/extn/ecore_evas_extn.c \
+modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h \
+modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
+ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH)
+ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasengineextnpkgLTLIBRARIES = install-ecoreevasengineextnpkgLTLIBRARIES
+$(install_ecoreevasengineextnpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES)
+modules_ecore_evas_engines_extn_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_IPC_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/buffer \
+-I$(top_srcdir)/src/modules/ecore_evas/engines/extn
+modules_ecore_evas_engines_extn_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_IPC_LIBS@ \
+@SHM_LIBS@
+modules_ecore_evas_engines_extn_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_IPC_INTERNAL_LIBS@
+modules_ecore_evas_engines_extn_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_extn_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_X11
+XSOURCES = modules/ecore_evas/engines/x/ecore_evas_x.c
+ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH)
+ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginexpkgLTLIBRARIES = install-ecoreevasenginexpkgLTLIBRARIES
+$(install_ecoreevasenginexpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
+modules_ecore_evas_engines_x_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
+-I$(top_srcdir)/src/modules/evas/engines/gl_x11
+modules_ecore_evas_engines_x_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_X_LIBS@
+modules_ecore_evas_engines_x_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@
+modules_ecore_evas_engines_x_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_OPENGL_COCOA
+COCOASOURCES = modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH)
+ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginecocoapkgLTLIBRARIES = install-ecoreevasenginecocoapkgLTLIBRARIES
+$(install_ecoreevasenginecocoapkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES)
+modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_COCOA_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
+modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_COCOA_LIBS@
+modules_ecore_evas_engines_cocoa_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_COCOA_INTERNAL_LIBS@
+modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_FB
+FBSOURCES = modules/ecore_evas/engines/fb/ecore_evas_fb.c
+ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH)
+ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginefbpkgLTLIBRARIES = install-ecoreevasenginefbpkgLTLIBRARIES
+$(install_ecoreevasenginefbpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES)
+modules_ecore_evas_engines_fb_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_FB_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/fb
+modules_ecore_evas_engines_fb_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_FB_LIBS@
+modules_ecore_evas_engines_fb_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_FB_INTERNAL_LIBS@
+modules_ecore_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_WAYLAND
+WAYLANDSOURCES = \
+modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c \
+modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c \
+modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c \
+modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+ecoreevasenginewaylandpkgdir = $(libdir)/ecore_evas/engines/wayland/$(MODULE_ARCH)
+ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginewaylandpkgLTLIBRARIES = install-ecoreevasenginewaylandpkgLTLIBRARIES
+$(install_ecoreevasenginewaylandpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES)
+modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_WL2_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
+@ECORE_WAYLAND_CFLAGS@ \
+@ECORE_WL2_CFLAGS@
+modules_ecore_evas_engines_wayland_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_WL2_LIBS@
+modules_ecore_evas_engines_wayland_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_WL2_INTERNAL_LIBS@
+modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_SDL
+SDLSOURCES = \
+modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH)
+ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginesdlpkgLTLIBRARIES = install-ecoreevasenginesdlpkgLTLIBRARIES
+$(install_ecoreevasenginesdlpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
+modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_SDL_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/buffer \
+-I$(top_srcdir)/src/modules/evas/engines/gl_sdl
+modules_ecore_evas_engines_sdl_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_SDL_LIBS@
+modules_ecore_evas_engines_sdl_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_SDL_INTERNAL_LIBS@
+modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_WIN32
+WIN32SOURCES = \
+modules/ecore_evas/engines/win32/ecore_evas_win32.c
+ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH)
+ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasengineswin32pkgLTLIBRARIES = install-ecoreevasengineswin32pkgLTLIBRARIES
+$(install_ecoreevasengineswin32pkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES)
+modules_ecore_evas_engines_win32_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_WIN32_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
+-I$(top_srcdir)/src/modules/evas/engines/software_gdi
+modules_ecore_evas_engines_win32_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_WIN32_LIBS@
+modules_ecore_evas_engines_win32_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_WIN32_INTERNAL_LIBS@
+modules_ecore_evas_engines_win32_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_DRM
+DRMSOURCES = \
+modules/ecore_evas/engines/drm/ecore_evas_drm.c \
+static_libs/libdrm/drm_fourcc.h \
+static_libs/libdrm/drm.h \
+static_libs/libdrm/drm_mode.h \
+static_libs/libdrm/xf86drm.h \
+static_libs/libdrm/xf86drmMode.h
+
+ecoreevasenginedrmpkgdir = $(libdir)/ecore_evas/engines/drm/$(MODULE_ARCH)
+ecoreevasenginedrmpkg_LTLIBRARIES = modules/ecore_evas/engines/drm/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginedrmpkgLTLIBRARIES = install-ecoreevasenginedrmpkgLTLIBRARIES
+$(install_ecoreevasenginedrmpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_engines_drm_module_la_SOURCES = $(DRMSOURCES)
+modules_ecore_evas_engines_drm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_DRM2_CFLAGS@ \
+@ELPUT_CFLAGS@ \
+-I$(top_srcdir)/src/static_libs/libdrm \
+-I$(top_srcdir)/src/modules/evas/engines/drm \
+-I$(top_srcdir)/src/modules/evas/engines/gl_drm
+modules_ecore_evas_engines_drm_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_DRM2_LIBS@
+modules_ecore_evas_engines_drm_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_DRM2_INTERNAL_LIBS@
+modules_ecore_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_engines_drm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ECORE_EVAS_VNC_SERVER
+VNCSERVERSOURCES = \
+modules/ecore_evas/vnc_server/ecore_evas_vnc_server.c \
+modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.c \
+modules/ecore_evas/vnc_server/ecore_evas_vnc_server_fb_keymap.h
+ecoreevasenginevncserverpkgdir = $(libdir)/ecore_evas/vnc_server/$(MODULE_ARCH)
+ecoreevasenginevncserverpkg_LTLIBRARIES = modules/ecore_evas/vnc_server/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreevasenginevncserverpkgLTLIBRARIES = install-ecoreevasenginevncserverpkgLTLIBRARIES
+$(install_ecoreevasenginevncserverpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_evas_vnc_server_module_la_SOURCES = $(VNCSERVERSOURCES)
+modules_ecore_evas_vnc_server_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/ecore_fb \
+@LIBVNCSERVER_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@
+modules_ecore_evas_vnc_server_module_la_LIBADD = \
+@LIBVNCSERVER_LIBS@ \
+@USE_ECORE_EVAS_LIBS@
+modules_ecore_evas_vnc_server_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@
+modules_ecore_evas_vnc_server_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_evas_vnc_server_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+### Binary
+
+bin_PROGRAMS += \
+bin/ecore_evas/ecore_evas_convert \
+bin/ecore_evas/eetpack
+
+bin_ecore_evas_ecore_evas_convert_SOURCES = bin/ecore_evas/ecore_evas_convert.c
+bin_ecore_evas_ecore_evas_convert_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_EVAS_CFLAGS@ @EINA_CFLAGS@ @ECORE_CFLAGS@ @EVAS_CFLAGS@
+bin_ecore_evas_ecore_evas_convert_LDADD = @USE_ECORE_EVAS_LIBS@ @USE_EINA_LIBS@ @USE_ECORE_LIBS@ @USE_EVAS_LIBS@
+bin_ecore_evas_ecore_evas_convert_DEPENDENCIES = @USE_ECORE_EVAS_INTERNAL_LIBS@ @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@
+
+bin_ecore_evas_eetpack_SOURCES = bin/ecore_evas/eetpack.c
+bin_ecore_evas_eetpack_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_EVAS_CFLAGS@ @EINA_CFLAGS@ @EET_CFLAGS@ @EVAS_CFLAGS@
+bin_ecore_evas_eetpack_LDADD = @USE_ECORE_EVAS_LIBS@ @USE_EINA_LIBS@ @USE_EET_LIBS@ @USE_EVAS_LIBS@
+bin_ecore_evas_eetpack_DEPENDENCIES = @USE_ECORE_EVAS_INTERNAL_LIBS@ @USE_EINA_INTERNAL_LIBS@ @USE_EET_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
new file mode 100644
index 0000000000..1035e257bd
--- /dev/null
+++ b/src/Makefile_Ecore_FB.am
@@ -0,0 +1,23 @@
+if HAVE_ECORE_FB
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_fb/libecore_fb.la
+
+installed_ecorefbmainheadersdir = $(includedir)/ecore-fb-@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
+
+lib_ecore_fb_libecore_fb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FB_CFLAGS@
+lib_ecore_fb_libecore_fb_la_LIBADD = @ECORE_FB_LIBS@
+lib_ecore_fb_libecore_fb_la_DEPENDENCIES = @ECORE_FB_INTERNAL_LIBS@
+lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
new file mode 100644
index 0000000000..8f5924504f
--- /dev/null
+++ b/src/Makefile_Ecore_File.am
@@ -0,0 +1,33 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_file/libecore_file.la
+
+installed_ecorefilemainheadersdir = $(includedir)/ecore-file-@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_path.c \
+lib/ecore_file/ecore_file_private.h
+
+if HAVE_INOTIFY
+lib_ecore_file_libecore_file_la_SOURCES += \
+lib/ecore_file/ecore_file_monitor_inotify.c
+else
+if HAVE_NOTIFY_WIN32
+lib_ecore_file_libecore_file_la_SOURCES += \
+lib/ecore_file/ecore_file_monitor_win32.c
+else
+lib_ecore_file_libecore_file_la_SOURCES += \
+lib/ecore_file/ecore_file_monitor_poll.c
+endif
+endif
+
+lib_ecore_file_libecore_file_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FILE_CFLAGS@ -DEFL_BUILD
+lib_ecore_file_libecore_file_la_LIBADD = @ECORE_FILE_LIBS@
+lib_ecore_file_libecore_file_la_DEPENDENCIES = @ECORE_FILE_INTERNAL_LIBS@
+lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am
new file mode 100644
index 0000000000..ac099c38bb
--- /dev/null
+++ b/src/Makefile_Ecore_IMF.am
@@ -0,0 +1,165 @@
+
+### Library
+
+installed_ecoreimfmainheadersdir = $(includedir)/ecore-imf-@VMAJ@
+dist_installed_ecoreimfmainheaders_DATA = \
+lib/ecore_imf/Ecore_IMF.h
+
+lib_LTLIBRARIES += \
+lib/ecore_imf/libecore_imf.la
+
+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 \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+lib_ecore_imf_libecore_imf_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@ECORE_IMF_CFLAGS@
+lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
+lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@
+lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Modules
+
+# Ibus
+
+if BUILD_ECORE_IMF_IBUS
+ecoreimfibuspkgdir = $(libdir)/ecore_imf/modules/ibus/$(MODULE_ARCH)
+ecoreimfibuspkg_LTLIBRARIES = modules/ecore_imf/ibus/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreimfibuspkgLTLIBRARIES = install-ecoreimfibuspkgLTLIBRARIES
+$(install_ecoreimfibuspkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_imf_ibus_module_la_SOURCES = \
+modules/ecore_imf/ibus/ibus_module.c \
+modules/ecore_imf/ibus/ibus_imcontext.c \
+modules/ecore_imf/ibus/ibus_imcontext.h
+modules_ecore_imf_ibus_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_IMF_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@IBUS_CFLAGS@
+modules_ecore_imf_ibus_module_la_LIBADD = \
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@IBUS_LIBS@
+modules_ecore_imf_ibus_module_la_DEPENDENCIES = \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@
+modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# Scim
+
+if BUILD_ECORE_IMF_SCIM
+ecoreimfscimpkgdir = $(libdir)/ecore_imf/modules/scim/$(MODULE_ARCH)
+ecoreimfscimpkg_LTLIBRARIES = modules/ecore_imf/scim/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreimfscimpkgLTLIBRARIES = install-ecoreimfscimpkgLTLIBRARIES
+$(install_ecoreimfscimpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_imf_scim_module_la_SOURCES = \
+modules/ecore_imf/scim/scim_module.cpp \
+modules/ecore_imf/scim/scim_imcontext.cpp \
+modules/ecore_imf/scim/scim_imcontext.h
+modules_ecore_imf_scim_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_IMF_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@SCIM_CFLAGS@
+modules_ecore_imf_scim_module_la_LIBADD = \
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@SCIM_LIBS@
+modules_ecore_imf_scim_module_la_DEPENDENCIES = \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@
+modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# Xim
+
+if BUILD_ECORE_IMF_XIM
+ecoreimfximpkgdir = $(libdir)/ecore_imf/modules/xim/$(MODULE_ARCH)
+ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreimfximpkgLTLIBRARIES = install-ecoreimfximpkgLTLIBRARIES
+$(install_ecoreimfximpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_imf_xim_module_la_SOURCES = \
+modules/ecore_imf/xim/ecore_imf_xim.c
+modules_ecore_imf_xim_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_IMF_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@ecore_imf_xim_cflags@
+modules_ecore_imf_xim_module_la_LIBADD = \
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@ecore_imf_xim_libs@
+modules_ecore_imf_xim_module_la_DEPENDENCIES = \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@
+modules_ecore_imf_xim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_xim_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+# Wayland
+if BUILD_ECORE_IMF_WAYLAND
+ecoreimfwaylandpkgdir = $(libdir)/ecore_imf/modules/wayland/$(MODULE_ARCH)
+ecoreimfwaylandpkg_LTLIBRARIES = modules/ecore_imf/wayland/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecoreimfwaylandpkgLTLIBRARIES = install-ecoreimfwaylandpkgLTLIBRARIES
+$(install_ecoreimfwaylandpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_imf_wayland_module_la_SOURCES = \
+modules/ecore_imf/wayland/wayland_module.c \
+modules/ecore_imf/wayland/wayland_imcontext.c \
+modules/ecore_imf/wayland/wayland_imcontext.h
+
+nodist_modules_ecore_imf_wayland_module_la_SOURCES = \
+modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \
+modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c
+
+BUILT_SOURCES += \
+modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \
+modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c
+
+modules_ecore_imf_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/modules/ecore_imf/wayland \
+@ECORE_IMF_CFLAGS@ \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_WL2_CFLAGS@
+modules_ecore_imf_wayland_module_la_LIBADD = \
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_WL2_LIBS@
+modules_ecore_imf_wayland_module_la_DEPENDENCIES = \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_WL2_INTERNAL_LIBS@
+modules_ecore_imf_wayland_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
diff --git a/src/Makefile_Ecore_IMF_Evas.am b/src/Makefile_Ecore_IMF_Evas.am
new file mode 100644
index 0000000000..b2fd780713
--- /dev/null
+++ b/src/Makefile_Ecore_IMF_Evas.am
@@ -0,0 +1,15 @@
+
+### Library
+
+installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-imf-evas-@VMAJ@
+dist_installed_ecoreimfevasmainheaders_DATA = \
+lib/ecore_imf_evas/Ecore_IMF_Evas.h
+
+lib_LTLIBRARIES += \
+lib/ecore_imf_evas/libecore_imf_evas.la
+
+lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c
+lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IMF_EVAS_CFLAGS@ -DEFL_BUILD
+lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
+lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
+lib_ecore_imf_evas_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
new file mode 100644
index 0000000000..0dc407bab5
--- /dev/null
+++ b/src/Makefile_Ecore_Input.am
@@ -0,0 +1,21 @@
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/ecore_input/libecore_input.la
+
+installed_ecoreinputmainheadersdir = $(includedir)/ecore-input-@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_joystick.c \
+lib/ecore_input/ecore_input_compose.h \
+lib/ecore_input/ecore_input_private.h
+
+lib_ecore_input_libecore_input_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_CFLAGS@ -DEFL_BUILD
+lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
+lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
+lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input_Evas.am b/src/Makefile_Ecore_Input_Evas.am
new file mode 100644
index 0000000000..23bcb92cda
--- /dev/null
+++ b/src/Makefile_Ecore_Input_Evas.am
@@ -0,0 +1,18 @@
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/ecore_input_evas/libecore_input_evas.la
+
+installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-input-evas-@VMAJ@
+dist_installed_ecoreinputevasmainheaders_DATA = \
+lib/ecore_input_evas/Ecore_Input_Evas.h
+
+lib_ecore_input_evas_libecore_input_evas_la_SOURCES = \
+lib/ecore_input_evas/ecore_input_evas.c \
+lib/ecore_input_evas/ecore_input_evas_private.h
+
+lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_EVAS_CFLAGS@ -DEFL_BUILD
+lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
+lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
+lib_ecore_input_evas_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
new file mode 100644
index 0000000000..0f09209f47
--- /dev/null
+++ b/src/Makefile_Ecore_Ipc.am
@@ -0,0 +1,17 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_ipc/libecore_ipc.la
+
+installed_ecoreipcmainheadersdir = $(includedir)/ecore-ipc-@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_builddir)/src/lib/efl @ECORE_IPC_CFLAGS@ -DEFL_BUILD
+lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@ @EVIL_LIBS@
+lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
+lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Js.am b/src/Makefile_Ecore_Js.am
new file mode 100644
index 0000000000..0c73b99aa5
--- /dev/null
+++ b/src/Makefile_Ecore_Js.am
@@ -0,0 +1,18 @@
+
+### Library
+
+if HAVE_JS
+installed_ecorejsheadersdir = $(includedir)/ecore-js-@VMAJ@
+dist_installed_ecorejsheaders_DATA = \
+bindings/js/ecore_js/Ecore_Js.hh \
+bindings/js/ecore_js/ecore_js_init.hh \
+bindings/js/ecore_js/ecore_js_mainloop.hh \
+bindings/js/ecore_js/ecore_js_timer.hh \
+bindings/js/ecore_js/ecore_js_event.hh \
+bindings/js/ecore_js/ecore_js_job.hh \
+bindings/js/ecore_js/ecore_js_idle.hh \
+bindings/js/ecore_js/ecore_js_animator.hh \
+bindings/js/ecore_js/ecore_js_poller.hh \
+bindings/js/ecore_js/ecore_js_throttle.hh
+endif
+
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
new file mode 100644
index 0000000000..88eec1bd10
--- /dev/null
+++ b/src/Makefile_Ecore_SDL.am
@@ -0,0 +1,20 @@
+if HAVE_ECORE_SDL
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_sdl/libecore_sdl.la
+
+installed_ecoresdlmainheadersdir = $(includedir)/ecore-sdl-@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_builddir)/src/lib/efl @ECORE_SDL_CFLAGS@ -DEFL_BUILD
+lib_ecore_sdl_libecore_sdl_la_LIBADD = @ECORE_SDL_LIBS@
+lib_ecore_sdl_libecore_sdl_la_DEPENDENCIES = @ECORE_SDL_INTERNAL_LIBS@
+lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
new file mode 100644
index 0000000000..6099f34cd4
--- /dev/null
+++ b/src/Makefile_Ecore_Wayland.am
@@ -0,0 +1,33 @@
+if HAVE_ECORE_WAYLAND
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_wayland/libecore_wayland.la
+
+installed_ecorewaylandmainheadersdir = $(includedir)/ecore-wayland-@VMAJ@
+dist_installed_ecorewaylandmainheaders_DATA = \
+lib/ecore_wayland/Ecore_Wayland.h
+
+lib_ecore_wayland_libecore_wayland_la_SOURCES = \
+lib/ecore_wayland/ecore_wl.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_wl_subsurf.c \
+lib/ecore_wayland/ecore_wl_private.h \
+lib/ecore_wayland/subsurface-protocol.c \
+lib/ecore_wayland/subsurface-client-protocol.h \
+lib/ecore_wayland/ivi-application-protocol.c \
+lib/ecore_wayland/ivi-application-client-protocol.h \
+lib/ecore_wayland/xdg-shell-client-protocol.h \
+lib/ecore_wayland/xdg-shell-protocol.c \
+lib/ecore_wayland/session-recovery-client-protocol.h \
+lib/ecore_wayland/session-recovery-protocol.c
+
+lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WAYLAND_CFLAGS@
+lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
+lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
+lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
new file mode 100644
index 0000000000..817eabe90b
--- /dev/null
+++ b/src/Makefile_Ecore_Win32.am
@@ -0,0 +1,35 @@
+if HAVE_WIN32
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_win32/libecore_win32.la
+
+installed_ecorewin32mainheadersdir = $(includedir)/ecore-win32-@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_clipboard.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_monitor.c \
+lib/ecore_win32/ecore_win32_window.c \
+lib/ecore_win32/ecore_win32_private.h \
+lib/ecore_win32/ecore_win32_cursor_x11.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/ecore_win32_keysym_table.h
+
+lib_ecore_win32_libecore_win32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WIN32_CFLAGS@ -DEFL_BUILD
+lib_ecore_win32_libecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@
+lib_ecore_win32_libecore_win32_la_DEPENDENCIES = @ECORE_WIN32_INTERNAL_LIBS@
+lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+endif
diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am
new file mode 100644
index 0000000000..452e1454a3
--- /dev/null
+++ b/src/Makefile_Ecore_Wl2.am
@@ -0,0 +1,100 @@
+if HAVE_ECORE_WL2
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_wl2/libecore_wl2.la
+
+installed_ecorewl2mainheadersdir = $(includedir)/ecore-wl2-@VMAJ@
+dist_installed_ecorewl2mainheaders_DATA = lib/ecore_wl2/Ecore_Wl2.h
+
+lib_ecore_wl2_libecore_wl2_la_SOURCES = \
+lib/ecore_wl2/ecore_wl2_subsurf.c \
+lib/ecore_wl2/ecore_wl2_dnd.c \
+lib/ecore_wl2/ecore_wl2_window.c \
+lib/ecore_wl2/ecore_wl2_input.c \
+lib/ecore_wl2/ecore_wl2_output.c \
+lib/ecore_wl2/ecore_wl2_display.c \
+lib/ecore_wl2/ecore_wl2.c \
+lib/ecore_wl2/ecore_wl2_private.h \
+lib/ecore_wl2/ecore_wl2_buffer.c \
+lib/ecore_wl2/ecore_wl2_surface.c \
+static_libs/libdrm/drm_fourcc.h \
+static_libs/libdrm/drm.h \
+static_libs/libdrm/drm_mode.h \
+static_libs/libdrm/exynos_drm.h \
+static_libs/libdrm/exynos_drmif.h \
+static_libs/libdrm/i915_drm.h \
+static_libs/libdrm/intel_bufmgr.h \
+static_libs/libdrm/vc4_drm.h \
+static_libs/libdrm/LICENSE \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+
+nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \
+lib/ecore_wl2/efl-aux-hints-protocol.c \
+lib/ecore_wl2/efl-aux-hints-client-protocol.h \
+lib/ecore_wl2/teamwork-protocol.c \
+lib/ecore_wl2/teamwork-client-protocol.h \
+lib/ecore_wl2/session-recovery-client-protocol.h \
+lib/ecore_wl2/session-recovery-protocol.c \
+lib/ecore_wl2/www-client-protocol.h \
+lib/ecore_wl2/www-protocol.c \
+lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \
+lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \
+lib/ecore_wl2/xdg-shell-client-protocol.h \
+lib/ecore_wl2/xdg-shell-protocol.c \
+lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \
+lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c \
+lib/ecore_wl2/efl-hints-client-protocol.h \
+lib/ecore_wl2/efl-hints-protocol.c
+
+lib_ecore_wl2_libecore_wl2_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@ECORE_WL2_CFLAGS@ \
+-I$(top_srcdir)/src/static_libs/libdrm \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DMODULE_ARCH=\"$(MODULE_ARCH)\"
+lib_ecore_wl2_libecore_wl2_la_LIBADD = @ECORE_WL2_LIBS@
+lib_ecore_wl2_libecore_wl2_la_DEPENDENCIES = @ECORE_WL2_INTERNAL_LIBS@
+lib_ecore_wl2_libecore_wl2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+BUILT_SOURCES += \
+lib/ecore_wl2/efl-aux-hints-protocol.c \
+lib/ecore_wl2/efl-aux-hints-client-protocol.h \
+ lib/ecore_wl2/www-client-protocol.h \
+ lib/ecore_wl2/www-protocol.c \
+ lib/ecore_wl2/teamwork-protocol.c \
+ lib/ecore_wl2/teamwork-client-protocol.h \
+ lib/ecore_wl2/xdg-shell-client-protocol.h \
+ lib/ecore_wl2/xdg-shell-protocol.c \
+ lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \
+ lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c \
+ lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \
+ lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \
+ lib/ecore_wl2/session-recovery-protocol.c \
+ lib/ecore_wl2/session-recovery-client-protocol.h \
+lib/ecore_wl2/efl-hints-client-protocol.h \
+lib/ecore_wl2/efl-hints-protocol.c
+
+DMABUFSOURCES = modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c
+ecorewl2enginedmabufpkgdir = $(libdir)/ecore_wl2/engines/dmabuf/$(MODULE_ARCH)
+ecorewl2enginedmabufpkg_LTLIBRARIES = modules/ecore_wl2/engines/dmabuf/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ecorewl2enginedmabufpkgLTLIBRARIES = install-ecorewl2enginedmabufpkgLTLIBRARIES
+$(install_ecorewl2enginedmabufpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ecore_wl2_engines_dmabuf_module_la_SOURCES = $(DMABUFSOURCES)
+modules_ecore_wl2_engines_dmabuf_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WL2_CFLAGS@
+modules_ecore_wl2_engines_dmabuf_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ @USE_ECORE_WL2_LIBS@
+modules_ecore_wl2_engines_dmabuf_module_la_DEPENDENCIES = lib/ecore_wl2/libecore_wl2.la
+modules_ecore_wl2_engines_dmabuf_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+endif
+
+#We want this in the release tarball even if the builder isn't compiling
+#wayland support.
+EXTRA_DIST2 += lib/ecore_wl2/window_v6.x
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
new file mode 100644
index 0000000000..636f745d90
--- /dev/null
+++ b/src/Makefile_Ecore_X.am
@@ -0,0 +1,62 @@
+if HAVE_ECORE_X
+
+### Library
+
+lib_LTLIBRARIES += lib/ecore_x/libecore_x.la
+
+installed_ecorexmainheadersdir = $(includedir)/ecore-x-@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
+
+lib_ecore_x_libecore_x_la_SOURCES = \
+lib/ecore_x/ecore_x_atoms_decl.h \
+lib/ecore_x/ecore_x.c \
+lib/ecore_x/ecore_x_dnd.c \
+lib/ecore_x/ecore_x_sync.c \
+lib/ecore_x/ecore_x_randr.c \
+lib/ecore_x/ecore_x_fixes.c \
+lib/ecore_x/ecore_x_damage.c \
+lib/ecore_x/ecore_x_composite.c \
+lib/ecore_x/ecore_x_error.c \
+lib/ecore_x/ecore_x_events.c \
+lib/ecore_x/ecore_x_icccm.c \
+lib/ecore_x/ecore_x_keygrab.c \
+lib/ecore_x/ecore_x_netwm.c \
+lib/ecore_x/ecore_x_mwm.c \
+lib/ecore_x/ecore_x_e.c \
+lib/ecore_x/ecore_x_selection.c \
+lib/ecore_x/ecore_x_window.c \
+lib/ecore_x/ecore_x_window_prop.c \
+lib/ecore_x/ecore_x_window_shape.c \
+lib/ecore_x/ecore_x_pixmap.c \
+lib/ecore_x/ecore_x_present.c \
+lib/ecore_x/ecore_x_gc.c \
+lib/ecore_x/ecore_x_xinerama.c \
+lib/ecore_x/ecore_x_screensaver.c \
+lib/ecore_x/ecore_x_dpms.c \
+lib/ecore_x/ecore_x_drawable.c \
+lib/ecore_x/ecore_x_cursor.c \
+lib/ecore_x/ecore_x_test.c \
+lib/ecore_x/ecore_x_atoms.c \
+lib/ecore_x/ecore_x_region.c \
+lib/ecore_x/ecore_x_image.c \
+lib/ecore_x/ecore_x_xi2.c \
+lib/ecore_x/ecore_x_vsync.c \
+lib/ecore_x/ecore_x_gesture.c \
+lib/ecore_x/ecore_x_private.h
+
+lib_ecore_x_libecore_x_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@ECORE_X_CFLAGS@ @ECORE_CON_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_x\"
+
+lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@ @USE_ECORE_CON_LIBS@
+lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@
+lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
new file mode 100644
index 0000000000..52a6047067
--- /dev/null
+++ b/src/Makefile_Ector.am
@@ -0,0 +1,219 @@
+
+### Library
+ector_eolian_files_generic = \
+	lib/ector/ector_surface.eo \
+	lib/ector/ector_buffer.eo \
+	lib/ector/ector_renderer.eo \
+	lib/ector/ector_renderer_shape.eo \
+	lib/ector/ector_renderer_gradient.eo \
+	lib/ector/ector_renderer_gradient_radial.eo \
+	lib/ector/ector_renderer_gradient_linear.eo
+ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h)
+
+# Handle cairo backend
+ector_eolian_files_cairo = \
+	lib/ector/cairo/ector_cairo_surface.eo \
+	lib/ector/cairo/ector_cairo_software_surface.eo \
+	lib/ector/cairo/ector_renderer_cairo.eo \
+	lib/ector/cairo/ector_renderer_cairo_shape.eo \
+	lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo \
+	lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+ector_eolian_cairo_h = $(ector_eolian_files_cairo:%.eo=%.eo.h)
+
+# Handle default software backend
+ector_eolian_files_software = \
+	lib/ector/software/ector_software_surface.eo \
+	lib/ector/software/ector_software_buffer.eo \
+	lib/ector/software/ector_software_buffer_base.eo \
+	lib/ector/software/ector_renderer_software.eo \
+	lib/ector/software/ector_renderer_software_shape.eo \
+	lib/ector/software/ector_renderer_software_gradient_radial.eo \
+	lib/ector/software/ector_renderer_software_gradient_linear.eo
+ector_eolian_software_h = $(ector_eolian_files_software:%.eo=%.eo.h)
+
+# Handle gl backend
+ector_eolian_files_gl = \
+	lib/ector/gl/ector_gl_surface.eo \
+	lib/ector/gl/ector_gl_buffer.eo \
+	lib/ector/gl/ector_renderer_gl.eo \
+	lib/ector/gl/ector_renderer_gl_shape.eo \
+	lib/ector/gl/ector_renderer_gl_gradient_radial.eo \
+	lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+ector_eolian_gl_h = $(ector_eolian_files_gl:%.eo=%.eo.h)
+
+ector_eolian_type_files = \
+    lib/ector/ector_types.eot
+
+ector_eolian_files = \
+                     $(ector_eolian_files_generic) \
+                     $(ector_eolian_files_cairo) \
+                     $(ector_eolian_files_software) \
+                     $(ector_eolian_files_gl)
+
+ector_eolian_c = $(ector_eolian_files:%.eo=%.eo.c)
+ector_eolian_h = $(ector_eolian_files:%.eo=%.eo.h) \
+                 $(ector_eolian_type_files:%.eot=%.eot.h)
+
+BUILT_SOURCES += \
+	$(ector_eolian_c) \
+	$(ector_eolian_h)
+
+if INSTALL_EO_FILES
+ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@
+ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files)
+endif
+
+EXTRA_DIST2 += $(ector_eolian_files) $(ector_eolian_type_files) \
+lib/ector/Ector.h \
+lib/ector/ector_util.h \
+lib/ector/ector_surface.h \
+lib/ector/ector_buffer.h \
+lib/ector/ector_renderer.h \
+lib/ector/cairo/Ector_Cairo.h \
+lib/ector/software/Ector_Software.h \
+lib/ector/gl/Ector_GL.h
+
+lib_LTLIBRARIES += lib/ector/libector.la
+
+# And the generic implementation
+
+lib_ector_libector_la_SOURCES = \
+lib/ector/ector_main.c \
+lib/ector/ector_gl_internal.h \
+lib/ector/ector_buffer.c \
+lib/ector/ector_renderer_shape.c \
+lib/ector/ector_renderer.c \
+lib/ector/ector_renderer_gradient.c \
+lib/ector/ector_renderer_gradient_radial.c \
+lib/ector/ector_renderer_gradient_linear.c
+
+# And now the cairo backend
+lib_ector_libector_la_SOURCES += \
+lib/ector/cairo/ector_renderer_cairo_gradient_linear.c \
+lib/ector/cairo/ector_renderer_cairo_gradient_radial.c \
+lib/ector/cairo/ector_renderer_cairo_shape.c \
+lib/ector/cairo/ector_renderer_cairo.c \
+lib/ector/cairo/ector_cairo_software_surface.c \
+lib/ector/cairo/ector_cairo_surface.c
+
+# SW draw static lib
+lib_ector_libector_la_SOURCES += \
+static_libs/draw/draw_main_sse2.c \
+static_libs/draw/draw_main.c \
+static_libs/draw/draw_main_neon.c \
+static_libs/rg_etc/rg_etc1.c \
+static_libs/rg_etc/rg_etc2.c \
+static_libs/rg_etc/rg_etc1.h \
+static_libs/rg_etc/etc2_encoder.c
+
+# Triangulator static lib
+triangulator_sources = \
+static_libs/triangulator/triangulator_stroker.c \
+static_libs/triangulator/triangulator_stroker.h \
+static_libs/triangulator/triangulator_simple.c \
+static_libs/triangulator/triangulator_simple.h \
+$(NULL)
+
+# And the default software backend
+lib_ector_libector_la_SOURCES += \
+lib/ector/software/ector_renderer_software_gradient_linear.c \
+lib/ector/software/ector_renderer_software_gradient_radial.c \
+lib/ector/software/ector_renderer_software_shape.c \
+lib/ector/software/ector_software_gradient.c \
+lib/ector/software/ector_software_gradient_sse3.c \
+lib/ector/software/ector_software_gradient.h \
+lib/ector/software/ector_software_rasterizer.c \
+lib/ector/software/ector_software_surface.c \
+lib/ector/software/ector_software_buffer.c \
+static_libs/freetype/sw_ft_math.c \
+static_libs/freetype/sw_ft_raster.c \
+static_libs/freetype/sw_ft_stroker.c \
+$(triangulator_sources)
+
+# And now the gl backend
+lib_ector_libector_la_SOURCES += \
+lib/ector/gl/ector_renderer_gl_gradient_linear.c \
+lib/ector/gl/ector_renderer_gl_gradient_radial.c \
+lib/ector/gl/ector_renderer_gl_shape.c \
+lib/ector/gl/ector_renderer_gl.c \
+lib/ector/gl/ector_gl_buffer.c \
+lib/ector/gl/ector_gl_surface.c \
+lib/ector/gl/ector_gl_private.h \
+lib/ector/gl/shader/ector_gl_shaders.x \
+lib/ector/gl/ector_gl_shader.c
+
+ECTOR_GL_SHADERS_GEN = \
+lib/ector/gl/shader/gen_shaders.sh \
+lib/ector/gl/shader/fragment.glsl \
+lib/ector/gl/shader/vertex.glsl \
+lib/ector/gl/shader/include.glsl
+
+lib/ector/gl/shader/ector_gl_shaders.x: $(ECTOR_GL_SHADERS_GEN)
+	@echo "  SHADERS  $@"
+	@sh $(srcdir)/lib/ector/gl/shader/gen_shaders.sh
+
+lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib \
+-I$(top_builddir)/src/lib/ector \
+-I$(top_builddir)/src/lib/ector/cairo \
+-I$(top_builddir)/src/lib/ector/software \
+-I$(top_builddir)/src/lib/ector/gl \
+-I$(top_srcdir)/src/static_libs/freetype \
+-I$(top_srcdir)/src/static_libs/draw \
+-I$(top_srcdir)/src/static_libs/triangulator \
+-DEFL_BUILD \
+@ECTOR_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ector\" \
+-DEFL_BETA_API_SUPPORT=1 \
+@VALGRIND_CFLAGS@ \
+@SSE3_CFLAGS@
+
+lib_ector_libector_la_LIBADD = @ECTOR_LIBS@
+lib_ector_libector_la_DEPENDENCIES = @ECTOR_INTERNAL_LIBS@
+lib_ector_libector_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/ector/suite/ector_suite tests/ector/cxx_compile_test/cxx_compile_test
+TESTS += tests/ector/suite/ector_suite
+
+tests_ector_suite_ector_suite_SOURCES = \
+tests/ector/suite/ector_suite.c \
+tests/ector/suite/ector_suite.h \
+tests/ector/suite/ector_test_init.c
+
+tests_ector_cxx_compile_test_cxx_compile_test_SOURCES = tests/ector/cxx_compile_test/cxx_compile_test.cxx
+tests_ector_cxx_compile_test_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECTOR_CFLAGS@
+tests_ector_cxx_compile_test_cxx_compile_test_LDADD = @USE_ECTOR_LIBS@
+tests_ector_cxx_compile_test_cxx_compile_test_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@
+
+
+tests_ector_suite_ector_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/tests/ector \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ector/suite\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ector\" \
+@CHECK_CFLAGS@ \
+@ECTOR_CFLAGS@
+tests_ector_suite_ector_suite_LDADD = @CHECK_LIBS@ @USE_ECTOR_LIBS@
+tests_ector_suite_ector_suite_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@
+
+endif
+
+EXTRA_DIST2 += \
+lib/ector/ector_private.h \
+lib/ector/cairo/ector_cairo_private.h \
+lib/ector/software/ector_software_private.h \
+static_libs/freetype/sw_ft_math.h \
+static_libs/freetype/sw_ft_raster.h \
+static_libs/freetype/sw_ft_stroker.h \
+static_libs/freetype/sw_ft_types.h \
+static_libs/draw/draw.h \
+static_libs/draw/draw_private.h \
+$(ECTOR_GL_SHADERS_GEN)
+
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
new file mode 100644
index 0000000000..827e7237f5
--- /dev/null
+++ b/src/Makefile_Edje.am
@@ -0,0 +1,404 @@
+
+### Library
+
+edje_eolian_files = \
+	lib/edje/efl_layout_calc.eo \
+	lib/edje/efl_layout_signal.eo \
+	lib/edje/efl_layout_group.eo \
+	lib/edje/efl_canvas_layout.eo \
+	lib/edje/efl_canvas_layout_part.eo \
+	lib/edje/efl_canvas_layout_part_box.eo \
+	lib/edje/efl_canvas_layout_part_external.eo \
+	lib/edje/efl_canvas_layout_part_swallow.eo \
+	lib/edje/efl_canvas_layout_part_table.eo \
+	lib/edje/efl_canvas_layout_part_text.eo
+
+edje_eolian_type_files = \
+    lib/edje/edje_types.eot
+
+edje_eolian_priv_files = \
+	lib/edje/edje_global.eo \
+	lib/edje/efl_canvas_layout_part_invalid.eo \
+	$(NULL)
+
+edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c)
+edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \
+                $(edje_eolian_type_files:%.eot=%.eot.h)
+
+edje_eolian_priv_c = $(edje_eolian_priv_files:%.eo=%.eo.c)
+edje_eolian_priv_h = $(edje_eolian_priv_files:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+                 $(edje_eolian_c) \
+                 $(edje_eolian_h) \
+                 $(edje_eolian_priv_c) \
+                 $(edje_eolian_priv_h)
+
+if INSTALL_EO_FILES
+edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
+edjeeolianfiles_DATA = \
+$(edje_eolian_files) \
+$(edje_eolian_type_files)
+endif
+
+noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h)
+
+EXTRA_DIST2 += \
+$(edje_eolian_files) \
+$(edje_eolian_type_files) \
+$(edje_eolian_priv_files)
+
+lib_LTLIBRARIES += lib/edje/libedje.la
+
+EDJE_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir) \
+-I$(top_srcdir)/src/lib/edje \
+-I$(top_builddir)/src/lib/edje \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+@EDJE_LUA_CFLAGS@ \
+@EDJE_CFLAGS@
+
+installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@
+dist_installed_edjemainheaders_DATA = \
+lib/edje/Edje.h \
+lib/edje/Edje_Common.h \
+lib/edje/Edje_Eo.h \
+lib/edje/Edje_Legacy.h \
+lib/edje/Edje_Edit.h \
+lib/edje/edje_edit_eo.h \
+lib/edje/edje_edit_eo.legacy.h \
+lib/edje/efl_canvas_layout_eo.legacy.h \
+lib/edje/efl_layout_group_eo.legacy.h
+
+EXTRA_DIST2 += \
+lib/edje/edje_edit_eo.c \
+lib/edje/efl_canvas_layout_eo.legacy.c \
+lib/edje/efl_layout_group_eo.legacy.c
+
+nodist_installed_edjemainheaders_DATA = \
+                                        $(edje_eolian_h) \
+                                        $(NULL)
+
+lib_edje_libedje_la_SOURCES = \
+lib/edje/edje_private.h \
+lib/edje/edje_convert.h \
+lib/edje/edje_box_layout.c \
+lib/edje/edje_cache.c \
+lib/edje/edje_calc.c \
+lib/edje/edje_callbacks.c \
+lib/edje/edje_data.c \
+lib/edje/edje_edit.c \
+lib/edje/edje_embryo.c \
+lib/edje/edje_entry.c \
+lib/edje/edje_external.c \
+lib/edje/edje_load.c \
+lib/edje/edje_lua.c \
+lib/edje/edje_lua2.c \
+lib/edje/edje_lua_script_only.c \
+lib/edje/edje_main.c \
+lib/edje/edje_match.c \
+lib/edje/edje_message_queue.c \
+lib/edje/edje_misc.c \
+lib/edje/edje_module.c \
+lib/edje/edje_multisense.c \
+lib/edje/edje_program.c \
+lib/edje/edje_smart.c \
+lib/edje/edje_text.c \
+lib/edje/edje_textblock.c \
+lib/edje/edje_textblock_styles.c \
+lib/edje/edje_util.c \
+lib/edje/edje_legacy.c \
+lib/edje/edje_var.c \
+lib/edje/edje_signal.c \
+lib/edje/edje_part.c \
+lib/edje/edje_part_helper.h \
+lib/edje/edje_part_external.c \
+lib/edje/edje_part_swallow.c \
+lib/edje/edje_part_table.c \
+lib/edje/edje_part_box.c \
+lib/edje/edje_part_text.c \
+lib/edje/edje_part_invalid.c \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+
+lib_edje_libedje_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) -DEFL_BUILD
+lib_edje_libedje_la_LIBADD = @EDJE_LIBS@ @EDJE_LUA_LIBS@
+lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
+lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+if ENABLE_MULTISENSE
+# edjemoduleXXXdir = $(libdir)/edje/modules/
+# edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la
+#
+# # Workaround for broken parallel install support in automake (relink issue)
+# # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+# install_edjemoduleXXXLTLIBRARIES = install-edjemoduleXXXLTLIBRARIES
+# $(install_edjemoduleXXXLTLIBRARIES): install-libLTLIBRARIES
+#
+# modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c
+# modules_edje_XXX_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@
+# modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD)
+# modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+# modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+# edjemodulemultisensefactorydir = $(libdir)/edje/modules/multisense_factory/$(MODULE_ARCH)
+# edjemodulemultisensefactory_LTLIBRARIES = modules/edje/multisense_factory/module.la
+#
+# # Workaround for broken parallel install support in automake (relink issue)
+# # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+# install_edjemodulemultisensefactoryLTLIBRARIES = install-edjemodulemultisensefactoryLTLIBRARIES
+# $(install_edjemodulemultisensefactoryLTLIBRARIES): install-libLTLIBRARIES
+#
+# modules_edje_multisense_factory_module_la_SOURCES = \
+# modules/edje/multisense_factory/multisense_factory.c
+# modules_edje_multisense_factory_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+# $(EDJE_COMMON_CPPFLAGS) \
+# @REMIX_CFLAGS@
+# modules_edje_multisense_factory_module_la_LIBADD = \
+# $(EDJE_COMMON_USER_LIBADD) \
+# @REMIX_LIBS@
+# modules_edje_multisense_factory_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+# modules_edje_multisense_factory_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+endif
+
+### Binary
+
+if HAVE_WIN32
+USE_EDJE_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_EDJE_LIBS@
+else
+USE_EDJE_BIN_LIBS = @USE_EDJE_LIBS@
+endif
+
+bin_PROGRAMS += \
+bin/edje/edje_cc \
+bin/edje/edje_decc \
+bin/edje/edje_player \
+bin/edje/edje_inspector \
+bin/edje/edje_external_inspector \
+bin/edje/edje_codegen \
+bin/edje/edje_pick \
+bin/edje/edje_watch
+
+bin_edje_edje_cc_SOURCES = \
+bin/edje/edje_multisense_convert.h \
+bin/edje/edje_cc.h \
+bin/edje/edje_cc.c \
+bin/edje/edje_cc_out.c \
+bin/edje/edje_cc_parse.c \
+bin/edje/edje_cc_mem.c \
+bin/edje/edje_cc_handlers.c \
+bin/edje/edje_cc_sources.c \
+bin/edje/edje_cc_script.c \
+bin/edje/edje_multisense_convert.c
+
+bin_edje_edje_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) @EDJE_LUA_CFLAGS@
+bin_edje_edje_cc_LDADD =  $(USE_EDJE_BIN_LIBS) @EDJE_LUA_LIBS@
+bin_edje_edje_cc_DEPENDENCIES = \
+@USE_EDJE_INTERNAL_LIBS@ \
+bin/edje/epp/epp$(EXEEXT) # epp is an artificial dependency because edje_cc will use it at runtime, so we be sure if we depend on edje_cc we get epp.
+
+bin_edje_edje_decc_SOURCES = \
+bin/edje/edje_decc.c \
+bin/edje/edje_decc.h \
+bin/edje/edje_cc_mem.c \
+bin/edje/edje_cc_sources.c
+bin_edje_edje_decc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_decc_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
+bin_edje_edje_player_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_player_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
+bin_edje_edje_inspector_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_inspector_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
+bin_edje_edje_external_inspector_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_external_inspector_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
+bin_edje_edje_codegen_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_codegen_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
+bin_edje_edje_pick_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_pick_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
+bin_edje_edje_watch_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_watch_LDADD =  $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
+
+# EPP (Edje's CPP)
+eppdir = $(libdir)/edje/utils/$(MODULE_ARCH)
+epp_PROGRAMS = bin/edje/epp/epp
+bin_edje_epp_epp_SOURCES = \
+bin/edje/epp/cpplib.h \
+bin/edje/epp/cpphash.h \
+bin/edje/epp/cppalloc.c \
+bin/edje/epp/cpperror.c \
+bin/edje/epp/cppexp.c \
+bin/edje/epp/cpphash.c \
+bin/edje/epp/cpplib.c \
+bin/edje/epp/cppmain.c
+
+# Note: eina is included only because of EINA_UNUSED
+bin_edje_epp_epp_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir) \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+$(CWARNFLAGS) \
+-DHAVE_CONFIG_H \
+-DHAVE_STRERROR \
+-DFATAL_EXIT_CODE=1 \
+-DSUCCESS_EXIT_CODE=0 \
+-DGCC_INCLUDE_DIR=\"/usr/include\" \
+-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include\" \
+-DTOOL_INCLUDE_DIR=\"/usr/bin\" \
+-DHOST_BITS_PER_LONG=32 \
+-DBITS_PER_UNIT=8 \
+-DHOST_BITS_PER_INT=32 \
+-DBITS_PER_WORD=16 \
+-DTARGET_BELL=7 \
+-DTARGET_BS=8 \
+-DTARGET_FF=12 \
+-DTARGET_NEWLINE=10 \
+-DTARGET_CR=13 \
+-DTARGET_TAB=9 \
+-DTARGET_VT=11
+if HAVE_WIN32
+bin_edje_epp_epp_CPPFLAGS += \
+@EFL_WINDOWS_VERSION_CFLAGS@ \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+bin_edje_epp_epp_LDADD = lib/evil/libevil.la
+endif
+
+# TODO: why keep these?
+EXTRA_DIST2 += \
+bin/edje/edje_convert.h \
+bin/edje/edje_convert.c \
+bin/edje/edje_data_convert.c \
+bin/edje/edje_convert_main.c \
+lib/edje/edje_convert.c \
+tests/edje/data/complex_layout.edc \
+tests/edje/data/test_layout.edc \
+tests/edje/data/test_parens.edc \
+tests/edje/data/test_masking.edc \
+tests/edje/data/test_filters.edc \
+tests/edje/data/test_snapshot.edc \
+tests/edje/data/test_size_class.edc \
+tests/edje/data/test_color_class.edc \
+tests/edje/data/test_swallows.edc \
+tests/edje/data/test_box.edc \
+tests/edje/data/test_table.edc \
+tests/edje/data/test_combine_keywords.edc \
+tests/edje/data/test_messages.edc \
+tests/edje/data/test_signals.edc \
+tests/edje/data/test_signal_callback_del_full.edc \
+tests/edje/data/test_text_cursor.edc \
+tests/edje/data/test_textblock.edc \
+tests/edje/data/test_text.edc \
+tests/edje/data/filter.lua
+
+
+bin_SCRIPTS += bin/edje/edje_recc
+
+# Useful to other modules that generate EDJ
+include Makefile_Edje_Helper.am
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/edje/edje_suite
+TESTS += tests/edje/edje_suite
+
+tests_edje_edje_suite_SOURCES = \
+tests/edje/edje_suite.c \
+tests/edje/edje_test_container.c \
+tests/edje/edje_test_edje.c \
+tests/edje/edje_test_features.c \
+tests/edje/edje_test_signal.c \
+tests/edje/edje_test_swallow.c \
+tests/edje/edje_test_text.c \
+tests/edje/edje_suite.h
+
+tests/edje/data/%.edj: tests/edje/data/%.edc bin/edje/edje_cc${EXEEXT}
+	$(AM_V_EDJ) \
+	$(MKDIR_P) tests/edje/data; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/edje/data \
+	-id $(srcdir)/tests/emotion/data \
+	-dd $(srcdir)/tests/edje/data \
+	$< $@
+
+EDJE_TEST_FILES = tests/edje/data/test_layout.edj \
+                     tests/edje/data/complex_layout.edj \
+                     tests/edje/data/test_parens.edj \
+                     tests/edje/data/test_masking.edj \
+                     tests/edje/data/test_filters.edj \
+                     tests/edje/data/test_snapshot.edj \
+                     tests/edje/data/test_size_class.edj \
+                     tests/edje/data/test_swallows.edj \
+                     tests/edje/data/test_color_class.edj \
+		     tests/edje/data/test_box.edj \
+                     tests/edje/data/test_table.edj \
+                     tests/edje/data/test_combine_keywords.edj \
+                     tests/edje/data/test_messages.edj \
+                     tests/edje/data/test_signals.edj \
+                     tests/edje/data/test_signal_callback_del_full.edj \
+                     tests/edje/data/test_text_cursor.edj \
+                     tests/edje/data/test_textblock.edj \
+                     tests/edje/data/test_text.edj \
+                     $(NULL)
+
+CLEANFILES += $(EDJE_TEST_FILES)
+
+tests_edje_edje_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+$(EDJE_COMMON_CPPFLAGS) \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje\" \
+-DTESTS_BUILD_DIR=\"$(abs_top_builddir)/src/tests/edje\" \
+@CHECK_CFLAGS@
+tests_edje_edje_suite_LDADD = @CHECK_LIBS@  $(USE_EDJE_BIN_LIBS)
+tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ $(EDJE_TEST_FILES)
+
+endif
+
+if HAVE_LUA_BINDINGS
+
+edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua)
+
+generated_edje_lua_all = $(edje_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_edje_lua_all)
+
+installed_edjeluadir = $(datadir)/elua/modules/edje
+nodist_installed_edjelua_DATA = $(generated_edje_lua_all)
+
+endif
+
+if HAVE_JS
+
+generated_edje_js_bindings = $(edje_eolian_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_edje_js_bindings)
+
+endif
+
+if HAVE_CXX
+edje_eolian_cxx_hh = $(edje_eolian_files:%.eo=%.eo.hh)
+edje_eolian_cxx_impl_hh = $(edje_eolian_files:%.eo=%.eo.impl.hh)
+endif
diff --git a/src/Makefile_Edje_Helper.am b/src/Makefile_Edje_Helper.am
new file mode 100644
index 0000000000..913a2037d9
--- /dev/null
+++ b/src/Makefile_Edje_Helper.am
@@ -0,0 +1,13 @@
+if HAVE_EDJE_CC
+EDJE_CC = @edje_cc@
+else
+EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
+endif
+EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
+EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
+EDJE_CC_FLAGS_VERBOSE_1 = -v
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
+
+AM_V_EDJ = $(am__v_EDJ_@AM_V@)
+am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
+am__v_EDJ_0 = @echo "  EDJ     " $@;
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
new file mode 100644
index 0000000000..3dc86a5c6e
--- /dev/null
+++ b/src/Makefile_Eet.am
@@ -0,0 +1,94 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/eet/libeet.la
+
+installed_eetmainheadersdir = $(includedir)/eet-@VMAJ@
+dist_installed_eetmainheaders_DATA = lib/eet/Eet.h
+
+lib_eet_libeet_la_SOURCES = \
+lib/eet/Eet_private.h \
+lib/eet/eet_alloc.c \
+lib/eet/eet_cipher.c \
+lib/eet/eet_connection.c \
+lib/eet/eet_data.c \
+lib/eet/eet_dictionary.c \
+lib/eet/eet_image.c \
+lib/eet/eet_lib.c \
+lib/eet/eet_node.c \
+lib/eet/eet_utils.c \
+static_libs/rg_etc/rg_etc1.c \
+static_libs/rg_etc/rg_etc2.c \
+static_libs/rg_etc/etc2_encoder.c \
+static_libs/rg_etc/rg_etc1.h
+
+lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/static_libs/rg_etc \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
+-DEFL_BUILD \
+@EET_CFLAGS@ \
+@NEON_CFLAGS@
+lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@
+lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
+lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Binary
+
+bin_PROGRAMS += bin/eet/eet
+bin_SCRIPTS += bin/eet/vieet \
+               bin/eet/diffeet
+
+bin_eet_eet_SOURCES = bin/eet/eet_main.c
+
+bin_eet_eet_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
+@EET_CFLAGS@
+
+if HAVE_WIN32
+bin_eet_eet_LDADD = -L$(top_builddir)/src/lib/evil @USE_EET_LIBS@
+else
+bin_eet_eet_LDADD = @USE_EET_LIBS@
+endif
+bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/eet/eet_suite
+TESTS += tests/eet/eet_suite
+
+tests_eet_eet_suite_SOURCES = \
+tests/eet/eet_test_cache.c \
+tests/eet/eet_test_cipher.c \
+tests/eet/eet_test_common.c \
+tests/eet/eet_test_connection.c \
+tests/eet/eet_test_data.c \
+tests/eet/eet_test_file.c \
+tests/eet/eet_test_identity.c \
+tests/eet/eet_test_image.c \
+tests/eet/eet_test_init.c \
+tests/eet/eet_suite.c \
+tests/eet/eet_test_common.h \
+tests/eet/eet_suite.h
+
+tests_eet_eet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet\" \
+@CHECK_CFLAGS@ \
+@EET_CFLAGS@
+tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
+tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
+endif
+
+EXTRA_DIST2 += \
+tests/eet/cert.pem \
+tests/eet/key_enc_none.pem \
+tests/eet/key_enc.pem \
+tests/eet/key.pem
diff --git a/src/Makefile_Eet_Helper.am b/src/Makefile_Eet_Helper.am
new file mode 100644
index 0000000000..3275a675b8
--- /dev/null
+++ b/src/Makefile_Eet_Helper.am
@@ -0,0 +1,13 @@
+if HAVE_EET_EET
+EET = @eet_eet@
+else
+EET = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eet/eet
+endif
+EET_FLAGS_VERBOSE = $(EET_FLAGS_VERBOSE_@AM_V@)
+EET_FLAGS_VERBOSE_ = $(EET_FLAGS_VERBOSE_@AM_DEFAULT_V@)
+EET_FLAGS_VERBOSE_1 = -v
+EET_FLAGS = $(EET_FLAGS_VERBOSE)
+
+AM_V_EET = $(am__v_EET_@AM_V@)
+am__v_EET_ = $(am__v_EET_@AM_DEFAULT_V@)
+am__v_EET_0 = @echo "  EET     " $@;
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
new file mode 100644
index 0000000000..5f8eb02605
--- /dev/null
+++ b/src/Makefile_Eeze.am
@@ -0,0 +1,192 @@
+if HAVE_EEZE
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/eeze/libeeze.la
+
+installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@
+dist_installed_eezemainheaders_DATA = \
+lib/eeze/Eeze.h \
+lib/eeze/Eeze_Net.h \
+lib/eeze/Eeze_Sensor.h \
+lib/eeze/Eeze_Disk.h \
+bin/eeze/eeze_scanner/eeze_scanner.h
+
+# libeeze.la
+lib_eeze_libeeze_la_SOURCES = \
+lib/eeze/eeze_main.c \
+lib/eeze/eeze_net.c \
+lib/eeze/eeze_net_private.h \
+lib/eeze/eeze_sensor.c \
+lib/eeze/eeze_sensor_private.h \
+lib/eeze/eeze_udev_find.c \
+lib/eeze/eeze_udev_private.c \
+lib/eeze/eeze_udev_private.h \
+lib/eeze/eeze_udev_syspath.c \
+lib/eeze/eeze_udev_walk.c \
+lib/eeze/eeze_udev_watch.c \
+lib/eeze/eeze_disk.c \
+lib/eeze/eeze_disk_udev.c \
+lib/eeze/eeze_disk_mount.c \
+lib/eeze/eeze_disk_private.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+if HAVE_EEZE_MOUNT
+if EEZE_LIBMOUNT_BEFORE_219
+lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c
+else
+if EEZE_LIBMOUNT_AFTER_219
+lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_new.c
+else
+lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount.c
+endif
+endif
+else
+lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_dummy.c
+endif
+
+lib_eeze_libeeze_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@EEZE_CFLAGS@
+lib_eeze_libeeze_la_LIBADD = @EEZE_LIBS@
+lib_eeze_libeeze_la_DEPENDENCIES = @EEZE_INTERNAL_LIBS@
+lib_eeze_libeeze_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+if HAVE_EEZE_TIZEN
+eezemodulesensortizendir = $(libdir)/eeze/modules/sensor/tizen/$(MODULE_ARCH)
+eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_eezemodulesensortizenLTLIBRARIES = install-eezemodulesensortizenLTLIBRARIES
+$(install_eezemodulesensortizenLTLIBRARIES): install-libLTLIBRARIES
+
+modules_eeze_sensor_tizen_module_la_SOURCES = \
+modules/eeze/sensor/tizen/tizen.c
+modules_eeze_sensor_tizen_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@EEZE_CFLAGS@ \
+@TIZEN_SENSOR_CFLAGS@
+modules_eeze_sensor_tizen_module_la_LIBADD = \
+@USE_EEZE_LIBS@ \
+@TIZEN_SENSOR_LIBS@
+modules_eeze_sensor_tizen_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+modules_eeze_sensor_tizen_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_eeze_sensor_tizen_module_la_LIBTOOLFLAGS = --tag=disable-static
+else
+eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH)
+eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_eezemodulesensorfakeLTLIBRARIES = install-eezemodulesensorfakeLTLIBRARIES
+$(install_eezemodulesensorfakeLTLIBRARIES): install-libLTLIBRARIES
+
+modules_eeze_sensor_fake_module_la_SOURCES = modules/eeze/sensor/fake/fake.c
+modules_eeze_sensor_fake_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+modules_eeze_sensor_fake_module_la_LIBADD = @USE_EEZE_LIBS@
+modules_eeze_sensor_fake_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_eeze_sensor_fake_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+eezemodulesensorudevdir = $(libdir)/eeze/modules/sensor/udev/$(MODULE_ARCH)
+eezemodulesensorudev_LTLIBRARIES = modules/eeze/sensor/udev/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_eezemodulesensorudevLTLIBRARIES = install-eezemodulesensorudevLTLIBRARIES
+$(install_eezemodulesensorudevLTLIBRARIES): install-libLTLIBRARIES
+
+modules_eeze_sensor_udev_module_la_SOURCES = modules/eeze/sensor/udev/udev.c
+modules_eeze_sensor_udev_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+modules_eeze_sensor_udev_module_la_LIBADD = @USE_EEZE_LIBS@
+modules_eeze_sensor_udev_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+modules_eeze_sensor_udev_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_eeze_sensor_udev_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+### Binary
+
+noinst_PROGRAMS += \
+bin/eeze/eeze_udev_test/eeze_udev_test \
+bin/eeze/eeze_sensor_test/eeze_sensor_test
+
+bin_eeze_eeze_udev_test_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test/eeze_udev_test.c
+bin_eeze_eeze_udev_test_eeze_udev_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_udev_test_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_udev_test_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_sensor_test_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test/eeze_sensor_test.c
+bin_eeze_eeze_sensor_test_eeze_sensor_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_sensor_test_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_sensor_test_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_PROGRAMS += \
+bin/eeze/eeze_mount/eeze_mount \
+bin/eeze/eeze_umount/eeze_umount \
+bin/eeze/eeze_disk_ls/eeze_disk_ls \
+bin/eeze/eeze_scanner/eeze_scanner \
+bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor
+
+bin_eeze_eeze_mount_eeze_mount_SOURCES = bin/eeze/eeze_mount/eeze_mount.c
+bin_eeze_eeze_mount_eeze_mount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_mount_eeze_mount_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_mount_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_umount_eeze_umount_SOURCES = bin/eeze/eeze_umount/eeze_umount.c
+bin_eeze_eeze_umount_eeze_umount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_umount_eeze_umount_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_umount_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_disk_ls_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls/eeze_disk_ls.c
+bin_eeze_eeze_disk_ls_eeze_disk_ls_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_disk_ls_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_disk_ls_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_scanner_eeze_scanner_SOURCES = \
+bin/eeze/eeze_scanner/eeze_scanner.c \
+bin/eeze/eeze_scanner/eeze_scanner.h
+bin_eeze_eeze_scanner_eeze_scanner_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_scanner_eeze_scanner_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_scanner_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_SOURCES = \
+bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_scanner_monitor_eeze_scanner_monitor_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+
+setuid_root_mode = a=rx,u+xs
+
+EFL_INSTALL_EXEC_HOOK+=chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true;
+
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/eeze/eeze_suite
+TESTS += tests/eeze/eeze_suite
+
+tests_eeze_eeze_suite_SOURCES = \
+tests/eeze/eeze_suite.c \
+tests/eeze/eeze_test_init.c \
+tests/eeze/eeze_test_net.c \
+tests/eeze/eeze_test_sensor.c \
+tests/eeze/eeze_test_udev.c \
+tests/eeze/eeze_suite.h
+tests_eeze_eeze_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+@EEZE_CFLAGS@ \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eeze\" \
+@CHECK_CFLAGS@
+tests_eeze_eeze_suite_LDADD = @CHECK_LIBS@ @USE_EEZE_LIBS@
+tests_eeze_eeze_suite_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
+endif
+endif
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
new file mode 100644
index 0000000000..91e46af267
--- /dev/null
+++ b/src/Makefile_Efl.am
@@ -0,0 +1,231 @@
+# Even though libefl is new, it contains definitions used by legacy APIs
+efl_eolian_legacy_files = \
+	lib/efl/interfaces/efl_gfx_fill.eo \
+	lib/efl/interfaces/efl_gfx_entity.eo \
+	lib/efl/interfaces/efl_gfx_color.eo \
+	lib/efl/interfaces/efl_gfx_image.eo \
+	lib/efl/interfaces/efl_gfx_frame_controller.eo \
+	lib/efl/interfaces/efl_input_device.eo \
+        lib/efl/interfaces/efl_ui_draggable.eo \
+        lib/efl/interfaces/efl_ui_scrollable.eo \
+        lib/efl/interfaces/efl_ui_scrollable_interactive.eo \
+        lib/efl/interfaces/efl_ui_scrollbar.eo \
+        lib/efl/interfaces/efl_ui_selectable.eo \
+        lib/efl/interfaces/efl_ui_multi_selectable.eo \
+        lib/efl/interfaces/efl_ui_zoom.eo \
+	$(NULL)
+
+efl_eolian_files = \
+      lib/efl/interfaces/efl_canvas_scene.eo \
+      lib/efl/interfaces/efl_canvas_pointer.eo \
+      lib/efl/interfaces/efl_config.eo \
+      lib/efl/interfaces/efl_control.eo \
+      lib/efl/interfaces/efl_duplicate.eo \
+      lib/efl/interfaces/efl_file.eo \
+      lib/efl/interfaces/efl_file_save.eo \
+      lib/efl/interfaces/efl_gfx_image_load_controller.eo \
+      lib/efl/interfaces/efl_part.eo \
+      lib/efl/interfaces/efl_playable.eo \
+      lib/efl/interfaces/efl_player.eo \
+      lib/efl/interfaces/efl_text.eo \
+      lib/efl/interfaces/efl_text_font.eo \
+      lib/efl/interfaces/efl_text_style.eo \
+      lib/efl/interfaces/efl_text_format.eo \
+      lib/efl/interfaces/efl_text_cursor.eo \
+      lib/efl/interfaces/efl_text_annotate.eo \
+      lib/efl/interfaces/efl_text_markup.eo \
+      lib/efl/interfaces/efl_text_markup_interactive.eo \
+      lib/efl/interfaces/efl_text_markup_util.eo \
+      lib/efl/interfaces/efl_gfx_stack.eo \
+      lib/efl/interfaces/efl_gfx_view.eo \
+      lib/efl/interfaces/efl_gfx_buffer.eo \
+      lib/efl/interfaces/efl_gfx_path.eo \
+      lib/efl/interfaces/efl_gfx_shape.eo \
+      lib/efl/interfaces/efl_gfx_gradient.eo \
+      lib/efl/interfaces/efl_gfx_gradient_linear.eo \
+      lib/efl/interfaces/efl_gfx_gradient_radial.eo \
+      lib/efl/interfaces/efl_gfx_filter.eo \
+      lib/efl/interfaces/efl_gfx_blur.eo \
+      lib/efl/interfaces/efl_gfx_hint.eo \
+      lib/efl/interfaces/efl_model.eo \
+      lib/efl/interfaces/efl_gfx_image_orientable.eo \
+      lib/efl/interfaces/efl_container.eo \
+      lib/efl/interfaces/efl_content.eo \
+      lib/efl/interfaces/efl_gfx_arrangement.eo \
+      lib/efl/interfaces/efl_pack.eo \
+      lib/efl/interfaces/efl_pack_layout.eo \
+      lib/efl/interfaces/efl_pack_linear.eo \
+      lib/efl/interfaces/efl_pack_table.eo \
+      lib/efl/interfaces/efl_ui_i18n.eo \
+      lib/efl/interfaces/efl_ui_layout_orientable.eo \
+      lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo \
+      lib/efl/interfaces/efl_ui_drag.eo \
+      lib/efl/interfaces/efl_ui_range_display.eo \
+      lib/efl/interfaces/efl_ui_range_interactive.eo \
+      lib/efl/interfaces/efl_ui_view.eo \
+      lib/efl/interfaces/efl_ui_property_bind.eo \
+      lib/efl/interfaces/efl_ui_factory.eo \
+      lib/efl/interfaces/efl_ui_factory_bind.eo \
+      lib/efl/interfaces/efl_screen.eo \
+      lib/efl/interfaces/efl_io_closer.eo \
+      lib/efl/interfaces/efl_io_positioner.eo \
+      lib/efl/interfaces/efl_io_reader.eo \
+      lib/efl/interfaces/efl_io_sizer.eo \
+      lib/efl/interfaces/efl_io_writer.eo \
+      lib/efl/interfaces/efl_io_buffer.eo \
+      lib/efl/interfaces/efl_io_queue.eo \
+      lib/efl/interfaces/efl_observer.eo \
+      lib/efl/interfaces/efl_observable.eo \
+      lib/efl/interfaces/efl_ui_autorepeat.eo \
+      lib/efl/interfaces/efl_ui_format.eo \
+      lib/efl/interfaces/efl_gfx_color_class.eo \
+      lib/efl/interfaces/efl_gfx_text_class.eo \
+      lib/efl/interfaces/efl_gfx_size_class.eo \
+      lib/efl/interfaces/efl_interpolator.eo \
+      lib/efl/interfaces/efl_cached_item.eo \
+      $(efl_eolian_legacy_files) \
+      $(NULL)
+
+efl_eolian_type_files = \
+	lib/efl/interfaces/efl_gfx_types.eot \
+	lib/efl/interfaces/efl_ui_types.eot \
+	lib/efl/interfaces/efl_input_types.eot \
+	lib/efl/interfaces/efl_types.eot \
+	lib/efl/interfaces/efl_text_types.eot \
+	$(NULL)
+
+efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) \
+                     $(efl_eolian_type_files:%.eot=%.eot.h)
+efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c)
+
+BUILT_SOURCES += \
+                 $(efl_eolian_files_c) \
+                 $(efl_eolian_files_h)
+
+EXTRA_DIST2 += \
+      lib/efl/Efl_Config.h \
+      lib/efl/Efl_Config.h.in \
+      lib/efl/Efl.h \
+      lib/efl/interfaces/efl_file.h \
+      lib/efl/interfaces/efl_common_internal.h \
+      $(efl_eolian_files) \
+      $(efl_eolian_type_files)
+
+if INSTALL_EO_FILES
+efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
+efleolianfiles_DATA = $(efl_eolian_files) $(efl_eolian_type_files)
+endif
+
+lib_LTLIBRARIES += lib/efl/libefl.la
+
+lib_efl_libefl_la_SOURCES = \
+lib/efl/interfaces/efl_interfaces_main.c \
+lib/efl/interfaces/efl_mvvm_common.c \
+lib/efl/interfaces/efl_gfx_path.c \
+lib/efl/interfaces/efl_gfx_shape.c \
+lib/efl/interfaces/efl_input_device.c \
+lib/efl/interfaces/efl_io_closer.c \
+lib/efl/interfaces/efl_io_positioner.c \
+lib/efl/interfaces/efl_io_reader.c \
+lib/efl/interfaces/efl_io_sizer.c \
+lib/efl/interfaces/efl_io_writer.c \
+lib/efl/interfaces/efl_io_buffer.c \
+lib/efl/interfaces/efl_io_queue.c \
+lib/efl/interfaces/efl_observer.c \
+lib/efl/interfaces/efl_file.c \
+lib/efl/interfaces/efl_ui_format.c \
+lib/efl/interfaces/efl_gfx_color.c \
+lib/efl/interfaces/efl_text_markup_util.c \
+lib/efl/interfaces/efl_ui_layout_orientable_readonly.c \
+$(NULL)
+
+lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA -DEFL_BUILD
+lib_efl_libefl_la_LIBADD = @EFL_LIBS@
+lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@
+lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+installed_eflheadersdir = $(includedir)/efl-@VMAJ@
+dist_installed_eflheaders_DATA = \
+              lib/efl/Efl_Config.h \
+              lib/efl/Efl_MVVM_Common.h \
+              lib/efl/Efl.h
+
+installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
+nodist_installed_eflinterfaces_DATA = \
+	$(efl_eolian_files_h) \
+	lib/efl/interfaces/efl_file.h
+
+if HAVE_LUA_BINDINGS
+
+efl_eolian_lua = $(efl_eolian_files:%.eo=%.eo.lua)
+
+generated_efl_lua_all = $(efl_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_efl_lua_all)
+
+installed_eflluadir = $(datadir)/elua/modules/efl
+nodist_installed_efllua_DATA = $(generated_efl_lua_all)
+
+endif
+
+if HAVE_JS
+
+generated_efl_js_bindings = $(efl_eolian_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_efl_js_bindings)
+endif
+
+if HAVE_CXX
+efl_eolian_cxx_hh = $(efl_eolian_files:%.eo=%.eo.hh)
+efl_eolian_cxx_impl_hh = $(efl_eolian_files:%.eo=%.eo.impl.hh)
+endif
+
+### Binary
+
+bin_PROGRAMS += \
+bin/efl/efl_debugd \
+bin/efl/efl_debug
+
+bin_efl_efl_debugd_SOURCES = bin/efl/efl_debugd.c
+bin_efl_efl_debugd_CPPFLAGS = -I$(top_builddir)/src/bin/efl @EINA_CFLAGS@ @ECORE_CFLAGS@ @ECORE_CON_CFLAGS@
+bin_efl_efl_debugd_LDADD = @EFL_LIBS@ @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@
+bin_efl_efl_debugd_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@
+
+bin_efl_efl_debug_SOURCES = bin/efl/efl_debug.c
+bin_efl_efl_debug_CPPFLAGS = -I$(top_builddir)/src/bin/efl @EINA_CFLAGS@ @ECORE_CFLAGS@ @ECORE_CON_CFLAGS@
+bin_efl_efl_debug_LDADD = @EFL_LIBS@ @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@
+bin_efl_efl_debug_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@
+
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/efl/efl_suite
+TESTS += tests/efl/efl_suite
+
+tests_efl_efl_suite_SOURCES = \
+tests/efl/efl_suite.c \
+tests/efl/efl_test_container_model.c \
+tests/efl/efl_test_composite_model.c \
+tests/efl/efl_test_view_model.c \
+tests/efl/efl_suite.h
+
+tests_efl_efl_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efl\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efl\" \
+@CHECK_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@EFL_CFLAGS@
+
+
+tests_efl_efl_suite_LDADD = @CHECK_LIBS@ \
+@EFL_LIBS@ \
+@USE_EFL_LIBS@ \
+@USE_ECORE_LIBS@ -lecore
+
+tests_efl_efl_suite_DEPENDENCIES = \
+@USE_EFL_INTERNAL_LIBS@ \
+@USE_ECORE_INTERNAL_LIBS@
+
+endif
+
diff --git a/src/Makefile_Efl_Js.am b/src/Makefile_Efl_Js.am
new file mode 100644
index 0000000000..f4f7ae732e
--- /dev/null
+++ b/src/Makefile_Efl_Js.am
@@ -0,0 +1,337 @@
+if HAVE_JS
+
+if HAVE_NODEJS
+
+noinst_lib_LTLIBRARIES = bindings/js/efl_js/libefl_js.la
+noinst_libdir = $(libdir)/efl_js
+
+bin/efl_js/efl.node: bindings/js/efl_js/libefl_js.la
+	$(AM_V_CP)$(CP) bindings/js/efl_js/.libs/libefl_js.so bin/efl_js/efl.node
+
+eflnodedir = $(libdir)/node_modules
+eflnode_DATA = bin/efl_js/efl.node
+
+CLEANFILES += ${eflnodedir_DATA}
+EXTRA_DIST2 += ${eflnodedir_DATA}
+
+efljsmimedir = @XDG_DATA_HOME@/mime/packages
+efljsmime_DATA = bin/efl_js/efljslaunch.xml
+
+efljsdesktopdir = @XDG_DATA_HOME@/applications
+efljsdesktop_DATA = bin/efl_js/efljslaunch.desktop
+
+bin_SCRIPTS += \
+	bin/efl_js/efljslaunch \
+	bin/efl_js/efljspack
+
+else
+
+bin_PROGRAMS += bin/efl_js/eflv8js
+
+bin_efl_js_eflv8js_SOURCES = \
+	bin/efl_js/launcher_main.cc
+
+bin_efl_js_eflv8js_CPPFLAGS = \
+	-I$(top_builddir)/src/lib/efl \
+	-I$(top_srcdir)/src/bindings/js/efl_js \
+        -I$(top_srcdir)/src/bindings/js/eina_js \
+        -I$(top_srcdir)/src/bindings/js/eo_js \
+	@CHECK_CFLAGS@ \
+	@EINA_CXX_CFLAGS@ \
+	@EO_CXX_CFLAGS@ \
+	@EMILE_CFLAGS@ \
+	@ECORE_CFLAGS@ \
+	@EET_CFLAGS@ \
+	@EO_CFLAGS@ \
+	@EFL_JS_CFLAGS@ \
+	@EINA_JS_CFLAGS@ \
+	@EO_JS_CFLAGS@
+
+bin_efl_js_eflv8js_LDFLAGS = \
+	-lv8 \
+	@USE_EFL_JS_INTERNAL_LIBS@
+
+bin_efl_js_eflv8js_LDADD = \
+	@USE_EFL_JS_LIBS@
+
+endif
+
+bindings/js/efl_js/eolian_js_bindings.cc: $(GENERATED_JS_BINDINGS)
+	@echo @ECHO_E@ "#ifdef HAVE_CONFIG_H" > $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include \"config.h\"" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include \"elementary_config.h\"" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Efl.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Efl_Config.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Ecore.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Eo.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Ecore_Con.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Ecore_Audio.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Evas.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Edje.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Ecore_Con_Eet.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Emotion.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#define ELM_INTERNAL_API_ARGESFSDFEFC" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <Elementary.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "extern \"C\" {" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "#include <elm_widget.h>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@echo @ECHO_E@ "}\n" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc
+	@for i in $(GENERATED_JS_BINDINGS); do echo "#include <$$i>" >> $(top_builddir)/src/bindings/js/efl_js/eolian_js_bindings.cc; done
+
+CLEANFILES += bindings/js/efl_js/eolian_js_bindings.cc
+
+## Install Ecore-JS headers
+installed_ecorejsheadersdir = $(includedir)/ecore-js-@VMAJ@
+dist_installed_ecorejsheaders_DATA = \
+bindings/js/ecore_js/Ecore_Js.hh
+
+## Install Eio-JS headers
+installed_eiojsheadersdir = $(includedir)/eio-js-@VMAJ@
+dist_installed_eiojsheaders_DATA = \
+bindings/js/eio_js/Eio_Js.hh
+
+## Install Ethumb-JS headers
+installed_ethumbjsheadersdir = $(includedir)/ethumb-js-@VMAJ@
+dist_installed_ethumbjsheaders_DATA = \
+bindings/js/ethumb_js/Ethumb_Js.hh
+
+## Install Eldbus-JS headers
+installed_eldbusjsheadersdir = $(includedir)/eldbus-js-@VMAJ@
+dist_installed_eldbusjsheaders_DATA = \
+bindings/js/eldbus_js/Eldbus_Js.hh
+
+## Install Eo-JS headers
+installed_eojsmainheadersdir = $(includedir)/eo-js-@VMAJ@
+dist_installed_eojsmainheaders_DATA = \
+bindings/js/eo_js/eo_js_call_function.hh \
+bindings/js/eo_js/eo_js_constructor.hh \
+bindings/js/eo_js/eo_js_direction.hh \
+bindings/js/eo_js/eo_js_event.hh \
+bindings/js/eo_js/eo_js_namespace.hh \
+bindings/js/eo_js/eo_js_struct.hh \
+bindings/js/eo_js/eo_js_construct_from_eo.hh \
+bindings/js/eo_js/Eo_Js.hh
+
+## Install Eina-JS headers
+installed_einajsheadersdir = $(includedir)/eina-js-@VMAJ@
+dist_installed_einajsheaders_DATA = \
+bindings/js/eina_js/Eina_Js.hh \
+bindings/js/eina_js/eina_js_accessor.hh \
+bindings/js/eina_js/eina_js_array.hh \
+bindings/js/eina_js/eina_js_compatibility.hh \
+bindings/js/eina_js/eina_js_container.hh \
+bindings/js/eina_js/eina_js_error.hh \
+bindings/js/eina_js/eina_js_get_value_from_c.hh \
+bindings/js/eina_js/eina_js_get_value.hh \
+bindings/js/eina_js/eina_js_iterator.hh \
+bindings/js/eina_js/eina_js_list.hh \
+bindings/js/eina_js/eina_js_log.hh \
+bindings/js/eina_js/eina_js_node.hh \
+bindings/js/eina_js/eina_js_value.hh
+
+installed_efljsheadersdir = $(includedir)/efl-js-@VMAJ@
+dist_installed_efljsheaders_DATA = \
+bindings/js/efl_js/Efl_Js.hh
+
+#lib_LTLIBRARIES += lib/efl_js/libefl_js.la
+
+bindings_js_efl_js_libefl_js_la_SOURCES = \
+bindings/js/eina_js/eina_js_container.cc \
+bindings/js/eina_js/eina_js_value.cc \
+bindings/js/eina_js/eina_js_error.cc \
+bindings/js/eina_js/eina_js_accessor.cc \
+bindings/js/eina_js/eina_js_log.cc \
+bindings/js/eina_js/eina_js_iterator.cc \
+bindings/js/eina_js/eina_js_compatibility.cc \
+bindings/js/ecore_js/ecore_js_init.cc \
+bindings/js/ecore_js/ecore_js_mainloop.cc \
+bindings/js/ecore_js/ecore_js_timer.cc \
+bindings/js/ecore_js/ecore_js_event.cc \
+bindings/js/ecore_js/ecore_js_job.cc \
+bindings/js/ecore_js/ecore_js_idle.cc \
+bindings/js/ecore_js/ecore_js_animator.cc \
+bindings/js/ecore_js/ecore_js_poller.cc \
+bindings/js/ecore_js/ecore_js_throttle.cc \
+bindings/js/eldbus_js/eldbus_js_core.cc \
+bindings/js/eldbus_js/eldbus_js_connection.cc \
+bindings/js/eldbus_js/eldbus_js_message.cc \
+bindings/js/eldbus_js/eldbus_js_object_mapper.cc \
+bindings/js/eio_js/eio_js.cc \
+bindings/js/efl_js/efl_js.cc \
+bindings/js/ethumb_js/ethumb_js_client.cc
+
+nodist_bindings_js_efl_js_libefl_js_la_SOURCES = \
+bindings/js/efl_js/eolian_js_bindings.cc
+
+bindings/js/efl_js/efl_js.cc $(bindings_js_efl_js_libefl_js_la_SOURCES): $(ecore_eolian_cxx_public_hh) $(ecore_eolian_cxx_public_impl_hh) $(eo_eolian_cxx_public_hh) $(eo_eolian_cxx_public_impl_hh) $(efl_eolian_cxx_public_hh) $(efl_eolian_cxx_public_impl_hh) lib/ecore/Ecore.eo.hh
+
+bindings_js_efl_js_libefl_js_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces/ \
+-I$(top_builddir)/src/lib/evas/canvas/ \
+-I$(top_builddir)/src/lib/ecore/ \
+-I$(top_srcdir)/src/bindings/js/eina_js \
+-I$(top_srcdir)/src/bindings/js/ecore_js \
+-I$(top_srcdir)/src/bindings/js/eo_js \
+-I$(top_srcdir)/src/bindings/js/eldbus_js \
+-I$(top_srcdir)/src/bindings/js/eio_js \
+-I$(top_srcdir)/src/bindings/js/ethumb_js \
+@EFL_JS_CFLAGS@ \
+@EO_JS_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
+@EO_CXX_CFLAGS@ \
+@ECORE_JS_CFLAGS@ \
+@EINA_JS_CFLAGS@ \
+@ELDBUS_JS_CFLAGS@ \
+@EIO_JS_CFLAGS@ \
+@ETHUMB_JS_CFLAGS@ \
+@EINA_CXX_CFLAGS@ \
+@ELEMENTARY_CFLAGS@ \
+-D_EO_ADD_FALLBACK_FORCE=1
+bindings_js_efl_js_libefl_js_la_LIBADD = @EFL_JS_LIBS@
+bindings_js_efl_js_libefl_js_la_DEPENDENCIES = @EFL_JS_INTERNAL_LIBS@
+bindings_js_efl_js_libefl_js_la_LIBTOOLFLAGS = --tag=disable-static
+bindings_js_efl_js_libefl_js_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+if EFL_ENABLE_TESTS
+
+SUITE_RUNNER_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/bindings/js/eina_js \
+-I$(top_srcdir)/src/bindings/js/eo_js \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efl_js\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efl_js\" \
+@CHECK_CFLAGS@ \
+@EFL_JS_CFLAGS@ \
+@EFL_CFLAGS@ \
+@EINA_CXX_CFLAGS@ \
+@EO_CXX_CFLAGS@ \
+@EO_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
+@ECORE_JS_CFLAGS@ \
+@EINA_JS_CFLAGS@
+
+if HAVE_NODEJS
+TESTS += tests/efl_js/eina_js_suite.js \
+tests/efl_js/eina_js_containers_suite.js \
+tests/efl_js/ecore_js_suite.js \
+tests/efl_js/eldbus_js_suite.js \
+tests/efl_js/ethumb_js_suite.js \
+tests/efl_js/eio_js_suite.js \
+tests/efl_js/benchmark_js_suite.js
+
+check_LTLIBRARIES += tests/efl_js/libbenchmark_object.la
+
+tests/efl_js/eina_js_suite.js tests/efl_js/eina_js_containers_suite.js tests/efl_js/ecore_js_suite.js tests/efl_js/eldbus_js_suite.js tests/efl_js/eio_js_suite.js tests/efl_js/ethumb_js_suite.js:bin/efl_js/efl.node
+
+tests/efl_js/benchmark_object.node: tests/efl_js/libbenchmark_object.la
+	$(AM_V_CP)$(CP) $(top_builddir)/src/tests/efl_js/.libs/libbenchmark_object.so $(top_builddir)/src/tests/efl_js/benchmark_object.node
+tests/efl_js/benchmark_js_suite.js: bin/efl_js/efl.node tests/efl_js/benchmark_object.node
+
+tests_efl_js_libbenchmark_object_la_SOURCES = tests/efl_js/benchmark_object_impl.cc
+tests_efl_js_libbenchmark_object_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/bindings/js/efl_js \
+-I$(top_builddir)/src/tests/efl_js \
+-I$(top_srcdir)/src/bindings/js/eina_js \
+-I$(top_srcdir)/src/bindings/js/eo_js \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efl_js\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/efl_js\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/efl_js\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efl_js\" \
+@CHECK_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EINA_JS_CFLAGS@ @EO_JS_CFLAGS@ \
+@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \
+@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@
+tests_efl_js_libbenchmark_object_la_LIBADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ bindings/js/efl_js/libefl_js.la
+tests_efl_js_libbenchmark_object_la_LDFLAGS = -rpath $(abs_top_builddir)/tests/efl_js @EFL_LTLIBRARY_FLAGS@
+tests_efl_js_libbenchmark_object_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+tests_efl_js_libbenchmark_object_la_LIBTOOLFLAGS = --tag=disable-static
+
+if HAVE_AM_16
+TESTS_EFL_JS_OBJNAME = 
+else
+TESTS_EFL_JS_OBJNAME = tests_efl_js_
+endif
+
+
+tests/efl_js/$(TESTS_EFL_JS_OBJNAME)libbenchmark_object_la-benchmark_object_impl.l$(OBJEXT): tests/efl_js/benchmark_object.eo.js.cc tests/efl_js/benchmark_object.eo.c tests/efl_js/benchmark_object.eo.h
+else
+check_PROGRAMS += \
+tests/efl_js/eina_js_suite \
+tests/efl_js/eina_js_containers_suite \
+tests/efl_js/ecore_js_suite \
+tests/efl_js/eldbus_js_suite \
+tests/efl_js/ethumb_js_suite \
+tests/efl_js/eio_js_suite \
+tests/efl_js/benchmark_js_suite
+TESTS += tests/efl_js/eina_js_suite \
+tests/efl_js/ecore_js_suite \
+tests/efl_js/eldbus_js_suite \
+tests/efl_js/ethumb_js_suite \
+tests/efl_js/eio_js_suite \
+tests/efl_js/benchmark_js_suite
+
+tests_efl_js_eina_js_suite_SOURCES = \
+tests/efl_js/eina_js_suite.cc
+
+tests_efl_js_eina_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_eina_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
+tests_efl_js_eina_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_efl_js_eina_js_containers_suite_SOURCES = \
+tests/efl_js/eina_js_containers_suite.cc
+
+tests_efl_js_eina_js_containers_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_eina_js_containers_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
+tests_efl_js_eina_js_containers_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_efl_js_ecore_js_suite_SOURCES = \
+tests/efl_js/ecore_js_suite.cc
+
+tests_efl_js_ecore_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_ecore_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
+tests_efl_js_ecore_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_efl_js_eldbus_js_suite_SOURCES = \
+tests/efl_js/eldbus_js_suite.cc
+
+tests_efl_js_eldbus_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_eldbus_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
+tests_efl_js_eldbus_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_efl_js_ethumb_js_suite_SOURCES = \
+tests/efl_js/ethumb_js_suite.cc
+
+tests_efl_js_ethumb_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_ethumb_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
+tests_efl_js_ethumb_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_efl_js_eio_js_suite_SOURCES = \
+tests/efl_js/eio_js_suite.cc
+
+tests_efl_js_eio_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_eio_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
+tests_efl_js_eio_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+tests_efl_js_benchmark_js_suite_SOURCES = \
+tests/efl_js/benchmark_js_suite.cc
+
+tests_efl_js_benchmark_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
+tests_efl_js_benchmark_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ bindings/js/efl_js/libefl_js.la
+tests_efl_js_benchmark_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+endif
+endif
+
+
+endif
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
new file mode 100644
index 0000000000..0cf41589ff
--- /dev/null
+++ b/src/Makefile_Efl_Mono.am
@@ -0,0 +1,549 @@
+
+efl_custom_exports_mono_files = \
+	lib/efl_mono/efl_custom_exports_mono.c
+
+efl_eo_mono_files = \
+	bindings/mono/eo_mono/iwrapper.cs \
+	bindings/mono/eo_mono/FunctionWrapper.cs \
+	bindings/mono/eo_mono/NativeModule.cs \
+	bindings/mono/eo_mono/workaround.cs \
+	bindings/mono/eo_mono/EoWrapper.cs \
+	bindings/mono/eo_mono/WrapperSupervisor.cs
+
+if HAVE_WIN32
+
+efl_eo_mono_files += \
+	bindings/mono/eo_mono/FunctionWrapper_Windows.cs \
+	bindings/mono/eo_mono/NativeModule_Windows.cs
+
+else
+
+efl_eo_mono_files += \
+	bindings/mono/eo_mono/FunctionWrapper_Unix.cs \
+	bindings/mono/eo_mono/NativeModule_Unix.cs
+
+endif
+
+
+efl_eina_mono_files = \
+	bindings/mono/eina_mono/eina_config.cs \
+	bindings/mono/eina_mono/eina_array.cs \
+	bindings/mono/eina_mono/eina_hash.cs \
+	bindings/mono/eina_mono/eina_list.cs \
+	bindings/mono/eina_mono/eina_inarray.cs \
+	bindings/mono/eina_mono/eina_inlist.cs \
+	bindings/mono/eina_mono/eina_iterator.cs \
+	bindings/mono/eina_mono/eina_container_common.cs \
+	bindings/mono/eina_mono/eina_common.cs \
+	bindings/mono/eina_mono/eina_log.cs \
+	bindings/mono/eina_mono/eina_binbuf.cs \
+	bindings/mono/eina_mono/eina_slice.cs \
+	bindings/mono/eina_mono/eina_stringshare.cs \
+	bindings/mono/eina_mono/eina_error.cs \
+	bindings/mono/eina_mono/eina_value.cs \
+	bindings/mono/eina_mono/eina_promises.cs \
+	bindings/mono/eina_mono/eina_accessor.cs \
+	bindings/mono/eina_mono/eina_strbuf.cs
+
+efl_eldbus_mono_files = \
+	bindings/mono/eldbus_mono/eldbus_common.cs \
+	bindings/mono/eldbus_mono/eldbus_config.cs \
+	bindings/mono/eldbus_mono/eldbus_connection.cs \
+	bindings/mono/eldbus_mono/eldbus_message.cs \
+	bindings/mono/eldbus_mono/eldbus_object.cs \
+	bindings/mono/eldbus_mono/eldbus_pending.cs \
+	bindings/mono/eldbus_mono/eldbus_proxy.cs \
+	bindings/mono/eldbus_mono/eldbus_service.cs
+
+# Static C# source files don't go into a _SOURCES var as the dll target
+# is custom built instead of through _LTLIBRARIES/_LIBRARIES
+lib_efl_mono_libefl_mono_dll_sources = \
+	bindings/mono/efl_mono/efl_all.cs \
+	bindings/mono/efl_mono/efl_csharp_application.cs \
+	$(efl_eo_mono_files) \
+	$(efl_eina_mono_files) \
+	$(efl_eldbus_mono_files)
+
+efl_mono_test_eolian_files = \
+	tests/efl_mono/dummy_test_object.eo \
+	tests/efl_mono/dummy_test_iface.eo \
+	tests/efl_mono/dummy_inherit_iface.eo \
+	tests/efl_mono/dummy_inherit_helper.eo \
+	tests/efl_mono/dummy_child.eo \
+	tests/efl_mono/dummy_part_holder.eo \
+	tests/efl_mono/dummy_numberwrapper.eo \
+	tests/efl_mono/dummy_event_manager.eo
+
+efl_mono_test_files = \
+	$(efl_mono_test_eolian_files) \
+	tests/efl_mono/mono_test_driver.sh
+
+EXTRA_DIST2 += \
+	$(lib_efl_mono_libefl_mono_dll_sources) \
+	$(efl_mono_test_files) \
+	bindings/mono/efl_mono/efl_libs.cs.in \
+	bindings/mono/efl_mono/efl_libs.csv.in
+
+if HAVE_CSHARP
+
+bin_PROGRAMS += bin/eolian_mono/eolian_mono
+
+bin_eolian_mono_eolian_mono_SOURCES = \
+	bin/eolian_mono/eolian_mono.cc \
+	bin/eolian_mono/eolian/mono/alias_definition.hh \
+	bin/eolian_mono/eolian/mono/async_function_definition.hh \
+	bin/eolian_mono/eolian/mono/blacklist.hh \
+	bin/eolian_mono/eolian/mono/documentation.hh \
+	bin/eolian_mono/eolian/mono/enum_definition.hh \
+	bin/eolian_mono/eolian/mono/events.hh \
+	bin/eolian_mono/eolian/mono/function_declaration.hh \
+	bin/eolian_mono/eolian/mono/function_definition.hh \
+	bin/eolian_mono/eolian/mono/function_helpers.hh \
+	bin/eolian_mono/eolian/mono/function_pointer.hh \
+	bin/eolian_mono/eolian/mono/function_registration.hh \
+	bin/eolian_mono/eolian/mono/generation_contexts.hh \
+	bin/eolian_mono/eolian/mono/helpers.hh \
+	bin/eolian_mono/eolian/mono/klass.hh \
+	bin/eolian_mono/eolian/mono/logging.hh \
+	bin/eolian_mono/eolian/mono/marshall_annotation.hh \
+	bin/eolian_mono/eolian/mono/marshall_type.hh \
+	bin/eolian_mono/eolian/mono/marshall_type_impl.hh \
+	bin/eolian_mono/eolian/mono/name_helpers.hh \
+	bin/eolian_mono/eolian/mono/parameter.hh \
+	bin/eolian_mono/eolian/mono/part_definition.hh \
+	bin/eolian_mono/eolian/mono/struct_definition.hh \
+	bin/eolian_mono/eolian/mono/struct_fields.hh \
+	bin/eolian_mono/eolian/mono/type.hh \
+	bin/eolian_mono/eolian/mono/type_impl.hh \
+	bin/eolian_mono/eolian/mono/using_decl.hh \
+	bin/eolian_mono/eolian/mono/utils.hh \
+	bin/eolian_mono/eolian/mono/variable_definition.hh
+
+bin_eolian_mono_eolian_mono_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eolian_cxx/ \
+-I$(top_srcdir)/src/bin/eolian_mono/ \
+@CHECK_CFLAGS@ @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_CXX_CFLAGS@ @EO_CFLAGS@ \
+-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
+@EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@
+
+bin_eolian_mono_eolian_mono_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
+
+bin_eolian_mono_eolian_mono_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+
+# Helper for other modules using Eolian_Mono, include only after Makefile_Eolian_Helper.am
+include Makefile_Eolian_Mono_Helper.am
+
+### Efl C Sharp Binding
+
+evas_eolian_blacklisted_files = \
+lib/evas/canvas/efl_canvas_scene3d.eo.cs \
+lib/evas/canvas/evas_canvas3d_camera.eo.cs \
+lib/evas/canvas/evas_canvas3d_light.eo.cs \
+lib/evas/canvas/evas_canvas3d_material.eo.cs \
+lib/evas/canvas/evas_canvas3d_mesh.eo.cs \
+lib/evas/canvas/evas_canvas3d_node.eo.cs \
+lib/evas/canvas/evas_canvas3d_object.eo.cs \
+lib/evas/canvas/evas_canvas3d_primitive.eo.cs \
+lib/evas/canvas/evas_canvas3d_scene.eo.cs \
+lib/evas/canvas/evas_canvas3d_texture.eo.cs
+
+efl_eolian_blacklisted_files = \
+lib/efl/interfaces/efl_io_buffer.eo.cs \
+lib/efl/interfaces/efl_io_positioner.eo.cs \
+lib/efl/interfaces/efl_io_queue.eo.cs \
+lib/efl/interfaces/efl_io_sizer.eo.cs
+
+ecore_eolian_blacklisted_files = \
+lib/ecore/efl_io_closer_fd.eo.cs \
+lib/ecore/efl_io_buffered_stream.eo.cs \
+lib/ecore/efl_io_positioner_fd.eo.cs \
+lib/ecore/efl_io_reader_fd.eo.cs \
+lib/ecore/efl_io_writer_fd.eo.cs \
+lib/ecore/efl_io_copier_fd.eo.cs \
+lib/ecore/efl_io_sizer_fd.eo.cs \
+lib/ecore/efl_io_stdin.eo.cs \
+lib/ecore/efl_io_stdout.eo.cs \
+lib/ecore/efl_io_stderr.eo.cs \
+lib/ecore/efl_io_file.eo.cs \
+lib/ecore/efl_io_copier.eo.cs
+
+eo_eolian_blacklisted_files = \
+lib/eo/efl_object_override.eo.cs
+
+elementary_eolian_blacklisted_files = \
+lib/elementary/elm_web_eo.cs \
+lib/elementary/elm_map_eo.cs \
+lib/elementary/elm_combobox.eo.cs \
+lib/elementary/elm_list_eo.cs \
+lib/elementary/elm_genlist_eo.cs \
+lib/elementary/elm_view_list_eo.cs \
+lib/elementary/elm_genlist_item_eo.cs \
+lib/elementary/elm_gengrid_eo.cs \
+lib/elementary/elm_code_widget.eo.cs \
+lib/elementary/elm_multibuttonentry_part.eo.cs \
+lib/elementary/elm_atspi_bridge.eo.cs \
+lib/elementary/elm_atspi_app_object.eo.cs \
+lib/elementary/elm_glview_eo.cs
+
+efl_mono_blacklisted_files = \
+$(evas_eolian_blacklisted_files) \
+$(efl_eolian_blacklisted_files) \
+$(ecore_eolian_blacklisted_files) \
+$(eo_eolian_blacklisted_files) \
+$(elementary_eolian_blacklisted_files)
+
+efl_eolian_mono_files = \
+$(filter-out $(eo_eolian_blacklisted_files),$(eo_eolian_files:%.eo=%.eo.cs)) \
+$(filter-out $(ecore_eolian_blacklisted_files),$(ecore_eolian_files_public:%.eo=%.eo.cs)) \
+$(ecore_eolian_type_files:%.eot=%.eot.cs) \
+$(filter-out $(efl_eolian_blacklisted_files),$(efl_eolian_files:%.eo=%.eo.cs)) \
+$(filter-out $(edje_eolian_blacklisted_files),$(edje_eolian_files:%.eo=%.eo.cs)) \
+$(filter-out $(elementary_eolian_blacklisted_files),$(elm_public_eolian_files:%.eo=%.eo.cs)) \
+$(efl_eolian_type_files:%.eot=%.eot.cs) \
+$(edje_eolian_type_files:%.eot=%.eot.cs) \
+$(elm_eolian_type_files:%.eot=%.eot.cs) \
+$(filter-out $(evas_eolian_blacklisted_files),$(evas_canvas_eolian_pub_files:%.eo=%.eo.cs)) \
+$(evas_gesture_eolian_pub_files:%.eo=%.eo.cs) \
+$(evas_gesture_eolian_type_files:%.eot=%.eot.cs) \
+lib/evas/canvas/efl_canvas_image.eo.cs \
+$(evas_canvas_eolian_type_files:%.eot=%.eot.cs) \
+lib/eo/eina_types.eot.cs \
+lib/ecore/efl_loop_timer.eo.cs
+
+efl_mono_files_gen =\
+$(efl_eolian_mono_files) \
+$(builddir)/bindings/mono/efl_mono/efl_libs.cs
+
+
+installed_eflmonomainheadersdir = $(includedir)/efl-mono-@VMAJ@/
+nodist_installed_eflmonomainheaders_DATA = $(efl_eolian_files:%.eo=%.eo.cs) $(builddir)/bindings/mono/efl_mono/efl_libs.csv
+
+CLEANFILES += $(efl_mono_files_gen) $(efl_mono_blacklisted_files) \
+	      $(builddir)/lib/efl_mono/libefl_mono.dll \
+	      $(builddir)/lib/efl_mono/libefl_mono.xml \
+	      $(builddir)/lib/efl_mono/libefl_mono.dll.config
+
+if HAVE_WIN32
+
+MCSFLAGS ?=
+MCSFLAGS += -define:WIN32
+
+endif
+
+# Efl Custom Exports Mono auxiliary library
+
+lib_LTLIBRARIES += \
+lib/efl_mono/libeflcustomexportsmono.la
+
+lib_efl_mono_libeflcustomexportsmono_la_SOURCES = \
+	$(efl_custom_exports_mono_files)
+
+lib_efl_mono_libeflcustomexportsmono_la_CPPFLAGS = \
+-DEFL_BETA_API_SUPPORT \
+-I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EFL_CUSTOM_EXPORTS_MONO_CFLAGS@
+lib_efl_mono_libeflcustomexportsmono_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+lib_efl_mono_libeflcustomexportsmono_la_LIBADD = @EFL_CUSTOM_EXPORTS_MONO_LIBS@
+lib_efl_mono_libeflcustomexportsmono_la_DEPENDENCIES = @EFL_CUSTOM_EXPORTS_MONO_INTERNAL_LIBS@
+
+#Efl Mono - C Sharp binding library
+
+libefl_mono_dll_MCSFLAGS = -doc:lib/efl_mono/libefl_mono.xml
+
+lib/efl_mono/libefl_mono.dll: $(efl_mono_files_dist) lib/efl_mono/$(am__dirstamp) $(lib_efl_mono_libefl_mono_dll_sources) $(efl_mono_files_gen) lib/efl_mono/libefl_mono.dll.config
+	@rm -f lib/efl_mono/libefl_mono.dll
+	$(AM_V_MCS) $(MCS) $(MCSFLAGS) $(libefl_mono_dll_MCSFLAGS) -out:$@ -t:library $(filter %.cs, $(^))
+
+lib/efl_mono/libefl_mono.dll.config:
+	echo "<configuration>" > $@
+	echo "  <dllmap dll=\"eina\" target=\"$(abs_top_builddir)/src/lib/eina/.libs/libeina.so\"/>" >> $@
+	echo "  <dllmap dll=\"ecore\" target=\"$(abs_top_builddir)/src/lib/ecore/.libs/libecore.so\"/>" >> $@
+	echo "  <dllmap dll=\"eo\" target=\"$(abs_top_builddir)/src/lib/eo/.libs/libeo.so\"/>" >> $@
+	echo "  <dllmap dll=\"evas\" target=\"$(abs_top_builddir)/src/lib/evas/.libs/libevas.so\"/>" >> $@
+	echo "  <dllmap dll=\"eldbus\" target=\"$(abs_top_builddir)/src/lib/eldbus/.libs/libeldbus.so\"/>" >> $@
+	echo "  <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@
+	echo "</configuration>" >> $@
+
+EFL_INSTALL_EXEC_HOOK += \
+$(MKDIR_P) @eflmonodlldir@; \
+cp -f $(builddir)/lib/efl_mono/libefl_mono.dll @eflmonodlldir@/libefl_mono.dll; \
+cp -f $(builddir)/lib/efl_mono/libefl_mono.xml @eflmonodlldir@/libefl_mono.xml; \
+$(MKDIR_P) $(DESTDIR)$(datadir)/efl_mono; \
+cp -f $(builddir)/bindings/mono/efl_mono/efl_libs.csv $(DESTDIR)$(datadir)/efl_mono/efl_libs.csv;
+
+all-local: lib/efl_mono/libefl_mono.dll
+
+uninstall-local:
+	rm -rf @eflmonodlldir@/libefl_mono.dll
+	rm -rf @eflmonodlldir@/libefl_mono.xml
+	rm -rf $(DESTDIR)$(datadir)/efl_mono
+	rm -rf src/tests/efl_mono
+
+
+### MSBuild
+
+bin_PROGRAMS += bin/efl_mono_msbuild_gen/efl_mono_msbuild_gen
+
+bin_efl_mono_msbuild_gen_efl_mono_msbuild_gen_SOURCES = \
+    bin/efl_mono_msbuild_gen/main.cc
+
+bin_efl_mono_msbuild_gen_efl_mono_msbuild_gen_CXXFLAGS = \
+    -I$(top_srcdir)/src/lib/efl \
+    -I$(top_builddir)/src/lib/efl \
+    -I$(top_srcdir)/src/lib/eolian_cxx/ \
+    -I$(top_srcdir)/src/bindings/cxx/eina_cxx \
+    @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
+    @ECORE_CXX_CFLAGS@ @EO_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@
+
+bin_efl_mono_msbuild_gen_efl_mono_msbuild_gen_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
+
+bin_efl_mono_msbuild_gen_efl_mono_msbuild_gen_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+
+# Helper for other modules using Efl_Mono_MSBuild_Gen
+include Makefile_Efl_Mono_MSBuild_Gen_Helper.am
+
+# Efl Mono DLL for MSBuild
+../libefl_mono.csproj: $(efl_mono_files_dist) lib/efl_mono/$(am__dirstamp) $(efl_mono_files_gen) $(_EFL_MONO_MSBUILD_GEN_DEP)
+	@rm -f $@
+	$(EFL_MONO_MSBUILD_GEN) $(MSBUILD_GEN_FLAGS) -o $@ -a libefl_mono.dll -t library $(patsubst %.cs,src/%.cs,$(filter %.cs, $(^)))
+
+CSPROJS_SUBDIRS = \
+examples/eina \
+examples/efl_mono
+
+msbuildcsprojs: ../libefl_mono.csproj
+	@for d in $(CSPROJS_SUBDIRS); do \
+	  echo "Making MSBuild C Sharp projects in $$d"; \
+	  $(MAKE) $(AM_MAKEFLAGS) -C $$d msbuildcsprojs || exit 1; \
+	done
+
+### Some hard-coded runtime dependencies for tests and examples
+TEST_PATHS = $(abs_top_builddir)/src/lib/efl_mono:$(abs_top_builddir)/src/lib/efl_mono/.libs:$(abs_top_builddir)/src/lib/eina/.libs:$(abs_top_builddir)/src/lib/ecore/.libs:$(abs_top_builddir)/src/lib/ecore_evas/.libs:$(abs_top_builddir)/src/lib/eo/.libs:$(abs_top_builddir)/src/lib/evas/.libs:$(abs_top_builddir)/src/lib/emile/.libs:$(abs_top_builddir)/src/lib/eet/.libs:$(abs_top_builddir)/src/lib/efl/.libs:$(abs_top_builddir)/src/ecore-file/.libs:$(abs_top_builddir)/src/lib/efl-input/.libs:$(abs_top_builddir)/src/lib/edje/.libs:$(abs_top_builddir)/src/lib/ethumb/.libs:$(abs_top_builddir)/src/lib/ethumb-client/.libs:$(abs_top_builddir)/src/lib/emotion/.libs:$(abs_top_builddir)/src/lib/ecore-imf/.libs:$(abs_top_builddir)/src/lib/ecore-con/.libs:$(abs_top_builddir)/src/lib/eldbus/.libs:$(abs_top_builddir)/src/lib/efreet/.libs:$(abs_top_builddir)/src/lib/efreet-mime/.libs:$(abs_top_builddir)/src/lib/efreet-trash/.libs:$(abs_top_builddir)/src/lib/eio/.libs:$(abs_top_builddir)/src/lib/elocation/.libs:$(abs_top_builddir)/src/lib/elementary/.libs:$(abs_top_builddir)/src/tests/efl_mono/.libs
+
+WIN_ADD_TEST_PATHS = $(abs_top_builddir)/src/lib/evil/.libs:$(abs_top_builddir)/src/lib/ecore_win32/.libs:$(abs_top_builddir)/src/lib/ector/.libs:$(abs_top_builddir)/src/lib/ecore_con/.libs:$(abs_top_builddir)/src/lib/ecore_imf/.libs:$(abs_top_builddir)/src/lib/ecore_file/.libs:$(abs_top_builddir)/src/lib/ecore_input/.libs:$(abs_top_builddir)/src/ethumb_client/.libs:$(abs_top_builddir)/src/tests/efl_mono/.libs
+
+
+### Rules for generating the .cs files
+
+ALL_EO_REFS = -r $(top_builddir)/src/bindings/mono/efl_mono/efl_libs.csv
+
+lib/eo/%.eo.cs: lib/eo/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport eo -o $@ $(ALL_EO_REFS) $<
+
+lib/ecore/%.eo.cs: lib/ecore/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport ecore -o $@ $(ALL_EO_REFS) $<
+
+lib/evas/%.eo.cs: lib/evas/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport evas -o $@ $(ALL_EO_REFS) $<
+
+lib/efl/%.eo.cs: lib/efl/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport efl -o $@ $(ALL_EO_REFS) $<
+
+lib/edje/%.eo.cs: lib/edje/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport edje -o $@ $(ALL_EO_REFS) $<
+
+lib/elementary/%.eo.cs: lib/elementary/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport elementary -o $@ $(ALL_EO_REFS) $<
+
+lib/ecore/%.eot.cs: lib/ecore/%.eot $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport ecore -o $@ $(ALL_EO_REFS) $<
+
+lib/eo/%.eot.cs: lib/eo/%.eot $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport eo -o $@ $(ALL_EO_REFS) $<
+
+lib/evas/%.eot.cs: lib/evas/%.eot $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport evas -o $@ $(ALL_EO_REFS) $<
+
+lib/efl/%.eot.cs: lib/efl/%.eot $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport efl -o $@ $(ALL_EO_REFS) $<
+
+lib/edje/%.eot.cs: lib/edje/%.eot $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport edje -o $@ $(ALL_EO_REFS) $<
+
+lib/elementary/%.eot.cs: lib/elementary/%.eot $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport elementary -o $@ $(ALL_EO_REFS) $<
+
+
+### Tests
+
+if EFL_ENABLE_TESTS
+
+# Intermediate C test native library
+check_LTLIBRARIES += tests/efl_mono/libefl_mono_native_test.la
+
+tests_efl_mono_libefl_mono_native_test_la_SOURCES = \
+	tests/efl_mono/dummy_child.c \
+	tests/efl_mono/dummy_event_manager.c \
+	tests/efl_mono/dummy_inherit_helper.c \
+	tests/efl_mono/dummy_interfaces.c \
+	tests/efl_mono/dummy_numberwrapper.c \
+	tests/efl_mono/dummy_part_holder.c \
+	tests/efl_mono/dummy_test_object.c
+
+efl_mono_test_eolian_c = $(efl_mono_test_eolian_files:%.eo=%.eo.c)
+efl_mono_test_eolian_h = $(efl_mono_test_eolian_files:%.eo=%.eo.h)
+
+tests_efl_mono_libefl_mono_native_test_la_CPPFLAGS =  \
+-I$(builddir)/tests/efl_mono \
+@CHECK_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @ELDBUS_CFLAGS@
+tests_efl_mono_libefl_mono_native_test_la_LIBADD = \
+@CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@ @USE_ECORE_LIBS@ @USE_ELDBUS_LIBS@
+tests_efl_mono_libefl_mono_native_test_la_LDFLAGS = -rpath $(abs_top_builddir)/tests/efl_mono @EFL_LTLIBRARY_FLAGS@
+tests_efl_mono_libefl_mono_native_test_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_ELDBUS_INTERNAL_LIBS@
+tests_efl_mono_libefl_mono_native_test_la_LIBTOOLFLAGS = --tag=disable-static
+
+tests/efl_mono/dummy_child.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+tests/efl_mono/dummy_event_manager.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+tests/efl_mono/dummy_inherit_helper.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+tests/efl_mono/dummy_interfaces.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+tests/efl_mono/dummy_numberwrapper.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+tests/efl_mono/dummy_part_holder.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+tests/efl_mono/dummy_test_object.c: \
+	$(efl_mono_test_eolian_c) \
+	$(efl_mono_test_eolian_h) \
+	tests/efl_mono/libefl_mono_native_test.h
+
+# Intermediate C Sharp test DLL
+efl_mono_test_eolian_mono_files = tests/efl_mono/dummy_test_object.eo.cs \
+tests/efl_mono/dummy_test_iface.eo.cs \
+tests/efl_mono/dummy_child.eo.cs \
+tests/efl_mono/dummy_event_manager.eo.cs \
+tests/efl_mono/dummy_part_holder.eo.cs \
+tests/efl_mono/dummy_numberwrapper.eo.cs \
+tests/efl_mono/dummy_inherit_iface.eo.cs \
+tests/efl_mono/dummy_inherit_helper.eo.cs
+
+tests/efl_mono/libefl_mono_test.dll: $(efl_mono_test_eolian_mono_files) tests/efl_mono/$(am__dirstamp) lib/efl_mono/libefl_mono.dll tests/efl_mono/libefl_mono_native_test.la tests/efl_mono/libefl_mono_test.dll.config
+	@rm -f tests/efl_mono/libefl_mono_test.dll
+	$(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_builddir)/lib/efl_mono/libefl_mono.dll -out:$@ -t:library $(filter %.cs, $(^))
+
+tests/efl_mono/efl_mono$(EXEEXT).config:
+	echo "<configuration>" > $@
+	echo "  <dllmap dll=\"eina\" target=\"$(abs_top_builddir)/src/lib/eina/.libs/libeina.so\"/>" >> $@
+	echo "  <dllmap dll=\"ecore\" target=\"$(abs_top_builddir)/src/lib/ecore/.libs/libecore.so\"/>" >> $@
+	echo "  <dllmap dll=\"eo\" target=\"$(abs_top_builddir)/src/lib/eo/.libs/libeo.so\"/>" >> $@
+	echo "  <dllmap dll=\"efl\" target=\"$(abs_top_builddir)/src/lib/efl/.libs/libefl.so\"/>" >> $@
+	echo "  <dllmap dll=\"evas\" target=\"$(abs_top_builddir)/src/lib/evas/.libs/libevas.so\"/>" >> $@
+	echo "  <dllmap dll=\"eldbus\" target=\"$(abs_top_builddir)/src/lib/eldbus/.libs/libeldbus.so\"/>" >> $@
+	echo "  <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@
+	echo "</configuration>" >> $@
+
+tests/efl_mono/libefl_mono_test.dll.config:
+	echo "<configuration>" > $@
+	echo "  <dllmap dll=\"eina\" target=\"$(abs_top_builddir)/src/lib/eina/.libs/libeina.so\"/>" >> $@
+	echo "  <dllmap dll=\"ecore\" target=\"$(abs_top_builddir)/src/lib/ecore/.libs/libecore.so\"/>" >> $@
+	echo "  <dllmap dll=\"eo\" target=\"$(abs_top_builddir)/src/lib/eo/.libs/libeo.so\"/>" >> $@
+	echo "  <dllmap dll=\"efl\" target=\"$(abs_top_builddir)/src/lib/efl/.libs/libefl.so\"/>" >> $@
+	echo "  <dllmap dll=\"evas\" target=\"$(abs_top_builddir)/src/lib/evas/.libs/libevas.so\"/>" >> $@
+	echo "  <dllmap dll=\"eldbus\" target=\"$(abs_top_builddir)/src/lib/eldbus/.libs/libeldbus.so\"/>" >> $@
+	echo "  <dllmap dll=\"elementary\" target=\"$(abs_top_builddir)/src/lib/elementary/.libs/libelementary.so\"/>" >> $@
+	echo "</configuration>" >> $@
+
+# C Sharp test executable
+AM_TESTS_ENVIRONMENT += MONO='mono'
+AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)'
+AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)'
+AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'
+if HAVE_WIN32
+AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)'
+else
+AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)'
+
+check_PROGRAMS += tests/efl_mono/efl_mono
+TESTS += tests/efl_mono/mono_test_driver.sh
+
+tests_efl_mono_efl_mono_SOURCES = \
+     tests/efl_mono/Main.cs \
+     tests/efl_mono/TestUtils.cs \
+     tests/efl_mono/BasicDirection.cs \
+     tests/efl_mono/Eina.cs \
+     tests/efl_mono/Eldbus.cs \
+     tests/efl_mono/Eo.cs \
+     tests/efl_mono/EoPromises.cs \
+     tests/efl_mono/Errors.cs \
+     tests/efl_mono/Events.cs \
+     tests/efl_mono/FunctionPointers.cs \
+     tests/efl_mono/FunctionPointerMarshalling.cs \
+     tests/efl_mono/Inheritance.cs \
+     tests/efl_mono/Parts.cs \
+     tests/efl_mono/Promises.cs \
+     tests/efl_mono/Strbuf.cs \
+     tests/efl_mono/Strings.cs \
+     tests/efl_mono/Structs.cs \
+     tests/efl_mono/Value.cs \
+     tests/efl_mono/ValueEolian.cs \
+     tests/efl_mono/EinaTestData.cs \
+     tests/efl_mono/StructHelpers.cs
+
+beta_mono_flags =
+
+if HAVE_CSHARP_BETA
+beta_mono_flags += -define:EFL_BETA
+endif
+
+tests/efl_mono/efl_mono$(EXEEXT): $(tests_efl_mono_efl_mono_SOURCES) tests/efl_mono/$(am__dirstamp) lib/efl_mono/libefl_mono.dll tests/efl_mono/libefl_mono_test.dll tests/efl_mono/efl_mono$(EXEEXT).config
+	@rm -f $@
+	$(AM_V_MCS) $(MCS) $(MCSFLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -r:$(abs_top_builddir)/src/tests/efl_mono/libefl_mono_test.dll -out:$@ $(filter %.cs, $(^)) $(beta_mono_flags)
+
+# Rule for generating the .cs files
+tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP)
+	$(AM_V_EOLMONO) \
+	$(MKDIR_P) $(dir $@); \
+	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport "@DLIB_PREFIX_MONO@efl_mono_native_test@DLIB_SUFFIX_MONO@" -o $@ $(ALL_EO_REFS) $<
+
+CLEANFILES += tests/efl_mono/libefl_mono_test.dll $(efl_mono_test_eolian_mono_files) $(efl_mono_test_eolian_c) $(efl_mono_test_eolian_h) tests/efl_mono/efl_mono.config
+
+endif
+
+
+endif
+endif
diff --git a/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am b/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am
new file mode 100644
index 0000000000..9f750f5fd8
--- /dev/null
+++ b/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am
@@ -0,0 +1,17 @@
+
+EFL_MONO_MSBUILD_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/efl_mono_msbuild_gen/efl_mono_msbuild_gen${EXEEXT}
+_EFL_MONO_MSBUILD_GEN_DEP = bin/efl_mono_msbuild_gen/efl_mono_msbuild_gen${EXEEXT}
+
+if HAVE_WIN32
+
+MSBUILD_GEN_FLAGS := $(MSBUILD_GEN_FLAGS)
+MSBUILD_GEN_FLAGS += -d WIN32
+
+endif
+
+if HAVE_X86_64
+
+MSBUILD_GEN_FLAGS := $(MSBUILD_GEN_FLAGS)
+MSBUILD_GEN_FLAGS += -p x64
+
+endif
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
new file mode 100644
index 0000000000..c0ad0d7b60
--- /dev/null
+++ b/src/Makefile_Efreet.am
@@ -0,0 +1,255 @@
+
+### Library
+
+lib_LTLIBRARIES += \
+lib/efreet/libefreet.la \
+lib/efreet/libefreet_mime.la \
+lib/efreet/libefreet_trash.la
+
+EFREET_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DPACKAGE_SYSCONF_DIR=\"$(sysconfdir)\" \
+-DDATA_DIR=\"$(datadir)\" \
+-DLOCALE_DIR=\"@LOCALE_DIR@\" \
+@EFREET_CFLAGS@
+
+installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
+dist_installed_efreetmainheaders_DATA = \
+lib/efreet/Efreet.h \
+lib/efreet/efreet_base.h \
+lib/efreet/efreet_desktop.h \
+lib/efreet/efreet_icon.h \
+lib/efreet/efreet_ini.h \
+lib/efreet/efreet_menu.h \
+lib/efreet/efreet_utils.h \
+lib/efreet/efreet_uri.h \
+lib/efreet/Efreet_Mime.h \
+lib/efreet/Efreet_Trash.h
+
+# libefreet.la
+lib_efreet_libefreet_la_SOURCES = \
+lib/efreet/efreet.c \
+lib/efreet/efreet_base.c \
+lib/efreet/efreet_icon.c \
+lib/efreet/efreet_xml.c \
+lib/efreet/efreet_ini.c \
+lib/efreet/efreet_desktop.c \
+lib/efreet/efreet_desktop_command.c \
+lib/efreet/efreet_menu.c \
+lib/efreet/efreet_utils.c \
+lib/efreet/efreet_uri.c \
+lib/efreet/efreet_cache.c \
+lib/efreet/efreet_private.h \
+lib/efreet/efreet_xml.h \
+lib/efreet/efreet_cache_private.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) -DEFL_BUILD
+lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@ @EVIL_LIBS@
+lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
+lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+# libefreet_mime.la
+lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
+lib_efreet_libefreet_mime_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) -DEFL_BUILD
+lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
+lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+# libefreet_trash.la
+lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
+lib_efreet_libefreet_trash_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) -DEFL_BUILD
+lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
+lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+
+### Binary
+
+if HAVE_WIN32
+USE_EFREET_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_EFREET_LIBS@
+else
+USE_EFREET_BIN_LIBS = @USE_EFREET_LIBS@
+endif
+
+bin_PROGRAMS += bin/efreet/efreetd
+
+bin_efreet_efreetd_SOURCES = \
+bin/efreet/efreetd.c \
+bin/efreet/efreetd.h \
+bin/efreet/efreetd_ipc.h \
+bin/efreet/efreetd_ipc.c \
+bin/efreet/efreetd_cache.h \
+bin/efreet/efreetd_cache.c
+
+bin_efreet_efreetd_CPPFLAGS = \
+  -I$(top_builddir)/src/lib/efl \
+  $(EFREET_COMMON_CPPFLAGS) \
+  @EIO_CFLAGS@
+bin_efreet_efreetd_LDADD = $(USE_EFREET_BIN_LIBS) @USE_EIO_LIBS@
+bin_efreet_efreetd_DEPENDENCIES = \
+  @USE_EFREET_INTERNAL_LIBS@ \
+  lib/eio/libeio.la \
+  lib/efreet/libefreet_mime.la \
+  lib/efreet/libefreet_trash.la
+
+efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
+efreetinternal_bin_PROGRAMS = \
+bin/efreet/efreet_desktop_cache_create \
+bin/efreet/efreet_icon_cache_create \
+bin/efreet/efreet_mime_cache_create
+
+bin_efreet_efreet_desktop_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+bin_efreet_efreet_desktop_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
+bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
+
+bin_efreet_efreet_icon_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+bin_efreet_efreet_icon_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
+bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
+
+bin_efreet_efreet_mime_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+bin_efreet_efreet_mime_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
+bin_efreet_efreet_mime_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_mime_cache_create_SOURCES = bin/efreet/efreet_mime_cache_create.c
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+noinst_PROGRAMS += \
+tests/efreet/efreet_test \
+tests/efreet/efreet_async_test \
+tests/efreet/efreet_spec_test \
+tests/efreet/efreet_cache_test \
+tests/efreet/efreet_icon_cache_dump \
+tests/efreet/efreet_user_dir \
+tests/efreet/compare/efreet_alloc \
+tests/efreet/compare/efreet_menu_alloc
+
+
+# efreet_test
+tests_efreet_efreet_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_test_LDADD = \
+@USE_EFREET_LIBS@ \
+lib/efreet/libefreet_mime.la
+tests_efreet_efreet_test_DEPENDENCIES = \
+@USE_EFREET_INTERNAL_LIBS@ \
+lib/efreet/libefreet_mime.la
+
+tests_efreet_efreet_test_SOURCES = \
+tests/efreet/ef_data_dirs.c \
+tests/efreet/ef_desktop.c \
+tests/efreet/ef_icon_theme.c \
+tests/efreet/ef_ini.c \
+tests/efreet/ef_locale.c \
+tests/efreet/ef_menu.c \
+tests/efreet/ef_mime.c \
+tests/efreet/ef_test.h \
+tests/efreet/ef_utils.c \
+tests/efreet/main.c
+
+# efreet_async_test
+tests_efreet_efreet_async_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_async_test_LDADD = \
+@USE_EFREET_LIBS@
+tests_efreet_efreet_async_test_DEPENDENCIES = \
+@USE_EFREET_INTERNAL_LIBS@
+
+tests_efreet_efreet_async_test_SOURCES = \
+tests/efreet/efreet_async_test.c
+
+# efreet_spec_test
+tests_efreet_efreet_spec_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
+
+# efreet_cache_test
+tests_efreet_efreet_cache_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
+
+# efreet_icon_cache_dump
+tests_efreet_efreet_icon_cache_dump_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
+
+# efreet_user_dir
+tests_efreet_efreet_user_dir_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
+
+# efreet_alloc
+tests_efreet_compare_efreet_alloc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
+tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_compare_efreet_alloc_SOURCES = \
+tests/efreet/compare/efreet_alloc.c \
+tests/efreet/compare/comp.h
+
+# efreet_menu_alloc
+tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
+tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_compare_efreet_menu_alloc_SOURCES = \
+tests/efreet/compare/efreet_menu_alloc.c \
+tests/efreet/compare/comp.h
+
+efreettestdir = $(datadir)/efreet/test
+efreettest_DATA = \
+tests/efreet/data/test.ini \
+tests/efreet/data/long.ini \
+tests/efreet/data/test.desktop \
+tests/efreet/data/test_type.desktop \
+tests/efreet/data/test.menu \
+tests/efreet/data/test_menu_slash_bad.menu \
+tests/efreet/data/entry.png \
+tests/efreet/data/entry \
+tests/efreet/data/preferences.menu \
+tests/efreet/data/test_garbage
+
+efreettestsubdir = $(datadir)/efreet/test/sub
+efreettestsub_DATA = \
+tests/efreet/data/sub/test.desktop
+
+check_PROGRAMS += tests/efreet/efreet_suite
+TESTS += tests/efreet/efreet_suite
+
+tests_efreet_efreet_suite_SOURCES = \
+tests/efreet/efreet_suite.c \
+tests/efreet/efreet_suite.h \
+tests/efreet/efreet_test_efreet.c \
+tests/efreet/efreet_test_efreet_cache.c
+
+tests_efreet_efreet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efreet\"
+tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
+tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+
+endif
+
+EXTRA_DIST2 += \
+tests/efreet/data/entry \
+tests/efreet/data/entry.png \
+tests/efreet/data/long.ini \
+tests/efreet/data/preferences.menu \
+tests/efreet/data/sub/Makefile.am \
+tests/efreet/data/sub/test.desktop \
+tests/efreet/data/test.desktop \
+tests/efreet/data/test_garbage \
+tests/efreet/data/test.ini \
+tests/efreet/data/test.menu \
+tests/efreet/data/test_menu_bad_comment.menu \
+tests/efreet/data/test_menu_slash_bad.menu \
+tests/efreet/data/test_type.desktop
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
new file mode 100644
index 0000000000..40ef392965
--- /dev/null
+++ b/src/Makefile_Eina.am
@@ -0,0 +1,408 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/eina/libeina.la
+
+installed_einamainheadersdir = $(includedir)/eina-@VMAJ@
+dist_installed_einamainheaders_DATA = \
+lib/eina/Eina.h \
+lib/eina/eina_config.h
+
+installed_einaheadersdir = $(includedir)/eina-@VMAJ@/eina
+dist_installed_einaheaders_DATA = \
+lib/eina/eina_promise.h \
+lib/eina/eina_safety_checks.h \
+lib/eina/eina_error.h \
+lib/eina/eina_debug.h \
+lib/eina/eina_debug_private.h \
+lib/eina/eina_log.h \
+lib/eina/eina_inline_log.x \
+lib/eina/eina_fp.h \
+lib/eina/eina_inline_f32p32.x \
+lib/eina/eina_inline_f16p16.x \
+lib/eina/eina_inline_f8p24.x \
+lib/eina/eina_inline_fp.x \
+lib/eina/eina_hash.h \
+lib/eina/eina_inline_hash.x \
+lib/eina/eina_lalloc.h \
+lib/eina/eina_clist.h \
+lib/eina/eina_inline_clist.x \
+lib/eina/eina_inarray.h \
+lib/eina/eina_inlist.h \
+lib/eina/eina_inline_inlist.x \
+lib/eina/eina_list.h \
+lib/eina/eina_file.h \
+lib/eina/eina_inline_file.x \
+lib/eina/eina_mempool.h \
+lib/eina/eina_module.h \
+lib/eina/eina_rectangle.h \
+lib/eina/eina_types.h \
+lib/eina/eina_array.h \
+lib/eina/eina_counter.h \
+lib/eina/eina_inline_array.x \
+lib/eina/eina_magic.h \
+lib/eina/eina_stringshare.h \
+lib/eina/eina_binshare.h \
+lib/eina/eina_binbuf.h \
+lib/eina/eina_ustringshare.h \
+lib/eina/eina_inline_stringshare.x \
+lib/eina/eina_inline_ustringshare.x \
+lib/eina/eina_inline_list.x \
+lib/eina/eina_accessor.h \
+lib/eina/eina_convert.h \
+lib/eina/eina_rbtree.h \
+lib/eina/eina_benchmark.h \
+lib/eina/eina_inline_rbtree.x \
+lib/eina/eina_inline_mempool.x \
+lib/eina/eina_inline_rectangle.x \
+lib/eina/eina_inline_trash.x \
+lib/eina/eina_thread.h \
+lib/eina/eina_trash.h \
+lib/eina/eina_iterator.h \
+lib/eina/eina_main.h \
+lib/eina/eina_cpu.h \
+lib/eina/eina_inline_cpu.x \
+lib/eina/eina_sched.h \
+lib/eina/eina_tiler.h \
+lib/eina/eina_hamster.h \
+lib/eina/eina_matrixsparse.h \
+lib/eina/eina_inline_tiler.x \
+lib/eina/eina_str.h \
+lib/eina/eina_inline_str.x \
+lib/eina/eina_strbuf.h \
+lib/eina/eina_ustrbuf.h \
+lib/eina/eina_unicode.h \
+lib/eina/eina_quadtree.h \
+lib/eina/eina_simple_xml_parser.h \
+lib/eina/eina_lock.h \
+lib/eina/eina_prefix.h \
+lib/eina/eina_refcount.h \
+lib/eina/eina_mmap.h \
+lib/eina/eina_xattr.h \
+lib/eina/eina_value.h \
+lib/eina/eina_inline_value.x \
+lib/eina/eina_value_util.h \
+lib/eina/eina_inline_value_util.x \
+lib/eina/eina_inline_lock_barrier.x \
+lib/eina/eina_inline_lock_posix.x \
+lib/eina/eina_tmpstr.h \
+lib/eina/eina_alloca.h \
+lib/eina/eina_cow.h \
+lib/eina/eina_inline_unicode.x \
+lib/eina/eina_thread_queue.h \
+lib/eina/eina_matrix.h \
+lib/eina/eina_quad.h \
+lib/eina/eina_crc.h \
+lib/eina/eina_inline_crc.x \
+lib/eina/eina_evlog.h \
+lib/eina/eina_util.h \
+lib/eina/eina_inline_util.x \
+lib/eina/eina_quaternion.h \
+lib/eina/eina_vector.h \
+lib/eina/eina_inline_vector.x \
+lib/eina/eina_bezier.h \
+lib/eina/eina_safepointer.h \
+lib/eina/eina_inline_safepointer.x \
+lib/eina/eina_slice.h \
+lib/eina/eina_inline_slice.x \
+lib/eina/eina_inline_modinfo.x \
+lib/eina/eina_freeq.h \
+lib/eina/eina_slstr.h \
+lib/eina/eina_vpath.h
+
+
+lib_eina_libeina_la_SOURCES = \
+lib/eina/eina_abi.c \
+lib/eina/eina_accessor.c \
+lib/eina/eina_array.c \
+lib/eina/eina_benchmark.c \
+lib/eina/eina_binbuf.c \
+lib/eina/eina_binshare.c \
+lib/eina/eina_convert.c \
+lib/eina/eina_counter.c \
+lib/eina/eina_cow.c \
+lib/eina/eina_cpu.c \
+lib/eina/eina_crc.c \
+lib/eina/eina_debug.c \
+lib/eina/eina_debug_bt.c \
+lib/eina/eina_debug_bt_file.c \
+lib/eina/eina_debug_chunk.c \
+lib/eina/eina_debug_thread.c \
+lib/eina/eina_debug_cpu.c \
+lib/eina/eina_debug_timer.c \
+lib/eina/eina_error.c \
+lib/eina/eina_evlog.c \
+lib/eina/eina_file_common.h \
+lib/eina/eina_file_common.c \
+lib/eina/eina_fp.c \
+lib/eina/eina_hamster.c \
+lib/eina/eina_hash.c \
+lib/eina/eina_inarray.c \
+lib/eina/eina_inlist.c \
+lib/eina/eina_iterator.c \
+lib/eina/eina_lalloc.c \
+lib/eina/eina_list.c \
+lib/eina/eina_lock.c \
+lib/eina/eina_log.c \
+lib/eina/eina_magic.c \
+lib/eina/eina_main.c \
+lib/eina/eina_matrix.c \
+lib/eina/eina_matrixsparse.c \
+lib/eina/eina_mempool.c \
+lib/eina/eina_mmap.c \
+lib/eina/eina_module.c \
+lib/eina/eina_prefix.c \
+lib/eina/eina_promise.c \
+lib/eina/eina_promise_private.h \
+lib/eina/eina_quad.c \
+lib/eina/eina_quadtree.c \
+lib/eina/eina_rbtree.c \
+lib/eina/eina_rectangle.c \
+lib/eina/eina_safety_checks.c \
+lib/eina/eina_sched.c \
+lib/eina/eina_share_common.c \
+lib/eina/eina_simple_xml_parser.c \
+lib/eina/eina_str.c \
+lib/eina/eina_strbuf.c \
+lib/eina/eina_strbuf_common.c \
+lib/eina/eina_stringshare.c \
+lib/eina/eina_thread.c \
+lib/eina/eina_thread_queue.c \
+lib/eina/eina_tiler.c \
+lib/eina/eina_tmpstr.c \
+lib/eina/eina_unicode.c \
+lib/eina/eina_ustrbuf.c \
+lib/eina/eina_ustringshare.c \
+lib/eina/eina_util.c \
+lib/eina/eina_value.c \
+lib/eina/eina_value_util.c \
+lib/eina/eina_xattr.c \
+lib/eina/eina_private.h \
+lib/eina/eina_share_common.h \
+lib/eina/eina_strbuf_common.h \
+lib/eina/eina_quaternion.c \
+lib/eina/eina_bezier.c \
+lib/eina/eina_safepointer.c \
+lib/eina/eina_freeq.c \
+lib/eina/eina_slstr.c \
+lib/eina/eina_vpath.c \
+lib/eina/eina_vpath_xdg.c
+
+
+if HAVE_WIN32
+lib_eina_libeina_la_SOURCES += lib/eina/eina_file_win32.c
+else
+lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c
+endif
+
+EINA_MODULE_COMMON_CFLAGS = \
+@EINA_CFLAGS@ \
+@VALGRIND_CFLAGS@
+
+if EINA_STATIC_BUILD_CHAINED_POOL
+lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c
+else
+einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
+einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_einampchainedpoolLTLIBRARIES = install-einampchainedpoolLTLIBRARIES
+$(install_einampchainedpoolLTLIBRARIES): install-libLTLIBRARIES
+
+modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) -DEFL_BUILD
+modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = @USE_EINA_LIBS@
+modules_eina_mp_chained_pool_chained_pool_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+modules_eina_mp_chained_pool_chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_eina_mp_chained_pool_chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
+modules_eina_mp_chained_pool_chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
+endif
+
+if EINA_STATIC_BUILD_ONE_BIG
+lib_eina_libeina_la_SOURCES += modules/eina/mp/one_big/eina_one_big.c
+else
+einamponebigdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
+einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_einamponebigLTLIBRARIES = install-einamponebigLTLIBRARIES
+$(install_einamponebigLTLIBRARIES): install-libLTLIBRARIES
+
+modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) -DEFL_BUILD
+modules_eina_mp_one_big_one_big_module_la_LIBADD = @USE_EINA_LIBS@
+modules_eina_mp_one_big_one_big_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+modules_eina_mp_one_big_one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_eina_mp_one_big_one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
+modules_eina_mp_one_big_one_big_module_la_SOURCES = modules/eina/mp/one_big/eina_one_big.c
+endif
+
+if EINA_STATIC_BUILD_PASS_THROUGH
+lib_eina_libeina_la_SOURCES += modules/eina/mp/pass_through/eina_pass_through.c
+else
+einamppassthroughdir = $(libdir)/eina/modules/mp/pass_through/$(MODULE_ARCH)
+einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_einamppassthroughLTLIBRARIES = install-einamppassthroughLTLIBRARIES
+$(install_einamppassthroughLTLIBRARIES): install-libLTLIBRARIES
+
+modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) -DEFL_BUILD
+modules_eina_mp_pass_through_pass_through_module_la_LIBADD = @USE_EINA_LIBS@
+modules_eina_mp_pass_through_pass_through_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+modules_eina_mp_pass_through_pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
+modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
+endif
+
+lib_eina_libeina_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+@EINA_CFLAGS@ \
+@UNWIND_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
+-DEFL_BUILD \
+@VALGRIND_CFLAGS@
+
+lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@
+lib_eina_libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@
+lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Binaries
+
+bin_PROGRAMS += bin/eina/eina_btlog/eina_btlog
+
+bin_eina_eina_btlog_eina_btlog_SOURCES = bin/eina/eina_btlog/eina_btlog.c
+bin_eina_eina_btlog_eina_btlog_CPPFLAGS =  -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
+@EINA_CFLAGS@
+
+bin_eina_eina_btlog_eina_btlog_LDADD = @USE_EINA_LIBS@
+bin_eina_eina_btlog_eina_btlog_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+bin_PROGRAMS += bin/eina/eina_modinfo/eina_modinfo
+
+bin_eina_eina_modinfo_eina_modinfo_SOURCES = bin/eina/eina_modinfo/eina_modinfo.c
+bin_eina_eina_modinfo_eina_modinfo_CPPFLAGS =  -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
+@EINA_CFLAGS@
+
+bin_eina_eina_modinfo_eina_modinfo_LDADD = @USE_EINA_LIBS@
+bin_eina_eina_modinfo_eina_modinfo_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+### Script
+
+# disabled because its a pretty useless script that forces python as a
+# a dependency and doesn't parse anything efl or test apps produce
+# bin_SCRIPTS += scripts/eina/eina-bench-cmp
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/eina/eina_suite tests/eina/cxx_compile_test
+TESTS += tests/eina/eina_suite
+
+tests_eina_eina_suite_SOURCES = \
+tests/efl_check.h \
+tests/eina/eina_suite.c \
+tests/eina/eina_suite.h \
+tests/eina/eina_test_abi.c \
+tests/eina/eina_test_fp.c \
+tests/eina/eina_test_ustringshare.c \
+tests/eina/eina_test_ustr.c \
+tests/eina/eina_test_binshare.c \
+tests/eina/eina_test_binbuf.c \
+tests/eina/eina_test_inarray.c \
+tests/eina/eina_test_array.c \
+tests/eina/eina_test_clist.c \
+tests/eina/eina_test_error.c \
+tests/eina/eina_test_sched.c \
+tests/eina/eina_test_log.c \
+tests/eina/eina_test_magic.c \
+tests/eina/eina_test_inlist.c \
+tests/eina/eina_test_main.c \
+tests/eina/eina_test_counter.c \
+tests/eina/eina_test_lalloc.c \
+tests/eina/eina_test_hash.c \
+tests/eina/eina_test_iterator.c \
+tests/eina/eina_test_accessor.c \
+tests/eina/eina_test_module.c \
+tests/eina/eina_test_convert.c \
+tests/eina/eina_test_rbtree.c \
+tests/eina/eina_test_file.c \
+tests/eina/eina_test_benchmark.c \
+tests/eina/eina_test_mempool.c \
+tests/eina/eina_test_rectangle.c \
+tests/eina/eina_test_list.c \
+tests/eina/eina_test_matrixsparse.c \
+tests/eina/eina_test_tiler.c \
+tests/eina/eina_test_strbuf.c \
+tests/eina/eina_test_str.c \
+tests/eina/eina_test_quadtree.c \
+tests/eina/eina_test_simple_xml_parser.c \
+tests/eina/eina_test_value.c \
+tests/eina/eina_test_cow.c \
+tests/eina/eina_test_barrier.c \
+tests/eina/eina_test_tmpstr.c \
+tests/eina/eina_test_trash.c \
+tests/eina/eina_test_lock.c \
+tests/eina/eina_test_xattr.c \
+tests/eina/eina_test_crc.c \
+tests/eina/eina_test_quad.c \
+tests/eina/eina_test_matrix.c \
+tests/eina/eina_test_quaternion.c \
+tests/eina/eina_test_vector.c \
+tests/eina/eina_test_bezier.c \
+tests/eina/eina_test_safepointer.c \
+tests/eina/eina_test_slice.c \
+tests/eina/eina_test_freeq.c \
+tests/eina/eina_test_slstr.c \
+tests/eina/eina_test_vpath.c \
+tests/eina/eina_test_debug.c
+
+tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina\" \
+@CHECK_CFLAGS@ \
+@EINA_CFLAGS@
+tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
+tests_eina_eina_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
+tests_eina_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EINA_CFLAGS@
+tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
+tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+check_LTLIBRARIES = tests/eina/module_dummy.la
+
+tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
+tests_eina_module_dummy_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+@CHECK_CFLAGS@ \
+@EINA_CFLAGS@
+tests_eina_module_dummy_la_LIBADD = @USE_EINA_LIBS@
+tests_eina_module_dummy_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+tests_eina_module_dummy_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
+
+endif
+
+EXTRA_DIST2 += \
+lib/eina/eina_strbuf_template_c.x \
+lib/eina/eina_binbuf_template_c.x \
+lib/eina/eina_inline_private.h \
+lib/eina/eina_internal.h \
+tests/eina/sample.gpx \
+tests/eina/eina_suite.x \
+lib/eina/eina_config.h.in \
+tests/eina/eina_test_stringshare.c \
+tests/eina/eina_test_util.c \
+$(bin_SCRIPTS)
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
new file mode 100644
index 0000000000..aa75c5fbcf
--- /dev/null
+++ b/src/Makefile_Eio.am
@@ -0,0 +1,114 @@
+
+### Library
+
+eio_eolian_files = \
+        lib/eio/efl_io_model.eo \
+        lib/eio/efl_io_manager.eo \
+        lib/eio/eio_sentry.eo
+
+eio_eolian_h =  $(eio_eolian_files:%.eo=%.eo.h)
+eio_eolian_c =  $(eio_eolian_files:%.eo=%.eo.c)
+
+BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h)
+
+if INSTALL_EO_FILES
+eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@
+eioeolianfiles_DATA = $(eio_eolian_files)
+endif
+
+lib_LTLIBRARIES += lib/eio/libeio.la
+EXTRA_DIST2 += $(eio_eolian_files)
+
+installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@
+
+dist_installed_eiomainheaders_DATA = \
+lib/eio/Eio.h \
+lib/eio/Eio_Legacy.h \
+lib/eio/Eio_Eo.h \
+lib/eio/eio_inline_helper.x
+nodist_installed_eiomainheaders_DATA = $(eio_eolian_h)
+
+lib_eio_libeio_la_SOURCES = \
+lib/eio/eio_dir.c \
+lib/eio/eio_eet.c \
+lib/eio/eio_file.c \
+lib/eio/efl_io_manager.c \
+lib/eio/eio_sentry.c \
+lib/eio/eio_main.c \
+lib/eio/eio_map.c \
+lib/eio/eio_monitor.c \
+lib/eio/eio_monitor_poll.c \
+lib/eio/eio_single.c \
+lib/eio/eio_xattr.c \
+lib/eio/efl_io_model.c \
+lib/eio/efl_io_model_private.h \
+lib/eio/eio_private.h \
+lib/eio/eio_sentry_private.h
+
+if HAVE_INOTIFY
+lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_inotify.c
+else
+if HAVE_NOTIFY_WIN32
+lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
+else
+if HAVE_NOTIFY_COCOA
+lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_cocoa.c
+else
+if HAVE_NOTIFY_KEVENT
+lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_kevent.c
+endif
+endif
+endif
+endif
+
+lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@ @EFL_CFLAGS@ -DEFL_BUILD
+lib_eio_libeio_la_LIBADD = @EIO_LIBS@ @EFL_LIBS@
+lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@
+lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+if HAVE_NOTIFY_COCOA
+lib_eio_libeio_la_LDFLAGS += -framework CoreServices
+endif
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/eio/eio_suite
+TESTS += tests/eio/eio_suite
+
+tests_eio_eio_suite_SOURCES = \
+tests/eio/eio_suite.c \
+tests/eio/efl_io_model_test_file.c \
+tests/eio/efl_io_model_test_monitor_add.c \
+tests/eio/eio_test_monitor.c \
+tests/eio/eio_test_sentry.c \
+tests/eio/eio_test_file.c \
+tests/eio/eio_test_manager.c \
+tests/eio/eio_test_manager_xattr.c \
+tests/eio/eio_test_xattr.c \
+tests/eio/eio_test_common.c \
+tests/eio/eio_test_common.h \
+tests/eio/eio_test_map.c \
+tests/eio/eio_test_eet.c \
+tests/eio/eio_suite.h
+
+tests_eio_eio_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eio\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eio\" \
+@CHECK_CFLAGS@ \
+@ECORE_FILE_CFLAGS@ \
+@EIO_CFLAGS@ \
+@EFREET_CFLAGS@ \
+@EFL_CFLAGS@
+
+tests_eio_eio_suite_LDADD = \
+@CHECK_LIBS@ \
+@USE_EIO_LIBS@ \
+@USE_ECORE_FILE_LIBS@ \
+@USE_EFREET_LIBS@ \
+@USE_EFL_LIBS@
+
+tests_eio_eio_suite_DEPENDENCIES = \
+@USE_EIO_INTERNAL_LIBS@ \
+@USE_EFREET_INTERNAL_LIBS@
+
+endif
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
new file mode 100644
index 0000000000..dace370ec2
--- /dev/null
+++ b/src/Makefile_Eldbus.am
@@ -0,0 +1,157 @@
+
+### Library
+
+eldbus_eolian_type_files = \
+    lib/eldbus/eldbus_types.eot
+
+eldbus_eolian_files = \
+	lib/eldbus/eldbus_model_connection.eo \
+	lib/eldbus/eldbus_model_object.eo \
+	lib/eldbus/eldbus_model_proxy.eo \
+	lib/eldbus/eldbus_model_method.eo \
+	lib/eldbus/eldbus_model_arguments.eo \
+	lib/eldbus/eldbus_model_signal.eo \
+	lib/eldbus/eldbus_model.eo
+
+eldbus_eolian_c = $(eldbus_eolian_files:%.eo=%.eo.c)
+eldbus_eolian_h = $(eldbus_eolian_files:%.eo=%.eo.h) \
+                  $(eldbus_eolian_type_files:%.eot=%.eot.h)
+
+BUILT_SOURCES += \
+	$(eldbus_eolian_c) \
+	$(eldbus_eolian_h)
+
+if INSTALL_EO_FILES
+eldbuseolianfilesdir = $(datadir)/eolian/include/eldbus-@VMAJ@
+eldbuseolianfiles_DATA = \
+$(eldbus_eolian_files) \
+$(eldbus_eolian_type_files)
+endif
+
+EXTRA_DIST2 += \
+$(eldbus_eolian_files) \
+$(eldbus_eolian_type_files)
+
+lib_LTLIBRARIES += lib/eldbus/libeldbus.la
+
+installed_eldbusmainheadersdir = $(includedir)/eldbus-@VMAJ@
+dist_installed_eldbusmainheaders_DATA = \
+lib/eldbus/Eldbus.h \
+lib/eldbus/eldbus_connection.h \
+lib/eldbus/eldbus_freedesktop.h \
+lib/eldbus/eldbus_message.h \
+lib/eldbus/eldbus_object.h \
+lib/eldbus/eldbus_pending.h \
+lib/eldbus/eldbus_proxy.h \
+lib/eldbus/eldbus_service.h \
+lib/eldbus/eldbus_signal_handler.h \
+lib/eldbus/eldbus_message_helper.h \
+lib/eldbus/eldbus_introspection.h \
+lib/eldbus/Eldbus_Model.h \
+lib/eldbus/eldbus_message_eina_value.h
+
+nodist_installed_eldbusmainheaders_DATA = $(eldbus_eolian_h)
+
+lib_eldbus_libeldbus_la_SOURCES = \
+lib/eldbus/eldbus_private.h \
+lib/eldbus/eldbus_private_types.h \
+lib/eldbus/eldbus_model_private.h \
+lib/eldbus/eldbus_model_proxy_private.h \
+lib/eldbus/eldbus_model_object_private.h \
+lib/eldbus/eldbus_model_arguments_private.h \
+lib/eldbus/eldbus_model_connection_private.h \
+lib/eldbus/eldbus_model_signal_private.h \
+lib/eldbus/eldbus_model_method_private.h \
+lib/eldbus/eldbus_proxy.c \
+lib/eldbus/eldbus_core.c \
+lib/eldbus/eldbus_message.c \
+lib/eldbus/eldbus_object.c \
+lib/eldbus/eldbus_pending.c \
+lib/eldbus/eldbus_freedesktop.c \
+lib/eldbus/eldbus_service.c \
+lib/eldbus/eldbus_signal_handler.c \
+lib/eldbus/eldbus_message_helper.c \
+lib/eldbus/eldbus_message_to_eina_value.c \
+lib/eldbus/eldbus_message_from_eina_value.c \
+lib/eldbus/eldbus_model_connection.c \
+lib/eldbus/eldbus_model_object.c \
+lib/eldbus/eldbus_model_proxy.c \
+lib/eldbus/eldbus_model_method.c \
+lib/eldbus/eldbus_model_arguments.c \
+lib/eldbus/eldbus_model_signal.c \
+lib/eldbus/eldbus_model.c \
+lib/eldbus/eldbus_introspection.c
+
+lib_eldbus_libeldbus_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-include $(top_builddir)/config.h \
+-DEFL_BUILD \
+@ELDBUS_CFLAGS@ @EFL_CFLAGS@
+lib_eldbus_libeldbus_la_LIBADD = @ELDBUS_LIBS@ @EFL_LIBS@
+lib_eldbus_libeldbus_la_DEPENDENCIES = @ELDBUS_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@
+lib_eldbus_libeldbus_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Binary
+
+bin_PROGRAMS += bin/eldbus/eldbus-codegen
+
+bin_eldbus_eldbus_codegen_SOURCES = \
+bin/eldbus/codegen.h \
+bin/eldbus/utils.c \
+bin/eldbus/parser.c \
+bin/eldbus/dbus.c \
+bin/eldbus/source_client.c \
+bin/eldbus/client.c
+
+bin_eldbus_eldbus_codegen_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eldbus\" \
+@ELDBUS_CFLAGS@
+
+if HAVE_WIN32
+bin_eldbus_eldbus_codegen_LDADD = -L$(top_builddir)/src/lib/evil @USE_ELDBUS_LIBS@
+else
+bin_eldbus_eldbus_codegen_LDADD = @USE_ELDBUS_LIBS@
+endif
+bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
+
+if HAVE_CXX
+eldbus_eolian_cxx_hh = $(eldbus_eolian_files:%.eo=%.eo.hh)
+eldbus_eolian_cxx_impl_hh = $(eldbus_eolian_files:%.eo=%.eo.impl.hh)
+endif
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/eldbus/eldbus_suite
+TESTS += tests/eldbus/eldbus_suite
+
+tests_eldbus_eldbus_suite_SOURCES = \
+tests/eldbus/eldbus_suite.c \
+tests/eldbus/eldbus_test_eldbus_init.c \
+tests/eldbus/eldbus_test_eldbus_model.h \
+tests/eldbus/eldbus_fake_server.h \
+tests/eldbus/eldbus_test_eldbus_model.c \
+tests/eldbus/eldbus_test_eldbus_model_connection.c \
+tests/eldbus/eldbus_test_eldbus_model_object.c \
+tests/eldbus/eldbus_test_eldbus_model_proxy.c \
+tests/eldbus/eldbus_test_eldbus_model_method.c \
+tests/eldbus/eldbus_test_eldbus_model_signal.c \
+tests/eldbus/eldbus_test_eldbus_object.c \
+tests/eldbus/eldbus_test_eldbus_message.c \
+tests/eldbus/eldbus_test_eldbus_signal_handler.c \
+tests/eldbus/eldbus_test_eldbus_proxy.c \
+tests/eldbus/eldbus_test_eldbus_pending_cancel.c \
+tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c \
+tests/eldbus/eldbus_fake_server.c \
+tests/eldbus/eldbus_suite.h
+
+tests_eldbus_eldbus_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @CHECK_CFLAGS@ @ELDBUS_CFLAGS@ \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+@EFL_CFLAGS@ -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\"
+
+tests_eldbus_eldbus_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@ @USE_EFL_LIBS@
+tests_eldbus_eldbus_suite_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
+
+endif
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
new file mode 100644
index 0000000000..e2957f185f
--- /dev/null
+++ b/src/Makefile_Elementary.am
@@ -0,0 +1,2022 @@
+
+### Library
+
+elm_public_eolian_files = \
+	lib/elementary/efl_ui_widget.eo \
+	lib/elementary/efl_ui_bg.eo \
+	lib/elementary/efl_ui_button.eo \
+ lib/elementary/efl_ui_calendar.eo \
+ lib/elementary/efl_ui_calendar_item.eo \
+	lib/elementary/efl_ui_check.eo \
+	lib/elementary/efl_ui_flip.eo \
+	lib/elementary/efl_ui_frame.eo \
+	lib/elementary/efl_ui_stack.eo \
+	lib/elementary/efl_ui_image.eo \
+	lib/elementary/efl_ui_image_zoomable.eo \
+	lib/elementary/efl_ui_layout.eo \
+	lib/elementary/efl_ui_layout_base.eo \
+	lib/elementary/efl_ui_nstate.eo \
+	lib/elementary/efl_ui_navigation_bar.eo \
+	lib/elementary/efl_ui_navigation_bar_part.eo \
+	lib/elementary/efl_ui_navigation_bar_part_back_button.eo \
+	lib/elementary/efl_ui_navigation_layout.eo \
+	lib/elementary/efl_ui_panes.eo \
+	lib/elementary/efl_ui_progressbar.eo \
+	lib/elementary/efl_ui_radio.eo \
+	lib/elementary/efl_ui_slider.eo \
+	lib/elementary/efl_ui_slider_interval.eo \
+	lib/elementary/efl_ui_spin.eo \
+	lib/elementary/efl_ui_spin_button.eo \
+	lib/elementary/efl_ui_datepicker.eo \
+	lib/elementary/efl_ui_timepicker.eo \
+	lib/elementary/efl_ui_tags.eo \
+	lib/elementary/efl_ui_panel.eo \
+	lib/elementary/efl_ui_video.eo \
+	lib/elementary/efl_ui_win.eo \
+	lib/elementary/efl_ui_win_inlined.eo \
+	lib/elementary/efl_ui_win_socket.eo \
+	lib/elementary/efl_ui_box.eo \
+	lib/elementary/efl_ui_box_flow.eo \
+	lib/elementary/efl_ui_box_stack.eo \
+	lib/elementary/efl_ui_table.eo \
+	lib/elementary/efl_ui_table_static.eo \
+	lib/elementary/efl_text_interactive.eo \
+	lib/elementary/efl_ui_text.eo \
+	lib/elementary/efl_ui_popup.eo \
+	lib/elementary/efl_ui_popup_part_backwall.eo \
+	lib/elementary/efl_ui_alert_popup.eo \
+	lib/elementary/efl_ui_alert_popup_part.eo \
+	lib/elementary/efl_ui_scroll_alert_popup.eo \
+	lib/elementary/efl_ui_scroll_alert_popup_part.eo \
+	lib/elementary/efl_ui_text_alert_popup.eo \
+	lib/elementary/efl_ui_text_alert_popup_part.eo \
+	lib/elementary/efl_ui_anchor_popup.eo \
+	lib/elementary/efl_ui_text_editable.eo \
+	lib/elementary/efl_ui_text_async.eo \
+	lib/elementary/efl_ui_text_factory_images.eo \
+	lib/elementary/efl_ui_text_factory_emoticons.eo \
+	lib/elementary/efl_ui_text_factory_fallback.eo \
+	lib/elementary/efl_ui_textpath.eo \
+	lib/elementary/efl_ui_l10n.eo \
+	lib/elementary/efl_ui_clock.eo \
+	lib/elementary/efl_ui_image_factory.eo \
+	lib/elementary/efl_ui_focus_manager.eo \
+	lib/elementary/efl_ui_focus_manager_calc.eo \
+	lib/elementary/efl_ui_focus_manager_sub.eo \
+	lib/elementary/efl_ui_focus_manager_root_focus.eo \
+	lib/elementary/efl_ui_focus_object.eo \
+	lib/elementary/efl_ui_focus_layer.eo \
+	lib/elementary/efl_ui_focus_composition.eo \
+	lib/elementary/efl_ui_focus_util.eo \
+	lib/elementary/efl_ui_flip_part.eo \
+	lib/elementary/efl_ui_layout_factory.eo \
+	lib/elementary/efl_ui_layout_part.eo \
+	lib/elementary/efl_ui_layout_part_box.eo \
+	lib/elementary/efl_ui_layout_part_content.eo \
+	lib/elementary/efl_ui_layout_part_text.eo \
+	lib/elementary/efl_ui_layout_part_table.eo \
+	lib/elementary/efl_ui_layout_part_bg.eo \
+	lib/elementary/efl_ui_layout_part_legacy.eo \
+	lib/elementary/efl_ui_list_view.eo \
+	lib/elementary/efl_ui_list_view_model.eo \
+	lib/elementary/efl_ui_list_view_pan.eo \
+	lib/elementary/efl_ui_item_part_text.eo \
+	lib/elementary/efl_ui_item_part_icon.eo \
+	lib/elementary/efl_ui_item_part_extra.eo \
+	lib/elementary/efl_ui_item_part_content.eo \
+	lib/elementary/efl_ui_item.eo \
+	lib/elementary/efl_ui_list_item.eo \
+	lib/elementary/efl_ui_list_default_item.eo \
+	lib/elementary/efl_ui_list_placeholder_item.eo \
+	lib/elementary/efl_ui_list.eo \
+	lib/elementary/efl_ui_grid_item.eo \
+	lib/elementary/efl_ui_grid_default_item.eo \
+	lib/elementary/efl_ui_grid.eo \
+	lib/elementary/efl_ui_panes_part.eo \
+	lib/elementary/efl_ui_progressbar_part.eo \
+	lib/elementary/efl_ui_textpath_part.eo \
+	lib/elementary/efl_ui_widget_part.eo \
+	lib/elementary/efl_ui_widget_part_bg.eo \
+	lib/elementary/efl_ui_widget_part_shadow.eo \
+	lib/elementary/efl_ui_win_part.eo \
+	lib/elementary/efl_ui_scroller.eo \
+	lib/elementary/efl_ui_scroll_manager.eo \
+	lib/elementary/efl_ui_pan.eo \
+	lib/elementary/efl_access_object.eo \
+	lib/elementary/efl_access_action.eo \
+	lib/elementary/efl_access_component.eo \
+	lib/elementary/efl_access_editable_text.eo \
+	lib/elementary/efl_access_selection.eo \
+	lib/elementary/efl_access_text.eo \
+	lib/elementary/efl_access_value.eo \
+	lib/elementary/efl_access_widget_action.eo \
+	lib/elementary/efl_access_window.eo \
+	lib/elementary/efl_ui_theme.eo \
+	lib/elementary/efl_config_global.eo \
+	lib/elementary/elm_code_widget.eo \
+	lib/elementary/efl_ui_selection.eo \
+	lib/elementary/efl_ui_dnd.eo \
+	lib/elementary/efl_ui_dnd_container.eo \
+	lib/elementary/efl_ui_focus_manager_window_root.eo \
+	lib/elementary/efl_ui_active_view_container.eo \
+	lib/elementary/efl_ui_active_view_view_manager.eo \
+	lib/elementary/efl_ui_active_view_view_manager_plain.eo \
+	lib/elementary/efl_ui_active_view_view_manager_scroll.eo \
+	lib/elementary/efl_ui_active_view_view_manager_stack.eo \
+	lib/elementary/efl_ui_active_view_indicator.eo \
+	lib/elementary/efl_ui_active_view_indicator_icon.eo \
+	lib/elementary/efl_ui_tab_pager.eo \
+	lib/elementary/efl_ui_tab_bar.eo \
+	lib/elementary/efl_ui_tab_page.eo \
+	lib/elementary/efl_ui_tab_page_part_tab.eo \
+	lib/elementary/efl_ui_widget_focus_manager.eo \
+	lib/elementary/efl_ui_text_part.eo \
+	lib/elementary/efl_ui_caching_factory.eo \
+	lib/elementary/efl_ui_widget_factory.eo \
+	lib/elementary/efl_ui_relative_layout.eo \
+	lib/elementary/efl_ui_clickable.eo \
+	lib/elementary/efl_ui_clickable_util.eo \
+	$(NULL)
+
+# More public files -- FIXME
+elm_public_eolian_files += \
+	lib/elementary/efl_ui_legacy.eo \
+	lib/elementary/efl_ui_button_legacy_part.eo \
+	lib/elementary/efl_ui_radio_legacy_part.eo \
+	lib/elementary/efl_ui_check_legacy_part.eo \
+	lib/elementary/efl_ui_progressbar_legacy_part.eo \
+	lib/elementary/elm_multibuttonentry_part.eo \
+	lib/elementary/elm_interface_scrollable.eo \
+	lib/elementary/efl_ui_image_zoomable_pan.eo \
+	$(NULL)
+
+# Private classes (not exposed or shipped)
+elm_private_eolian_files = \
+	lib/elementary/efl_ui_internal_text_interactive.eo \
+	lib/elementary/efl_ui_internal_text_scroller.eo \
+	lib/elementary/efl_ui_focus_composition_adapter.eo \
+	lib/elementary/efl_ui_win_part.eo \
+	lib/elementary/efl_ui_focus_parent_provider.eo \
+	lib/elementary/efl_ui_focus_parent_provider_standard.eo \
+	lib/elementary/efl_ui_state_model.eo \
+	tests/elementary/focus_test.eo \
+	tests/elementary/focus_manager_test.eo \
+	tests/elementary/focus_test_sub_main.eo \
+	lib/elementary/efl_ui_selection_manager.eo \
+	lib/elementary/efl_datetime_manager.eo \
+	lib/elementary/efl_ui_list_view_relayout.eo \
+	lib/elementary/efl_ui_list_view_precise_layouter.eo \
+	lib/elementary/efl_ui_size_model.eo \
+	lib/elementary/efl_ui_homogeneous_model.eo \
+	lib/elementary/efl_ui_exact_model.eo \
+	lib/elementary/efl_ui_average_model.eo \
+	$(NULL)
+
+# Legacy classes - not part of public EO API
+elm_legacy_eolian_files = \
+	lib/elementary/efl_ui_clock_legacy.eo \
+	lib/elementary/elm_ctxpopup_part.eo \
+	lib/elementary/elm_dayselector_part.eo \
+	lib/elementary/elm_entry_part.eo \
+	lib/elementary/elm_fileselector_entry_part.eo \
+	lib/elementary/elm_flip_part.eo \
+	lib/elementary/elm_hover_part.eo \
+	lib/elementary/elm_mapbuf_part.eo \
+	lib/elementary/elm_naviframe_part.eo \
+	lib/elementary/elm_notify_part.eo \
+	lib/elementary/elm_panel_part.eo \
+	lib/elementary/elm_player_part.eo \
+	lib/elementary/elm_popup_part.eo \
+	lib/elementary/elm_scroller_part.eo \
+	lib/elementary/elm_label_part.eo \
+	lib/elementary/elm_actionslider_part.eo \
+	lib/elementary/elm_bubble_part.eo \
+	lib/elementary/elm_fileselector_part.eo \
+	$(NULL)
+
+elm_eolian_type_files = \
+	lib/elementary/elm_general.eot \
+	lib/elementary/efl_ui.eot \
+	lib/elementary/efl_ui_list_view_types.eot \
+	lib/elementary/efl_ui_selection_types.eot \
+	lib/elementary/efl_ui_dnd_types.eot
+
+elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c)
+elm_public_eolian_h = $(elm_public_eolian_files:%.eo=%.eo.h) \
+        $(elm_eolian_type_files:%.eot=%.eot.h)
+
+elm_private_eolian_c = $(elm_private_eolian_files:%.eo=%.eo.c)
+elm_private_eolian_h = $(elm_private_eolian_files:%.eo=%.eo.h)
+
+elm_legacy_eolian_c = $(elm_legacy_eolian_files:%.eo=%.eo.c)
+elm_legacy_eolian_eo_h = $(elm_legacy_eolian_files:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+	$(elm_public_eolian_c) \
+	$(elm_public_eolian_h) \
+	$(elm_private_eolian_c) \
+	$(elm_private_eolian_h) \
+	$(elm_legacy_eolian_c) \
+	$(elm_legacy_eolian_eo_h)
+
+if INSTALL_EO_FILES
+elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
+elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files)
+endif
+
+noinst_DATA += $(elm_legacy_eolian_eo_h)
+
+elm_legacy_eo_files = \
+lib/elementary/efl_ui_bg_legacy_eo.c \
+lib/elementary/efl_ui_button_legacy_eo.c \
+lib/elementary/efl_ui_check_eo.legacy.c \
+lib/elementary/efl_ui_check_legacy_eo.c \
+lib/elementary/efl_ui_flip_legacy_eo.c \
+lib/elementary/efl_ui_flip_eo.legacy.c \
+lib/elementary/efl_ui_frame_legacy_eo.c \
+lib/elementary/efl_ui_frame_eo.legacy.c \
+lib/elementary/efl_ui_image_legacy_eo.c \
+lib/elementary/efl_ui_image_zoomable_eo.legacy.c \
+lib/elementary/efl_ui_image_zoomable_legacy_eo.c \
+lib/elementary/efl_ui_layout_legacy_eo.c \
+lib/elementary/efl_ui_panes_eo.legacy.c \
+lib/elementary/efl_ui_panes_legacy_eo.c \
+lib/elementary/efl_ui_progressbar_legacy_eo.c \
+lib/elementary/efl_ui_radio_eo.legacy.c \
+lib/elementary/efl_ui_radio_legacy_eo.c \
+lib/elementary/efl_ui_textpath_eo.legacy.c \
+lib/elementary/efl_ui_textpath_legacy_eo.c \
+lib/elementary/efl_ui_video_eo.legacy.c \
+lib/elementary/efl_ui_video_legacy_eo.c \
+lib/elementary/efl_ui_widget_eo.legacy.c \
+lib/elementary/efl_ui_win_inlined_legacy_eo.c \
+lib/elementary/efl_ui_win_legacy_eo.c \
+lib/elementary/efl_ui_win_socket_legacy_eo.c \
+lib/elementary/elm_access_eo.c \
+lib/elementary/elm_access_eo.legacy.c \
+lib/elementary/elm_actionslider_eo.c \
+lib/elementary/elm_actionslider_eo.legacy.c \
+lib/elementary/elm_atspi_app_object_eo.c \
+lib/elementary/elm_atspi_bridge_eo.c \
+lib/elementary/elm_atspi_bridge_eo.legacy.c \
+lib/elementary/elm_box_eo.c \
+lib/elementary/elm_box_eo.legacy.c \
+lib/elementary/elm_bubble_eo.c \
+lib/elementary/elm_bubble_eo.legacy.c \
+lib/elementary/elm_calendar_eo.c \
+lib/elementary/elm_calendar_eo.legacy.c \
+lib/elementary/elm_calendar_item_eo.c \
+lib/elementary/elm_clock_eo.c \
+lib/elementary/elm_clock_eo.legacy.c \
+lib/elementary/elm_code_widget_eo.legacy.c \
+lib/elementary/elm_code_widget_legacy_eo.c \
+lib/elementary/elm_color_item_eo.legacy.c \
+lib/elementary/elm_color_item_eo.c \
+lib/elementary/elm_colorselector_eo.legacy.c \
+lib/elementary/elm_colorselector_eo.c \
+lib/elementary/elm_conformant_eo.c \
+lib/elementary/elm_ctxpopup_eo.legacy.c \
+lib/elementary/elm_ctxpopup_eo.c \
+lib/elementary/elm_ctxpopup_item_eo.legacy.c \
+lib/elementary/elm_ctxpopup_item_eo.c \
+lib/elementary/elm_dayselector_eo.legacy.c \
+lib/elementary/elm_dayselector_eo.c \
+lib/elementary/elm_dayselector_item_eo.c \
+lib/elementary/elm_diskselector_eo.legacy.c \
+lib/elementary/elm_diskselector_eo.c \
+lib/elementary/elm_diskselector_item_eo.legacy.c \
+lib/elementary/elm_diskselector_item_eo.c \
+lib/elementary/elm_entry_eo.legacy.c \
+lib/elementary/elm_entry_eo.c \
+lib/elementary/elm_fileselector_button_eo.c \
+lib/elementary/elm_fileselector_entry_eo.c \
+lib/elementary/elm_fileselector_eo.legacy.c \
+lib/elementary/elm_fileselector_eo.c \
+lib/elementary/elm_flipselector_eo.legacy.c \
+lib/elementary/elm_flipselector_eo.c \
+lib/elementary/elm_flipselector_item_eo.legacy.c \
+lib/elementary/elm_flipselector_item_eo.c \
+lib/elementary/elm_gengrid_eo.legacy.c \
+lib/elementary/elm_gengrid_eo.c \
+lib/elementary/elm_gengrid_item_eo.legacy.c \
+lib/elementary/elm_gengrid_item_eo.c \
+lib/elementary/elm_gengrid_pan_eo.c \
+lib/elementary/elm_genlist_eo.legacy.c \
+lib/elementary/elm_genlist_eo.c \
+lib/elementary/elm_genlist_item_eo.legacy.c \
+lib/elementary/elm_genlist_item_eo.c \
+lib/elementary/elm_genlist_pan_eo.c \
+lib/elementary/elm_gesture_layer_eo.legacy.c \
+lib/elementary/elm_gesture_layer_eo.c \
+lib/elementary/elm_glview_eo.legacy.c \
+lib/elementary/elm_glview_eo.c \
+lib/elementary/elm_grid_eo.legacy.c \
+lib/elementary/elm_grid_eo.c \
+lib/elementary/elm_hover_eo.legacy.c \
+lib/elementary/elm_hover_eo.c \
+lib/elementary/elm_hoversel_eo.c \
+lib/elementary/elm_hoversel_eo.legacy.c \
+lib/elementary/elm_hoversel_item_eo.c \
+lib/elementary/elm_hoversel_item_eo.legacy.c \
+lib/elementary/elm_icon_eo.c \
+lib/elementary/elm_index_eo.c \
+lib/elementary/elm_index_eo.legacy.c \
+lib/elementary/elm_index_item_eo.c \
+lib/elementary/elm_index_item_eo.legacy.c \
+lib/elementary/elm_interface_fileselector_eo.c \
+lib/elementary/elm_inwin_eo.c \
+lib/elementary/elm_inwin_eo.legacy.c \
+lib/elementary/elm_label_eo.c \
+lib/elementary/elm_label_eo.legacy.c \
+lib/elementary/elm_list_eo.c \
+lib/elementary/elm_list_eo.legacy.c \
+lib/elementary/elm_list_item_eo.c \
+lib/elementary/elm_list_item_eo.legacy.c \
+lib/elementary/elm_mapbuf_eo.c \
+lib/elementary/elm_mapbuf_eo.legacy.c \
+lib/elementary/elm_map_eo.c \
+lib/elementary/elm_map_eo.legacy.c \
+lib/elementary/elm_map_pan_eo.c \
+lib/elementary/elm_menu_eo.c \
+lib/elementary/elm_menu_eo.legacy.c \
+lib/elementary/elm_menu_item_eo.c \
+lib/elementary/elm_menu_item_eo.legacy.c \
+lib/elementary/elm_multibuttonentry_eo.c \
+lib/elementary/elm_multibuttonentry_eo.legacy.c \
+lib/elementary/elm_multibuttonentry_item_eo.c \
+lib/elementary/elm_multibuttonentry_item_eo.legacy.c \
+lib/elementary/elm_naviframe_eo.c \
+lib/elementary/elm_naviframe_eo.legacy.c \
+lib/elementary/elm_naviframe_item_eo.c \
+lib/elementary/elm_naviframe_item_eo.legacy.c \
+lib/elementary/elm_notify_eo.c \
+lib/elementary/elm_notify_eo.legacy.c \
+lib/elementary/elm_panel_eo.c \
+lib/elementary/elm_panel_eo.legacy.c \
+lib/elementary/elm_pan_eo.c \
+lib/elementary/elm_pan_eo.legacy.c \
+lib/elementary/elm_photo_eo.c \
+lib/elementary/elm_player_eo.c \
+lib/elementary/elm_plug_eo.c \
+lib/elementary/elm_plug_eo.legacy.c \
+lib/elementary/elm_popup_eo.c \
+lib/elementary/elm_popup_eo.legacy.c \
+lib/elementary/elm_popup_item_eo.c \
+lib/elementary/elm_prefs_eo.c \
+lib/elementary/elm_prefs_eo.legacy.c \
+lib/elementary/elm_route_eo.c \
+lib/elementary/elm_route_eo.legacy.c \
+lib/elementary/elm_scroller_eo.c \
+lib/elementary/elm_scroller_eo.legacy.c \
+lib/elementary/elm_segment_control_eo.c \
+lib/elementary/elm_segment_control_eo.legacy.c \
+lib/elementary/elm_segment_control_item_eo.c \
+lib/elementary/elm_segment_control_item_eo.legacy.c \
+lib/elementary/elm_separator_eo.c \
+lib/elementary/elm_separator_eo.legacy.c \
+lib/elementary/elm_slider_eo.c \
+lib/elementary/elm_slider_part_indicator_eo.c \
+lib/elementary/elm_slideshow_eo.c \
+lib/elementary/elm_slideshow_eo.legacy.c \
+lib/elementary/elm_slideshow_item_eo.c \
+lib/elementary/elm_slideshow_item_eo.legacy.c \
+lib/elementary/elm_spinner_eo.c \
+lib/elementary/elm_spinner_eo.legacy.c \
+lib/elementary/elm_sys_notify_dbus_eo.c \
+lib/elementary/elm_sys_notify_eo.c \
+lib/elementary/elm_sys_notify_eo.legacy.c \
+lib/elementary/elm_sys_notify_interface_eo.c \
+lib/elementary/elm_sys_notify_interface_eo.legacy.c \
+lib/elementary/elm_systray_eo.c \
+lib/elementary/elm_systray_eo.legacy.c \
+lib/elementary/elm_table_eo.c \
+lib/elementary/elm_table_eo.legacy.c \
+lib/elementary/elm_thumb_eo.c \
+lib/elementary/elm_toolbar_eo.c \
+lib/elementary/elm_toolbar_eo.legacy.c \
+lib/elementary/elm_toolbar_item_eo.c \
+lib/elementary/elm_toolbar_item_eo.legacy.c \
+lib/elementary/elm_view_form_eo.c \
+lib/elementary/elm_view_list_eo.c \
+lib/elementary/elm_web_eo.c \
+lib/elementary/elm_web_eo.legacy.c \
+lib/elementary/elm_widget_item_container_eo.c \
+lib/elementary/elm_widget_item_eo.c \
+lib/elementary/elm_widget_item_eo.legacy.c \
+lib/elementary/elm_widget_item_static_focus_eo.c \
+lib/elementary/efl_ui_focus_parent_provider_gen_eo.c \
+$(NULL)
+
+elm_legacy_eo_headers_pub = \
+lib/elementary/efl_ui_bg_eo.legacy.h \
+lib/elementary/efl_ui_bg_legacy_eo.legacy.h \
+lib/elementary/efl_ui_button_eo.legacy.h \
+lib/elementary/efl_ui_button_legacy_eo.legacy.h \
+lib/elementary/efl_ui_check_eo.legacy.h \
+lib/elementary/efl_ui_check_legacy_eo.legacy.h \
+lib/elementary/efl_ui_flip_eo.legacy.h \
+lib/elementary/efl_ui_flip_legacy_eo.legacy.h \
+lib/elementary/efl_ui_frame_eo.legacy.h \
+lib/elementary/efl_ui_frame_legacy_eo.legacy.h \
+lib/elementary/efl_ui_image_legacy_eo.legacy.h \
+lib/elementary/efl_ui_image_zoomable_eo.legacy.h \
+lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h \
+lib/elementary/efl_ui_layout_legacy_eo.legacy.h \
+lib/elementary/efl_ui_panes_eo.legacy.h \
+lib/elementary/efl_ui_panes_legacy_eo.legacy.h \
+lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h \
+lib/elementary/efl_ui_radio_eo.legacy.h \
+lib/elementary/efl_ui_radio_legacy_eo.legacy.h \
+lib/elementary/efl_ui_textpath_eo.legacy.h \
+lib/elementary/efl_ui_textpath_legacy_eo.legacy.h \
+lib/elementary/efl_ui_video_eo.legacy.h \
+lib/elementary/efl_ui_video_legacy_eo.legacy.h \
+lib/elementary/efl_ui_widget_eo.legacy.h \
+lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h \
+lib/elementary/efl_ui_win_legacy_eo.legacy.h \
+lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \
+lib/elementary/elm_access_eo.legacy.h \
+lib/elementary/elm_actionslider_eo.legacy.h \
+lib/elementary/elm_atspi_app_object_eo.legacy.h \
+lib/elementary/elm_atspi_bridge_eo.legacy.h \
+lib/elementary/elm_box_eo.legacy.h \
+lib/elementary/elm_bubble_eo.legacy.h \
+lib/elementary/elm_calendar_eo.legacy.h \
+lib/elementary/elm_calendar_item_eo.legacy.h \
+lib/elementary/elm_clock_eo.legacy.h \
+lib/elementary/elm_code_widget_eo.legacy.h \
+lib/elementary/elm_code_widget_legacy_eo.legacy.h \
+lib/elementary/elm_color_item_eo.legacy.h \
+lib/elementary/elm_colorselector_eo.legacy.h \
+lib/elementary/elm_conformant_eo.legacy.h \
+lib/elementary/elm_ctxpopup_eo.legacy.h \
+lib/elementary/elm_ctxpopup_item_eo.legacy.h \
+lib/elementary/elm_dayselector_eo.legacy.h \
+lib/elementary/elm_dayselector_item_eo.legacy.h \
+lib/elementary/elm_diskselector_eo.legacy.h \
+lib/elementary/elm_diskselector_item_eo.legacy.h \
+lib/elementary/elm_entry_eo.legacy.h \
+lib/elementary/elm_fileselector_button_eo.legacy.h \
+lib/elementary/elm_fileselector_entry_eo.legacy.h \
+lib/elementary/elm_fileselector_eo.legacy.h \
+lib/elementary/elm_flipselector_eo.legacy.h \
+lib/elementary/elm_flipselector_item_eo.legacy.h \
+lib/elementary/elm_gengrid_eo.legacy.h \
+lib/elementary/elm_gengrid_item_eo.legacy.h \
+lib/elementary/elm_gengrid_pan_eo.legacy.h \
+lib/elementary/elm_genlist_eo.legacy.h \
+lib/elementary/elm_genlist_item_eo.legacy.h \
+lib/elementary/elm_genlist_pan_eo.legacy.h \
+lib/elementary/elm_gesture_layer_eo.legacy.h \
+lib/elementary/elm_glview_eo.legacy.h \
+lib/elementary/elm_grid_eo.legacy.h \
+lib/elementary/elm_hover_eo.legacy.h \
+lib/elementary/elm_hoversel_eo.legacy.h \
+lib/elementary/elm_hoversel_item_eo.legacy.h \
+lib/elementary/elm_icon_eo.legacy.h \
+lib/elementary/elm_index_eo.legacy.h \
+lib/elementary/elm_index_item_eo.legacy.h \
+lib/elementary/elm_interface_fileselector_eo.legacy.h \
+lib/elementary/elm_inwin_eo.legacy.h \
+lib/elementary/elm_label_eo.legacy.h \
+lib/elementary/elm_list_eo.legacy.h \
+lib/elementary/elm_list_item_eo.legacy.h \
+lib/elementary/elm_mapbuf_eo.legacy.h \
+lib/elementary/elm_map_eo.legacy.h \
+lib/elementary/elm_map_pan_eo.legacy.h \
+lib/elementary/elm_menu_eo.legacy.h \
+lib/elementary/elm_menu_item_eo.legacy.h \
+lib/elementary/elm_multibuttonentry_eo.legacy.h \
+lib/elementary/elm_multibuttonentry_item_eo.legacy.h \
+lib/elementary/elm_naviframe_eo.legacy.h \
+lib/elementary/elm_naviframe_item_eo.legacy.h \
+lib/elementary/elm_notify_eo.legacy.h \
+lib/elementary/elm_panel_eo.legacy.h \
+lib/elementary/elm_pan_eo.legacy.h \
+lib/elementary/elm_photo_eo.legacy.h \
+lib/elementary/elm_player_eo.legacy.h \
+lib/elementary/elm_plug_eo.legacy.h \
+lib/elementary/elm_popup_eo.legacy.h \
+lib/elementary/elm_popup_item_eo.legacy.h \
+lib/elementary/elm_prefs_eo.legacy.h \
+lib/elementary/elm_route_eo.legacy.h \
+lib/elementary/elm_scroller_eo.legacy.h \
+lib/elementary/elm_segment_control_eo.legacy.h \
+lib/elementary/elm_segment_control_item_eo.legacy.h \
+lib/elementary/elm_separator_eo.legacy.h \
+lib/elementary/elm_slider_eo.legacy.h \
+lib/elementary/elm_slider_part_indicator_eo.legacy.h \
+lib/elementary/elm_slideshow_eo.legacy.h \
+lib/elementary/elm_slideshow_item_eo.legacy.h \
+lib/elementary/elm_spinner_eo.legacy.h \
+lib/elementary/elm_sys_notify_dbus_eo.legacy.h \
+lib/elementary/elm_sys_notify_eo.legacy.h \
+lib/elementary/elm_sys_notify_interface_eo.legacy.h \
+lib/elementary/elm_systray_eo.legacy.h \
+lib/elementary/elm_table_eo.legacy.h \
+lib/elementary/elm_thumb_eo.legacy.h \
+lib/elementary/elm_toolbar_eo.legacy.h \
+lib/elementary/elm_toolbar_item_eo.legacy.h \
+lib/elementary/elm_view_form_eo.legacy.h \
+lib/elementary/elm_view_list_eo.legacy.h \
+lib/elementary/elm_view_form_eo.h \
+lib/elementary/elm_view_list_eo.h \
+lib/elementary/elm_web_eo.legacy.h \
+lib/elementary/elm_widget_item_container_eo.legacy.h \
+lib/elementary/elm_widget_item_container_eo.h \
+lib/elementary/elm_widget_item_eo.legacy.h \
+lib/elementary/elm_widget_item_static_focus_eo.legacy.h
+
+elm_legacy_eo_headers_priv = \
+lib/elementary/efl_ui_bg_legacy_eo.h \
+lib/elementary/efl_ui_button_legacy_eo.h \
+lib/elementary/efl_ui_check_legacy_eo.h \
+lib/elementary/efl_ui_flip_legacy_eo.h \
+lib/elementary/efl_ui_frame_legacy_eo.h \
+lib/elementary/efl_ui_image_legacy_eo.h \
+lib/elementary/efl_ui_image_zoomable_legacy_eo.h \
+lib/elementary/efl_ui_layout_legacy_eo.h \
+lib/elementary/efl_ui_panes_legacy_eo.h \
+lib/elementary/efl_ui_progressbar_legacy_eo.h \
+lib/elementary/efl_ui_radio_legacy_eo.h \
+lib/elementary/efl_ui_textpath_legacy_eo.h \
+lib/elementary/efl_ui_video_legacy_eo.h \
+lib/elementary/efl_ui_win_inlined_legacy_eo.h \
+lib/elementary/efl_ui_win_legacy_eo.h \
+lib/elementary/efl_ui_win_socket_legacy_eo.h \
+lib/elementary/elm_access_eo.h \
+lib/elementary/elm_actionslider_eo.h \
+lib/elementary/elm_atspi_app_object_eo.h \
+lib/elementary/elm_atspi_bridge_eo.h \
+lib/elementary/elm_box_eo.h \
+lib/elementary/elm_bubble_eo.h \
+lib/elementary/elm_calendar_eo.h \
+lib/elementary/elm_calendar_item_eo.h \
+lib/elementary/elm_clock_eo.h \
+lib/elementary/elm_code_widget_legacy_eo.h \
+lib/elementary/elm_color_item_eo.h \
+lib/elementary/elm_colorselector_eo.h \
+lib/elementary/elm_conformant_eo.h \
+lib/elementary/elm_ctxpopup_eo.h \
+lib/elementary/elm_ctxpopup_item_eo.h \
+lib/elementary/elm_dayselector_eo.h \
+lib/elementary/elm_dayselector_item_eo.h \
+lib/elementary/elm_diskselector_eo.h \
+lib/elementary/elm_diskselector_item_eo.h \
+lib/elementary/elm_entry_eo.h \
+lib/elementary/elm_fileselector_button_eo.h \
+lib/elementary/elm_fileselector_entry_eo.h \
+lib/elementary/elm_fileselector_eo.h \
+lib/elementary/elm_flipselector_eo.h \
+lib/elementary/elm_flipselector_item_eo.h \
+lib/elementary/elm_gengrid_eo.h \
+lib/elementary/elm_gengrid_item_eo.h \
+lib/elementary/elm_gengrid_pan_eo.h \
+lib/elementary/elm_gengrid_pan_eo.h \
+lib/elementary/elm_genlist_eo.h \
+lib/elementary/elm_genlist_item_eo.h \
+lib/elementary/elm_genlist_pan_eo.h \
+lib/elementary/elm_gesture_layer_eo.h \
+lib/elementary/elm_glview_eo.h \
+lib/elementary/elm_grid_eo.h \
+lib/elementary/elm_hover_eo.h \
+lib/elementary/elm_hoversel_eo.h \
+lib/elementary/elm_hoversel_item_eo.h \
+lib/elementary/elm_icon_eo.h \
+lib/elementary/elm_index_eo.h \
+lib/elementary/elm_index_item_eo.h \
+lib/elementary/elm_interface_fileselector_eo.h \
+lib/elementary/elm_inwin_eo.h \
+lib/elementary/elm_label_eo.h \
+lib/elementary/elm_list_eo.h \
+lib/elementary/elm_list_item_eo.h \
+lib/elementary/elm_mapbuf_eo.h \
+lib/elementary/elm_map_eo.h \
+lib/elementary/elm_map_pan_eo.h \
+lib/elementary/elm_menu_eo.h \
+lib/elementary/elm_menu_item_eo.h \
+lib/elementary/elm_multibuttonentry_eo.h \
+lib/elementary/elm_multibuttonentry_item_eo.h \
+lib/elementary/elm_naviframe_eo.h \
+lib/elementary/elm_naviframe_item_eo.h \
+lib/elementary/elm_notify_eo.h \
+lib/elementary/elm_panel_eo.h \
+lib/elementary/elm_pan_eo.h \
+lib/elementary/elm_photo_eo.h \
+lib/elementary/elm_player_eo.h \
+lib/elementary/elm_plug_eo.h \
+lib/elementary/elm_popup_eo.h \
+lib/elementary/elm_popup_item_eo.h \
+lib/elementary/elm_prefs_eo.h \
+lib/elementary/elm_route_eo.h \
+lib/elementary/elm_scroller_eo.h \
+lib/elementary/elm_segment_control_eo.h \
+lib/elementary/elm_segment_control_item_eo.h \
+lib/elementary/elm_separator_eo.h \
+lib/elementary/elm_slider_eo.h \
+lib/elementary/elm_slider_part_indicator_eo.h \
+lib/elementary/elm_slideshow_eo.h \
+lib/elementary/elm_slideshow_item_eo.h \
+lib/elementary/elm_spinner_eo.h \
+lib/elementary/elm_sys_notify_dbus_eo.h \
+lib/elementary/elm_sys_notify_eo.h \
+lib/elementary/elm_sys_notify_interface_eo.h \
+lib/elementary/elm_systray_eo.h \
+lib/elementary/elm_table_eo.h \
+lib/elementary/elm_thumb_eo.h \
+lib/elementary/elm_toolbar_eo.h \
+lib/elementary/elm_toolbar_item_eo.h \
+lib/elementary/elm_web_eo.h \
+lib/elementary/elm_widget_item_container_eo.h \
+lib/elementary/elm_widget_item_eo.h \
+lib/elementary/elm_widget_item_static_focus_eo.h \
+lib/elementary/efl_ui_focus_parent_provider_gen_eo.h \
+lib/elementary/elm_removed.h \
+lib/elementary/elm_widget_bg.h \
+lib/elementary/elm_widget_clipper.h \
+$(NULL)
+
+
+EXTRA_DIST2 += $(elm_public_eolian_files) $(elm_eolian_type_files) $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files) $(elm_legacy_eo_headers_priv)
+
+lib_LTLIBRARIES += lib/elementary/libelementary.la
+
+includes_HEADERS = \
+lib/elementary/Elementary.h \
+lib/elementary/Elementary_Options.h \
+lib/elementary/Elementary_Cursor.h \
+$(elm_legacy_eo_headers_pub)
+includesdir = $(includedir)/elementary-@VMAJ@
+
+includesunstable_HEADERS = \
+	lib/elementary/elm_gen_common.h \
+	lib/elementary/efl_access_object.h \
+	lib/elementary/efl_access_text.h \
+	lib/elementary/efl_access_widget_action.h \
+	lib/elementary/efl_access_window.h \
+	lib/elementary/elm_interface_fileselector.h \
+	lib/elementary/elm_interface_scrollable.h \
+	lib/elementary/elm_interfaces.h \
+	lib/elementary/elm_widget.h \
+	lib/elementary/efl_ui_widget_common.h \
+	lib/elementary/elm_widget_actionslider.h \
+	lib/elementary/elm_widget_box.h \
+	lib/elementary/elm_widget_bubble.h \
+	lib/elementary/efl_ui_button_private.h \
+	lib/elementary/efl_ui_bg_private.h \
+	lib/elementary/elm_widget_calendar.h \
+	lib/elementary/efl_ui_calendar_private.h \
+	lib/elementary/efl_ui_check_private.h \
+	lib/elementary/elm_widget_clock.h \
+	lib/elementary/elm_widget_colorselector.h \
+	lib/elementary/elm_widget_conform.h \
+	lib/elementary/elm_widget_container.h \
+	lib/elementary/elm_widget_combobox.h \
+	lib/elementary/elm_widget_ctxpopup.h \
+	lib/elementary/elm_widget_dayselector.h \
+	lib/elementary/elm_widget_diskselector.h \
+	lib/elementary/elm_widget_entry.h \
+	lib/elementary/elm_widget_fileselector.h \
+	lib/elementary/elm_widget_fileselector_button.h \
+	lib/elementary/elm_widget_fileselector_entry.h \
+	lib/elementary/efl_ui_widget_flip.h \
+	lib/elementary/elm_widget_flipselector.h \
+	lib/elementary/efl_ui_widget_frame.h \
+	lib/elementary/efl_ui_stack_private.h \
+	lib/elementary/elm_widget_gengrid.h \
+	lib/elementary/elm_widget_genlist.h \
+	lib/elementary/elm_widget_glview.h \
+	lib/elementary/elm_widget_grid.h \
+	lib/elementary/elm_widget_hover.h \
+	lib/elementary/elm_widget_hoversel.h \
+	lib/elementary/elm_widget_icon.h \
+	lib/elementary/efl_ui_widget_image.h \
+	lib/elementary/efl_ui_popup_private.h \
+	lib/elementary/efl_ui_alert_popup_private.h \
+	lib/elementary/efl_ui_scroll_alert_popup_private.h \
+	lib/elementary/efl_ui_text_alert_popup_private.h \
+	lib/elementary/efl_ui_anchor_popup_private.h \
+	lib/elementary/elm_widget_index.h \
+	lib/elementary/elm_widget_inwin.h \
+	lib/elementary/elm_widget_label.h \
+	lib/elementary/elm_widget_layout.h \
+	lib/elementary/elm_widget_list.h \
+	lib/elementary/elm_widget_map.h \
+	lib/elementary/elm_widget_mapbuf.h \
+	lib/elementary/elm_widget_menu.h \
+	lib/elementary/elm_widget_multibuttonentry.h \
+	lib/elementary/elm_widget_naviframe.h \
+	lib/elementary/efl_ui_navigation_bar_private.h \
+	lib/elementary/efl_ui_navigation_layout_private.h \
+	lib/elementary/elm_widget_notify.h \
+	lib/elementary/elm_widget_panel.h \
+	lib/elementary/efl_ui_panes_private.h \
+	lib/elementary/elm_widget_photo.h \
+	lib/elementary/efl_ui_image_zoomable_private.h \
+	lib/elementary/elm_widget_player.h \
+	lib/elementary/elm_widget_plug.h \
+	lib/elementary/elm_widget_popup.h \
+	lib/elementary/elm_widget_prefs.h \
+	lib/elementary/efl_ui_progressbar_private.h \
+	lib/elementary/efl_ui_radio_private.h \
+	lib/elementary/elm_widget_route.h \
+	lib/elementary/elm_widget_scroller.h \
+	lib/elementary/elm_widget_segment_control.h \
+	lib/elementary/elm_widget_separator.h \
+	lib/elementary/elm_widget_slider.h \
+	lib/elementary/efl_ui_slider_private.h \
+	lib/elementary/efl_ui_slider_interval_private.h \
+	lib/elementary/elm_widget_slideshow.h \
+	lib/elementary/elm_widget_spinner.h \
+	lib/elementary/efl_ui_spin_private.h \
+	lib/elementary/efl_ui_spin_button_private.h \
+	lib/elementary/efl_ui_datepicker_private.h \
+	lib/elementary/efl_ui_timepicker_private.h \
+	lib/elementary/efl_ui_tags_private.h \
+	lib/elementary/efl_ui_panel_private.h \
+	lib/elementary/elm_widget_table.h \
+	lib/elementary/elm_widget_thumb.h \
+	lib/elementary/elm_widget_toolbar.h \
+	lib/elementary/efl_ui_video_private.h \
+	lib/elementary/efl_ui_item_private.h \
+	lib/elementary/efl_ui_list_item_private.h \
+	lib/elementary/efl_ui_list_private.h \
+	lib/elementary/efl_ui_grid_item_private.h \
+	lib/elementary/efl_ui_grid_private.h \
+	lib/elementary/efl_ui_list_view_private.h \
+	lib/elementary/efl_ui_list_view_seg_array.h \
+	lib/elementary/elm_widget_web.h \
+	lib/elementary/efl_ui_clock.h \
+	lib/elementary/elm_code.h \
+	lib/elementary/elm_code_widget_legacy.h \
+	lib/elementary/elm_code_widget_selection.h \
+        lib/elementary/elm_code_diff_widget.h \
+	lib/elementary/elm_code_common.h \
+	lib/elementary/elm_code_line.h \
+	lib/elementary/elm_code_text.h \
+	lib/elementary/elm_code_indent.h \
+	lib/elementary/elm_code_file.h \
+	lib/elementary/elm_code_parse.h \
+	lib/elementary/elm_code_syntax.h \
+	lib/elementary/efl_ui_widget_scroller.h \
+	lib/elementary/efl_ui_widget_scroll_manager.h \
+	lib/elementary/efl_ui_widget_pan.h \
+	lib/elementary/efl_ui_nstate_private.h \
+	lib/elementary/Efl_Ui.h \
+	lib/elementary/efl_ui_tab_pager_private.h \
+	lib/elementary/efl_ui_tab_bar_private.h \
+	lib/elementary/efl_ui_tab_page_private.h \
+	lib/elementary/efl_ui_relative_layout_private.h
+includesunstabledir = $(includedir)/elementary-@VMAJ@
+
+nodist_includesunstable_HEADERS = \
+	$(elm_public_eolian_h)
+
+includesub_HEADERS = \
+	lib/elementary/elc_ctxpopup.h \
+	lib/elementary/elc_ctxpopup_legacy.h \
+	lib/elementary/elc_combobox.h \
+	lib/elementary/elc_combobox_legacy.h \
+	lib/elementary/elc_fileselector.h \
+	lib/elementary/elc_fileselector_legacy.h \
+	lib/elementary/elc_fileselector_common.h \
+	lib/elementary/elc_fileselector_button.h \
+	lib/elementary/elc_fileselector_button_legacy.h \
+	lib/elementary/elc_fileselector_entry.h \
+	lib/elementary/elc_fileselector_entry_legacy.h \
+	lib/elementary/elc_hoversel.h \
+	lib/elementary/elc_hoversel_legacy.h \
+	lib/elementary/elc_multibuttonentry.h \
+	lib/elementary/elc_multibuttonentry_eo.h \
+	lib/elementary/elc_multibuttonentry_legacy.h \
+	lib/elementary/elc_multibuttonentry_common.h \
+	lib/elementary/elc_naviframe.h \
+	lib/elementary/elc_naviframe_legacy.h \
+	lib/elementary/elc_naviframe_common.h \
+	lib/elementary/elc_popup.h \
+	lib/elementary/elc_popup_legacy.h \
+	lib/elementary/elm_access.h \
+	lib/elementary/elm_actionslider.h \
+	lib/elementary/elm_actionslider_legacy.h \
+	lib/elementary/elm_app.h \
+	lib/elementary/elm_atspi_app_object.h \
+	lib/elementary/elm_atspi_bridge.h \
+	lib/elementary/elm_authors.h \
+	lib/elementary/elm_bg.h \
+	lib/elementary/elm_bg_legacy.h \
+	lib/elementary/elm_box.h \
+	lib/elementary/elm_box_legacy.h \
+	lib/elementary/elm_box_common.h \
+	lib/elementary/elm_bubble.h \
+	lib/elementary/elm_bubble_legacy.h \
+	lib/elementary/elm_button.h \
+	lib/elementary/efl_ui_button_eo.h \
+	lib/elementary/elm_button_legacy.h \
+	lib/elementary/elm_cache.h \
+	lib/elementary/elm_calendar.h \
+	lib/elementary/elm_calendar_legacy.h \
+	lib/elementary/elm_calendar_common.h \
+	lib/elementary/efl_ui_calendar.h \
+	lib/elementary/elm_check.h \
+	lib/elementary/efl_ui_check_eo.h \
+	lib/elementary/elm_check_legacy.h \
+	lib/elementary/elm_clock.h \
+	lib/elementary/elm_clock_legacy.h \
+	lib/elementary/elm_cnp.h \
+	lib/elementary/elm_colorselector.h \
+	lib/elementary/elm_colorselector_legacy.h \
+	lib/elementary/elm_colorselector_common.h \
+	lib/elementary/elm_color_class.h \
+	lib/elementary/elm_config.h \
+	lib/elementary/elm_conform.h \
+	lib/elementary/elm_conform_legacy.h \
+	lib/elementary/elm_cursor.h \
+	lib/elementary/elm_datetime.h \
+	lib/elementary/elm_dayselector.h \
+	lib/elementary/elm_dayselector_legacy.h \
+	lib/elementary/elm_debug.h \
+	lib/elementary/elm_deprecated.h \
+	lib/elementary/elm_diskselector.h \
+	lib/elementary/elm_diskselector_common.h \
+	lib/elementary/elm_diskselector_legacy.h \
+	lib/elementary/elm_entry.h \
+	lib/elementary/elm_entry_common.h \
+	lib/elementary/elm_entry_eo.h \
+	lib/elementary/elm_entry_legacy.h \
+	lib/elementary/elm_finger.h \
+	lib/elementary/elm_flip.h \
+	lib/elementary/efl_ui_flip_eo.h \
+	lib/elementary/efl_ui_flip_legacy.h \
+	lib/elementary/elm_flipselector.h \
+	lib/elementary/elm_flipselector_legacy.h \
+	lib/elementary/elm_focus.h \
+	lib/elementary/elm_focus_item.h \
+	lib/elementary/elm_font.h \
+	lib/elementary/elm_frame.h \
+	lib/elementary/efl_ui_frame_eo.h \
+	lib/elementary/efl_ui_frame_legacy.h \
+	lib/elementary/elm_gen.h \
+	lib/elementary/elm_general.h \
+	lib/elementary/elm_gengrid.h \
+	lib/elementary/elm_gengrid_common.h \
+	lib/elementary/elm_gengrid_legacy.h \
+	lib/elementary/elm_genlist.h \
+	lib/elementary/elm_genlist_common.h \
+	lib/elementary/elm_genlist_legacy.h \
+	lib/elementary/elm_gesture_layer.h \
+	lib/elementary/elm_gesture_layer_common.h \
+	lib/elementary/elm_gesture_layer_legacy.h \
+	lib/elementary/elm_getting_started.h \
+	lib/elementary/elm_glview.h \
+	lib/elementary/elm_glview_common.h \
+	lib/elementary/elm_glview_legacy.h \
+	lib/elementary/elm_grid.h \
+	lib/elementary/elm_grid_legacy.h \
+	lib/elementary/elm_hover.h \
+	lib/elementary/elm_hover_legacy.h \
+	lib/elementary/elm_icon.h \
+	lib/elementary/elm_icon_legacy.h \
+	lib/elementary/elm_image.h \
+	lib/elementary/elm_image_eo.h \
+	lib/elementary/elm_image_legacy.h \
+	lib/elementary/elm_index.h \
+	lib/elementary/elm_index_legacy.h \
+	${top_builddir}/elm_intro.h \
+	lib/elementary/elm_inwin.h \
+	lib/elementary/elm_inwin_legacy.h \
+	lib/elementary/elm_label.h \
+	lib/elementary/elm_label_legacy.h \
+	lib/elementary/elm_layout.h \
+	lib/elementary/elm_layout_common.h \
+	lib/elementary/elm_layout_legacy.h \
+	lib/elementary/elm_list.h \
+	lib/elementary/elm_list_legacy.h \
+	lib/elementary/elm_macros.h \
+	lib/elementary/elm_map.h \
+	lib/elementary/elm_map_common.h \
+	lib/elementary/elm_map_legacy.h \
+	lib/elementary/elm_mapbuf.h \
+	lib/elementary/elm_mapbuf_legacy.h \
+	lib/elementary/elm_menu.h \
+	lib/elementary/elm_menu_legacy.h \
+	lib/elementary/elm_mirroring.h \
+	lib/elementary/elm_need.h \
+	lib/elementary/elm_notify.h \
+	lib/elementary/elm_notify_common.h \
+	lib/elementary/elm_notify_legacy.h \
+	lib/elementary/efl_ui_nstate.h \
+	lib/elementary/elm_object.h \
+	lib/elementary/elm_object_item.h \
+	lib/elementary/elm_panel.h \
+	lib/elementary/elm_panel_common.h \
+	lib/elementary/elm_panel_legacy.h \
+	lib/elementary/elm_panes.h \
+	lib/elementary/efl_ui_panes_eo.h \
+	lib/elementary/elm_panes_legacy.h \
+	lib/elementary/elm_photo.h \
+	lib/elementary/elm_photo_legacy.h \
+	lib/elementary/elm_photocam.h \
+	lib/elementary/efl_ui_image_zoomable_eo.h \
+	lib/elementary/elm_photocam_legacy.h \
+	lib/elementary/elm_plug.h \
+	lib/elementary/elm_plug_legacy.h \
+	lib/elementary/elm_prefs.h \
+	lib/elementary/elm_prefs_common.h \
+	lib/elementary/elm_prefs_legacy.h \
+	lib/elementary/elm_prefs_data.h \
+	lib/elementary/elm_progressbar.h \
+	lib/elementary/elm_progressbar_common.h \
+	lib/elementary/efl_ui_progressbar_eo.h \
+	lib/elementary/elm_progressbar_legacy.h \
+	lib/elementary/elm_radio.h \
+	lib/elementary/efl_ui_radio_eo.h \
+	lib/elementary/elm_radio_legacy.h \
+	lib/elementary/elm_route.h \
+	lib/elementary/elm_route_legacy.h \
+	lib/elementary/elm_scale.h \
+	lib/elementary/elm_scroll.h \
+	lib/elementary/elm_scroller.h \
+	lib/elementary/elm_scroller_legacy.h \
+	lib/elementary/elm_segment_control.h \
+	lib/elementary/elm_segment_control_legacy.h \
+	lib/elementary/elm_separator.h \
+	lib/elementary/elm_separator_legacy.h \
+	lib/elementary/elm_slider.h \
+	lib/elementary/elm_slider_common.h \
+	lib/elementary/elm_slider_legacy.h \
+	lib/elementary/elm_slideshow.h \
+	lib/elementary/elm_slideshow_common.h \
+	lib/elementary/elm_slideshow_legacy.h \
+	lib/elementary/elm_spinner.h \
+	lib/elementary/elm_spinner_legacy.h \
+	lib/elementary/elm_store.h \
+	lib/elementary/elm_systray.h \
+	lib/elementary/elm_systray_common.h \
+	lib/elementary/elm_systray_watcher.h \
+	lib/elementary/elm_sys_notify.h \
+	lib/elementary/elm_table.h \
+	lib/elementary/elm_table_legacy.h \
+	lib/elementary/elm_textpath.h \
+	lib/elementary/elm_textpath_legacy.h \
+	lib/elementary/elm_theme.h \
+	lib/elementary/elm_thumb.h \
+	lib/elementary/elm_thumb_common.h \
+	lib/elementary/elm_thumb_legacy.h \
+	lib/elementary/elm_toolbar.h \
+	lib/elementary/elm_toolbar_common.h \
+	lib/elementary/elm_toolbar_eo.h \
+	lib/elementary/elm_toolbar_legacy.h \
+	lib/elementary/elm_tooltip.h \
+	lib/elementary/elm_transit.h \
+	lib/elementary/efl_ui_video.h \
+	lib/elementary/efl_ui_video_eo.h \
+	lib/elementary/efl_ui_video_legacy.h \
+	lib/elementary/elm_view_list.h \
+	lib/elementary/elm_view_form.h \
+	lib/elementary/elm_web.h \
+	lib/elementary/elm_web_common.h \
+	lib/elementary/elm_web_eo.h \
+	lib/elementary/elm_web_legacy.h \
+	lib/elementary/elm_win.h \
+	lib/elementary/elm_win_common.h \
+	lib/elementary/elm_win_eo.h \
+	lib/elementary/elm_win_legacy.h \
+	lib/elementary/elm_helper.h \
+	lib/elementary/elm_part_helper.h \
+	$(NULL)
+
+includesubdir = $(includedir)/elementary-@VMAJ@/
+
+lib/elementary/elm_config.c: lib/elementary/elm_default_config.x
+
+lib_elementary_libelementary_la_SOURCES = \
+	lib/elementary/elm_priv.h \
+	static_libs/atspi/atspi-constants.h \
+	lib/elementary/elementary_config.h \
+	lib/elementary/els_box.h \
+	lib/elementary/elc_ctxpopup.c \
+	lib/elementary/elc_fileselector.c \
+	lib/elementary/elc_fileselector_button.c \
+	lib/elementary/elc_fileselector_entry.c \
+	lib/elementary/elc_hoversel.c \
+	lib/elementary/elc_multibuttonentry.c \
+	lib/elementary/elc_naviframe.c \
+	lib/elementary/efl_ui_navigation_bar.c \
+	lib/elementary/efl_ui_navigation_layout.c \
+	lib/elementary/elc_player.c \
+	lib/elementary/elc_popup.c \
+	lib/elementary/elc_scrolled_entry.c \
+	lib/elementary/elm_access.c \
+	lib/elementary/elm_actionslider.c \
+	lib/elementary/elm_atspi_app_object.c \
+	lib/elementary/elm_atspi_bridge.c \
+	lib/elementary/efl_ui_legacy.c \
+	lib/elementary/efl_ui_bg.c \
+	lib/elementary/elm_box.c \
+	lib/elementary/elm_bubble.c \
+	lib/elementary/efl_ui_button.c \
+	lib/elementary/elm_calendar.c \
+	lib/elementary/efl_ui_calendar.c \
+	lib/elementary/efl_ui_check.c \
+	lib/elementary/elm_clock.c \
+	lib/elementary/elm_code_line.c \
+	lib/elementary/elm_code_text.c \
+	lib/elementary/elm_code_indent.c \
+	lib/elementary/elm_code_file.c \
+	lib/elementary/elm_code_parse.c \
+	lib/elementary/elm_code_syntax.c \
+	lib/elementary/elm_code_widget_selection.c \
+	lib/elementary/elm_code_widget.c \
+	lib/elementary/elm_code_diff_widget.c \
+	lib/elementary/elm_code.c \
+	lib/elementary/elm_code_private.h \
+	lib/elementary/elm_code_widget_private.h \
+	lib/elementary/elm_colorselector.c \
+	lib/elementary/elm_color_class.c \
+	lib/elementary/elc_combobox.c \
+	lib/elementary/elm_config.c \
+	lib/elementary/elm_conform.c \
+	lib/elementary/elm_datetime.c \
+	lib/elementary/elm_dayselector.c \
+	lib/elementary/elm_dbus_menu.c \
+	lib/elementary/elm_diskselector.c \
+	lib/elementary/elm_entry.c \
+	lib/elementary/efl_ui_flip.c \
+	lib/elementary/efl_ui_internal_text_interactive.c \
+	lib/elementary/efl_ui_internal_text_interactive.h \
+	lib/elementary/efl_ui_internal_text_scroller.c \
+	lib/elementary/efl_ui_internal_text_scroller.h \
+	lib/elementary/elm_flipselector.c \
+	lib/elementary/elm_font.c \
+	lib/elementary/efl_ui_frame.c \
+	lib/elementary/efl_ui_stack.c \
+	lib/elementary/elm_gengrid.c \
+	lib/elementary/elm_genlist.c \
+	lib/elementary/elm_gesture_layer.c \
+	lib/elementary/elm_gesture_layer_extra_gestures.c \
+	lib/elementary/elm_glview.c \
+	lib/elementary/elm_grid.c \
+	lib/elementary/elm_hover.c \
+	lib/elementary/elm_icon.c \
+	lib/elementary/efl_ui_image.c \
+	lib/elementary/elm_index.c \
+	lib/elementary/efl_access_object.c \
+	lib/elementary/efl_access_action.c \
+	lib/elementary/efl_access_component.c \
+	lib/elementary/efl_access_editable_text.c \
+	lib/elementary/efl_access_selection.c \
+	lib/elementary/efl_access_text.c \
+	lib/elementary/efl_access_value.c \
+	lib/elementary/efl_access_widget_action.c \
+	lib/elementary/efl_access_window.c \
+	lib/elementary/elm_interface_fileselector.c \
+	lib/elementary/elm_interface_scrollable.c \
+	lib/elementary/elm_inwin.c \
+	lib/elementary/elm_label.c \
+	lib/elementary/efl_ui_layout.c \
+	lib/elementary/efl_ui_layout_pack.c \
+	lib/elementary/elm_list.c \
+	lib/elementary/elm_main.c \
+	lib/elementary/elm_map.c \
+	lib/elementary/elm_mapbuf.c \
+	lib/elementary/elm_menu.c \
+	lib/elementary/elm_module.c \
+	lib/elementary/elm_notify.c \
+	lib/elementary/efl_ui_nstate.c \
+	lib/elementary/elm_panel.c \
+	lib/elementary/efl_ui_panes.c \
+	lib/elementary/elm_photo.c \
+	lib/elementary/efl_ui_image_zoomable.c \
+	lib/elementary/elm_plug.c \
+	lib/elementary/elm_prefs.c \
+	lib/elementary/elm_prefs_data.c \
+	lib/elementary/elm_prefs_edd.x \
+	lib/elementary/efl_ui_progressbar.c \
+	lib/elementary/efl_ui_radio.c \
+	lib/elementary/elm_route.c \
+	lib/elementary/elm_scroller.c \
+	lib/elementary/elm_segment_control.c \
+	lib/elementary/elm_separator.c \
+	lib/elementary/elm_slider.c \
+	lib/elementary/efl_ui_slider.c \
+	lib/elementary/efl_ui_slider_interval.c \
+	lib/elementary/efl_ui_spin.c \
+	lib/elementary/efl_ui_spin_button.c \
+	lib/elementary/efl_ui_datepicker.c \
+	lib/elementary/efl_ui_timepicker.c \
+	lib/elementary/efl_ui_tags.c \
+	lib/elementary/efl_ui_panel.c \
+	lib/elementary/elm_slideshow.c \
+	lib/elementary/elm_spinner.c \
+	lib/elementary/elm_store.c \
+	lib/elementary/elm_systray.c \
+	lib/elementary/elm_systray_watcher.c \
+	lib/elementary/elm_sys_notify_interface.c \
+	lib/elementary/elm_sys_notify.c \
+	lib/elementary/elm_sys_notify_dbus.c \
+	lib/elementary/elm_table.c \
+	lib/elementary/elm_theme.c \
+	lib/elementary/elm_thumb.c \
+	lib/elementary/elm_toolbar.c \
+	lib/elementary/elm_transit.c \
+	lib/elementary/elm_util.c \
+	lib/elementary/efl_ui_video.c \
+	lib/elementary/elm_view_list.c \
+	lib/elementary/elm_view_form.c \
+	lib/elementary/elm_web2.c \
+	lib/elementary/efl_ui_widget.c \
+	lib/elementary/efl_ui_widget_common.c \
+	lib/elementary/efl_ui_win.c \
+	lib/elementary/efl_ui_win_inlined.c \
+	lib/elementary/efl_ui_win_socket.c \
+	lib/elementary/elm_helper.c \
+	lib/elementary/els_box.c \
+	lib/elementary/els_cursor.c \
+	lib/elementary/els_tooltip.c \
+	lib/elementary/elu_ews_wm.c \
+	lib/elementary/efl_ui_container_layout.c \
+	lib/elementary/efl_ui_container_layout.h \
+	lib/elementary/efl_ui_box.c \
+	lib/elementary/efl_ui_box_flow.c \
+	lib/elementary/efl_ui_box_stack.c \
+	lib/elementary/efl_ui_box_layout.c \
+	lib/elementary/efl_ui_box_private.h \
+	lib/elementary/efl_ui_popup.c \
+	lib/elementary/efl_ui_alert_popup.c \
+	lib/elementary/efl_ui_scroll_alert_popup.c \
+	lib/elementary/efl_ui_text_alert_popup.c \
+	lib/elementary/efl_ui_anchor_popup.c \
+	lib/elementary/efl_ui_table.c \
+	lib/elementary/efl_ui_table_static.c \
+	lib/elementary/efl_ui_table_layout.c \
+	lib/elementary/efl_ui_table_private.h \
+	lib/elementary/efl_ui_text.c \
+	lib/elementary/efl_ui_text_factory_images.c \
+	lib/elementary/efl_ui_text_factory_emoticons.c \
+	lib/elementary/efl_ui_text_factory_fallback.c \
+	lib/elementary/efl_ui_clock.c \
+	lib/elementary/efl_ui_clock_private.h \
+	lib/elementary/efl_ui_image_factory.c \
+	lib/elementary/efl_ui_focus_manager.c \
+	lib/elementary/efl_ui_focus_manager_calc.c \
+	lib/elementary/efl_ui_focus_manager_sub.c \
+	lib/elementary/efl_ui_focus_object.c \
+	lib/elementary/efl_ui_focus_manager_root_focus.c \
+	lib/elementary/efl_ui_textpath.c \
+	lib/elementary/efl_ui_focus_layer.c \
+	lib/elementary/efl_ui_focus_composition.c \
+	lib/elementary/efl_ui_focus_parent_provider.c \
+	lib/elementary/efl_ui_focus_parent_provider_standard.c \
+	lib/elementary/efl_ui_focus_parent_provider_gen.c \
+	lib/elementary/efl_ui_focus_util.c \
+	lib/elementary/elm_widget_item_static_focus.c \
+	lib/elementary/efl_ui_item.c \
+	lib/elementary/efl_ui_list_item.c \
+	lib/elementary/efl_ui_list_default_item.c \
+	lib/elementary/efl_ui_list_placeholder_item.c \
+	lib/elementary/efl_ui_list.c \
+	lib/elementary/efl_ui_grid_item.c \
+	lib/elementary/efl_ui_grid_default_item.c \
+	lib/elementary/efl_ui_grid.c \
+	lib/elementary/efl_ui_list_view.c \
+	lib/elementary/efl_ui_list_view_precise_layouter.c \
+	lib/elementary/efl_ui_list_view_seg_array.c \
+	lib/elementary/efl_ui_layout_factory.c \
+	lib/elementary/efl_ui_scroller.c \
+	lib/elementary/efl_ui_scroll_manager.c \
+	lib/elementary/efl_ui_pan.c \
+	lib/elementary/efl_ui_selection_manager.c \
+	lib/elementary/efl_ui_selection_manager_private.h \
+	lib/elementary/efl_ui_selection.c \
+	lib/elementary/efl_datetime_manager.c \
+	lib/elementary/efl_ui_dnd.c \
+	lib/elementary/elm_focus_legacy.c \
+	static_libs/buildsystem/buildsystem.h \
+	static_libs/buildsystem/buildsystem_autotools.c \
+	lib/elementary/efl_ui_active_view_container.c \
+	lib/elementary/efl_ui_active_view_view_manager.c \
+	lib/elementary/efl_ui_active_view_view_manager_plain.c \
+	lib/elementary/efl_ui_active_view_view_manager_scroll.c \
+	lib/elementary/efl_ui_active_view_view_manager_stack.c \
+	lib/elementary/efl_ui_active_view_indicator.c \
+	lib/elementary/efl_ui_active_view_indicator_icon.c \
+	lib/elementary/efl_ui_focus_graph.h \
+	lib/elementary/efl_ui_focus_graph.c \
+	lib/elementary/efl_ui_tab_pager.c \
+	lib/elementary/efl_ui_tab_bar.c \
+	lib/elementary/efl_ui_tab_page.c \
+	lib/elementary/efl_ui_widget_focus_manager.c \
+	lib/elementary/efl_ui_caching_factory.c \
+	lib/elementary/efl_ui_widget_factory.c \
+	lib/elementary/efl_ui_size_model.c \
+	lib/elementary/efl_ui_homogeneous_model.c \
+	lib/elementary/efl_ui_exact_model.c \
+	lib/elementary/efl_ui_average_model.c \
+	lib/elementary/efl_ui_relative_layout.c \
+	lib/elementary/efl_ui_clickable.c \
+	lib/elementary/efl_ui_clickable_util.c \
+	$(NULL)
+
+
+lib_elementary_libelementary_la_CFLAGS = @ELEMENTARY_CFLAGS@
+lib_elementary_libelementary_la_LIBADD = \
+@ELEMENTARY_LIBS@ \
+@LTLIBINTL@
+lib_elementary_libelementary_la_DEPENDENCIES = @ELEMENTARY_INTERNAL_LIBS@
+lib_elementary_libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+lib_elementary_libelementary_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DMODULES_PATH=\"$(pkglibdir)/modules\" \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/static_libs/ \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_srcdir)/src/modules/ecore_evas/engines/wayland \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DLOCALE_DIR=\"$(localedir)\" \
+-DICON_DIR=\"$(datadir)/icons\" \
+-DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+
+if HAVE_WINDOWS
+lib_elementary_libelementary_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_srcdir)/src/lib/evil/regex \
+-DPOSIX_MISTAKE
+endif
+
+EXTRA_DIST2 += \
+	lib/elementary/elm_factory.h \
+	lib/elementary/elm_factory.c \
+	lib/elementary/elm_module_helper.h \
+	$(top_srcdir)/elm_intro.h.in
+
+### Binary
+
+bin_PROGRAMS += \
+bin/elementary/elementary_test \
+bin/elementary/elementary_config \
+bin/elementary/elementary_codegen \
+bin/elementary/elm_prefs_cc
+
+if BUILD_QUICKLAUNCH
+bin_PROGRAMS += \
+bin/elementary/elementary_quicklaunch
+if BUILD_RUN
+bin_PROGRAMS += \
+bin/elementary/elementary_run
+endif
+endif
+
+bin_elementary_elementary_test_SOURCES = \
+bin/elementary/test.c \
+bin/elementary/test_explode.c \
+bin/elementary/test_explode.h \
+bin/elementary/test_3d.c \
+bin/elementary/test_access.c \
+bin/elementary/test_actionslider.c \
+bin/elementary/test_anim.c \
+bin/elementary/test_bg.c \
+bin/elementary/test_box.c \
+bin/elementary/test_bubble.c \
+bin/elementary/test_button.c \
+bin/elementary/test_ui_button.c \
+bin/elementary/test_calendar.c \
+bin/elementary/test_check.c \
+bin/elementary/test_clock.c \
+bin/elementary/test_cnp.c \
+bin/elementary/test_code.c \
+bin/elementary/test_colorselector.c \
+bin/elementary/test_colorclass.c \
+bin/elementary/test_combobox.c \
+bin/elementary/test_config.c \
+bin/elementary/test_conform.c \
+bin/elementary/test_conform_indicator.c \
+bin/elementary/test_ctxpopup.c \
+bin/elementary/test_cursor.c \
+bin/elementary/test_datetime.c \
+bin/elementary/test_dayselector.c \
+bin/elementary/test_disable.c \
+bin/elementary/test_diskselector.c \
+bin/elementary/test_dnd.c \
+bin/elementary/test_efl_anim_alpha.c \
+bin/elementary/test_efl_anim_rotate.c \
+bin/elementary/test_efl_anim_scale.c \
+bin/elementary/test_efl_anim_translate.c \
+bin/elementary/test_efl_anim_group_parallel.c \
+bin/elementary/test_efl_anim_group_sequential.c \
+bin/elementary/test_efl_anim_pause.c \
+bin/elementary/test_efl_anim_repeat.c \
+bin/elementary/test_efl_anim_start_delay.c \
+bin/elementary/test_efl_anim_interpolator.c \
+bin/elementary/test_eio.c \
+bin/elementary/test_entry.c \
+bin/elementary/test_entry_anchor.c \
+bin/elementary/test_entry_anchor2.c \
+bin/elementary/test_events.c \
+bin/elementary/test_evas_mask.c \
+bin/elementary/test_evas_map.c \
+bin/elementary/test_efl_gfx_mapping.c \
+bin/elementary/test_evas_snapshot.c \
+bin/elementary/test_external.c \
+bin/elementary/test_fileselector_button.c \
+bin/elementary/test_fileselector.c \
+bin/elementary/test_fileselector_entry.c \
+bin/elementary/test_flip.c \
+bin/elementary/test_flip_page.c \
+bin/elementary/test_flip_page_eo.c \
+bin/elementary/test_flipselector.c \
+bin/elementary/test_floating.c \
+bin/elementary/test_focus.c \
+bin/elementary/test_focus_custom_chain.c \
+bin/elementary/test_focus_policy.c \
+bin/elementary/test_focus_style.c \
+bin/elementary/test_gengrid.c \
+bin/elementary/test_genlist.c \
+bin/elementary/test_gesture_layer.c \
+bin/elementary/test_gesture_layer2.c \
+bin/elementary/test_gesture_layer3.c \
+bin/elementary/test_gfx_filters.c \
+bin/elementary/test_glview_simple.c \
+bin/elementary/test_glview.c \
+bin/elementary/test_glview_manygears.c \
+bin/elementary/test_grid.c \
+bin/elementary/test_ui_table_static.c \
+bin/elementary/test_ui_stack.c \
+bin/elementary/test_hover.c \
+bin/elementary/test_hoversel.c \
+bin/elementary/test_icon.c \
+bin/elementary/test_icon_desktops.c \
+bin/elementary/test_icon_animated.c \
+bin/elementary/test_image.c \
+bin/elementary/test_ui_image.c \
+bin/elementary/test_index.c \
+bin/elementary/test_inwin.c \
+bin/elementary/test_label.c \
+bin/elementary/test_launcher.c \
+bin/elementary/test_layout.c \
+bin/elementary/test_list.c \
+bin/elementary/test_map.c \
+bin/elementary/test_main_menu.c \
+bin/elementary/test_menu.c \
+bin/elementary/test_multi.c \
+bin/elementary/test_multibuttonentry.c \
+bin/elementary/test_naviframe.c \
+bin/elementary/test_naviframe_complex.c \
+bin/elementary/test_notify.c \
+bin/elementary/test_nstate.c \
+bin/elementary/test_panel.c \
+bin/elementary/test_panes.c \
+bin/elementary/test_ui_panes.c \
+bin/elementary/test_part_bg.c \
+bin/elementary/test_part_shadow.c \
+bin/elementary/test_photo.c \
+bin/elementary/test_photocam.c \
+bin/elementary/test_popup.c \
+bin/elementary/test_prefs.c \
+bin/elementary/test_progressbar.c \
+bin/elementary/test_ui_progressbar.c \
+bin/elementary/test_radio.c \
+bin/elementary/test_scaling.c \
+bin/elementary/test_scroller.c \
+bin/elementary/test_ui_scroller.c \
+bin/elementary/test_segment_control.c \
+bin/elementary/test_separator.c \
+bin/elementary/test_slider.c \
+bin/elementary/test_ui_slider.c \
+bin/elementary/test_ui_slider_interval.c \
+bin/elementary/test_ui_spin.c \
+bin/elementary/test_ui_spin_button.c \
+bin/elementary/test_ui_datepicker.c \
+bin/elementary/test_ui_timepicker.c \
+bin/elementary/test_ui_tags.c \
+bin/elementary/test_ui_panel.c \
+bin/elementary/test_slideshow.c \
+bin/elementary/test_spinner.c \
+bin/elementary/test_store.c \
+bin/elementary/test_sys_notify.c \
+bin/elementary/test_systray.c \
+bin/elementary/test_table.c \
+bin/elementary/test_thumb.c \
+bin/elementary/test_toolbar.c \
+bin/elementary/test_tooltip.c \
+bin/elementary/test_transit.c \
+bin/elementary/test_transit_bezier.c \
+bin/elementary/test_ui_box.c \
+bin/elementary/test_ui_box_stack.c \
+bin/elementary/test_ui_clock.c \
+bin/elementary/test_ui_table.c \
+bin/elementary/test_ui_popup.c \
+bin/elementary/test_ui_textpath.c \
+bin/elementary/test_video.c \
+bin/elementary/test_weather.c \
+bin/elementary/test_web.c \
+bin/elementary/test_win_inline.c \
+bin/elementary/test_win_keygrab.c \
+bin/elementary/test_win_socket.c \
+bin/elementary/test_win_plug.c \
+bin/elementary/test_win_state.c \
+bin/elementary/test_win_wm_rotation.c \
+bin/elementary/test_win_dialog.c \
+bin/elementary/test_win_modal.c \
+bin/elementary/test_efl_ui_text.c \
+bin/elementary/test_win_stack.c \
+bin/elementary/test_win_indicator.c \
+bin/elementary/test_gesture_framework.c \
+bin/elementary/test_ui_tab_pager.c \
+bin/elementary/test_ui_active_view.c \
+bin/elementary/test_ui_relative_layout.c \
+bin/elementary/test.h
+
+bin_elementary_elementary_test_LDADD = @USE_ELEMENTARY_LIBS@
+bin_elementary_elementary_test_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_elementary_elementary_test_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/bin/elementary \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
+@ELEMENTARY_CFLAGS@
+
+bin_elementary_elementary_config_SOURCES = bin/elementary/config.c
+bin_elementary_elementary_config_LDADD = @USE_ELEMENTARY_LIBS@
+bin_elementary_elementary_config_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_elementary_elementary_config_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/bin/elementary \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
+@ELEMENTARY_CFLAGS@
+
+bin_elementary_elementary_codegen_SOURCES = bin/elementary/elementary_codegen.c
+bin_elementary_elementary_codegen_LDADD = @USE_ELEMENTARY_LIBS@
+bin_elementary_elementary_codegen_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_elementary_elementary_codegen_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/bin/elementary \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+@ELEMENTARY_CFLAGS@
+
+noinst_HEADERS += \
+bin/elementary/elm_prefs_cc.h
+
+bin_elementary_elm_prefs_cc_SOURCES = \
+bin/elementary/elm_prefs_cc.c \
+bin/elementary/elm_prefs_cc_mem.c \
+bin/elementary/elm_prefs_cc_out.c \
+bin/elementary/elm_prefs_cc_parse.c \
+bin/elementary/elm_prefs_cc_handlers.c
+
+bin_elementary_elm_prefs_cc_LDADD = @USE_ELEMENTARY_LIBS@
+bin_elementary_elm_prefs_cc_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_elementary_elm_prefs_cc_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/bin/elementary \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+@ELEMENTARY_CFLAGS@
+
+if HAVE_WINDOWS
+bin_elementary_elm_prefs_cc_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_srcdir)/src/lib/evil/regex \
+-DPOSIX_MISTAKE
+endif
+
+if BUILD_QUICKLAUNCH
+bin_elementary_elementary_quicklaunch_SOURCES = bin/elementary/quicklaunch.c
+bin_elementary_elementary_quicklaunch_LDADD = @USE_ELEMENTARY_LIBS@ @requirements_libs_elm@
+bin_elementary_elementary_quicklaunch_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_elementary_elementary_quicklaunch_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/bin/elementary \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+@ELEMENTARY_CFLAGS@
+
+if BUILD_RUN
+bin_elementary_elementary_run_CPPFLAGS = -I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary/ \
+-I$(top_builddir)/src/lib/elementary/ \
+-I$(top_srcdir)/src/bin/elementary/ \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
+
+bin_elementary_elementary_run_SOURCES = bin/elementary/run.c
+bin_elementary_elementary_run_LDADD = @requirements_libs_elm@
+bin_elementary_elementary_run_LDFLAGS =
+endif
+endif
+
+EXTRA_DIST2 += \
+bin/elementary/test_factory.c
+
+### Modules
+
+## access_output
+
+moduleaccess_outputpkgdir = $(libdir)/elementary/modules/access_output/$(MODULE_ARCH)
+moduleaccess_outputpkg_LTLIBRARIES = modules/elementary/access_output/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleaccess_outputpkgLTLIBRARIES = install-moduleaccess_outputpkgLTLIBRARIES
+$(install_moduleaccess_outputpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_access_output_module_la_SOURCES = modules/elementary/access_output/mod.c
+modules_elementary_access_output_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_access_output_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_access_output_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_access_output_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_access_output_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## clock_input_ctxpopup
+
+moduleclock_input_ctxpopuppkgdir = $(libdir)/elementary/modules/clock_input_ctxpopup/$(MODULE_ARCH)
+moduleclock_input_ctxpopuppkg_LTLIBRARIES = modules/elementary/clock_input_ctxpopup/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleclock_input_ctxpopuppkgLTLIBRARIES = install-moduleclock_input_ctxpopuppkgLTLIBRARIES
+$(install_moduleclock_input_ctxpopuppkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_clock_input_ctxpopup_module_la_SOURCES = \
+modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
+modules_elementary_clock_input_ctxpopup_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_clock_input_ctxpopup_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_clock_input_ctxpopup_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_clock_input_ctxpopup_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_clock_input_ctxpopup_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## prefs
+
+moduleprefspkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
+moduleprefspkg_LTLIBRARIES = modules/elementary/prefs/module.la
+
+EXTRA_DIST2 += modules/elementary/prefs/elm_prefs_swallow.edc
+
+prefs_filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
+prefs_files_DATA = modules/elementary/prefs/elm_prefs_swallow.edj
+CLEANFILES += $(prefs_files_DATA) lib/elementary/elm_default_config.x
+
+modules/elementary/prefs/elm_prefs_swallow.edj: modules/elementary/prefs/elm_prefs_swallow.edc bin/edje/edje_cc${EXEEXT}
+	$(AM_V_EDJ) \
+	$(MKDIR_P) modules/elementary/prefs/ ; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/src/modules/elementary/prefs/ $< $@
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleprefspkgLTLIBRARIES = install-moduleprefspkgLTLIBRARIES
+$(install_moduleprefspkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_prefs_module_la_SOURCES = \
+modules/elementary/prefs/private.h \
+modules/elementary/prefs/item_widgets.inc \
+modules/elementary/prefs/page_widgets.inc \
+modules/elementary/prefs/prefs_iface.c \
+modules/elementary/prefs/elm_button.c \
+modules/elementary/prefs/elm_check.c \
+modules/elementary/prefs/elm_datetime.c \
+modules/elementary/prefs/elm_entry.c \
+modules/elementary/prefs/elm_label.c \
+modules/elementary/prefs/elm_separator.c \
+modules/elementary/prefs/elm_slider.c \
+modules/elementary/prefs/elm_spinner.c \
+modules/elementary/prefs/elm_swallow.c \
+modules/elementary/prefs/elm_vertical_box.c \
+modules/elementary/prefs/elm_horizontal_box.c \
+modules/elementary/prefs/elm_vertical_frame.c \
+modules/elementary/prefs/elm_horizontal_frame.c
+
+modules_elementary_prefs_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+
+if HAVE_WINDOWS
+modules_elementary_prefs_module_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_srcdir)/src/lib/evil/regex \
+-DPOSIX_MISTAKE
+endif
+
+modules_elementary_prefs_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_prefs_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_prefs_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_prefs_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## test_entry
+
+moduletest_entrypkgdir = $(libdir)/elementary/modules/test_entry/$(MODULE_ARCH)
+moduletest_entrypkg_LTLIBRARIES = modules/elementary/test_entry/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduletest_entrypkgLTLIBRARIES = install-moduletest_entrypkgLTLIBRARIES
+$(install_moduletest_entrypkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_test_entry_module_la_SOURCES = modules/elementary/test_entry/mod.c
+modules_elementary_test_entry_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_test_entry_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_test_entry_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_test_entry_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_test_entry_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## test_map
+
+moduletest_mappkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH)
+moduletest_mappkg_LTLIBRARIES = modules/elementary/test_map/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduletest_mappkgLTLIBRARIES = install-moduletest_mappkgLTLIBRARIES
+$(install_moduletest_mappkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_test_map_module_la_SOURCES = modules/elementary/test_map/mod.c
+modules_elementary_test_map_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_test_map_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_test_map_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_test_map_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_test_map_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## web_none
+
+moduleweb_nonepkgdir = $(libdir)/elementary/modules/web/none/$(MODULE_ARCH)
+moduleweb_nonepkg_LTLIBRARIES = modules/elementary/web/none/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleweb_nonepkgLTLIBRARIES = install-moduleweb_nonepkgLTLIBRARIES
+$(install_moduleweb_nonepkgLTLIBRARIES): install-libLTLIBRARIES
+
+
+EXTRA_DIST2 += \
+modules/elementary/web/none/elm_web_none_eo.c \
+modules/elementary/web/none/elm_web_none_eo.h
+
+modules_elementary_web_none_module_la_SOURCES = \
+	modules/elementary/web/none/elm_web_none.c
+
+modules_elementary_web_none_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DMODULES_PATH=\"$(libdir)/elementary/modules\" \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_builddir)/src/modules/elementary/web/none \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_web_none_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_web_none_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_web_none_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_web_none_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## edje_external
+
+moduleedje_externalpkgdir = $(libdir)/edje/modules/elm/$(MODULE_ARCH)
+moduleedje_externalpkg_LTLIBRARIES = edje_external/elementary/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleedje_externalpkgLTLIBRARIES = install-moduleedje_externalpkgLTLIBRARIES
+$(install_moduleedje_externalpkgLTLIBRARIES): install-libLTLIBRARIES
+
+edje_external_elementary_module_la_SOURCES = \
+	edje_external/elementary/private.h \
+	edje_external/elementary/modules.inc \
+	edje_external/elementary/elm.c \
+	edje_external/elementary/elm_actionslider.c \
+	edje_external/elementary/elm_bg.c \
+	edje_external/elementary/elm_bubble.c \
+	edje_external/elementary/elm_button.c \
+	edje_external/elementary/elm_calendar.c \
+	edje_external/elementary/elm_check.c \
+	edje_external/elementary/elm_clock.c \
+	edje_external/elementary/elm_combobox.c \
+	edje_external/elementary/elm_entry.c \
+	edje_external/elementary/elm_fileselector.c \
+	edje_external/elementary/elm_fileselector_button.c \
+	edje_external/elementary/elm_fileselector_entry.c \
+	edje_external/elementary/elm_frame.c \
+	edje_external/elementary/elm_gengrid.c \
+	edje_external/elementary/elm_genlist.c \
+	edje_external/elementary/elm_hoversel.c \
+	edje_external/elementary/elm_icon.c \
+	edje_external/elementary/elm_index.c \
+	edje_external/elementary/elm_label.c \
+	edje_external/elementary/elm_list.c \
+	edje_external/elementary/elm_map.c \
+	edje_external/elementary/elm_multibuttonentry.c \
+	edje_external/elementary/elm_naviframe.c \
+	edje_external/elementary/elm_notify.c \
+	edje_external/elementary/elm_panes.c \
+	edje_external/elementary/elm_photocam.c \
+	edje_external/elementary/elm_progressbar.c \
+	edje_external/elementary/elm_radio.c \
+	edje_external/elementary/elm_scroller.c \
+	edje_external/elementary/elm_segment_control.c \
+	edje_external/elementary/elm_slider.c \
+	edje_external/elementary/elm_slideshow.c \
+	edje_external/elementary/elm_spinner.c \
+	edje_external/elementary/elm_thumb.c \
+	edje_external/elementary/elm_toolbar.c \
+	edje_external/elementary/elm_video.c \
+	edje_external/elementary/elm_web.c
+
+edje_external_elementary_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DMODULES_PATH=\"$(libdir)/elementary/modules\" \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_builddir)/src/edje_externals \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
+@ELEMENTARY_CFLAGS@
+edje_external_elementary_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+edje_external_elementary_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+testfilesdir = $(datadir)/elementary/
+testfiles_DATA = \
+                tests/elementary/testfile_entry.txt \
+                tests/elementary/testfile_entry2.txt \
+                tests/elementary/testfile.txt \
+                tests/elementary/testfile-windows.txt \
+                tests/elementary/testfile-withblanks.txt \
+                tests/elementary/testdiff.diff
+
+### Tests
+EXTRA_DIST2 += $(testfiles_DATA)
+
+if EFL_ENABLE_TESTS
+
+AM_TESTS_ENVIRONMENT += \
+        ELM_DATA_DIR=${top_builddir}/data/elementary \
+        ELM_RUN_IN_TREE=1 \
+	EFL_RUN_IN_TREE=1
+
+check_PROGRAMS += tests/elementary/elm_suite tests/elementary/efl_ui_suite
+TESTS += tests/elementary/elm_suite tests/elementary/efl_ui_suite
+
+tests_elementary_elm_suite_SOURCES = \
+	tests/elementary/suite_helpers.c \
+	tests/elementary/elm_suite.c \
+	tests/elementary/elm_suite_build.c \
+	tests/elementary/elm_test_atspi.c \
+	tests/elementary/elm_test_check.c \
+	tests/elementary/elm_test_colorselector.c \
+	tests/elementary/elm_test_entry.c \
+	tests/elementary/elm_test_init.c \
+	tests/elementary/elm_test_list.c \
+	tests/elementary/elm_test_button.c \
+	tests/elementary/elm_test_image.c \
+	tests/elementary/elm_test_photo.c \
+	tests/elementary/elm_test_actionslider.c \
+	tests/elementary/elm_test_box.c \
+	tests/elementary/elm_test_table.c \
+	tests/elementary/elm_test_thumb.c \
+	tests/elementary/elm_test_menu.c \
+	tests/elementary/elm_test_photocam.c \
+	tests/elementary/elm_test_win.c \
+	tests/elementary/elm_test_icon.c \
+	tests/elementary/elm_test_prefs.c \
+	tests/elementary/elm_test_map.c \
+	tests/elementary/elm_test_glview.c \
+	tests/elementary/elm_test_web.c \
+	tests/elementary/elm_test_toolbar.c \
+	tests/elementary/elm_test_grid.c \
+	tests/elementary/elm_test_diskselector.c \
+	tests/elementary/elm_test_notify.c \
+	tests/elementary/elm_test_mapbuf.c \
+	tests/elementary/elm_test_flip.c \
+	tests/elementary/elm_test_layout.c \
+	tests/elementary/elm_test_slider.c \
+	tests/elementary/elm_test_ctxpopup.c \
+	tests/elementary/elm_test_separator.c \
+	tests/elementary/elm_test_calendar.c \
+	tests/elementary/elm_test_inwin.c \
+	tests/elementary/elm_test_gengrid.c \
+	tests/elementary/elm_test_radio.c \
+	tests/elementary/elm_test_scroller.c \
+	tests/elementary/elm_test_frame.c \
+	tests/elementary/elm_test_datetime.c \
+	tests/elementary/elm_test_player.c \
+	tests/elementary/elm_test_bg.c \
+	tests/elementary/elm_test_video.c \
+	tests/elementary/elm_test_segmentcontrol.c \
+	tests/elementary/elm_test_progressbar.c \
+	tests/elementary/elm_test_fileselector.c \
+	tests/elementary/elm_test_fileselector_button.c \
+	tests/elementary/elm_test_fileselector_entry.c \
+	tests/elementary/elm_test_hoversel.c \
+	tests/elementary/elm_test_multibuttonentry.c \
+	tests/elementary/elm_test_naviframe.c \
+	tests/elementary/elm_test_popup.c \
+	tests/elementary/elm_test_bubble.c \
+	tests/elementary/elm_test_clock.c \
+	tests/elementary/elm_test_conformant.c \
+	tests/elementary/elm_test_dayselector.c \
+	tests/elementary/elm_test_flipselector.c \
+	tests/elementary/elm_test_genlist.c \
+	tests/elementary/elm_test_hover.c \
+	tests/elementary/elm_test_index.c \
+	tests/elementary/elm_test_label.c \
+	tests/elementary/elm_test_panel.c \
+	tests/elementary/elm_test_panes.c \
+	tests/elementary/elm_test_slideshow.c \
+	tests/elementary/elm_test_spinner.c \
+	tests/elementary/elm_test_plug.c \
+	tests/elementary/elm_test_config.c \
+	tests/elementary/elm_code_file_test_load.c \
+	tests/elementary/elm_code_file_test_memory.c \
+	tests/elementary/elm_code_test_basic.c \
+	tests/elementary/elm_code_test_line.c \
+	tests/elementary/elm_code_test_parse.c \
+	tests/elementary/elm_code_test_syntax.c \
+	tests/elementary/elm_code_test_text.c \
+	tests/elementary/elm_code_test_indent.c \
+	tests/elementary/elm_code_test_widget.c \
+	tests/elementary/elm_code_test_widget_text.c \
+	tests/elementary/elm_code_test_widget_selection.c \
+	tests/elementary/elm_code_test_widget_undo.c \
+	tests/elementary/elm_test_widget_focus.c
+
+tests_elementary_elm_suite_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+	-DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
+	-DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \
+	-DELM_IMAGE_DATA_DIR=\"${top_srcdir}/data/elementary\" \
+	-DELM_TEST_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \
+	-DPACKAGE_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \
+	-I$(top_srcdir)/src/lib/elementary \
+	-I$(top_builddir)/src/lib/elementary \
+	-I$(top_builddir)/src/tests/elementary \
+	@CHECK_CFLAGS@ \
+	@ELEMENTARY_CFLAGS@
+
+tests_elementary_elm_suite_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@
+tests_elementary_elm_suite_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+
+tests_elementary_efl_ui_suite_SOURCES = \
+	tests/elementary/suite_helpers.c \
+	tests/elementary/suite_helpers.h \
+	tests/elementary/efl_ui_suite.c \
+	tests/elementary/efl_ui_build.c \
+	tests/elementary/elm_test_init.c \
+	tests/elementary/efl_ui_test_atspi.c \
+	tests/elementary/efl_ui_test_callback.c \
+	tests/elementary/efl_ui_test_focus_common.c \
+	tests/elementary/efl_ui_test_focus_common.h \
+	tests/elementary/efl_ui_test_focus.c \
+	tests/elementary/efl_ui_test_focus_sub.c \
+	tests/elementary/efl_ui_test_box.c \
+	tests/elementary/efl_ui_test_box_flow.c \
+	tests/elementary/efl_ui_test_box_stack.c \
+	tests/elementary/efl_ui_test_table.c \
+	tests/elementary/efl_ui_test_relative_layout.c \
+	tests/elementary/efl_ui_test_grid.c \
+	tests/elementary/efl_ui_test_image.c \
+	tests/elementary/efl_ui_test_image_zoomable.c \
+	tests/elementary/efl_ui_test_layout.c \
+	tests/elementary/efl_ui_test_widget.c \
+	tests/elementary/efl_ui_test_active_view.c \
+	tests/elementary/efl_ui_test_check.c \
+	tests/elementary/efl_ui_suite.h \
+	tests/elementary/efl_ui_model.c
+
+tests_elementary_efl_ui_suite_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+	-DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
+	-DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \
+	-DELM_IMAGE_DATA_DIR=\"${top_srcdir}/data/elementary\" \
+	-DELM_TEST_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \
+	-DPACKAGE_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \
+	-I$(top_srcdir)/src/lib/elementary \
+	-I$(top_builddir)/src/lib/elementary \
+	-I$(top_builddir)/src/tests/elementary \
+	@CHECK_CFLAGS@ \
+	@ELEMENTARY_CFLAGS@
+
+tests_elementary_efl_ui_suite_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@
+tests_elementary_efl_ui_suite_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+endif
+
+if HAVE_LUA_BINDINGS
+
+elementary_eolian_lua = $(elm_public_eolian_files:%.eo=%.eo.lua)
+
+generated_elementary_lua_all = $(elementary_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_elementary_lua_all)
+
+installed_elementaryluadir = $(datadir)/elua/modules/elementary
+nodist_installed_elementarylua_DATA = $(generated_elementary_lua_all)
+
+endif
+
+if HAVE_JS
+
+generated_elementary_js_bindings = $(elm_public_eolian_files:%.eo=%.eo.js.cc)
+
+
+GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings)
+
+endif
+
+if HAVE_CXX
+elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh)
+elementary_eolian_cxx_impl_hh = $(elm_public_eolian_files:%.eo=%.eo.impl.hh)
+endif
+
+EXTRA_DIST2 += \
+tests/elementary/elm_suite.h \
+lib/elementary/Elementary_Options.h.in \
+lib/elementary/elm_code_widget_text.c \
+lib/elementary/elm_code_widget_undo.c \
+lib/elementary/config_embed
+
+lib/elementary/elm_default_config.x:
+	$(top_srcdir)/src/lib/elementary/config_embed $(abs_top_srcdir)/data/elementary/config/standard/base.src.in $@
diff --git a/src/Makefile_Elocation.am b/src/Makefile_Elocation.am
new file mode 100644
index 0000000000..d9c5a489a8
--- /dev/null
+++ b/src/Makefile_Elocation.am
@@ -0,0 +1,45 @@
+### Library
+
+lib_LTLIBRARIES += lib/elocation/libelocation.la
+
+installed_elocationsmainheadersdir = $(includedir)/elocation-@VMAJ@
+dist_installed_elocationsmainheaders_DATA = \
+lib/elocation/Elocation.h \
+lib/elocation/elocation_private.h \
+lib/elocation/gen/eldbus_geo_clue2_client.h \
+lib/elocation/gen/eldbus_geo_clue2_location.h \
+lib/elocation/gen/eldbus_geo_clue2_manager.h \
+lib/elocation/gen/eldbus_utils.h
+
+lib_elocation_libelocation_la_SOURCES = \
+lib/elocation/elocation.c \
+lib/elocation/gen/eldbus_geo_clue2_client.c \
+lib/elocation/gen/eldbus_geo_clue2_location.c \
+lib/elocation/gen/eldbus_geo_clue2_manager.c
+
+lib_elocation_libelocation_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELOCATION_CFLAGS@ @EFL_CFLAGS@ -DEFL_BUILD
+lib_elocation_libelocation_la_LIBADD = @ELOCATION_LIBS@
+lib_elocation_libelocation_la_DEPENDENCIES = @ELOCATION_INTERNAL_LIBS@
+lib_elocation_libelocation_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+#check_PROGRAMS += tests/elocation/elocation_suite
+#TESTS += tests/elocation/elocation_suite
+
+#tests_elocation_elocation_suite_SOURCES = \
+#tests/elocation/elocation_suite.c
+
+#tests_elocation_elocation_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+#-DTESTS_WD=\"`pwd`\" \
+#-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elocation\" \
+#-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elocation\" \
+#@CHECK_CFLAGS@ \
+#@ELOCATION_CFLAGS@
+#tests_elocation_elocation_suite_LDADD = @CHECK_LIBS@ @USE_ELOCATION_LIBS@
+#tests_elocation_elocation_suite_DEPENDENCIES = @USE_ELOCATION_INTERNAL_LIBS@
+
+endif
diff --git a/src/Makefile_Elput.am b/src/Makefile_Elput.am
new file mode 100644
index 0000000000..a3abb335b3
--- /dev/null
+++ b/src/Makefile_Elput.am
@@ -0,0 +1,63 @@
+if HAVE_ELPUT
+
+### Library
+
+lib_LTLIBRARIES += lib/elput/libelput.la
+
+installed_elputmainheadersdir = $(includedir)/elput-@VMAJ@
+dist_installed_elputmainheaders_DATA = \
+  lib/elput/Elput.h
+
+lib_elput_libelput_la_SOURCES = \
+lib/elput/elput_touch.c \
+lib/elput/elput_evdev.c \
+lib/elput/elput_input.c \
+lib/elput/elput_logind.c \
+lib/elput/elput_manager.c \
+lib/elput/elput.c \
+lib/elput/elput_private.h
+
+lib_elput_libelput_la_CPPFLAGS = \
+  -I$(top_builddir)/src/lib/efl \
+  -DEFL_BUILD \
+  @ELPUT_CFLAGS@ @EFL_CFLAGS@ \
+  -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+  -DMODULE_ARCH=\"$(MODULE_ARCH)\"
+
+lib_elput_libelput_la_LIBADD = @ELPUT_LIBS@
+if HAVE_SYSTEMD
+lib_elput_libelput_la_LIBADD += @SYSTEMD_LIBS@
+endif
+lib_elput_libelput_la_DEPENDENCIES = @ELPUT_INTERNAL_LIBS@
+lib_elput_libelput_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/elput/elput_suite
+TESTS += tests/elput/elput_suite
+
+tests_elput_elput_suite_SOURCES = \
+tests/elput/elput_suite.c \
+tests/elput/elput_test_elput.c \
+tests/elput/elput_suite.h
+
+tests_elput_elput_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elput\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elput\" \
+@CHECK_CFLAGS@ \
+@ELPUT_CFLAGS@
+
+tests_elput_elput_suite_LDADD = \
+@CHECK_LIBS@ \
+@USE_ELPUT_LIBS@
+
+tests_elput_elput_suite_DEPENDENCIES = \
+@USE_ELPUT_INTERNAL_LIBS@
+
+endif
+
+endif
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
new file mode 100644
index 0000000000..f172a228b9
--- /dev/null
+++ b/src/Makefile_Elua.am
@@ -0,0 +1,139 @@
+if HAVE_ELUA
+
+lib_LTLIBRARIES += lib/elua/libelua.la
+
+installed_eluamainheadersdir = $(includedir)/elua-@VMAJ@
+dist_installed_eluamainheaders_DATA = \
+lib/elua/Elua.h
+
+lib_elua_libelua_la_SOURCES = \
+	lib/elua/elua_private.h \
+	lib/elua/elua.c \
+	lib/elua/io.c \
+	lib/elua/cache.c
+
+lib_elua_libelua_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
+        -DEFL_BUILD \
+	-DLOCALE_DIR=\"@LOCALE_DIR@\" \
+	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+	-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
+
+if HAVE_WIN32
+lib_elua_libelua_la_LIBADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@
+else
+lib_elua_libelua_la_LIBADD = @ELUA_LIBS@
+endif
+lib_elua_libelua_la_DEPENDENCIES = @ELUA_INTERNAL_LIBS@
+lib_elua_libelua_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+bin_PROGRAMS += bin/elua/elua
+
+bin_elua_elua_SOURCES = \
+	bin/elua/main.c
+
+bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
+	-DLOCALE_DIR=\"@LOCALE_DIR@\"
+
+if HAVE_OSX
+if  HAVE_X86_64
+bin_elua_elua_LDFLAGS = -pagezero_size 10000 -image_base 100000000
+endif
+endif
+
+if HAVE_WIN32
+bin_elua_elua_LDADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@ @USE_ELUA_LIBS@
+else
+bin_elua_elua_LDADD = @ELUA_LIBS@ @USE_ELUA_LIBS@
+endif
+bin_elua_elua_DEPENDENCIES = @ELUA_INTERNAL_LIBS@ lib/elua/libelua.la
+
+ELUA_BINDINGS_DIR = $(abs_top_srcdir)/src/bindings/luajit
+ELUA_CORE_DIR = $(abs_top_srcdir)/src/scripts/elua/core
+ELUA_MODULES_DIR = $(abs_top_srcdir)/src/scripts/elua/modules
+ELUA_APPS_DIR = $(abs_top_srcdir)/src/scripts/elua/apps
+
+### Helper for other modules using Elua
+include Makefile_Elua_Helper.am
+
+endif
+eluaapps_files = \
+	scripts/elua/apps/lualian.lua
+
+EXTRA_DIST2 += $(eluaapps_files)
+
+eluamodules_files = \
+	scripts/elua/modules/benchmark.lua \
+	scripts/elua/modules/getopt.lua \
+	scripts/elua/modules/lualian.lua \
+	bindings/luajit/eo.lua \
+	bindings/luajit/eolian.lua
+
+EXTRA_DIST2 += $(eluamodules_files)
+
+eluaeina_files = \
+	bindings/luajit/eina/accessor.lua \
+	bindings/luajit/eina/counter.lua \
+	bindings/luajit/eina/file.lua \
+	bindings/luajit/eina/hamster.lua \
+	bindings/luajit/eina/iterator.lua \
+	bindings/luajit/eina/list.lua \
+	bindings/luajit/eina/log.lua \
+	bindings/luajit/eina/rectangle.lua \
+	bindings/luajit/eina/tiler.lua \
+	bindings/luajit/eina/xattr.lua
+
+EXTRA_DIST2 += $(eluaeina_files)
+
+eluacore_files = \
+	scripts/elua/core/gettext.lua \
+	scripts/elua/core/module.lua \
+	scripts/elua/core/serializer.lua \
+	scripts/elua/core/util.lua
+
+EXTRA_DIST2 += $(eluacore_files)
+
+if HAVE_ELUA
+eluaappsdir = $(datadir)/elua/apps
+eluaapps_DATA = $(eluaapps_files)
+eluamodulesdir = $(datadir)/elua/modules
+eluamodules_DATA = $(eluamodules_files)
+eluaeinadir = $(eluamodulesdir)/eina
+eluaeina_DATA = $(eluaeina_files)
+eluacoredir = $(datadir)/elua/core
+eluacore_DATA = $(eluacore_files)
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/elua/elua_suite
+
+tests_elua_elua_suite_SOURCES = \
+tests/elua/elua_lib.c \
+tests/elua/elua_suite.c \
+tests/elua/elua_suite.h
+
+tests_elua_elua_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DTESTS_BUILD_DIR=\"$(abs_top_builddir)/src/tests/elua\" \
+-DTESTS_SRC_DIR=\"$(abs_top_srcdir)/src/tests/elua\" \
+-DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/elua\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DELUA_BINDINGS_DIR=\"$(ELUA_BINDINGS_DIR)\" \
+-DELUA_CORE_DIR=\"$(ELUA_CORE_DIR)\" \
+-DELUA_MODULES_DIR=\"$(ELUA_MODULES_DIR)\" \
+-DELUA_APPS_DIR=\"$(abs_top_srcdir)/src/tests/elua/data/apps\" \
+@CHECK_CFLAGS@ \
+@ELUA_CFLAGS@
+
+TESTS += tests/elua/elua_suite
+
+if HAVE_OSX
+if  HAVE_X86_64
+tests_elua_elua_suite_LDFLAGS = -pagezero_size 10000 -image_base 100000000
+endif
+endif
+
+tests_elua_elua_suite_LDADD = @CHECK_LIBS@ @USE_ELUA_LIBS@
+tests_elua_elua_suite_DEPENDENCIES = @USE_ELUA_INTERNAL_LIBS@
+
+endif
+
+endif
+EXTRA_DIST2 += tests/elua/data/apps/test.lua
diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am
new file mode 100644
index 0000000000..091b21e884
--- /dev/null
+++ b/src/Makefile_Elua_Helper.am
@@ -0,0 +1,28 @@
+if HAVE_LUA_BINDINGS
+
+if HAVE_ELUA_BIN
+ELUA_GEN = @elua_bin@ lualian
+_ELUA_GEN_DEP = @elua_bin@
+else
+ELUA_GEN = ELUA_EOLIAN_LIBRARY_PATH=$(top_builddir)/src/lib/eolian/.libs \
+	ELUA_EINA_LIBRARY_PATH=$(top_builddir)/src/lib/eina/.libs \
+	$(top_builddir)/src/bin/elua/elua${EXEEXT} \
+	-I$(ELUA_BINDINGS_DIR) -C$(ELUA_CORE_DIR) -M$(ELUA_MODULES_DIR) \
+	-A$(ELUA_APPS_DIR) lualian
+_ELUA_GEN_DEP = bin/elua/elua${EXEEXT} scripts/elua/apps/lualian.lua \
+	scripts/elua/modules/lualian.lua \
+	scripts/elua/modules/getopt.lua scripts/elua/core/util.lua \
+	bindings/luajit/eina/log.lua bindings/luajit/eina/iterator.lua \
+	bindings/luajit/eolian.lua
+endif
+
+AM_V_ELUA = $(am__v_ELUA_@AM_V@)
+am__v_ELUA_ = $(am__v_ELUA_@AM_DEFAULT_V@)
+am__v_ELUA_0 = @echo "  ELUA    " $@;
+
+SUFFIXES += .lua
+
+%.eo.lua: %.eo ${_ELUA_GEN_DEP}
+	$(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $<
+
+endif
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
new file mode 100644
index 0000000000..be764f4f92
--- /dev/null
+++ b/src/Makefile_Embryo.am
@@ -0,0 +1,69 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/embryo/libembryo.la
+
+installed_embryomainheadersdir = $(includedir)/embryo-@VMAJ@
+dist_installed_embryomainheaders_DATA = lib/embryo/Embryo.h
+
+lib_embryo_libembryo_la_SOURCES = \
+lib/embryo/embryo_amx.c \
+lib/embryo/embryo_args.c \
+lib/embryo/embryo_float.c \
+lib/embryo/embryo_main.c \
+lib/embryo/embryo_rand.c \
+lib/embryo/embryo_str.c \
+lib/embryo/embryo_time.c \
+lib/embryo/embryo_private.h
+
+lib_embryo_libembryo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
+-DEFL_BUILD \
+@EMBRYO_CFLAGS@
+lib_embryo_libembryo_la_LIBADD = @EMBRYO_LIBS@
+lib_embryo_libembryo_la_DEPENDENCIES = @EMBRYO_INTERNAL_LIBS@
+lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Binary
+
+bin_PROGRAMS += bin/embryo/embryo_cc
+
+bin_embryo_embryo_cc_SOURCES = \
+bin/embryo/embryo_cc_amx.h \
+bin/embryo/embryo_cc_osdefs.h \
+bin/embryo/embryo_cc_sc.h \
+bin/embryo/embryo_cc_sc1.c \
+bin/embryo/embryo_cc_sc2.c \
+bin/embryo/embryo_cc_sc3.c \
+bin/embryo/embryo_cc_sc4.c \
+bin/embryo/embryo_cc_sc5.c \
+bin/embryo/embryo_cc_sc6.c \
+bin/embryo/embryo_cc_sc7.c \
+bin/embryo/embryo_cc_scexpand.c \
+bin/embryo/embryo_cc_sclist.c \
+bin/embryo/embryo_cc_scvars.c \
+bin/embryo/embryo_cc_prefix.c \
+bin/embryo/embryo_cc_prefix.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+bin_embryo_embryo_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+@EMBRYO_CFLAGS@
+
+if HAVE_WIN32
+bin_embryo_embryo_cc_LDADD = -L$(top_builddir)/src/lib/evil @USE_EMBRYO_LIBS@
+else
+bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
+endif
+bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
+
+EXTRA_DIST2 += \
+bin/embryo/embryo_cc_sc5.scp \
+bin/embryo/embryo_cc_sc7.scp
diff --git a/src/Makefile_Emile.am b/src/Makefile_Emile.am
new file mode 100644
index 0000000000..59ac7bb4e9
--- /dev/null
+++ b/src/Makefile_Emile.am
@@ -0,0 +1,101 @@
+
+### Library
+lib_LTLIBRARIES += lib/emile/libemile.la
+
+installed_emilemainheadersdir = $(includedir)/emile-@VMAJ@
+dist_installed_emilemainheaders_DATA = \
+lib/emile/Emile.h \
+lib/emile/emile_cipher.h \
+lib/emile/emile_compress.h \
+lib/emile/emile_image.h \
+lib/emile/emile_base64.h
+
+lib_emile_libemile_la_SOURCES = \
+lib/emile/emile_private.h \
+lib/emile/emile_main.c \
+lib/emile/emile_compress.c \
+lib/emile/emile_image.c \
+lib/emile/emile_base64.c \
+static_libs/rg_etc/rg_etc1.c \
+static_libs/rg_etc/rg_etc2.c \
+static_libs/rg_etc/rg_etc1.h \
+static_libs/rg_etc/etc2_encoder.c
+
+if ! ENABLE_LIBLZ4
+lib_emile_libemile_la_SOURCES += \
+static_libs/lz4/lz4.c \
+static_libs/lz4/lz4.h \
+static_libs/lz4/lz4hc.c \
+static_libs/lz4/lz4hc.h
+endif
+
+if HAVE_CRYPTO_GNUTLS
+lib_emile_libemile_la_SOURCES += lib/emile/emile_cipher_gnutls.c
+else
+if HAVE_CRYPTO_OPENSSL
+lib_emile_libemile_la_SOURCES += lib/emile/emile_cipher_openssl.c
+else
+lib_emile_libemile_la_SOURCES += lib/emile/emile_cipher.c
+endif
+endif
+
+lib_emile_libemile_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/static_libs/rg_etc \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emile\" \
+-DEFL_BUILD \
+@EMILE_CFLAGS@ \
+@NEON_CFLAGS@
+
+if ! ENABLE_LIBLZ4
+lib_emile_libemile_la_CPPFLAGS += \
+-I$(top_srcdir)/src/static_libs/lz4
+endif
+
+lib_emile_libemile_la_LIBADD = @EMILE_LIBS@
+lib_emile_libemile_la_DEPENDENCIES = @EMILE_INTERNAL_LIBS@
+lib_emile_libemile_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+if ENABLE_LIBLZ4
+lib_emile_libemile_la_LIBADD += @LIBLZ4_LIBS@
+endif
+
+EXTRA_DIST2 += static_libs/lz4/README.md \
+static_libs/lz4/LICENSE \
+static_libs/lz4/NEWS \
+static_libs/lz4/lz4.c \
+static_libs/lz4/lz4.h \
+static_libs/lz4/lz4hc.c \
+static_libs/lz4/lz4hc.h \
+static_libs/rg_etc/README
+
+### Binary
+
+# None yet, maybe a tool to manually use cypher/compression ?
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/emile/emile_suite
+TESTS += tests/emile/emile_suite
+
+tests_emile_emile_suite_SOURCES = \
+tests/emile/emile_suite.c \
+tests/emile/emile_test_base.c \
+tests/emile/emile_test_base64.c \
+tests/emile/emile_suite.h
+
+tests_emile_emile_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DTESTS_WD=\"`pwd`\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/emile\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/emile\" \
+@CHECK_CFLAGS@ \
+@EMILE_CFLAGS@
+
+tests_emile_emile_suite_LDADD = @CHECK_LIBS@ @USE_EMILE_LIBS@
+tests_emile_emile_suite_DEPENDENCIES = @USE_EMILE_INTERNAL_LIBS@
+
+endif
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
new file mode 100644
index 0000000000..2de10651c2
--- /dev/null
+++ b/src/Makefile_Emotion.am
@@ -0,0 +1,392 @@
+### Library
+
+emotion_eolian_files = \
+	lib/emotion/efl_canvas_video.eo
+
+emotion_eolian_c = $(emotion_eolian_files:%.eo=%.eo.c)
+emotion_eolian_h = $(emotion_eolian_files:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+                 $(emotion_eolian_c) \
+                 $(emotion_eolian_h)
+if INSTALL_EO_FILES
+emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@
+emotioneolianfiles_DATA = \
+                          $(emotion_eolian_files)
+endif
+EXTRA_DIST2 += \
+lib/emotion/efl_canvas_video_eo.legacy.c \
+              ${emotion_eolian_files}
+
+lib_LTLIBRARIES += \
+lib/emotion/libemotion.la
+
+installed_emotionmainheadersdir = $(includedir)/emotion-@VMAJ@
+dist_installed_emotionmainheaders_DATA = lib/emotion/Emotion.h \
+                                         lib/emotion/efl_canvas_video_eo.legacy.h \
+                                         lib/emotion/Emotion_Legacy.h \
+                                         lib/emotion/Emotion_Eo.h
+
+nodist_installed_emotionmainheaders_DATA = \
+                                           $(emotion_eolian_h)
+
+# libemotion.la
+lib_emotion_libemotion_la_SOURCES = \
+lib/emotion/emotion_modules.h \
+lib/emotion/emotion_private.h \
+lib/emotion/emotion_smart.c \
+lib/emotion/emotion_webcam.c \
+lib/emotion/emotion_modules.c \
+lib/emotion/emotion_main.c \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@
+lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
+lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
+lib_emotion_libemotion_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+## Modules
+
+# Xine
+EMOTION_XINE_SOURCES = \
+modules/emotion/xine/emotion_xine.h \
+modules/emotion/xine/emotion_xine.c \
+modules/emotion/xine/emotion_xine_vo_out.c
+
+if EMOTION_STATIC_BUILD_XINE
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_XINE_SOURCES)
+else
+if EMOTION_BUILD_XINE
+emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH)
+emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_emotionmodulexineLTLIBRARIES = install-emotionmodulexineLTLIBRARIES
+$(install_emotionmodulexineLTLIBRARIES): install-libLTLIBRARIES
+
+modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
+modules_emotion_xine_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@ \
+@EMOTION_MODULE_XINE_CFLAGS@
+modules_emotion_xine_module_la_LIBADD = \
+@USE_EMOTION_LIBS@ \
+@EMOTION_MODULE_XINE_LIBS@
+modules_emotion_xine_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
+modules_emotion_xine_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_xine_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+# Gstreamer 0.10
+EMOTION_GSTREAMER_SOURCES = \
+modules/emotion/gstreamer/emotion_gstreamer.h \
+modules/emotion/gstreamer/emotion_gstreamer.c \
+modules/emotion/gstreamer/emotion_alloc.c \
+modules/emotion/gstreamer/emotion_convert.c \
+modules/emotion/gstreamer/emotion_fakeeos.c \
+modules/emotion/gstreamer/emotion_sink.c
+
+if EMOTION_STATIC_BUILD_GSTREAMER
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_GSTREAMER_SOURCES)
+else
+if EMOTION_BUILD_GSTREAMER
+emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH)
+emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_emotionmodulegstreamerLTLIBRARIES = install-emotionmodulegstreamerLTLIBRARIES
+$(install_emotionmodulegstreamerLTLIBRARIES): install-libLTLIBRARIES
+
+modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
+modules_emotion_gstreamer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@ \
+@EMOTION_MODULE_GSTREAMER_CFLAGS@
+modules_emotion_gstreamer_module_la_LIBADD = \
+@USE_EMOTION_LIBS@ \
+@EMOTION_MODULE_GSTREAMER_LIBS@
+modules_emotion_gstreamer_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
+modules_emotion_gstreamer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_gstreamer_module_la_LIBTOOLFLAGS = --tag=disable-static
+if HAVE_ECORE_X
+modules_emotion_gstreamer_module_la_CPPFLAGS += @ECORE_X_CFLAGS@ @ECORE_EVAS_CFLAGS@
+modules_emotion_gstreamer_module_la_LIBADD += @USE_ECORE_X_LIBS@ @USE_ECORE_EVAS_LIBS@
+modules_emotion_gstreamer_module_la_DEPENDENCIES += @USE_ECORE_X_INTERNAL_LIBS@ @USE_ECORE_EVAS_INTERNAL_LIBS@
+endif
+endif
+endif
+
+# Gstreamer 1.0
+EMOTION_GSTREAMER1_SOURCES = \
+modules/emotion/gstreamer1/emotion_gstreamer.h \
+modules/emotion/gstreamer1/emotion_gstreamer.c \
+modules/emotion/gstreamer1/emotion_alloc.c \
+modules/emotion/gstreamer1/emotion_convert.c \
+modules/emotion/gstreamer1/emotion_sink.c
+
+if EMOTION_STATIC_BUILD_GSTREAMER1
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_GSTREAMER1_SOURCES)
+else
+if EMOTION_BUILD_GSTREAMER1
+emotionmodulegstreamer1dir = $(libdir)/emotion/modules/gstreamer1/$(MODULE_ARCH)
+emotionmodulegstreamer1_LTLIBRARIES = modules/emotion/gstreamer1/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_emotionmodulegstreamer1LTLIBRARIES = install-emotionmodulegstreamer1LTLIBRARIES
+$(install_emotionmodulegstreamer1LTLIBRARIES): install-libLTLIBRARIES
+
+modules_emotion_gstreamer1_module_la_SOURCES = $(EMOTION_GSTREAMER1_SOURCES)
+modules_emotion_gstreamer1_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@ \
+@EMOTION_MODULE_GSTREAMER1_CFLAGS@
+modules_emotion_gstreamer1_module_la_LIBADD = \
+@USE_EMOTION_LIBS@ \
+@EMOTION_MODULE_GSTREAMER1_LIBS@
+modules_emotion_gstreamer1_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
+modules_emotion_gstreamer1_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_gstreamer1_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+# LibVLC
+EMOTION_LIBVLC_SOURCES =\
+modules/emotion/libvlc/emotion_libvlc.c
+
+if EMOTION_STATIC_BUILD_LIBVLC
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_LIBVLC_SOURCES)
+else
+if EMOTION_BUILD_LIBVLC
+emotionmodulelibvlcdir = $(libdir)/emotion/modules/libvlc/$(MODULE_ARCH)
+emotionmodulelibvlc_LTLIBRARIES = modules/emotion/libvlc/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_emotionmodulelibvlcLTLIBRARIES = install-emotionmodulelibvlcLTLIBRARIES
+$(install_emotionmodulelibvlcLTLIBRARIES): install-libLTLIBRARIES
+
+modules_emotion_libvlc_module_la_SOURCES = $(EMOTION_LIBVLC_SOURCES)
+modules_emotion_libvlc_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@ \
+@EMOTION_MODULE_LIBVLC_CFLAGS@
+modules_emotion_libvlc_module_la_LIBADD = \
+@USE_EMOTION_LIBS@ \
+@EMOTION_MODULE_LIBVLC_LIBS@
+modules_emotion_libvlc_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
+modules_emotion_libvlc_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_libvlc_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+# Generic
+EMOTION_GENERIC_SOURCES = \
+modules/emotion/generic/emotion_generic.h \
+modules/emotion/generic/emotion_generic.c
+
+if EMOTION_STATIC_BUILD_GENERIC
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_GENERIC_SOURCES)
+else
+if EMOTION_BUILD_GENERIC
+emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH)
+emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_emotionmodulegenericLTLIBRARIES = install-emotionmodulegenericLTLIBRARIES
+$(install_emotionmodulegenericLTLIBRARIES): install-libLTLIBRARIES
+
+modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
+modules_emotion_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@ \
+@EMOTION_MODULE_GENERIC_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
+modules_emotion_generic_module_la_LIBADD = \
+@USE_EMOTION_LIBS@ \
+@EMOTION_MODULE_GENERIC_LIBS@
+modules_emotion_generic_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
+modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if EMOTION_BUILD_GENERIC
+dist_installed_emotionmainheaders_DATA += \
+modules/emotion/generic/Emotion_Generic_Plugin.h
+endif
+
+
+# Edje_External
+emotionedjeexternaldir = $(libdir)/edje/modules/emotion/$(MODULE_ARCH)
+emotionedjeexternal_LTLIBRARIES = edje_external/emotion/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_emotionedjeexternalLTLIBRARIES = install-emotionedjeexternalLTLIBRARIES
+$(install_emotionedjeexternalLTLIBRARIES): install-libLTLIBRARIES
+
+edje_external_emotion_module_la_SOURCES = \
+edje_external/emotion/emotion.c
+edje_external_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EDJE_CFLAGS@ \
+@EMOTION_CFLAGS@ \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
+edje_external_emotion_module_la_LIBADD = \
+@USE_EDJE_LIBS@ \
+@USE_EMOTION_LIBS@
+edje_external_emotion_module_la_DEPENDENCIES = \
+@USE_EDJE_INTERNAL_LIBS@ \
+@USE_EMOTION_INTERNAL_LIBS@
+edje_external_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+edje_external_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+### Binary
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+if BUILD_LOADER_PNG
+
+bin_PROGRAMS += tests/emotion/emotion_test
+
+tests_emotion_emotion_test_SOURCES = \
+tests/emotion/emotion_test_main.c
+
+tests_emotion_emotion_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+@EDJE_CFLAGS@ \
+@EMOTION_CFLAGS@
+
+tests_emotion_emotion_test_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@
+tests_emotion_emotion_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ @USE_EMOTION_INTERNAL_LIBS@
+
+bin_PROGRAMS += tests/emotion/emotion_test-eo
+
+tests_emotion_emotion_test_eo_SOURCES = \
+tests/emotion/emotion_test_main-eo.c
+
+tests_emotion_emotion_test_eo_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+@EDJE_CFLAGS@ \
+@EMOTION_CFLAGS@ \
+@EO_CFLAGS@
+
+tests_emotion_emotion_test_eo_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@ @USE_EO_LIBS@
+tests_emotion_emotion_test_eo_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ @USE_EMOTION_INTERNAL_LIBS@ \
+@USE_EO_INTERNAL_LIBS@
+
+tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc${EXEEXT}
+	$(AM_V_EDJ) \
+	$(MKDIR_P) tests/emotion/data; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@
+
+emotiondatafilesdir = $(datadir)/emotion/data
+emotiondatafiles_DATA = tests/emotion/data/theme.edj
+CLEANFILES += tests/emotion/data/theme.edj
+
+endif
+endif
+
+# Those probably should be in the if block, but then
+# "make distcheck" would not work
+EXTRA_DIST2 += \
+tests/emotion/data/bpause.png \
+tests/emotion/data/bplay.png \
+tests/emotion/data/bstop.png \
+tests/emotion/data/icon_pause.png \
+tests/emotion/data/icon_play.png \
+tests/emotion/data/icon_stop.png \
+tests/emotion/data/e_logo.png \
+tests/emotion/data/fr1.png \
+tests/emotion/data/fr2.png \
+tests/emotion/data/fr3.png \
+tests/emotion/data/fr4.png \
+tests/emotion/data/fr5.png \
+tests/emotion/data/fr6.png \
+tests/emotion/data/fr7.png \
+tests/emotion/data/h_slider.png \
+tests/emotion/data/icon.edc \
+tests/emotion/data/knob.png \
+tests/emotion/data/orb.png \
+tests/emotion/data/pnl.png \
+tests/emotion/data/sl.png \
+tests/emotion/data/theme.edc \
+tests/emotion/data/tiles.png \
+tests/emotion/data/video_frame_bottom.png \
+tests/emotion/data/video_frame_left.png \
+tests/emotion/data/video_frame_right.png \
+tests/emotion/data/video_frame_top.png \
+tests/emotion/data/whb.png \
+tests/emotion/data/window_inner_shadow.png \
+modules/emotion/generic/README
+
+if HAVE_LUA_BINDINGS
+
+emotion_eolian_lua = $(emotion_eolian_files:%.eo=%.eo.lua)
+
+generated_emotion_lua_all = $(emotion_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_emotion_lua_all)
+
+installed_emotionluadir = $(datadir)/elua/modules/emotion
+nodist_installed_emotionlua_DATA = $(generated_emotion_lua_all)
+
+endif
+
+# TODO: gives undefined reference to emotion_object_class_get()
+if HAVE_JS
+
+generated_emotion_js_bindings = $(emotion_eolian_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_emotion_js_bindings)
+
+endif
+
+emotiongenericplayersdir = \
+$(libdir)/emotion/generic_players/$(MODULE_ARCH)
+
+emotiongenericplayers_PROGRAMS =
+
+if HAVE_GENERIC_VLC
+
+emotiongenericplayers_PROGRAMS += generic/emotion/vlc/vlc
+generic_emotion_vlc_vlc_SOURCES = generic/emotion/vlc/emotion_generic_vlc.c
+generic_emotion_vlc_vlc_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/modules/emotion/generic \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DEMOTION_GENERIC_PLAYERS_DIR=\"$(libdir)/emotion/generic_players/$(MODULE_ARCH)\" \
+@GENERIC_VLC_CFLAGS@
+generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@ @USE_EINA_LIBS@ @USE_ECORE_LIBS@
+generic_emotion_vlc_vlc_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@
+endif
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
new file mode 100644
index 0000000000..19179a78c3
--- /dev/null
+++ b/src/Makefile_Eo.am
@@ -0,0 +1,255 @@
+
+### Library
+
+eo_eolian_files = \
+	lib/eo/efl_object.eo \
+	lib/eo/efl_class.eo \
+	lib/eo/efl_object_override.eo
+
+eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c)
+eo_eolian_h = $(eo_eolian_files:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+                 $(eo_eolian_c) \
+                 $(eo_eolian_h)
+
+lib_LTLIBRARIES += lib/eo/libeo.la \
+                   lib/eo/libeo_dbg.la
+
+installed_eomainheadersdir = $(includedir)/eo-@VMAJ@
+dist_installed_eomainheaders_DATA = lib/eo/Eo.h
+
+nodist_installed_eomainheaders_DATA = \
+									  $(eo_eolian_h)
+
+lib_eo_libeo_la_SOURCES = \
+lib/eo/eo.c \
+lib/eo/eo_ptr_indirection.c \
+lib/eo/eo_ptr_indirection.h \
+lib/eo/eo_base_class.c \
+lib/eo/eo_class_class.c \
+lib/eo/eo_add_fallback.c \
+lib/eo/eo_add_fallback.h \
+lib/eo/eo_internal.h \
+lib/eo/eo_private.h
+
+lib_eo_libeo_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+@EO_CFLAGS@ \
+@VALGRIND_CFLAGS@
+lib_eo_libeo_la_LIBADD = @EO_LIBS@
+lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
+lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### The Eo debug build
+lib_eo_libeo_dbg_la_SOURCES = $(lib_eo_libeo_la_SOURCES)
+lib_eo_libeo_dbg_la_CPPFLAGS = $(lib_eo_libeo_la_CPPFLAGS) -DEO_DEBUG -DEFL_BUILD
+lib_eo_libeo_dbg_la_LIBADD = $(lib_eo_libeo_la_LIBADD)
+lib_eo_libeo_dbg_la_DEPENDENCIES = $(lib_eo_libeo_la_DEPENDENCIES)
+lib_eo_libeo_dbg_la_LDFLAGS = $(lib_eo_libeo_la_LDFLAGS)
+
+bin_SCRIPTS += scripts/eo/eo_debug
+
+######
+if INSTALL_EO_FILES
+eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
+eoeolianfiles_DATA = \
+					 $(eo_eolian_files) \
+					 lib/eo/eina_types.eot # We don't generate .c/.h on purpose
+endif
+EXTRA_DIST2 += \
+$(eo_eolian_files) \
+lib/eo/eina_types.eot
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+check_PROGRAMS += \
+tests/eo/test_access \
+tests/eo/test_composite_objects \
+tests/eo/test_constructors \
+tests/eo/test_function_overrides \
+tests/eo/test_interface \
+tests/eo/test_mixin \
+tests/eo/test_signals \
+tests/eo/test_children \
+tests/eo/eo_suite_add_fallback \
+tests/eo/eo_suite
+
+tests_eo_test_children_SOURCES = \
+tests/eo/children/children_main.c \
+tests/eo/children/children_simple.c \
+tests/eo/children/children_simple.h
+tests_eo_test_children_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_children_LDADD = @USE_EO_LIBS@
+tests_eo_test_children_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_children
+
+tests_eo_test_access_SOURCES = \
+tests/eo/access/access_inherit.c \
+tests/eo/access/access_inherit.h \
+tests/eo/access/access_main.c \
+tests/eo/access/access_simple.c \
+tests/eo/access/access_simple.h \
+tests/eo/access/access_simple_protected.h
+tests_eo_test_access_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_access_LDADD = @USE_EO_LIBS@
+tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_access
+
+tests_eo_test_composite_objects_SOURCES = \
+tests/eo/composite_objects/composite_objects_comp.c \
+tests/eo/composite_objects/composite_objects_comp.h \
+tests/eo/composite_objects/composite_objects_main.c \
+tests/eo/composite_objects/composite_objects_simple.c \
+tests/eo/composite_objects/composite_objects_simple.h
+tests_eo_test_composite_objects_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@
+tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_composite_objects
+
+tests_eo_test_constructors_SOURCES = \
+tests/eo/constructors/constructors_main.c \
+tests/eo/constructors/constructors_mixin.c \
+tests/eo/constructors/constructors_mixin.h \
+tests/eo/constructors/constructors_simple.c \
+tests/eo/constructors/constructors_simple.h \
+tests/eo/constructors/constructors_simple2.c \
+tests/eo/constructors/constructors_simple2.h \
+tests/eo/constructors/constructors_simple3.c \
+tests/eo/constructors/constructors_simple3.h \
+tests/eo/constructors/constructors_simple4.c \
+tests/eo/constructors/constructors_simple4.h \
+tests/eo/constructors/constructors_simple5.c \
+tests/eo/constructors/constructors_simple5.h \
+tests/eo/constructors/constructors_simple6.c \
+tests/eo/constructors/constructors_simple6.h \
+tests/eo/constructors/constructors_simple7.c \
+tests/eo/constructors/constructors_simple7.h
+tests_eo_test_constructors_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_constructors_LDADD = @USE_EO_LIBS@
+tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_constructors
+
+tests_eo_eo_suite_SOURCES = \
+tests/eo/suite/eo_test_class_simple.c \
+tests/eo/suite/eo_test_class_simple.h \
+tests/eo/suite/eo_test_class_singleton.c \
+tests/eo/suite/eo_test_class_singleton.h \
+tests/eo/suite/eo_test_domain.c \
+tests/eo/suite/eo_test_domain.h \
+tests/eo/suite/eo_suite.c \
+tests/eo/suite/eo_suite.h \
+tests/eo/suite/eo_error_msgs.h \
+tests/eo/suite/eo_error_msgs.c \
+tests/eo/suite/eo_test_class_errors.c \
+tests/eo/suite/eo_test_class_behaviour_errors.c \
+tests/eo/suite/eo_test_call_errors.c \
+tests/eo/suite/eo_test_general.c \
+tests/eo/suite/eo_test_value.c \
+tests/eo/suite/eo_test_event.c \
+tests/eo/suite/eo_test_threaded_calls.c \
+tests/eo/suite/eo_test_init.c \
+tests/eo/suite/eo_test_lifecycle.c \
+tests/eo/suite/eo_test_reflection.c
+
+tests_eo_eo_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \
+@CHECK_CFLAGS@ \
+@EO_CFLAGS@ \
+@VALGRIND_CFLAGS@
+
+tests_eo_eo_suite_LDADD = @CHECK_LIBS@ @USE_EO_LIBS@
+tests_eo_eo_suite_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+
+TESTS += tests/eo/eo_suite
+
+tests_eo_eo_suite_add_fallback_SOURCES = $(tests_eo_eo_suite_SOURCES)
+tests_eo_eo_suite_add_fallback_CPPFLAGS = $(tests_eo_eo_suite_CPPFLAGS) \
+                                          -D_EO_ADD_FALLBACK_FORCE=1
+tests_eo_eo_suite_add_fallback_LDADD = $(tests_eo_eo_suite_LDADD)
+tests_eo_eo_suite_add_fallback_DEPENDENCIES = $(tests_eo_eo_suite_DEPENDENCIES)
+
+TESTS += tests/eo/eo_suite_add_fallback
+
+tests_eo_test_function_overrides_SOURCES = \
+tests/eo/function_overrides/function_overrides_inherit.c \
+tests/eo/function_overrides/function_overrides_inherit.h \
+tests/eo/function_overrides/function_overrides_inherit2.c \
+tests/eo/function_overrides/function_overrides_inherit2.h \
+tests/eo/function_overrides/function_overrides_inherit3.c \
+tests/eo/function_overrides/function_overrides_inherit3.h \
+tests/eo/function_overrides/function_overrides_main.c \
+tests/eo/function_overrides/function_overrides_simple.c \
+tests/eo/function_overrides/function_overrides_simple.h
+tests_eo_test_function_overrides_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
+tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_function_overrides
+
+tests_eo_test_interface_SOURCES = \
+tests/eo/interface/interface_interface.c \
+tests/eo/interface/interface_interface.h \
+tests/eo/interface/interface_interface2.c \
+tests/eo/interface/interface_interface2.h \
+tests/eo/interface/interface_main.c \
+tests/eo/interface/interface_simple.c \
+tests/eo/interface/interface_simple.h
+tests_eo_test_interface_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_interface_LDADD = @USE_EO_LIBS@
+tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_interface
+
+tests_eo_test_mixin_SOURCES = \
+tests/eo/mixin/mixin_inherit.c \
+tests/eo/mixin/mixin_inherit.h \
+tests/eo/mixin/mixin_main.c \
+tests/eo/mixin/mixin_mixin.c \
+tests/eo/mixin/mixin_mixin.h \
+tests/eo/mixin/mixin_mixin2.c \
+tests/eo/mixin/mixin_mixin2.h \
+tests/eo/mixin/mixin_mixin3.c \
+tests/eo/mixin/mixin_mixin3.h \
+tests/eo/mixin/mixin_mixin4.c \
+tests/eo/mixin/mixin_mixin4.h \
+tests/eo/mixin/mixin_simple.c \
+tests/eo/mixin/mixin_simple.h
+tests_eo_test_mixin_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_mixin_LDADD = @USE_EO_LIBS@
+tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_mixin
+
+tests_eo_test_signals_SOURCES = \
+tests/eo/signals/signals_main.c \
+tests/eo/signals/signals_simple.c \
+tests/eo/signals/signals_simple.h
+tests_eo_test_signals_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+tests_eo_test_signals_LDADD = @USE_EO_LIBS@
+tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/test_signals
+
+endif
+
+
+EXTRA_DIST2 += \
+tests/eo/eunit_tests.h \
+tests/eo/suite/eo_test_reflection_complex_class_structure.c \
+tests/eo/suite/eo_test_reflection_complex_class_structure.h \
+lib/eo/eo_ptr_indirection.x
+
+if HAVE_JS
+
+generated_eo_js_bindings = $(eo_eolian_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_eo_js_bindings)
+
+endif
+
+if HAVE_CXX
+
+eo_eolian_cxx_hh = $(eo_eolian_files:%.eo=%.eo.hh)
+eo_eolian_cxx_impl_hh = $(eo_eolian_files:%.eo=%.eo.impl.hh)
+
+endif
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
new file mode 100644
index 0000000000..0336b7f5c2
--- /dev/null
+++ b/src/Makefile_Eolian.am
@@ -0,0 +1,171 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/eolian/libeolian.la
+
+installed_eolianmainheadersdir = $(includedir)/eolian-@VMAJ@
+dist_installed_eolianmainheaders_DATA = lib/eolian/Eolian.h lib/eolian/Eolian_Aux.h
+
+lib_eolian_libeolian_la_SOURCES = \
+                                  lib/eolian/eo_lexer.c \
+                                  lib/eolian/eo_lexer.h \
+                                  lib/eolian/eo_parser.c \
+                                  lib/eolian/eo_parser.h \
+                                  lib/eolian/eolian.c \
+                                  lib/eolian/eolian_priv.h \
+                                  lib/eolian/eolian_database.c \
+                                  lib/eolian/eolian_database.h \
+                                  lib/eolian/database_class.c \
+                                  lib/eolian/database_class_api.c \
+                                  lib/eolian/database_function.c \
+                                  lib/eolian/database_function_api.c \
+                                  lib/eolian/database_function_parameter.c \
+                                  lib/eolian/database_function_parameter_api.c \
+                                  lib/eolian/database_type.c \
+                                  lib/eolian/database_type_api.c \
+                                  lib/eolian/database_implement.c \
+                                  lib/eolian/database_implement_api.c \
+                                  lib/eolian/database_constructor.c \
+                                  lib/eolian/database_constructor_api.c \
+                                  lib/eolian/database_event.c \
+                                  lib/eolian/database_event_api.c \
+                                  lib/eolian/database_part.c \
+                                  lib/eolian/database_part_api.c \
+                                  lib/eolian/database_expr.c \
+                                  lib/eolian/database_expr_api.c \
+                                  lib/eolian/database_var.c \
+                                  lib/eolian/database_var_api.c \
+                                  lib/eolian/database_validate.c \
+                                  lib/eolian/database_check.c \
+                                  lib/eolian/eolian_aux.c
+
+lib_eolian_libeolian_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@ \
+        -DEFL_BUILD \
+	-DPACKAGE_DATA_DIR=\"$(datadir)/eolian\"
+
+lib_eolian_libeolian_la_LIBADD = @EOLIAN_LIBS@
+lib_eolian_libeolian_la_DEPENDENCIES = @EOLIAN_INTERNAL_LIBS@
+lib_eolian_libeolian_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+### Binary
+
+bin_PROGRAMS += \
+                bin/eolian/eolian_gen
+
+bin_eolian_eolian_gen_SOURCES = \
+                bin/eolian/main.c \
+                bin/eolian/main.h \
+                bin/eolian/types.c \
+                bin/eolian/types.h \
+                bin/eolian/headers.c \
+                bin/eolian/headers.h \
+                bin/eolian/sources.c \
+                bin/eolian/sources.h \
+                bin/eolian/docs.c \
+                bin/eolian/docs.h
+
+bin_eolian_eolian_gen_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
+bin_eolian_eolian_gen_LDADD = @USE_EOLIAN_LIBS@
+bin_eolian_eolian_gen_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+
+### Helper for other modules using Eolian
+include Makefile_Eolian_Helper.am
+
+### Unit tests
+
+
+EOLIAN_TESTS_EOS = \
+tests/eolian/data/base.eo \
+tests/eolian/data/class_funcs.eo \
+tests/eolian/data/class_simple.eo \
+tests/eolian/data/complex_type.eo \
+tests/eolian/data/consts.eo \
+tests/eolian/data/ctor_dtor.eo \
+tests/eolian/data/eo_docs.eo \
+tests/eolian/data/enum.eo \
+tests/eolian/data/events.eo \
+tests/eolian/data/extern.eo \
+tests/eolian/data/free_func.eo \
+tests/eolian/data/function_as_argument.eo \
+tests/eolian/data/import.eo \
+tests/eolian/data/nmsp1_class1.eo \
+tests/eolian/data/nmsp1_nmsp11_class2.eo \
+tests/eolian/data/nmsp2_class1.eo \
+tests/eolian/data/no_nmsp.eo \
+tests/eolian/data/object_impl.eo \
+tests/eolian/data/object_impl_add.eo \
+tests/eolian/data/override.eo \
+tests/eolian/data/owning.eo \
+tests/eolian/data/parts.eo \
+tests/eolian/data/scope.eo \
+tests/eolian/data/struct.eo \
+tests/eolian/data/typedef.eo \
+tests/eolian/data/var.eo \
+tests/eolian/data/function_types.eot \
+tests/eolian/data/import_types.eot \
+tests/eolian/data/class_requires.eo \
+tests/eolian/data/mixins_require.eo \
+tests/eolian/data/iface.eo \
+tests/eolian/data/unimpl.eo \
+tests/eolian/data_aux/aux_a.eo \
+tests/eolian/data_aux/aux_b.eo \
+tests/eolian/data_aux/aux_c.eo
+
+if EFL_ENABLE_TESTS
+check_PROGRAMS += \
+tests/eolian/eolian_suite
+
+tests_eolian_eolian_suite_SOURCES = \
+tests/eolian/eolian_parsing.c \
+tests/eolian/eolian_aux.c \
+tests/eolian/eolian_static.c \
+tests/eolian/eolian_generation.c \
+tests/eolian/eolian_generated_future.c \
+tests/eolian/eolian_suite.c \
+tests/eolian/eolian_suite.h
+
+
+if HAVE_AM_16
+TESTS_EOLIAN_OBJNAME = 
+else
+TESTS_EOLIAN_OBJNAME = tests_eolian_
+endif
+
+tests/eolian/$(TESTS_EOLIAN_OBJNAME)eolian_suite-eolian_generated_future.$(OBJEXT): tests/eolian/generated_future.eo.h tests/eolian/generated_future.eo.c
+
+CLEANFILES += tests/eolian/generated_future.eo.h tests/eolian/generated_future.eo.c
+
+tests_eolian_eolian_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/tests/eolian \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian\" \
+-DEO_SRC_DIR=\"$(top_srcdir)/src/lib\" \
+-DEOLIAN_GEN="\"$(EOLIAN_GEN)\"" \
+@CHECK_CFLAGS@ \
+@EOLIAN_CFLAGS@ @EO_CFLAGS@
+TESTS += tests/eolian/eolian_suite
+
+tests_eolian_eolian_suite_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@ @USE_EO_LIBS@
+tests_eolian_eolian_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
+
+endif
+
+EXTRA_DIST2 += \
+tests/eolian/data/object_impl_ref.c \
+tests/eolian/data/object_impl_add_ref.c \
+tests/eolian/data/typedef_ref.h \
+tests/eolian/data/typedef_ref_stub.h \
+tests/eolian/data/struct_ref.h \
+tests/eolian/data/struct_ref_stub.h \
+tests/eolian/data/owning_ref.c \
+tests/eolian/data/class_simple_ref.c \
+tests/eolian/data/override_ref.c \
+tests/eolian/data/class_simple_ref_eo.h \
+tests/eolian/data/import_types_ref.h \
+tests/eolian/data/docs_ref.h \
+tests/eolian/data/function_types_ref.h \
+tests/eolian/data/function_as_argument_impl_ref.c \
+tests/eolian/data/function_as_argument_ref.c \
+tests/eolian/data/function_as_argument_ref.h \
+tests/eolian/generated_future.eo \
+$(EOLIAN_TESTS_EOS)
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
new file mode 100644
index 0000000000..8ae97279af
--- /dev/null
+++ b/src/Makefile_Eolian_Cxx.am
@@ -0,0 +1,218 @@
+
+### Library
+
+installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
+dist_installed_eoliancxxmainheaders_DATA = \
+lib/eolian_cxx/Eolian_Cxx.hh
+
+installed_eoliancxxgrammarheadersdir = $(includedir)/eolian-cxx-@VMAJ@/grammar/
+dist_installed_eoliancxxgrammarheaders_DATA = \
+lib/eolian_cxx/grammar/address_of.hpp \
+lib/eolian_cxx/grammar/alternative.hpp \
+lib/eolian_cxx/grammar/attribute_conditional.hpp \
+lib/eolian_cxx/grammar/attribute_reorder.hpp \
+lib/eolian_cxx/grammar/attribute_replace.hpp \
+lib/eolian_cxx/grammar/attributes.hpp \
+lib/eolian_cxx/grammar/blacklist.hpp \
+lib/eolian_cxx/grammar/base_class_definition.hpp \
+lib/eolian_cxx/grammar/case.hpp \
+lib/eolian_cxx/grammar/class_declaration.hpp \
+lib/eolian_cxx/grammar/class_definition.hpp \
+lib/eolian_cxx/grammar/class_implementation.hpp \
+lib/eolian_cxx/grammar/container.hpp \
+lib/eolian_cxx/grammar/context.hpp \
+lib/eolian_cxx/grammar/converting_argument.hpp \
+lib/eolian_cxx/grammar/c_type.hpp \
+lib/eolian_cxx/grammar/eps.hpp \
+lib/eolian_cxx/grammar/function_declaration.hpp \
+lib/eolian_cxx/grammar/function_definition.hpp \
+lib/eolian_cxx/grammar/generator.hpp \
+lib/eolian_cxx/grammar/header_guards.hpp \
+lib/eolian_cxx/grammar/header.hpp \
+lib/eolian_cxx/grammar/header_include_directive.hpp \
+lib/eolian_cxx/grammar/html_escaped_string.hpp \
+lib/eolian_cxx/grammar/implementation_include_directive.hpp \
+lib/eolian_cxx/grammar/impl_header.hpp \
+lib/eolian_cxx/grammar/indentation.hpp \
+lib/eolian_cxx/grammar/integral.hpp \
+lib/eolian_cxx/grammar/keyword.hpp \
+lib/eolian_cxx/grammar/klass_def.hpp \
+lib/eolian_cxx/grammar/kleene.hpp \
+lib/eolian_cxx/grammar/list.hpp \
+lib/eolian_cxx/grammar/meta.hpp \
+lib/eolian_cxx/grammar/namespace.hpp \
+lib/eolian_cxx/grammar/parameter.hpp \
+lib/eolian_cxx/grammar/part_declaration.hpp \
+lib/eolian_cxx/grammar/part_implementation.hpp \
+lib/eolian_cxx/grammar/qualifier_def.hpp \
+lib/eolian_cxx/grammar/sequence.hpp \
+lib/eolian_cxx/grammar/string.hpp \
+lib/eolian_cxx/grammar/type_function_declaration.hpp \
+lib/eolian_cxx/grammar/type.hpp \
+lib/eolian_cxx/grammar/type_impl.hpp \
+lib/eolian_cxx/grammar/types_definition.hpp \
+lib/eolian_cxx/grammar/type_traits.hpp
+
+### Binary
+if HAVE_CXX
+
+bin_PROGRAMS += bin/eolian_cxx/eolian_cxx
+
+bin_eolian_cxx_eolian_cxx_SOURCES = \
+    bin/eolian_cxx/eolian_cxx.cc
+
+bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eolian_cxx/ \
+@CHECK_CFLAGS@ @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_CXX_CFLAGS@ @EO_CFLAGS@ \
+-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
+@EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@
+
+bin_eolian_cxx_eolian_cxx_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
+
+bin_eolian_cxx_eolian_cxx_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/eolian_cxx/eolian_cxx_suite
+TESTS += tests/eolian_cxx/eolian_cxx_suite
+
+tests_eolian_cxx_eolian_cxx_suite_SOURCES = \
+tests/eolian_cxx/eolian_cxx_suite.cc \
+tests/eolian_cxx/eolian_cxx_test_parse.cc \
+tests/eolian_cxx/a.c \
+tests/eolian_cxx/b.c \
+tests/eolian_cxx/c.c \
+tests/eolian_cxx/eolian_cxx_test_binding.cc \
+tests/eolian_cxx/eolian_cxx_test_address_of.cc \
+tests/eolian_cxx/eolian_cxx_test_wrapper.cc \
+tests/eolian_cxx/simple.c \
+tests/eolian_cxx/name_name.c \
+tests/eolian_cxx/name_name_cxx.cc \
+tests/eolian_cxx/generic.c \
+tests/eolian_cxx/name1_name2_type_generation.c \
+tests/eolian_cxx/eolian_cxx_test_inheritance.cc \
+tests/eolian_cxx/eolian_cxx_test_generate.cc \
+tests/eolian_cxx/eolian_cxx_test_documentation.cc \
+tests/eolian_cxx/eolian_cxx_test_cyclic.cc \
+tests/eolian_cxx/complex.c \
+tests/eolian_cxx/complex_cxx.cc \
+tests/eolian_cxx/beta_class.eo \
+tests/eolian_cxx/eolian_cxx_suite.h
+
+if HAVE_AM_16
+TESTS_EOLIAN_CXX_OBJNAME = 
+else
+TESTS_EOLIAN_CXX_OBJNAME = tests_eolian_cxx_
+endif
+
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-name1_name2_type_generation.$(OBJEXT): tests/eolian_cxx/name1_name2_type_generation.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.c
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-eolian_cxx_test_inheritance.$(OBJEXT): tests/eolian_cxx/simple.eo.hh tests/eolian_cxx/simple.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-eolian_cxx_test_binding.$(OBJEXT): tests/eolian_cxx/generic.eo.hh tests/eolian_cxx/generic.eo.h tests/eolian_cxx/generic.eo.c tests/eolian_cxx/generic_interface.eo.hh tests/eolian_cxx/generic_interface.eo.h tests/eolian_cxx/generic_interface.eo.c tests/eolian_cxx/name1_name2_type_generation.eo.hh tests/eolian_cxx/name1_name2_type_generation.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.c
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-eolian_cxx_test_address_of.$(OBJEXT): tests/eolian_cxx/a.eo.hh tests/eolian_cxx/b.eo.hh tests/eolian_cxx/c.eo.hh tests/eolian_cxx/a.eo.h tests/eolian_cxx/b.eo.h tests/eolian_cxx/c.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-eolian_cxx_test_cyclic.$(OBJEXT): tests/eolian_cxx/cyclic1.eo.hh tests/eolian_cxx/cyclic2.eo.hh tests/eolian_cxx/cyclic1.eo.c tests/eolian_cxx/cyclic2.eo.c tests/eolian_cxx/cyclic1.eo.h tests/eolian_cxx/cyclic2.eo.h
+
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-eolian_cxx_test_wrapper.$(OBJEXT): tests/eolian_cxx/a.eo.h tests/eolian_cxx/a.eo.c tests/eolian_cxx/a.eo.hh
+
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-simple.$(OBJEXT): tests/eolian_cxx/simple.eo.c tests/eolian_cxx/simple.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-generic.$(OBJEXT): tests/eolian_cxx/generic.eo.c tests/eolian_cxx/generic.eo.h tests/eolian_cxx/generic_interface.eo.c tests/eolian_cxx/generic_interface.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-a.$(OBJEXT): tests/eolian_cxx/a.eo.c tests/eolian_cxx/a.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-b.$(OBJEXT): tests/eolian_cxx/b.eo.c tests/eolian_cxx/b.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-c.$(OBJEXT): tests/eolian_cxx/c.eo.c tests/eolian_cxx/c.eo.h
+
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-name_name.$(OBJEXT): tests/eolian_cxx/name_name.eo.c tests/eolian_cxx/name_name.eo.h tests/eolian_cxx/ns_name.eo.c tests/eolian_cxx/ns_name.eo.h tests/eolian_cxx/ns_name_other.eo.c tests/eolian_cxx/ns_name_other.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-name_name_cxx.$(OBJEXT): tests/eolian_cxx/name_name.eo.h tests/eolian_cxx/name_name.eo.hh tests/eolian_cxx/ns_name.eo.h tests/eolian_cxx/ns_name.eo.hh tests/eolian_cxx/ns_name_other.eo.h tests/eolian_cxx/ns_name_other.eo.hh
+
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-complex.$(OBJEXT): tests/eolian_cxx/complex.eo.c tests/eolian_cxx/complex.eo.h
+tests/eolian_cxx/$(TESTS_EOLIAN_CXX_OBJNAME)eolian_cxx_suite-complex_cxx.$(OBJEXT): tests/eolian_cxx/complex.eo.h tests/eolian_cxx/complex.eo.hh
+
+CLEANFILES += \
+tests/eolian_cxx/simple.eo.c \
+tests/eolian_cxx/simple.eo.h \
+tests/eolian_cxx/simple.eo.hh \
+tests/eolian_cxx/simple.eo.impl.hh \
+tests/eolian_cxx/generic.eo.c \
+tests/eolian_cxx/generic.eo.h \
+tests/eolian_cxx/generic.eo.hh \
+tests/eolian_cxx/generic.eo.impl.hh \
+tests/eolian_cxx/generic_interface.eo.c \
+tests/eolian_cxx/generic_interface.eo.h \
+tests/eolian_cxx/generic_interface.eo.hh \
+tests/eolian_cxx/generic_interface.eo.impl.hh \
+tests/eolian_cxx/a.eo.hh tests/eolian_cxx/a.eo.impl.hh tests/eolian_cxx/a.eo.c tests/eolian_cxx/a.eo.h \
+tests/eolian_cxx/b.eo.hh tests/eolian_cxx/b.eo.impl.hh tests/eolian_cxx/b.eo.c tests/eolian_cxx/b.eo.h \
+tests/eolian_cxx/c.eo.hh tests/eolian_cxx/c.eo.impl.hh tests/eolian_cxx/c.eo.c tests/eolian_cxx/c.eo.h \
+tests/eolian_cxx/name_name.eo.hh \
+tests/eolian_cxx/name_name.eo.c \
+tests/eolian_cxx/name_name.eo.h \
+tests/eolian_cxx/name_name.eo.impl.hh \
+tests/eolian_cxx/ns_name.eo.hh \
+tests/eolian_cxx/ns_name.eo.c \
+tests/eolian_cxx/ns_name.eo.h \
+tests/eolian_cxx/ns_name.eo.impl.hh \
+tests/eolian_cxx/ns_name_other.eo.hh \
+tests/eolian_cxx/ns_name_other.eo.c \
+tests/eolian_cxx/ns_name_other.eo.h \
+tests/eolian_cxx/ns_name_other.eo.impl.hh \
+tests/eolian_cxx/complex.eo.hh \
+tests/eolian_cxx/complex.eo.c \
+tests/eolian_cxx/complex.eo.h \
+tests/eolian_cxx/complex.eo.impl.hh \
+tests/eolian_cxx/name1_name2_type_generation.eo.hh \
+tests/eolian_cxx/name1_name2_type_generation.eo.impl.hh \
+tests/eolian_cxx/name1_name2_type_generation.eo.h \
+tests/eolian_cxx/name1_name2_type_generation.eo.c \
+tests/eolian_cxx/cyclic1.eo.c \
+tests/eolian_cxx/cyclic1.eo.h \
+tests/eolian_cxx/cyclic1.eo.hh \
+tests/eolian_cxx/cyclic1.eo.impl.hh \
+tests/eolian_cxx/cyclic2.eo.c \
+tests/eolian_cxx/cyclic2.eo.h \
+tests/eolian_cxx/cyclic2.eo.hh \
+tests/eolian_cxx/cyclic2.eo.impl.hh
+
+tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_srcdir)/src/bin/eolian_cxx \
+-I$(top_builddir)/src/tests/eolian_cxx \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian_cxx\" \
+-DEO_SRC_DIR=\"$(top_srcdir)/src/lib\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/eolian_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian_cxx\" \
+@CHECK_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ \
+@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ \
+@EO_CXX_CFLAGS@ @ECORE_CXX_CFLAGS@
+
+tests_eolian_cxx_eolian_cxx_suite_CFLAGS = ${tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS}
+tests_eolian_cxx_eolian_cxx_suite_CPPFLAGS = ${tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS}
+tests_eolian_cxx_eolian_cxx_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_ECORE_LIBS@ @USE_EOLIAN_LIBS@
+tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+
+endif
+endif
+
+EXTRA_DIST2 += \
+tests/eolian_cxx/simple.eo \
+tests/eolian_cxx/generic.eo \
+tests/eolian_cxx/generic_interface.eo \
+tests/eolian_cxx/docs.eo \
+tests/eolian_cxx/a.eo \
+tests/eolian_cxx/b.eo \
+tests/eolian_cxx/c.eo \
+tests/eolian_cxx/name_name.eo \
+tests/eolian_cxx/ns_name.eo \
+tests/eolian_cxx/ns_name_other.eo \
+tests/eolian_cxx/name1_name2_type_generation.eo \
+tests/eolian_cxx/complex.eo \
+tests/eolian_cxx/property_holder.eo \
+tests/eolian_cxx/cyclic1.eo \
+tests/eolian_cxx/cyclic2.eo
+
+include Makefile_Eolian_Cxx_Helper.am
+
diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am
new file mode 100644
index 0000000000..eb28a54e43
--- /dev/null
+++ b/src/Makefile_Eolian_Cxx_Helper.am
@@ -0,0 +1,23 @@
+if HAVE_EOLIAN_CXX
+EOLIAN_CXX = @eolian_cxx@
+_EOLIAN_CXX_DEP = @eolian_cxx@
+else
+EOLIAN_CXX = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian_cxx/eolian_cxx$(EXEEXT)
+_EOLIAN_CXX_DEP = bin/eolian_cxx/eolian_cxx$(EXEEXT)
+endif
+
+AM_V_EOLCXX = $(am__v_EOLCXX_@AM_V@)
+am__v_EOLCXX_ = $(am__v_EOLCXX_@AM_DEFAULT_V@)
+am__v_EOLCXX_0 = @echo "  EOLCXX  " $@;
+
+SUFFIXES += .eo.hh
+
+
+#disable rules for subdir builds to avoid recursive dependencies
+../%.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
+../%.eo.impl.hh: %.eo $(_EOLIAN_CXX_DEP)
+
+%.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
+	$(AM_V_EOLCXX) \
+	$(MKDIR_P) $(@D); \
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $<
diff --git a/src/Makefile_Eolian_Files_Helper.am b/src/Makefile_Eolian_Files_Helper.am
new file mode 100644
index 0000000000..727e0ad229
--- /dev/null
+++ b/src/Makefile_Eolian_Files_Helper.am
@@ -0,0 +1,27 @@
+
+AM_V_EOL = $(am__v_EOL_@AM_V@)
+am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
+am__v_EOL_0 = @echo "  EOLIAN  " $@;
+
+SUFFIXES = .eo .eo.c .eo.h .eot .eot.h
+
+
+#disable rules for subdir builds to avoid recursive dependencies
+../%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
+../%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
+../%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
+
+%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
+	$(AM_V_EOL) \
+	$(MKDIR_P) $(@D); \
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gc -o c:$@ $<
+
+%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
+	$(AM_V_EOL) \
+	$(MKDIR_P) $(@D); \
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gh -o h:$@ $<
+
+%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
+	$(AM_V_EOL) \
+	$(MKDIR_P) $(@D); \
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gh -o h:$@ $<
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
new file mode 100644
index 0000000000..ddf09e54a4
--- /dev/null
+++ b/src/Makefile_Eolian_Helper.am
@@ -0,0 +1,9 @@
+if HAVE_EOLIAN_GEN
+EOLIAN_GEN = @eolian_gen@
+_EOLIAN_GEN_DEP = @eolian_gen@
+else
+EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
+_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
+endif
+
+include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
diff --git a/src/Makefile_Eolian_Js.am b/src/Makefile_Eolian_Js.am
new file mode 100644
index 0000000000..7e4e760e25
--- /dev/null
+++ b/src/Makefile_Eolian_Js.am
@@ -0,0 +1,138 @@
+
+if HAVE_JS
+
+### Binary
+bin_PROGRAMS += bin/eolian_js/eolian_js
+
+bin_eolian_js_eolian_js_SOURCES = \
+    bin/eolian_js/main.cc
+
+bin_eolian_js_eolian_js_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/bin/eolian_js \
+-I$(top_srcdir)/src/bindings/js/eina_js \
+-I$(top_srcdir)/src/bindings/js/eo_js \
+@EOLIAN_JS_CFLAGS@ \
+@EINA_CXX_CFLAGS@ \
+@EO_CXX_CFLAGS@ \
+@EFL_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
+@EOLIAN_CXX_CFLAGS@
+
+bin_eolian_js_eolian_js_LDADD = @USE_EO_LIBS@ @USE_EOLIAN_LIBS@
+bin_eolian_js_eolian_js_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ @USE_EOLIAN_INTERNAL_LIBS@
+
+# generate C++ bindings before compiling C++ files for JS binding
+if HAVE_AM_16
+bin/eolian_js/eolian_js-main.$(OBJEXT): $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh)
+else
+bin/eolian_js/bin_eolian_js_eolian_js-main.$(OBJEXT): $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh)
+endif
+include Makefile_Eolian_Js_Helper.am
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+if HAVE_NODEJS
+
+TESTS += tests/eolian_js/eolian_js_suite.sh
+
+check_LTLIBRARIES += tests/eolian_js/libeolian_js_suite.la
+
+tests/eolian_js/eolian_js_suite.sh: tests/eolian_js/eolian_js_suite_mod.node
+tests/eolian_js/eolian_js_suite_mod.node: tests/eolian_js/libeolian_js_suite.la
+	$(AM_V_CP)$(CP) $(top_builddir)/src/tests/eolian_js/.libs/libeolian_js_suite.so $(top_builddir)/src/tests/eolian_js/eolian_js_suite_mod.node
+
+tests_eolian_js_libeolian_js_suite_la_SOURCES = \
+tests/eolian_js/eolian_js_suite.cc \
+tests/eolian_js/eolian_js_test_eolian_js_binding.cc \
+tests/eolian_js/eolian_js_test_constructor_method_impl.c \
+tests/eolian_js/eolian_js_test_test_object_impl.c
+
+tests_eolian_js_libeolian_js_suite_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/bin/eolian_js \
+-I$(top_srcdir)/src/bindings/js/eina_js \
+-I$(top_srcdir)/src/bindings/js/eo_js \
+-I$(top_builddir)/src/tests/eolian_js \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian_js\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eolian_js\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eolian_js\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian_js\" \
+@CHECK_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EINA_JS_CFLAGS@ @EO_JS_CFLAGS@ \
+@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \
+@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_CXX_CFLAGS@
+tests_eolian_js_libeolian_js_suite_la_LIBADD = \
+HECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ bindings/js/efl_js/libefl_js.la
+tests_eolian_js_libeolian_js_suite_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ 
+tests_eolian_js_libeolian_js_suite_la_CFLAGS = $(tests_eolian_js_libeolian_js_suite_la_CXXFLAGS)
+tests_eolian_js_libeolian_js_suite_la_LIBTOOLFLAGS = --tag=disable-static
+tests_eolian_js_libeolian_js_suite_la_LDFLAGS = -rpath $(abs_top_builddir)/src/tests/eolian_js -rpath $(abs_top_builddir)/src/bin/efl_js @EFL_LTLIBRARY_FLAGS@
+
+# if compiler_o_lo == yes, lo, otherwise $(OBJEXT)
+
+if HAVE_AM_16
+TESTS_EOLIAN_JS_OBJNAME = 
+else
+TESTS_EOLIAN_JS_OBJNAME = tests_eolian_js_
+endif
+tests/eolian_js/$(TESTS_EOLIAN_JS_OBJNAME)libeolian_js_suite_la-eolian_js_test_eolian_js_binding.l$(OBJEXT): tests/eolian_js/constructor_method_class.eo.js.cc tests/eolian_js/constructor_method_class.eo.h tests/eolian_js/test_object.eo.js.cc tests/eolian_js/test_object.eo.h
+tests/eolian_js/$(TESTS_EOLIAN_JS_OBJNAME)libeolian_js_suite_la-eolian_js_test_constructor_method_impl.l$(OBJEXT): tests/eolian_js/constructor_method_class.eo.c
+tests/eolian_js/$(TESTS_EOLIAN_JS_OBJNAME)libeolian_js_suite_la-eolian_js_test_test_object_impl.l$(OBJEXT): tests/eolian_js/test_object.eo.c
+
+
+CLEANFILES += \
+tests/eolian_js/constructor_method_class.eo.js.cc \
+tests/eolian_js/constructor_method_class.eo.c \
+tests/eolian_js/constructor_method_class.eo.h \
+tests/eolian_js/test_object.eo.js.cc \
+tests/eolian_js/test_object.eo.c \
+tests/eolian_js/test_object.eo.h
+else
+check_PROGRAMS += tests/eolian_js/eolian_js_suite
+TESTS += tests/eolian_js/eolian_js_suite
+
+tests_eolian_js_eolian_js_suite_SOURCES = \
+tests/eolian_js/eolian_js_suite.cc \
+tests/eolian_js/eolian_js_test_eolian_js_binding.cc \
+tests/eolian_js/eolian_js_test_constructor_method_impl.c \
+tests/eolian_js/eolian_js_test_test_object_impl.c
+
+tests/eolian_js/$(TESTS_EOLIAN_JS_OBJNAME)eolian_js_suite-eolian_js_test_eolian_js_binding.$(OBJEXT): tests/eolian_js/constructor_method_class.eo.js.cc tests/eolian_js/constructor_method_class.eo.h tests/eolian_js/test_object.eo.js.cc tests/eolian_js/test_object.eo.h
+tests/eolian_js/$(TESTS_EOLIAN_JS_OBJNAME)eolian_js_suite-eolian_js_test_constructor_method_impl.$(OBJEXT): tests/eolian_js/constructor_method_class.eo.c
+tests/eolian_js/$(TESTS_EOLIAN_JS_OBJNAME)eolian_js_suite-eolian_js_test_test_object_impl.$(OBJEXT): tests/eolian_js/test_object.eo.c
+
+CLEANFILES += \
+tests/eolian_js/constructor_method_class.eo.js.cc \
+tests/eolian_js/constructor_method_class.eo.c \
+tests/eolian_js/constructor_method_class.eo.h \
+tests/eolian_js/test_object.eo.js.cc \
+tests/eolian_js/test_object.eo.c \
+tests/eolian_js/test_object.eo.h
+
+tests_eolian_js_eolian_js_suite_CPPFLAGS = 	\
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/bin/eolian_js \
+-I$(top_srcdir)/src/bindings/js/eina_js \
+-I$(top_srcdir)/src/bindings/js/eo_js \
+-I$(top_builddir)/src/tests/eolian_js \
+-I$(top_srcdir)/src/tests/efl_js \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian_js\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eolian_js\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian_js\" \
+@CHECK_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EINA_JS_CFLAGS@ @EO_JS_CFLAGS@ @EFL_JS_CFLAGS@ \
+@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \
+@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ @EFL_JS_CFLAGS@ @ECORE_CXX_CFLAGS@
+
+tests_eolian_js_eolian_js_suite_LDADD = \
+@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EVAS_LIBS@ bin/efl_js/efl.node
+tests_eolian_js_eolian_js_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@
+endif
+endif
+
+endif
+
+
+
diff --git a/src/Makefile_Eolian_Js_Helper.am b/src/Makefile_Eolian_Js_Helper.am
new file mode 100644
index 0000000000..e96db1a352
--- /dev/null
+++ b/src/Makefile_Eolian_Js_Helper.am
@@ -0,0 +1,18 @@
+#if HAVE_EOLIAN_JS
+#EOLIAN_JS = @eolian_js@
+#_EOLIAN_JS_DEP = @eolian_js@
+#else
+EOLIAN_JS = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian_js/eolian_js${EXEEXT}
+_EOLIAN_JS_DEP = bin/eolian_js/eolian_js${EXEEXT}
+#endif
+
+AM_V_EOLJS = $(am__v_EOLJS_@AM_V@)
+am__v_EOLJS_ = $(am__v_EOLJS_@AM_DEFAULT_V@)
+am__v_EOLJS_0 = @echo "  EOLJS  " $@;
+
+SUFFIXES += .eo.js.cc
+
+%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP)
+	$(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $<
+
+../%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP)
diff --git a/src/Makefile_Eolian_Mono_Helper.am b/src/Makefile_Eolian_Mono_Helper.am
new file mode 100644
index 0000000000..3ada3b2a0b
--- /dev/null
+++ b/src/Makefile_Eolian_Mono_Helper.am
@@ -0,0 +1,21 @@
+### Helper for other modules using Eolian_Mono, include only after Makefile_Eolian_Helper.am
+
+if HAVE_EOLIAN_MONO
+EOLIAN_MONO = @eolian_mono@
+_EOLIAN_MONO_DEP = @eolian_mono@
+else
+EOLIAN_MONO = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian_mono/eolian_mono${EXEEXT}
+_EOLIAN_MONO_DEP = bin/eolian_mono/eolian_mono${EXEEXT}
+endif
+
+if HAVE_CSHARP_BETA
+EOLIAN_MONO_FLAGS = -b -M @VMAJ@ -m @VMIN@
+else
+EOLIAN_MONO_FLAGS = -M @VMAJ@ -m @VMIN@
+endif
+
+AM_V_EOLMONO = $(am__v_EOLMONO_@AM_V@)
+am__v_EOLMONO_ = $(am__v_EOLMONO_@AM_DEFAULT_V@)
+am__v_EOLMONO_0 = @echo "  EOLMONO  " $@;
+
+SUFFIXES += .eo.cs
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
new file mode 100644
index 0000000000..6a2062bc06
--- /dev/null
+++ b/src/Makefile_Escape.am
@@ -0,0 +1,27 @@
+if HAVE_PS3
+
+### 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_builddir)/src/lib/efl @ESCAPE_CFLAGS@
+lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
+lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@
+lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+endif
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
new file mode 100644
index 0000000000..6d9f0cb0ce
--- /dev/null
+++ b/src/Makefile_Ethumb.am
@@ -0,0 +1,88 @@
+### Library
+
+lib_LTLIBRARIES += \
+lib/ethumb/libethumb.la
+
+installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
+dist_installed_ethumbmainheaders_DATA = \
+lib/ethumb/Ethumb.h
+
+lib_ethumb_libethumb_la_SOURCES = \
+lib/ethumb/Ethumb_Plugin.h \
+lib/ethumb/ethumb_private.h \
+lib/ethumb/md5.h \
+lib/ethumb/ethumb.c \
+lib/ethumb/md5.c \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@ETHUMB_CFLAGS@
+lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
+lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
+lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+## Modules
+
+# Emotion
+if BUILD_LOADER_PNG
+ethumbmoduleemotiondir = $(libdir)/ethumb/modules/emotion/$(MODULE_ARCH)
+ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_ethumbmoduleemotionLTLIBRARIES = install-ethumbmoduleemotionLTLIBRARIES
+$(install_ethumbmoduleemotionLTLIBRARIES): install-libLTLIBRARIES
+
+modules_ethumb_emotion_module_la_SOURCES = \
+modules/ethumb/emotion/emotion.c
+modules_ethumb_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DEFL_BUILD \
+@EMOTION_CFLAGS@ \
+@ETHUMB_CFLAGS@
+modules_ethumb_emotion_module_la_LIBADD = \
+@USE_EMOTION_LIBS@ \
+@USE_ETHUMB_LIBS@
+modules_ethumb_emotion_module_la_DEPENDENCIES = \
+@USE_EMOTION_INTERNAL_LIBS@ \
+@USE_ETHUMB_INTERNAL_LIBS@
+modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules/ethumb/emotion/placeholder.png bin/edje/edje_cc${EXEEXT}
+	$(AM_V_EDJ) \
+	$(MKDIR_P) modules/ethumb/emotion; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/modules/ethumb/emotion $< $@
+
+ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
+CLEANFILES += modules/ethumb/emotion/template.edj
+endif
+
+EXTRA_DIST2 += \
+modules/ethumb/emotion/template.edc \
+modules/ethumb/emotion/placeholder.png
+
+
+### Binary
+
+bin_PROGRAMS += \
+bin/ethumb/ethumb
+
+bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
+bin_ethumb_ethumb_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CFLAGS@
+if HAVE_WIN32
+bin_ethumb_ethumb_LDADD = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_LIBS@
+else
+bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
+endif
+bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
diff --git a/src/Makefile_Ethumb_Client.am b/src/Makefile_Ethumb_Client.am
new file mode 100644
index 0000000000..a319f5da02
--- /dev/null
+++ b/src/Makefile_Ethumb_Client.am
@@ -0,0 +1,57 @@
+### Library
+
+lib_LTLIBRARIES += \
+lib/ethumb_client/libethumb_client.la
+
+installed_ethumbclientmainheadersdir = $(includedir)/ethumb-client-@VMAJ@
+dist_installed_ethumbclientmainheaders_DATA = \
+lib/ethumb_client/Ethumb_Client.h
+
+# libethumb_client.la
+lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c
+lib_ethumb_client_libethumb_client_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@ -DEFL_BUILD
+lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
+lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
+lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+
+### Binary
+
+if HAVE_WIN32
+USE_ETHUMB_CLIENT_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_CLIENT_LIBS@
+else
+USE_ETHUMB_CLIENT_BIN_LIBS = @USE_ETHUMB_CLIENT_LIBS@
+endif
+
+bin_PROGRAMS += \
+bin/ethumb_client/ethumbd \
+bin/ethumb_client/ethumbd_client
+
+ethumbclientinternal_bindir=$(libdir)/ethumb_client/utils/$(MODULE_ARCH)
+ethumbclientinternal_bin_PROGRAMS = \
+bin/ethumb_client/ethumbd_slave
+
+bin_ethumb_client_ethumbd_SOURCES = \
+bin/ethumb_client/ethumbd_private.h \
+bin/ethumb_client/ethumbd.c
+bin_ethumb_client_ethumbd_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+@ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_client_ethumbd_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
+bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
+
+bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
+bin_ethumb_client_ethumbd_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_client_ethumbd_client_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
+bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
+
+# slave does not use dbus, it's a simple ethumb application
+bin_ethumb_client_ethumbd_slave_SOURCES = \
+bin/ethumb_client/ethumbd_private.h \
+bin/ethumb_client/ethumbd_slave.c
+bin_ethumb_client_ethumbd_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CFLAGS@
+bin_ethumb_client_ethumbd_slave_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
+bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ @USE_ETHUMB_INTERNAL_LIBS@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
new file mode 100644
index 0000000000..9abbe585a3
--- /dev/null
+++ b/src/Makefile_Evas.am
@@ -0,0 +1,2690 @@
+
+### Library
+
+evas_canvas_eolian_pub_files = \
+	lib/evas/canvas/efl_canvas_object.eo \
+	lib/evas/canvas/efl_canvas_event_grabber.eo \
+	lib/evas/canvas/efl_canvas_polygon.eo \
+	lib/evas/canvas/efl_canvas_rectangle.eo \
+	lib/evas/canvas/efl_canvas_text.eo \
+	lib/evas/canvas/efl_canvas_text_factory.eo \
+	lib/evas/canvas/efl_canvas_group.eo \
+	lib/evas/canvas/efl_canvas_image_internal.eo \
+	lib/evas/canvas/evas_canvas3d_camera.eo\
+	lib/evas/canvas/evas_canvas3d_texture.eo\
+	lib/evas/canvas/evas_canvas3d_material.eo\
+	lib/evas/canvas/evas_canvas3d_light.eo\
+	lib/evas/canvas/evas_canvas3d_mesh.eo\
+	lib/evas/canvas/evas_canvas3d_primitive.eo\
+	lib/evas/canvas/evas_canvas3d_node.eo\
+	lib/evas/canvas/evas_canvas3d_scene.eo\
+	lib/evas/canvas/evas_canvas3d_object.eo \
+	lib/evas/canvas/efl_canvas_vg_object.eo \
+	lib/evas/canvas/efl_canvas_vg_node.eo \
+	lib/evas/canvas/efl_canvas_vg_container.eo \
+	lib/evas/canvas/efl_canvas_vg_shape.eo \
+	lib/evas/canvas/efl_canvas_vg_gradient.eo \
+	lib/evas/canvas/efl_canvas_vg_gradient_radial.eo \
+	lib/evas/canvas/efl_canvas_vg_gradient_linear.eo \
+	lib/evas/canvas/efl_canvas_image.eo \
+	lib/evas/canvas/efl_canvas_snapshot.eo \
+	lib/evas/canvas/efl_canvas_proxy.eo \
+	lib/evas/canvas/efl_canvas_scene3d.eo \
+	lib/evas/canvas/efl_canvas_surface.eo \
+	lib/evas/canvas/efl_canvas_surface_tbm.eo \
+	lib/evas/canvas/efl_canvas_surface_x11.eo \
+	lib/evas/canvas/efl_canvas_surface_wayland.eo \
+	lib/evas/canvas/efl_canvas_filter_internal.eo \
+	lib/evas/canvas/efl_input_state.eo \
+	lib/evas/canvas/efl_input_interface.eo \
+	lib/evas/canvas/efl_input_event.eo \
+	lib/evas/canvas/efl_input_key.eo \
+	lib/evas/canvas/efl_input_pointer.eo \
+	lib/evas/canvas/efl_input_hold.eo \
+	lib/evas/canvas/efl_input_focus.eo \
+	lib/evas/canvas/efl_gfx_mapping.eo \
+	lib/evas/canvas/efl_canvas_animation.eo \
+	lib/evas/canvas/efl_canvas_animation_alpha.eo \
+	lib/evas/canvas/efl_canvas_animation_rotate.eo \
+	lib/evas/canvas/efl_canvas_animation_scale.eo \
+	lib/evas/canvas/efl_canvas_animation_translate.eo \
+	lib/evas/canvas/efl_canvas_animation_group.eo \
+	lib/evas/canvas/efl_canvas_animation_group_parallel.eo \
+	lib/evas/canvas/efl_canvas_animation_group_sequential.eo \
+	lib/evas/canvas/efl_canvas_animation_player.eo \
+	$(NULL)
+
+evas_gesture_eolian_pub_files = \
+	lib/evas/gesture/efl_canvas_gesture_touch.eo \
+	lib/evas/gesture/efl_canvas_gesture.eo \
+	lib/evas/gesture/efl_canvas_gesture_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_long_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_double_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_triple_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_momentum.eo \
+	lib/evas/gesture/efl_canvas_gesture_flick.eo \
+	lib/evas/gesture/efl_canvas_gesture_zoom.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_flick.eo \
+	lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.eo \
+	lib/evas/gesture/efl_canvas_gesture_manager.eo \
+	lib/evas/gesture/efl_gesture_events.eo \
+	$(NULL)
+
+evas_canvas_eolian_priv_files = \
+    lib/evas/include/evas_ector_buffer.eo
+
+evas_canvas_eolian_type_files = \
+    lib/evas/canvas/evas_canvas3d_types.eot \
+    lib/evas/canvas/efl_canvas_animation_types.eot
+
+evas_gesture_eolian_type_files = \
+    lib/evas/gesture/efl_canvas_gesture_types.eot
+
+evas_canvas_eolian_priv_c = $(evas_canvas_eolian_priv_files:%.eo=%.eo.c)
+evas_canvas_eolian_priv_h = $(evas_canvas_eolian_priv_files:%.eo=%.eo.h)
+
+evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c)
+evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \
+                           $(evas_canvas_eolian_type_files:%.eot=%.eot.h)
+
+evas_gesture_eolian_pub_c = $(evas_gesture_eolian_pub_files:%.eo=%.eo.c)
+evas_gesture_eolian_pub_h = $(evas_gesture_eolian_pub_files:%.eo=%.eo.h) \
+                            $(evas_gesture_eolian_type_files:%.eot=%.eot.h)
+
+evas_eolian_files = $(evas_canvas_eolian_pub_files) \
+                    $(evas_canvas_eolian_type_files) \
+                    $(evas_gesture_eolian_pub_files) \
+                    $(evas_gesture_eolian_type_files)
+
+evas_eolian_internal_files = $(evas_canvas_eolian_priv_files) \
+                             $(evas_eolian_legacy_files)
+
+evas_eolian_c = $(evas_canvas_eolian_pub_c) $(evas_canvas_eolian_priv_c) \
+                $(evas_gesture_eolian_pub_c) \
+                $(evas_eolian_legacy_c)
+
+evas_eolian_h = $(evas_canvas_eolian_pub_h) $(evas_canvas_eolian_priv_h) \
+                $(evas_gesture_eolian_pub_h) \
+                $(evas_eolian_legacy_h)
+
+BUILT_SOURCES += \
+                 $(evas_eolian_c) \
+                 $(evas_eolian_h)
+
+if INSTALL_EO_FILES
+evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
+evaseolianfiles_DATA = $(evas_eolian_files)
+endif
+
+evas_legacy_eo_h = \
+lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h \
+lib/evas/canvas/efl_canvas_group_eo.legacy.h \
+lib/evas/canvas/efl_canvas_object_eo.legacy.h \
+lib/evas/canvas/efl_canvas_text_eo.legacy.h \
+lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h \
+lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h \
+lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h \
+lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h \
+lib/evas/canvas/evas_box_eo.legacy.h \
+lib/evas/canvas/evas_canvas_eo.legacy.h \
+lib/evas/canvas/evas_grid_eo.legacy.h \
+lib/evas/canvas/evas_image_eo.legacy.h \
+lib/evas/canvas/evas_line_eo.legacy.h \
+lib/evas/canvas/evas_table_eo.legacy.h \
+lib/evas/canvas/evas_text_eo.legacy.h \
+lib/evas/canvas/evas_textgrid_eo.legacy.h
+
+evas_legacy_eo_c = \
+lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.c \
+lib/evas/canvas/efl_canvas_group_eo.legacy.c \
+lib/evas/canvas/efl_canvas_object_eo.legacy.c \
+lib/evas/canvas/efl_canvas_text_eo.legacy.c \
+lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c \
+lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c \
+lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c \
+lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.c \
+lib/evas/canvas/evas_box_eo.c \
+lib/evas/canvas/evas_box_eo.h \
+lib/evas/canvas/evas_box_eo.legacy.c \
+lib/evas/canvas/evas_canvas_eo.c \
+lib/evas/canvas/evas_canvas_eo.h \
+lib/evas/canvas/evas_canvas_eo.legacy.c \
+lib/evas/canvas/evas_grid_eo.c \
+lib/evas/canvas/evas_grid_eo.h \
+lib/evas/canvas/evas_grid_eo.legacy.c \
+lib/evas/canvas/evas_image_eo.c \
+lib/evas/canvas/evas_image_eo.h \
+lib/evas/canvas/evas_image_eo.legacy.c \
+lib/evas/canvas/evas_line_eo.c \
+lib/evas/canvas/evas_line_eo.h \
+lib/evas/canvas/evas_line_eo.legacy.c \
+lib/evas/canvas/evas_table_eo.c \
+lib/evas/canvas/evas_table_eo.h \
+lib/evas/canvas/evas_table_eo.legacy.c \
+lib/evas/canvas/evas_text_eo.c \
+lib/evas/canvas/evas_text_eo.h \
+lib/evas/canvas/evas_text_eo.legacy.c \
+lib/evas/canvas/evas_textgrid_eo.c \
+lib/evas/canvas/evas_textgrid_eo.h \
+lib/evas/canvas/evas_textgrid_eo.legacy.c
+
+
+EXTRA_DIST2 += \
+        $(evas_eolian_files) \
+        $(evas_eolian_internal_files) \
+        $(evas_legacy_eo_c)
+
+lib_LTLIBRARIES += lib/evas/libevas.la
+
+installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@
+dist_installed_evasmainheaders_DATA = \
+lib/evas/Evas.h \
+lib/evas/Evas_Common.h \
+lib/evas/Evas_Eo.h \
+lib/evas/Evas_Legacy.h \
+lib/evas/Evas_GL.h \
+lib/evas/Evas_Loader.h
+
+installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas
+nodist_installed_evascanvasheaders_DATA = $(evas_canvas_eolian_pub_h)
+dist_installed_evascanvasheaders_DATA = lib/evas/canvas/evas_textblock_legacy.h \
+$(evas_legacy_eo_h)
+
+installed_evasgestureheadersdir = $(includedir)/evas-@VMAJ@/gesture
+nodist_installed_evasgestureheaders_DATA = $(evas_gesture_eolian_pub_h)
+
+noinst_DATA += $(evas_eolian_priv_h)
+
+noinst_HEADERS += \
+lib/evas/Evas_Internal.h \
+lib/evas/include/evas_inline.x \
+lib/evas/include/evas_private.h \
+lib/evas/include/evas_common_types.h \
+lib/evas/include/evas_options.h \
+lib/evas/include/evas_macros.h \
+lib/evas/include/evas_mmx.h \
+lib/evas/include/evas_common_private.h \
+lib/evas/include/evas_blend_ops.h \
+lib/evas/include/evas_filter.h \
+lib/evas/canvas/evas_vg_private.h \
+lib/evas/canvas/evas_image_private.h \
+lib/evas/canvas/evas_polygon_private.h \
+lib/evas/canvas/efl_canvas_surface.h \
+lib/evas/common3d/primitives/primitive_common.h \
+lib/evas/canvas/efl_canvas_animation_private.h \
+lib/evas/canvas/efl_canvas_animation_alpha_private.h \
+lib/evas/canvas/efl_canvas_animation_rotate_private.h \
+lib/evas/canvas/efl_canvas_animation_scale_private.h \
+lib/evas/canvas/efl_canvas_animation_translate_private.h \
+lib/evas/canvas/efl_canvas_animation_group_private.h \
+lib/evas/canvas/efl_canvas_animation_group_parallel_private.h \
+lib/evas/canvas/efl_canvas_animation_group_sequential_private.h \
+lib/evas/canvas/efl_canvas_animation_player_private.h \
+lib/evas/canvas/evas_stack.x \
+lib/evas/gesture/efl_canvas_gesture_private.h
+
+# Linebreak
+
+noinst_HEADERS += \
+static_libs/libunibreak/unibreakbase.h \
+static_libs/libunibreak/unibreakdef.h \
+static_libs/libunibreak/linebreak.h \
+static_libs/libunibreak/linebreakdef.h \
+static_libs/libunibreak/wordbreakdef.h \
+static_libs/libunibreak/wordbreak.h \
+static_libs/libunibreak/wordbreakdata.c \
+static_libs/libunibreak/graphemebreak.h \
+static_libs/libunibreak/graphemebreakdef.h \
+static_libs/libunibreak/graphemebreakdata.c
+
+# Linebreak
+lib_evas_libevas_la_SOURCES = \
+static_libs/libunibreak/unibreakbase.c \
+static_libs/libunibreak/unibreakdef.c \
+static_libs/libunibreak/linebreak.c \
+static_libs/libunibreak/linebreakdata.c \
+static_libs/libunibreak/linebreakdef.c \
+static_libs/libunibreak/wordbreak.c \
+static_libs/libunibreak/graphemebreak.c
+
+# Main
+lib_evas_libevas_la_SOURCES += \
+lib/evas/main.c
+
+# Canvas
+lib_evas_libevas_la_SOURCES += \
+lib/evas/canvas/evas_callbacks.c \
+lib/evas/canvas/evas_clip.c \
+lib/evas/canvas/evas_data.c \
+lib/evas/canvas/evas_device.c \
+lib/evas/canvas/evas_events.c \
+lib/evas/canvas/evas_events_legacy.c \
+lib/evas/canvas/evas_focus.c \
+lib/evas/canvas/evas_key.c \
+lib/evas/canvas/evas_key_grab.c \
+lib/evas/canvas/evas_layer.c \
+lib/evas/canvas/evas_main.c \
+lib/evas/canvas/evas_name.c \
+lib/evas/canvas/evas_image_legacy.c \
+lib/evas/canvas/evas_object_image.c \
+lib/evas/canvas/evas_object_main.c \
+lib/evas/canvas/evas_object_inform.c \
+lib/evas/canvas/evas_object_intercept.c \
+lib/evas/canvas/evas_object_line.c \
+lib/evas/canvas/evas_object_polygon.c \
+lib/evas/canvas/evas_object_rectangle.c \
+lib/evas/canvas/evas_object_smart.c \
+lib/evas/canvas/evas_object_smart_clipped.c \
+lib/evas/canvas/evas_object_box.c \
+lib/evas/canvas/evas_object_table.c \
+lib/evas/canvas/evas_object_text.c \
+lib/evas/canvas/evas_object_textblock.c \
+lib/evas/canvas/evas_textblock_hyphenation.x \
+lib/evas/canvas/evas_object_textgrid.c \
+lib/evas/canvas/evas_object_grid.c \
+lib/evas/canvas/evas_font_dir.c \
+lib/evas/canvas/evas_rectangle.c \
+lib/evas/canvas/evas_render.c \
+lib/evas/canvas/evas_smart.c \
+lib/evas/canvas/evas_async_events.c \
+lib/evas/canvas/evas_stats.c \
+lib/evas/canvas/evas_touch_point.c \
+lib/evas/canvas/evas_map.c \
+lib/evas/canvas/evas_map.h \
+lib/evas/canvas/evas_gl.c \
+lib/evas/canvas/evas_out.c \
+lib/evas/canvas/efl_canvas_image.c \
+lib/evas/canvas/efl_canvas_event_grabber.c \
+lib/evas/canvas/efl_canvas_proxy.c \
+lib/evas/canvas/efl_canvas_snapshot.c \
+lib/evas/canvas/efl_canvas_scene3d.c \
+lib/evas/canvas/efl_canvas_surface.c \
+lib/evas/canvas/efl_canvas_surface_tbm.c \
+lib/evas/canvas/efl_canvas_surface_x11.c \
+lib/evas/canvas/efl_canvas_surface_wayland.c \
+lib/evas/canvas/efl_gfx_mapping.c \
+lib/evas/canvas/efl_input_event.c \
+lib/evas/canvas/efl_input_key.c \
+lib/evas/canvas/efl_input_pointer.c \
+lib/evas/canvas/efl_input_hold.c \
+lib/evas/canvas/efl_input_focus.c \
+lib/evas/canvas/efl_canvas_animation.c \
+lib/evas/canvas/efl_canvas_animation_alpha.c \
+lib/evas/canvas/efl_canvas_animation_rotate.c \
+lib/evas/canvas/efl_canvas_animation_scale.c \
+lib/evas/canvas/efl_canvas_animation_translate.c \
+lib/evas/canvas/efl_canvas_animation_group.c \
+lib/evas/canvas/efl_canvas_animation_group_parallel.c \
+lib/evas/canvas/efl_canvas_animation_group_sequential.c \
+lib/evas/canvas/efl_canvas_animation_player.c \
+lib/evas/gesture/efl_canvas_gesture_touch.c \
+lib/evas/gesture/efl_canvas_gesture.c \
+lib/evas/gesture/efl_canvas_gesture_tap.c \
+lib/evas/gesture/efl_canvas_gesture_long_tap.c \
+lib/evas/gesture/efl_canvas_gesture_double_tap.c \
+lib/evas/gesture/efl_canvas_gesture_triple_tap.c \
+lib/evas/gesture/efl_canvas_gesture_momentum.c \
+lib/evas/gesture/efl_canvas_gesture_flick.c \
+lib/evas/gesture/efl_canvas_gesture_zoom.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c \
+lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c \
+lib/evas/gesture/efl_canvas_gesture_manager.c \
+lib/evas/common/region.c \
+lib/evas/common/region.h \
+$(NULL)
+
+ # Vg
+ lib_evas_libevas_la_SOURCES += \
+ lib/evas/vg/evas_vg_cache.c
+
+
+# Cache
+lib_evas_libevas_la_SOURCES += \
+lib/evas/cache/evas_cache_image.c \
+lib/evas/cache/evas_cache_engine_image.c \
+lib/evas/cache/evas_preload.c \
+lib/evas/cache/evas_cache.h
+
+# File
+lib_evas_file_SOURCES = \
+lib/evas/file/evas_module.c \
+lib/evas/file/evas_module.h \
+lib/evas/file/evas_path.c \
+lib/evas/file/evas_path.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
+lib_evas_libevas_la_SOURCES += \
+$(lib_evas_file_SOURCES)
+
+# Evas_3D
+noinst_HEADERS += \
+lib/evas/include/evas_3d_utils.h
+
+lib_evas_libevas_la_SOURCES += \
+lib/evas/canvas/evas_canvas3d_object.c \
+lib/evas/canvas/evas_canvas3d_scene.c \
+lib/evas/canvas/evas_canvas3d_node.c \
+lib/evas/canvas/evas_canvas3d_camera.c \
+lib/evas/canvas/evas_canvas3d_light.c \
+lib/evas/canvas/evas_canvas3d_mesh.c \
+lib/evas/canvas/evas_canvas3d_texture.c \
+lib/evas/canvas/evas_canvas3d_material.c \
+lib/evas/canvas/evas_canvas3d_primitive.c \
+lib/evas/canvas/evas_canvas3d_node_callback.h
+
+# Model savers/loaders (will be replaced to modules in next commits)
+lib_evas_libevas_la_SOURCES += \
+lib/evas/common3d/save_load/evas_model_load.c \
+lib/evas/common3d/save_load/evas_model_save.c \
+lib/evas/common3d/save_load/evas_model_load_save_common.c \
+lib/evas/common3d/save_load/evas_model_load_save_common.h \
+modules/evas/model_loaders/eet/evas_model_load_eet.c \
+modules/evas/model_loaders/md2/evas_model_load_md2.c \
+modules/evas/model_loaders/obj/evas_model_load_obj.c \
+modules/evas/model_loaders/ply/evas_model_load_ply.c \
+modules/evas/model_savers/eet/evas_model_save_eet.c \
+modules/evas/model_savers/obj/evas_model_save_obj.c \
+modules/evas/model_savers/ply/evas_model_save_ply.c \
+lib/evas/canvas/evas_canvas3d_eet.c
+
+# 3d primitives
+lib_evas_libevas_la_SOURCES += \
+lib/evas/common3d/primitives/tabulated_primitives/square.c \
+lib/evas/common3d/primitives/tabulated_primitives/cube.c \
+lib/evas/common3d/primitives/solids_of_revolution/sphere.c \
+lib/evas/common3d/primitives/solids_of_revolution/torus.c \
+lib/evas/common3d/primitives/solids_of_revolution/cylinder.c \
+lib/evas/common3d/primitives/solids_of_revolution/cone.c \
+lib/evas/common3d/primitives/surfaces/surface.c \
+lib/evas/common3d/primitives/surfaces/terrain.c \
+lib/evas/common3d/primitives/primitive_common.c
+
+# Evas_VG
+lib_evas_libevas_la_SOURCES += \
+lib/evas/canvas/efl_canvas_vg_object.c \
+lib/evas/canvas/efl_canvas_vg_node.c \
+lib/evas/canvas/efl_canvas_vg_container.c \
+lib/evas/canvas/efl_canvas_vg_gradient.c \
+lib/evas/canvas/efl_canvas_vg_gradient_linear.c \
+lib/evas/canvas/efl_canvas_vg_gradient_radial.c \
+lib/evas/canvas/efl_canvas_vg_utils.c \
+lib/evas/canvas/efl_canvas_vg_shape.c
+
+# Static draw lib
+lib_evas_libevas_la_SOURCES += \
+static_libs/draw/draw_alpha_main.c \
+static_libs/draw/draw_convert.c \
+static_libs/draw/draw_main_neon.c \
+static_libs/draw/draw_main.c \
+static_libs/rg_etc/rg_etc1.c \
+static_libs/rg_etc/rg_etc2.c \
+static_libs/rg_etc/rg_etc1.h \
+static_libs/rg_etc/etc2_encoder.c
+
+# Engine
+lib_evas_libevas_la_SOURCES += \
+lib/evas/common/evas_op_copy_main_.c \
+lib/evas/common/evas_op_blend_main_.c \
+lib/evas/common/evas_op_add_main_.c \
+lib/evas/common/evas_op_sub_main_.c \
+lib/evas/common/evas_op_mask_main_.c \
+lib/evas/common/evas_op_mul_main_.c \
+lib/evas/common/evas_blend_main.c \
+lib/evas/common/evas_blit_main.c \
+lib/evas/common/evas_convert_color.c \
+lib/evas/common/evas_convert_colorspace.c \
+lib/evas/common/evas_convert_gry_1.c \
+lib/evas/common/evas_convert_gry_8.c \
+lib/evas/common/evas_convert_main.c \
+lib/evas/common/evas_convert_rgb_16.c \
+lib/evas/common/evas_convert_rgb_24.c \
+lib/evas/common/evas_convert_rgb_8.c \
+lib/evas/common/evas_convert_grypal_6.c \
+lib/evas/common/evas_convert_yuv.c \
+lib/evas/common/evas_cpu.c \
+lib/evas/common/evas_draw_main.c \
+lib/evas/common/evas_font_draw.c \
+lib/evas/common/evas_font_load.c \
+lib/evas/common/evas_font_main.c \
+lib/evas/common/evas_font_query.c \
+lib/evas/common/evas_font_compress.c \
+lib/evas/common/evas_image_load.c \
+lib/evas/common/evas_image_save.c \
+lib/evas/common/evas_image_main.c \
+lib/evas/common/evas_image_data.c \
+lib/evas/common/evas_image_scalecache.c \
+lib/evas/common/evas_line_main.c \
+lib/evas/common/evas_polygon_main.c \
+lib/evas/common/evas_rectangle_main.c \
+lib/evas/common/evas_scale_main.c \
+lib/evas/common/evas_scale_sample.c \
+lib/evas/common/evas_scale_smooth.c \
+lib/evas/common/evas_scale_span.c \
+lib/evas/common/evas_thread_render.c \
+lib/evas/common/evas_tiler.c \
+lib/evas/common/evas_pipe.c \
+lib/evas/common/language/evas_bidi_utils.c \
+lib/evas/common/language/evas_language_utils.c \
+lib/evas/common/evas_text_utils.c \
+lib/evas/common/evas_font_ot.c \
+lib/evas/common/evas_map_image.c \
+lib/evas/common/evas_map_image.h \
+lib/evas/common/evas_blend.h \
+lib/evas/common/evas_blend_private.h \
+lib/evas/common/evas_convert_color.h \
+lib/evas/common/evas_convert_colorspace.h \
+lib/evas/common/evas_convert_gry_1.h \
+lib/evas/common/evas_convert_gry_8.h \
+lib/evas/common/evas_convert_grypal_6.h \
+lib/evas/common/evas_convert_main.h \
+lib/evas/common/evas_convert_rgb_16.h \
+lib/evas/common/evas_convert_rgb_24.h \
+lib/evas/common/evas_convert_rgb_32.h \
+lib/evas/common/evas_convert_rgb_8.h \
+lib/evas/common/evas_convert_yuv.h \
+lib/evas/common/evas_draw.h \
+lib/evas/common/evas_font.h \
+lib/evas/common/evas_font_default_walk.x \
+lib/evas/common/evas_font_private.h \
+lib/evas/common/evas_image.h \
+lib/evas/common/evas_image_private.h \
+lib/evas/common/evas_line.h \
+lib/evas/common/evas_polygon.h \
+lib/evas/common/evas_rectangle.h \
+lib/evas/common/evas_scale_main.h \
+lib/evas/common/evas_scale_smooth.h \
+lib/evas/common/evas_scale_span.h \
+lib/evas/common/evas_pipe.h \
+lib/evas/common/language/evas_bidi_utils.h \
+lib/evas/common/language/evas_language_utils.h \
+lib/evas/common/language/evas_script_table.h \
+lib/evas/common/evas_text_utils.h \
+lib/evas/common/evas_font_ot.h \
+lib/evas/common/evas_font_draw.h \
+lib/evas/common/evas_common_generic_cache.c
+
+if BUILD_NEON
+if !BUILD_NEON_INTRINSICS
+lib_evas_libevas_la_SOURCES += \
+lib/evas/common/evas_op_copy/op_copy_neon.S
+endif
+endif
+
+lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/canvas \
+-I$(top_srcdir)/src/lib/evas/common \
+-I$(top_srcdir)/src/lib/evas/common3d/save_load \
+-I$(top_srcdir)/src/lib/evas/file \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/static_libs/libunibreak \
+-I$(top_srcdir)/src/static_libs/draw \
+-I$(top_builddir)/src/lib \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_builddir)/src/lib/evas/gesture \
+-I$(top_builddir)/src/lib/evas/include \
+-I$(top_builddir)/src/modules/evas/engines/software_generic \
+-I$(top_builddir)/src/modules/evas/engines/gl_generic \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@VALGRIND_CFLAGS@ \
+@NEON_CFLAGS@ \
+@ALTIVEC_CFLAGS@ \
+-DEFL_GFX_FILTER_BETA
+
+# SSE3
+noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
+
+lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \
+lib/evas/common/evas_op_blend/op_blend_master_sse3.c \
+static_libs/draw/draw_main_sse2.c
+
+lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+$(lib_evas_libevas_la_CPPFLAGS) \
+@SSE3_CFLAGS@
+
+lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EVAS_LIBS@
+lib_evas_common_libevas_op_blend_sse3_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
+
+# maybe neon, maybe not
+noinst_LTLIBRARIES += lib/evas/common/libevas_convert_rgb_32.la
+
+lib_evas_common_libevas_convert_rgb_32_la_SOURCES = \
+lib/evas/common/evas_convert_rgb_32.c
+
+lib_evas_common_libevas_convert_rgb_32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
+$(lib_evas_libevas_la_CPPFLAGS) \
+@NEON_CFLAGS@
+
+lib_evas_common_libevas_convert_rgb_32_la_LIBADD = @EVAS_LIBS@
+lib_evas_common_libevas_convert_rgb_32_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
+
+lib_evas_libevas_la_LIBADD = \
+lib/evas/common/libevas_op_blend_sse3.la \
+lib/evas/common/libevas_convert_rgb_32.la \
+@EVAS_LIBS@
+lib_evas_libevas_la_DEPENDENCIES = \
+lib/evas/common/libevas_op_blend_sse3.la \
+lib/evas/common/libevas_convert_rgb_32.la \
+@EVAS_INTERNAL_LIBS@
+
+lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+# Linebreak
+
+EXTRA_DIST2 += \
+static_libs/libunibreak/LICENCE \
+static_libs/libunibreak/AUTHORS \
+static_libs/libunibreak/NEWS \
+static_libs/libunibreak/README.md \
+static_libs/libunibreak/ChangeLog
+
+# Engines
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_font_compress_draw.c \
+lib/evas/common/evas_map_image_internal.c \
+lib/evas/common/evas_map_image_core.c \
+lib/evas/common/evas_map_image_loop.c \
+lib/evas/common/evas_map_image_aa.c \
+lib/evas/common/evas_map_image_internal_high.c \
+lib/evas/common/evas_scale_smooth_scaler.c \
+lib/evas/common/evas_scale_smooth_scaler_down.c \
+lib/evas/common/evas_scale_smooth_scaler_downx.c \
+lib/evas/common/evas_scale_smooth_scaler_downx_downy.c \
+lib/evas/common/evas_scale_smooth_scaler_downy.c \
+lib/evas/common/evas_scale_smooth_scaler_noscale.c \
+lib/evas/common/evas_scale_smooth_scaler_up.c
+
+# evas_op_add
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_add/op_add_color_.c \
+lib/evas/common/evas_op_add/op_add_color_i386.c \
+lib/evas/common/evas_op_add/op_add_mask_color_.c \
+lib/evas/common/evas_op_add/op_add_mask_color_i386.c \
+lib/evas/common/evas_op_add/op_add_pixel_.c \
+lib/evas/common/evas_op_add/op_add_pixel_color_.c \
+lib/evas/common/evas_op_add/op_add_pixel_color_i386.c \
+lib/evas/common/evas_op_add/op_add_pixel_i386.c \
+lib/evas/common/evas_op_add/op_add_pixel_mask_.c \
+lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c
+
+# evas_op_blend
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_blend/op_blend_color_.c \
+lib/evas/common/evas_op_blend/op_blend_color_i386.c \
+lib/evas/common/evas_op_blend/op_blend_color_neon.c \
+lib/evas/common/evas_op_blend/op_blend_color_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_i386.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_neon.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
+
+# evas_op_copy
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_copy/op_copy_color_.c \
+lib/evas/common/evas_op_copy/op_copy_color_i386.c \
+lib/evas/common/evas_op_copy/op_copy_color_neon.c \
+lib/evas/common/evas_op_copy/op_copy_mask_color_.c \
+lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c \
+lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_neon.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_color_.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_i386.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c
+
+if BUILD_NEON
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_copy/op_copy_neon.S
+endif
+
+# evas_op_mask
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_mask/op_mask_color_.c \
+lib/evas/common/evas_op_mask/op_mask_color_i386.c \
+lib/evas/common/evas_op_mask/op_mask_mask_color_.c \
+lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_color_.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_i386.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c
+
+# evas_op_mul
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_mul/op_mul_color_.c \
+lib/evas/common/evas_op_mul/op_mul_color_i386.c \
+lib/evas/common/evas_op_mul/op_mul_mask_color_.c \
+lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_color_.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_i386.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c
+
+# evas_op_sub
+
+EXTRA_DIST2 += \
+lib/evas/common/evas_op_sub/op_sub_color_.c \
+lib/evas/common/evas_op_sub/op_sub_color_i386.c \
+lib/evas/common/evas_op_sub/op_sub_mask_color_.c \
+lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_color_.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_i386.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c
+
+
+### Evas filters
+
+lib_evas_libevas_la_SOURCES += \
+lib/evas/canvas/evas_filter_mixin.c \
+lib/evas/filters/evas_filter.c \
+lib/evas/filters/evas_filter_parser.c \
+lib/evas/filters/evas_filter_utils.c \
+lib/evas/filters/evas_filter_private.h
+
+EXTRA_DIST2 += \
+modules/evas/engines/software_generic/filters/blur/blur_gaussian_alpha_.c \
+modules/evas/engines/software_generic/filters/blur/blur_gaussian_rgba_.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_alpha_.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_alpha_i386.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_alpha_sse3.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_alpha_neon.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_rgba_.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_rgba_i386.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_rgba_sse3.c \
+modules/evas/engines/software_generic/filters/blur/blur_box_rgba_neon.c
+
+GFX_FILTER_SW_FILES = \
+modules/evas/engines/software_generic/filters/evas_engine_filter.h \
+modules/evas/engines/software_generic/filters/evas_filter_blend.c \
+modules/evas/engines/software_generic/filters/evas_filter_blur.c \
+modules/evas/engines/software_generic/filters/evas_filter_bump.c \
+modules/evas/engines/software_generic/filters/evas_filter_curve.c \
+modules/evas/engines/software_generic/filters/evas_filter_displace.c \
+modules/evas/engines/software_generic/filters/evas_filter_fill.c \
+modules/evas/engines/software_generic/filters/evas_filter_mask.c \
+modules/evas/engines/software_generic/filters/evas_filter_transform.c \
+$(NULL)
+
+### Engine Ector stuff
+
+evas_software_generic_eolian_files = \
+modules/evas/engines/software_generic/evas_ector_software_buffer.eo
+
+EXTRA_DIST2 += $(evas_software_generic_eolian_files)
+
+evas_software_generic_eolian_c = $(evas_software_generic_eolian_files:%.eo=%.eo.c)
+evas_software_generic_eolian_h = $(evas_software_generic_eolian_files:%.eo=%.eo.h)
+
+BUILT_SOURCES += \
+$(evas_software_generic_eolian_c) \
+$(evas_software_generic_eolian_h)
+
+### Engines
+
+if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
+lib_evas_libevas_la_SOURCES += \
+modules/evas/engines/software_generic/evas_engine.c \
+modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h \
+modules/evas/engines/software_generic/Evas_Engine_Software_Shared.h \
+modules/evas/engines/software_generic/evas_native_tbm.c \
+modules/evas/engines/software_generic/evas_native_dmabuf.c \
+modules/evas/engines/software_generic/evas_ector_software_buffer.c \
+modules/evas/engines/software_generic/evas_native_common.h \
+modules/evas/engines/software_generic/evas_ector_software.h \
+$(GFX_FILTER_SW_FILES)
+lib_evas_libevas_la_LIBADD +=
+lib_evas_libevas_la_CPPFLAGS += -I$(top_srcdir)/src/lib/ector \
+-I$(top_srcdir)/src/lib/evas/filters
+else
+enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
+enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginesoftwaregenericpkgLTLIBRARIES = install-enginesoftwaregenericpkgLTLIBRARIES
+$(install_enginesoftwaregenericpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_software_generic_module_la_SOURCES = \
+modules/evas/engines/software_generic/evas_engine.c \
+modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h \
+modules/evas/engines/software_generic/Evas_Engine_Software_Shared.h \
+modules/evas/engines/software_generic/evas_native_tbm.c \
+modules/evas/engines/software_generic/evas_native_dmabuf.c \
+modules/evas/engines/software_generic/evas_ector_software_buffer.c \
+modules/evas/engines/software_generic/evas_native_common.h \
+$(GFX_FILTER_SW_FILES)
+
+modules_evas_engines_software_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/filters \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_builddir)/src/modules/evas/engines/software_generic \
+-DEFL_BUILD \
+@EVAS_CFLAGS@
+modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
+modules_evas_engines_software_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ENGINE_BUFFER
+dist_installed_evasmainheaders_DATA += modules/evas/engines/buffer/Evas_Engine_Buffer.h
+BUFFER_SOURCES = \
+modules/evas/engines/buffer/evas_engine.c \
+modules/evas/engines/buffer/evas_outbuf.c \
+modules/evas/engines/buffer/evas_engine.h
+if EVAS_STATIC_BUILD_BUFFER
+lib_evas_libevas_la_SOURCES += $(BUFFER_SOURCES)
+else
+enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
+enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginebufferpkgLTLIBRARIES = install-enginebufferpkgLTLIBRARIES
+$(install_enginebufferpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
+modules_evas_engines_buffer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@
+modules_evas_engines_buffer_module_la_LIBADD = @USE_EVAS_LIBS@
+modules_evas_engines_buffer_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_FB
+FB_SOURCES = \
+modules/evas/engines/fb/evas_engine.c \
+modules/evas/engines/fb/evas_fb_main.c \
+modules/evas/engines/fb/evas_outbuf.c \
+modules/evas/engines/fb/evas_engine.h \
+modules/evas/engines/fb/evas_fb.h \
+modules/evas/engines/fb/Evas_Engine_FB.h
+if EVAS_STATIC_BUILD_FB
+lib_evas_libevas_la_SOURCES += $(FB_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_fb_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_fb_libs@
+else
+enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
+enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginefbpkgLTLIBRARIES = install-enginefbpkgLTLIBRARIES
+$(install_enginefbpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
+modules_evas_engines_fb_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_engine_fb_cflags@ \
+@EVAS_CFLAGS@
+modules_evas_engines_fb_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_engine_fb_libs@
+modules_evas_engines_fb_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+GL_COMMON_SOURCES = \
+modules/evas/engines/gl_common/evas_gl_private.h \
+modules/evas/engines/gl_common/evas_gl_common.h \
+modules/evas/engines/gl_common/evas_gl_define.h \
+modules/evas/engines/gl_common/evas_gl_context.c \
+modules/evas/engines/gl_common/evas_gl_file_cache.c \
+modules/evas/engines/gl_common/evas_gl_shader.c \
+modules/evas/engines/gl_common/evas_gl_rectangle.c \
+modules/evas/engines/gl_common/evas_gl_texture.c \
+modules/evas/engines/gl_common/evas_gl_preload.c \
+modules/evas/engines/gl_common/evas_gl_image.c \
+modules/evas/engines/gl_common/evas_gl_font.c \
+modules/evas/engines/gl_common/evas_gl_polygon.c \
+modules/evas/engines/gl_common/evas_gl_line.c \
+modules/evas/engines/gl_common/evas_gl_core.c \
+modules/evas/engines/gl_common/evas_gl_api_ext.h \
+modules/evas/engines/gl_common/evas_gl_api_ext_def.h \
+modules/evas/engines/gl_common/evas_gl_core.h \
+modules/evas/engines/gl_common/evas_gl_core_private.h \
+modules/evas/engines/gl_common/evas_gl_api.c \
+modules/evas/engines/gl_common/evas_gl_api_def.h \
+modules/evas/engines/gl_common/evas_gl_api_gles1.c \
+modules/evas/engines/gl_common/evas_gl_api_gles3_def.h \
+modules/evas/engines/gl_common/evas_gl_api_ext.c \
+modules/evas/engines/gl_common/shader/evas_gl_shaders.x \
+$(NULL)
+
+# 3D
+GL_COMMON_SOURCES += \
+modules/evas/engines/gl_common/evas_gl_3d_common.h \
+modules/evas/engines/gl_common/evas_gl_3d_private.h \
+modules/evas/engines/gl_common/evas_gl_3d.c \
+modules/evas/engines/gl_common/evas_gl_3d_renderer.c \
+modules/evas/engines/gl_common/evas_gl_3d_shader.c \
+modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x \
+$(NULL)
+
+EVAS_GL_SHADERS_GEN = \
+modules/evas/engines/gl_common/shader/gen_shaders.sh \
+modules/evas/engines/gl_common/shader/fragment.glsl \
+modules/evas/engines/gl_common/shader/vertex.glsl \
+modules/evas/engines/gl_common/shader/include.glsl \
+$(NULL)
+
+EXTRA_DIST2 += $(EVAS_GL_SHADERS_GEN)
+
+modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
+	@if [ "x$(EFL_SHD_REGEN)" = "x1" ] ; then \
+	  echo "  SHADERS  $@" ; \
+	  sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader/gen_shaders.sh ; \
+	fi
+
+modules/evas/engines/gl_common/evas_gl_shader.c: modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+
+# NOTE: order here should be equal with modes in file Evas_Eo.h
+GL_SHADERS_3D_GEN = \
+modules/evas/engines/gl_common/shader_3d/vertex_color_vert.shd \
+modules/evas/engines/gl_common/shader_3d/vertex_color_frag.shd \
+modules/evas/engines/gl_common/shader_3d/diffuse_vert.shd \
+modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd \
+modules/evas/engines/gl_common/shader_3d/flat_vert.shd \
+modules/evas/engines/gl_common/shader_3d/flat_frag.shd \
+modules/evas/engines/gl_common/shader_3d/phong_vert.shd \
+modules/evas/engines/gl_common/shader_3d/phong_frag.shd \
+modules/evas/engines/gl_common/shader_3d/normal_map_vert.shd \
+modules/evas/engines/gl_common/shader_3d/normal_map_frag.shd \
+modules/evas/engines/gl_common/shader_3d/shadow_map_vert.shd \
+modules/evas/engines/gl_common/shader_3d/shadow_map_frag.shd \
+modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd \
+modules/evas/engines/gl_common/shader_3d/color_pick_frag.shd \
+modules/evas/engines/gl_common/shader_3d/parallax_occlusion_vert.shd \
+modules/evas/engines/gl_common/shader_3d/parallax_occlusion_frag.shd \
+modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_vert.shd \
+modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_frag.shd \
+$(NULL)
+
+EXTRA_DIST2 += \
+modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh \
+modules/evas/engines/gl_common/shader_3d/include.shd \
+$(GL_SHADERS_3D_GEN)
+
+modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/include.shd
+	@if [ "x$(EFL_SHD_REGEN)" = "x1" ] ; then \
+	  echo "  SHADERS  $@" ; \
+	  sh $(top_srcdir)/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) ; \
+	fi
+
+modules/evas/engines/gl_common/evas_gl_3d_shader.c: modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+
+
+GL_GENERIC_SOURCES = \
+modules/evas/engines/gl_generic/evas_engine.c \
+modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h \
+modules/evas/engines/gl_generic/Evas_Engine_GL_Shared.h \
+modules/evas/engines/gl_generic/evas_ector_gl.h \
+modules/evas/engines/gl_generic/evas_ector_gl_buffer.c \
+modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c \
+modules/evas/engines/gl_generic/filters/gl_engine_filter.h \
+modules/evas/engines/gl_generic/filters/gl_filter_blend.c \
+modules/evas/engines/gl_generic/filters/gl_filter_blur.c \
+modules/evas/engines/gl_generic/filters/gl_filter_curve.c \
+modules/evas/engines/gl_generic/filters/gl_filter_displace.c \
+modules/evas/engines/gl_generic/filters/gl_filter_fill.c \
+modules/evas/engines/gl_generic/filters/gl_filter_mask.c \
+$(NULL)
+
+evas_gl_generic_eolian_files = \
+modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo \
+modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo \
+$(NULL)
+
+evas_gl_generic_eolian_c = $(evas_gl_generic_eolian_files:%.eo=%.eo.c)
+evas_gl_generic_eolian_h = $(evas_gl_generic_eolian_files:%.eo=%.eo.h) \
+                $(evas_gl_generic_eolian_type_files:%.eot=%.eot.h)
+
+BUILT_SOURCES += \
+                 $(evas_gl_generic_eolian_c) \
+                 $(evas_gl_generic_eolian_h) \
+                 $(NULL)
+
+EXTRA_DIST2 += $(evas_gl_generic_eolian_files)
+
+#evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
+#evaseolianfiles_DATA += $(evas_gl_generic_eolian_files)
+
+
+if BUILD_ENGINE_GL_COMMON
+if EVAS_STATIC_BUILD_GL_COMMON
+lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES) $(GL_GENERIC_SOURCES)
+lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_builddir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/filters \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+-I$(top_builddir)/src/modules/evas/engines/gl_generic \
+@evas_engine_gl_common_cflags@ \
+@EVAS_CFLAGS@
+else
+noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+@EVAS_CFLAGS@
+
+# The generic backend for GL
+engineglgenericpkgdir = $(libdir)/evas/modules/engines/gl_generic/$(MODULE_ARCH)
+engineglgenericpkg_LTLIBRARIES = modules/evas/engines/gl_generic/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_engineglgenericpkgLTLIBRARIES = install-engineglgenericpkgLTLIBRARIES
+$(install_engineglgenericpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_gl_generic_module_la_SOURCES = $(GL_GENERIC_SOURCES)
+modules_evas_engines_gl_generic_module_la_CFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_builddir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/filters \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+-I$(top_builddir)/src/modules/evas/engines/gl_generic \
+-I$(top_builddir)/src/modules/evas/engines/software_generic \
+@evas_engine_gl_common_cflags@ \
+-DEFL_BUILD \
+@EVAS_CFLAGS@
+modules_evas_engines_gl_generic_module_la_LIBADD = \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+@evas_engine_gl_common_libs@ \
+@USE_EVAS_LIBS@
+modules_evas_engines_gl_generic_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@ \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la
+modules_evas_engines_gl_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_gl_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+if BUILD_ENGINE_GL_X11
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ -DEFL_BUILD
+endif
+if BUILD_ENGINE_WAYLAND_EGL
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@
+endif
+if BUILD_ENGINE_GL_DRM
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_drm_cflags@
+endif
+if BUILD_ENGINE_EGLFS
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_eglfs_cflags@ -DEFL_BUILD
+endif
+if BUILD_ENGINE_GL_COCOA
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_cocoa_cflags@
+endif
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = @USE_EVAS_LIBS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_COCOA
+GL_COCOA_SOURCES = \
+modules/evas/engines/gl_cocoa/evas_engine.c \
+modules/evas/engines/gl_cocoa/evas_outbuf.m \
+modules/evas/engines/gl_cocoa/evas_engine.h \
+modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
+if EVAS_STATIC_BUILD_GL_COCOA
+noinst_LTLIBRARIES += modules/evas/engines/gl_cocoa/libglcocoa.la
+lib_evas_libevas_la_LIBADD += modules/evas/engines/gl_cocoa/libglcocoa.la
+lib_evas_libevas_la_DEPENDENCIES += modules/evas/engines/gl_cocoa/libglcocoa.la
+modules_evas_engines_gl_cocoa_libglcocoa_la_SOURCES = $(GL_COCOA_SOURCES)
+modules_evas_engines_gl_cocoa_libglcocoa_la_CPPFLAGS = @evas_engine_gl_cocoa_cflags@
+modules_evas_engines_gl_cocoa_libglcocoa_la_LIBADD = @evas_engine_gl_cocoa_libs@
+else
+engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
+engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_engineglcocoapkgLTLIBRARIES = install-engineglcocoapkgLTLIBRARIES
+$(install_engineglcocoapkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
+modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+@EVAS_CFLAGS@ \
+@evas_engine_gl_cocoa_cflags@
+modules_evas_engines_gl_cocoa_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_engine_gl_cocoa_libs@
+modules_evas_engines_gl_cocoa_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_SDL
+GL_SDL_SOURCES = \
+modules/evas/engines/gl_sdl/evas_engine.c \
+modules/evas/engines/gl_sdl/evas_engine.h \
+modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
+if EVAS_STATIC_BUILD_GL_SDL
+lib_evas_libevas_la_SOURCES += $(GL_SDL_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@evas_engine_gl_sdl_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_gl_sdl_libs@
+else
+engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
+engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_engineglsdlpkgLTLIBRARIES = install-engineglsdlpkgLTLIBRARIES
+$(install_engineglsdlpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
+modules_evas_engines_gl_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_engine_gl_sdl_cflags@
+modules_evas_engines_gl_sdl_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_engine_gl_sdl_libs@
+modules_evas_engines_gl_sdl_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_gl_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_X11
+GL_X11_SOURCES = \
+modules/evas/engines/gl_x11/evas_engine.c \
+modules/evas/engines/gl_x11/evas_x_main.c \
+modules/evas/engines/gl_x11/evas_engine.h \
+modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h
+if EVAS_STATIC_BUILD_GL_X11
+lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_gl_xlib_libs@
+else
+engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
+engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_engineglx11pkgLTLIBRARIES = install-engineglx11pkgLTLIBRARIES
+$(install_engineglx11pkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
+modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_engine_gl_xlib_cflags@
+modules_evas_engines_gl_x11_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_engine_gl_xlib_libs@
+modules_evas_engines_gl_x11_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_SOFTWARE_DDRAW
+SOFTWARE_DDRAW_SOURCES = \
+modules/evas/engines/software_ddraw/evas_engine.c \
+modules/evas/engines/software_ddraw/evas_outbuf.c \
+modules/evas/engines/software_ddraw/evas_ddraw_buffer.c \
+modules/evas/engines/software_ddraw/evas_ddraw_main.cpp \
+modules/evas/engines/software_ddraw/evas_engine.h \
+modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h
+if EVAS_STATIC_BUILD_SOFTWARE_DDRAW
+lib_evas_libevas_la_LIBADD += modules/evas/engines/software_ddraw/libswddraw.la
+lib_evas_libevas_la_DEPENDENCIES += modules/evas/engines/software_ddraw/libswddraw.la
+noinst_LTLIBRARIES += modules/evas/engines/software_ddraw/libswddraw.la
+modules_evas_engines_software_ddraw_libswddraw_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
+modules_evas_engines_software_ddraw_libswddraw_la_CPPFLAGS = \
+@evas_engine_software_ddraw_cflags@ \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EVAS_CFLAGS@
+modules_evas_engines_software_ddraw_libswddraw_la_CXXFLAGS = -fno-rtti -fno-exceptions
+modules_evas_engines_software_ddraw_libswddraw_la_LIBADD = @evas_engine_software_ddraw_libs@
+else
+enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
+enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginesoftwareddrawpkgLTLIBRARIES = install-enginesoftwareddrawpkgLTLIBRARIES
+$(install_enginesoftwareddrawpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
+modules_evas_engines_software_ddraw_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_engine_software_ddraw_cflags@
+modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
+modules_evas_engines_software_ddraw_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_engine_software_ddraw_libs@
+modules_evas_engines_software_ddraw_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_ddraw_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_SOFTWARE_GDI
+SOFTWARE_GDI_SOURCES = \
+modules/evas/engines/software_gdi/evas_engine.c \
+modules/evas/engines/software_gdi/evas_outbuf.c \
+modules/evas/engines/software_gdi/evas_gdi_buffer.c \
+modules/evas/engines/software_gdi/evas_gdi_main.c \
+modules/evas/engines/software_gdi/evas_engine.h \
+modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h
+if EVAS_STATIC_BUILD_SOFTWARE_GDI
+lib_evas_libevas_la_SOURCES += $(SOFTWARE_GDI_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_software_gdi_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_software_gdi_libs@
+else
+enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
+enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginesoftwaregdipkgLTLIBRARIES = install-enginesoftwaregdipkgLTLIBRARIES
+$(install_enginesoftwaregdipkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
+modules_evas_engines_software_gdi_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_engine_software_gdi_cflags@
+modules_evas_engines_software_gdi_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_engine_software_gdi_libs@
+modules_evas_engines_software_gdi_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_gdi_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_SOFTWARE_X11
+SOFTWARE_X11_SOURCES = \
+modules/evas/engines/software_x11/evas_engine.c \
+modules/evas/engines/software_x11/evas_engine.h \
+modules/evas/engines/software_x11/evas_x_egl.c \
+modules/evas/engines/software_x11/evas_x_egl.h \
+modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
+SOFTWARE_X11_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+@ECORE_X_CFLAGS@ \
+@EVAS_CFLAGS@
+SOFTWARE_X11_LIBADD =
+if BUILD_ENGINE_SOFTWARE_XLIB
+SOFTWARE_X11_SOURCES += \
+modules/evas/engines/software_x11/evas_xlib_swapbuf.c \
+modules/evas/engines/software_x11/evas_xlib_outbuf.c \
+modules/evas/engines/software_x11/evas_xlib_buffer.c \
+modules/evas/engines/software_x11/evas_xlib_color.c \
+modules/evas/engines/software_x11/evas_xlib_main.c \
+modules/evas/engines/software_x11/evas_xlib_swapper.c \
+modules/evas/engines/software_x11/evas_xlib_image.c \
+modules/evas/engines/software_x11/evas_xlib_dri_image.c \
+modules/evas/engines/software_x11/evas_xlib_outbuf.h \
+modules/evas/engines/software_x11/evas_xlib_swapbuf.h \
+modules/evas/engines/software_x11/evas_xlib_buffer.h \
+modules/evas/engines/software_x11/evas_xlib_color.h \
+modules/evas/engines/software_x11/evas_xlib_swapper.h \
+modules/evas/engines/software_x11/evas_xlib_image.h \
+modules/evas/engines/software_x11/evas_xlib_dri_image.h
+SOFTWARE_X11_CPPFLAGS += @evas_engine_software_xlib_cflags@
+SOFTWARE_X11_LIBADD += @evas_engine_software_xlib_libs@
+endif
+if EVAS_STATIC_BUILD_SOFTWARE_X11
+lib_evas_libevas_la_SOURCES += $(SOFTWARE_X11_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += $(SOFTWARE_X11_CPPFLAGS)
+lib_evas_libevas_la_LIBADD += $(SOFTWARE_X11_LIBADD)
+else
+enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
+enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginesoftwarex11pkgLTLIBRARIES = install-enginesoftwarex11pkgLTLIBRARIES
+$(install_enginesoftwarex11pkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
+modules_evas_engines_software_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(SOFTWARE_X11_CPPFLAGS) -DEFL_BUILD
+modules_evas_engines_software_x11_module_la_LIBADD = @USE_ECORE_X_LIBS@ @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
+modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_ECORE_X_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_WAYLAND_EGL
+WAYLAND_EGL_SOURCES = \
+modules/evas/engines/wayland_egl/evas_engine.c \
+modules/evas/engines/wayland_egl/evas_wl_main.c \
+modules/evas/engines/wayland_egl/evas_engine.h \
+modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
+if EVAS_STATIC_BUILD_WAYLAND_EGL
+lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_wayland_egl_libs@
+else
+enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
+enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginewaylandeglpkgLTLIBRARIES = install-enginewaylandeglpkgLTLIBRARIES
+$(install_enginewaylandeglpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
+modules_evas_engines_wayland_egl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
+@EVAS_CFLAGS@ \
+@ECORE_WL2_CFLAGS@ \
+@evas_engine_wayland_egl_cflags@
+modules_evas_engines_wayland_egl_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@USE_ECORE_WL2_LIBS@ \
+@evas_engine_wayland_egl_libs@
+modules_evas_engines_wayland_egl_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ lib/ecore_wl2/libecore_wl2.la
+modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_WAYLAND_SHM
+WAYLAND_SHM_SOURCES = \
+modules/evas/engines/wayland_common/Evas_Engine_Wayland.h \
+modules/evas/engines/wayland_shm/evas_engine.c \
+modules/evas/engines/wayland_shm/evas_engine.h \
+modules/evas/engines/wayland_shm/evas_outbuf.c
+
+NODIST_WAYLAND_SHM_SOURCES = \
+lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c
+
+if EVAS_STATIC_BUILD_WAYLAND_SHM
+nodist_lib_evas_libevas_la_SOURCES = $(NODIST_WAYLAND_SHM_SOURCES)
+lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_wayland_shm_libs@
+else
+enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
+enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginewaylandshmpkgLTLIBRARIES = install-enginewaylandshmpkgLTLIBRARIES
+$(install_enginewaylandshmpkgLTLIBRARIES): install-libLTLIBRARIES
+
+nodist_modules_evas_engines_wayland_shm_module_la_SOURCES = $(NODIST_WAYLAND_SHM_SOURCES)
+modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
+modules_evas_engines_wayland_shm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/ecore_wl2 \
+-I$(top_builddir)/src/lib/ecore_wl2 \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
+@EVAS_CFLAGS@ \
+@ECORE_WL2_CFLAGS@ \
+@evas_engine_wayland_shm_cflags@
+modules_evas_engines_wayland_shm_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@USE_ECORE_WL2_LIBS@ \
+@evas_engine_wayland_shm_libs@
+modules_evas_engines_wayland_shm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ lib/ecore_wl2/libecore_wl2.la
+modules_evas_engines_wayland_shm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_DRM
+DRM_SOURCES = \
+modules/evas/engines/drm/evas_outbuf.c \
+modules/evas/engines/drm/evas_engine.c \
+modules/evas/engines/drm/evas_engine.h \
+modules/evas/engines/drm/Evas_Engine_Drm.h
+if EVAS_STATIC_BUILD_DRM
+lib_evas_libevas_la_SOURCES += $(DRM_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_drm_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_drm_libs@
+else
+enginedrmpkgdir = $(libdir)/evas/modules/engines/drm/$(MODULE_ARCH)
+enginedrmpkg_LTLIBRARIES = modules/evas/engines/drm/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginedrmpkgLTLIBRARIES = install-enginedrmpkgLTLIBRARIES
+$(install_enginedrmpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_drm_module_la_SOURCES = $(DRM_SOURCES)
+modules_evas_engines_drm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/modules/evas/engines/drm \
+@EVAS_CFLAGS@ \
+@ECORE_DRM2_CFLAGS@ \
+@evas_engine_drm_cflags@
+modules_evas_engines_drm_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@USE_ECORE_DRM2_LIBS@ \
+@evas_engine_drm_libs@
+modules_evas_engines_drm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ @USE_ECORE_DRM2_INTERNAL_LIBS@
+modules_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_drm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_DRM
+GL_DRM_SOURCES = \
+modules/evas/engines/gl_drm/evas_outbuf.c \
+modules/evas/engines/gl_drm/evas_engine.c \
+modules/evas/engines/gl_drm/evas_engine.h \
+modules/evas/engines/gl_drm/Evas_Engine_GL_Drm.h
+if EVAS_STATIC_BUILD_GL_DRM
+lib_evas_libevas_la_SOURCES += $(GL_DRM_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_gl_drm_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_gl_drm_libs@
+else
+enginegl_drmpkgdir = $(libdir)/evas/modules/engines/gl_drm/$(MODULE_ARCH)
+enginegl_drmpkg_LTLIBRARIES = modules/evas/engines/gl_drm/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_enginegl_drmpkgLTLIBRARIES = install-enginegl_drmpkgLTLIBRARIES
+$(install_enginegl_drmpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_gl_drm_module_la_SOURCES = $(GL_DRM_SOURCES)
+modules_evas_engines_gl_drm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/modules/evas/engines/gl_drm \
+@EVAS_CFLAGS@ \
+@ECORE_DRM2_CFLAGS@ \
+@evas_engine_gl_drm_cflags@
+modules_evas_engines_gl_drm_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@USE_ECORE_DRM2_LIBS@ \
+@evas_engine_gl_drm_libs@
+modules_evas_engines_gl_drm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ @USE_ECORE_DRM2_INTERNAL_LIBS@
+modules_evas_engines_gl_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_gl_drm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_EGLFS
+EGLFS_SOURCES = \
+modules/evas/engines/eglfs/evas_outbuf.c \
+modules/evas/engines/eglfs/evas_engine.c \
+modules/evas/engines/eglfs/evas_engine.h \
+modules/evas/engines/eglfs/Evas_Engine_Eglfs.h
+if EVAS_STATIC_BUILD_EGLFS
+lib_evas_libevas_la_SOURCES += $(EGLFS_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_eglfs_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_eglfs_libs@
+else
+engineeglfspkgdir = $(libdir)/evas/modules/engines/eglfs/$(MODULE_ARCH)
+engineeglfspkg_LTLIBRARIES = modules/evas/engines/eglfs/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_engineeglfspkgLTLIBRARIES = install-engineeglfspkgLTLIBRARIES
+$(install_engineeglfspkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_engines_eglfs_module_la_SOURCES = $(EGLFS_SOURCES)
+modules_evas_engines_eglfs_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/modules/evas/engines/eglfs \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@ECORE_DRM_CFLAGS@ \
+@evas_engine_eglfs_cflags@
+modules_evas_engines_eglfs_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@USE_ECORE_DRM_LIBS@ \
+@evas_engine_eglfs_libs@
+modules_evas_engines_eglfs_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ @USE_ECORE_DRM_INTERNAL_LIBS@
+modules_evas_engines_eglfs_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_engines_eglfs_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+### loaders and savers
+
+if BUILD_VG_LOADER_SVG
+if EVAS_STATIC_BUILD_VG_SVG
+lib_evas_libevas_la_SOURCES += modules/evas/vg_loaders/svg/evas_vg_load_svg.c modules/evas/vg_savers/svg/evas_vg_save_svg.c \
+static_libs/vg_common/vg_common_svg.c \
+static_libs/vg_common/vg_common.h
+lib_evas_libevas_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/vg_common \
+@evas_vg_loader_svg_cflags@
+lib_evas_libevas_la_LIBADD += @evas_vg_loader_svg_libs@
+else
+vgloadersvgpkgdir = $(libdir)/evas/modules/vg_loaders/svg/$(MODULE_ARCH)
+vgloadersvgpkg_LTLIBRARIES = modules/evas/vg_loaders/svg/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_vgloadersvgpkgLTLIBRARIES = install-vgloadersvgpkgLTLIBRARIES
+$(install_vgloadersvgpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_vg_loaders_svg_module_la_SOURCES = modules/evas/vg_loaders/svg/evas_vg_load_svg.c \
+static_libs/vg_common/vg_common_svg.c \
+static_libs/vg_common/vg_common.h
+modules_evas_vg_loaders_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/static_libs/vg_common \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_vg_loader_svg_cflags@
+modules_evas_vg_loaders_svg_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_vg_loader_svg_libs@
+modules_evas_vg_loaders_svg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_vg_loaders_svg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_vg_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+vgsaversvgpkgdir = $(libdir)/evas/modules/vg_savers/svg/$(MODULE_ARCH)
+vgsaversvgpkg_LTLIBRARIES = modules/evas/vg_savers/svg/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_vgsaversvgpkgLTLIBRARIES = install-vgloadersvgpkgLTLIBRARIES
+$(install_vgsaversvgpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_vg_savers_svg_module_la_SOURCES = modules/evas/vg_savers/svg/evas_vg_save_svg.c \
+static_libs/vg_common/vg_common_svg.c \
+static_libs/vg_common/vg_common.h
+modules_evas_vg_savers_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/static_libs/vg_common \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_vg_saver_svg_cflags@
+modules_evas_vg_savers_svg_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_vg_saver_svg_libs@
+modules_evas_vg_savers_svg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_vg_savers_svg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_vg_savers_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_VG_LOADER_EET
+if EVAS_STATIC_BUILD_VG_EET
+lib_evas_libevas_la_SOURCES += modules/evas/vg_loaders/eet/evas_vg_load_eet.c modules/evas/vg_savers/eet/evas_vg_save_eet.c
+lib_evas_libevas_la_CPPFLAGS += @evas_vg_loader_eet_cflags@
+lib_evas_libevas_la_LIBADD += @evas_vg_loader_eet_libs@
+else
+vgloadereetpkgdir = $(libdir)/evas/modules/vg_loaders/eet/$(MODULE_ARCH)
+vgloadereetpkg_LTLIBRARIES = modules/evas/vg_loaders/eet/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_vgloadereetpkgLTLIBRARIES = install-vgloadereetpkgLTLIBRARIES
+$(install_vgloadereetpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_vg_loaders_eet_module_la_SOURCES = modules/evas/vg_loaders/eet/evas_vg_load_eet.c
+modules_evas_vg_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_vg_loader_eet_cflags@
+modules_evas_vg_loaders_eet_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_vg_loader_eet_libs@
+modules_evas_vg_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_vg_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_vg_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+vgsavereetpkgdir = $(libdir)/evas/modules/vg_savers/eet/$(MODULE_ARCH)
+vgsavereetpkg_LTLIBRARIES = modules/evas/vg_savers/eet/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_vgsavereetpkgLTLIBRARIES = install-vgloadereetpkgLTLIBRARIES
+$(install_vgsavereetpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_vg_savers_eet_module_la_SOURCES = modules/evas/vg_savers/eet/evas_vg_save_eet.c
+modules_evas_vg_savers_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_vg_saver_eet_cflags@
+modules_evas_vg_savers_eet_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_vg_saver_eet_libs@
+modules_evas_vg_savers_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_vg_savers_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_vg_savers_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+
+if BUILD_LOADER_BMP
+if EVAS_STATIC_BUILD_BMP
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/bmp/evas_image_load_bmp.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_bmp_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_bmp_libs@
+else
+loaderbmppkgdir = $(libdir)/evas/modules/image_loaders/bmp/$(MODULE_ARCH)
+loaderbmppkg_LTLIBRARIES = modules/evas/image_loaders/bmp/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderbmppkgLTLIBRARIES = install-loaderbmppkgLTLIBRARIES
+$(install_loaderbmppkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_bmp_module_la_SOURCES = modules/evas/image_loaders/bmp/evas_image_load_bmp.c
+modules_evas_image_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_bmp_cflags@
+modules_evas_image_loaders_bmp_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_bmp_libs@
+modules_evas_image_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_DDS
+if EVAS_STATIC_BUILD_DDS
+lib_evas_libevas_la_SOURCES += \
+modules/evas/image_loaders/dds/evas_image_load_dds.c \
+modules/evas/image_loaders/dds/s3tc_decoder.c \
+modules/evas/image_loaders/dds/s3tc.h
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_dds_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_dds_libs@
+else
+loaderddspkgdir = $(libdir)/evas/modules/image_loaders/dds/$(MODULE_ARCH)
+loaderddspkg_LTLIBRARIES = modules/evas/image_loaders/dds/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderddspkgLTLIBRARIES = install-loaderddspkgLTLIBRARIES
+$(install_loaderddspkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_dds_module_la_SOURCES = \
+modules/evas/image_loaders/dds/evas_image_load_dds.c \
+modules/evas/image_loaders/dds/s3tc_decoder.c \
+modules/evas/image_loaders/dds/s3tc.h
+modules_evas_image_loaders_dds_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_dds_cflags@
+modules_evas_image_loaders_dds_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_dds_libs@
+modules_evas_image_loaders_dds_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_dds_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_dds_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_EET
+if EVAS_STATIC_BUILD_EET
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/eet/evas_image_load_eet.c modules/evas/image_savers/eet/evas_image_save_eet.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_eet_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_eet_libs@
+else
+loadereetpkgdir = $(libdir)/evas/modules/image_loaders/eet/$(MODULE_ARCH)
+loadereetpkg_LTLIBRARIES = modules/evas/image_loaders/eet/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadereetpkgLTLIBRARIES = install-loadereetpkgLTLIBRARIES
+$(install_loadereetpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_eet_module_la_SOURCES = modules/evas/image_loaders/eet/evas_image_load_eet.c
+modules_evas_image_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_eet_cflags@
+modules_evas_image_loaders_eet_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_eet_libs@
+modules_evas_image_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_GENERIC
+if EVAS_STATIC_BUILD_GENERIC
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/generic/evas_image_load_generic.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_generic_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_generic_libs@
+else
+loadergenericpkgdir = $(libdir)/evas/modules/image_loaders/generic/$(MODULE_ARCH)
+loadergenericpkg_LTLIBRARIES = modules/evas/image_loaders/generic/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadergenericpkgLTLIBRARIES = install-loadergenericpkgLTLIBRARIES
+$(install_loadergenericpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_generic_module_la_SOURCES = modules/evas/image_loaders/generic/evas_image_load_generic.c
+modules_evas_image_loaders_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_generic_cflags@
+modules_evas_image_loaders_generic_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_generic_libs@
+modules_evas_image_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_GIF
+if EVAS_STATIC_BUILD_GIF
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/gif/evas_image_load_gif.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_gif_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_gif_libs@
+else
+loadergifpkgdir = $(libdir)/evas/modules/image_loaders/gif/$(MODULE_ARCH)
+loadergifpkg_LTLIBRARIES = modules/evas/image_loaders/gif/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadergifpkgLTLIBRARIES = install-loadergifpkgLTLIBRARIES
+$(install_loadergifpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_gif_module_la_SOURCES = modules/evas/image_loaders/gif/evas_image_load_gif.c
+modules_evas_image_loaders_gif_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_gif_cflags@
+modules_evas_image_loaders_gif_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_gif_libs@
+modules_evas_image_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_ICO
+if EVAS_STATIC_BUILD_ICO
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/ico/evas_image_load_ico.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_ico_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_ico_libs@
+else
+loadericopkgdir = $(libdir)/evas/modules/image_loaders/ico/$(MODULE_ARCH)
+loadericopkg_LTLIBRARIES = modules/evas/image_loaders/ico/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadericopkgLTLIBRARIES = install-loadericopkgLTLIBRARIES
+$(install_loadericopkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_ico_module_la_SOURCES = modules/evas/image_loaders/ico/evas_image_load_ico.c
+modules_evas_image_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_ico_cflags@
+modules_evas_image_loaders_ico_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_ico_libs@
+modules_evas_image_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_JPEG
+if EVAS_STATIC_BUILD_JPEG
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
+lib_evas_libevas_la_SOURCES += modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jpeg_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_jpeg_libs@
+else
+loaderjpegpkgdir = $(libdir)/evas/modules/image_loaders/jpeg/$(MODULE_ARCH)
+loaderjpegpkg_LTLIBRARIES = modules/evas/image_loaders/jpeg/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderjpegpkgLTLIBRARIES = install-loaderjpegpkgLTLIBRARIES
+$(install_loaderjpegpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_jpeg_module_la_SOURCES = modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
+modules_evas_image_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_jpeg_cflags@
+modules_evas_image_loaders_jpeg_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_jpeg_libs@
+modules_evas_image_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
+saverjpegpkgdir = $(libdir)/evas/modules/image_savers/jpeg/$(MODULE_ARCH)
+saverjpegpkg_LTLIBRARIES = modules/evas/image_savers/jpeg/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_saverjpegpkgLTLIBRARIES = install-saverjpegpkgLTLIBRARIES
+$(install_saverjpegpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_savers_jpeg_module_la_SOURCES = modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
+modules_evas_image_savers_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_jpeg_cflags@
+modules_evas_image_savers_jpeg_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_jpeg_libs@
+modules_evas_image_savers_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_JP2K
+if EVAS_STATIC_BUILD_JP2K
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jp2k_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_jp2k_libs@
+else
+loaderjp2kpkgdir = $(libdir)/evas/modules/image_loaders/jp2k/$(MODULE_ARCH)
+loaderjp2kpkg_LTLIBRARIES = modules/evas/image_loaders/jp2k/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderjp2kpkgLTLIBRARIES = install-loaderjp2kpkgLTLIBRARIES
+$(install_loaderjp2kpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_jp2k_module_la_SOURCES = modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
+modules_evas_image_loaders_jp2k_module_la_CPPFLAGS = \
+@evas_image_loader_jp2k_cflags@ \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@
+modules_evas_image_loaders_jp2k_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_jp2k_libs@
+modules_evas_image_loaders_jp2k_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_jp2k_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_jp2k_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_PMAPS
+if EVAS_STATIC_BUILD_PMAPS
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_pmaps_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_pmaps_libs@
+else
+loaderpmapspkgdir = $(libdir)/evas/modules/image_loaders/pmaps/$(MODULE_ARCH)
+loaderpmapspkg_LTLIBRARIES = modules/evas/image_loaders/pmaps/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderpmapspkgLTLIBRARIES = install-loaderpmapspkgLTLIBRARIES
+$(install_loaderpmapspkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_pmaps_module_la_SOURCES = modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
+modules_evas_image_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_pmaps_cflags@
+modules_evas_image_loaders_pmaps_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_pmaps_libs@
+modules_evas_image_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_PNG
+if EVAS_STATIC_BUILD_PNG
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/png/evas_image_load_png.c modules/evas/image_savers/png/evas_image_save_png.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_png_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@
+else
+loaderpngpkgdir = $(libdir)/evas/modules/image_loaders/png/$(MODULE_ARCH)
+loaderpngpkg_LTLIBRARIES = modules/evas/image_loaders/png/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderpngpkgLTLIBRARIES = install-loaderpngpkgLTLIBRARIES
+$(install_loaderpngpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_png_module_la_SOURCES = modules/evas/image_loaders/png/evas_image_load_png.c
+modules_evas_image_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_png_cflags@
+modules_evas_image_loaders_png_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_png_libs@
+modules_evas_image_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+saverpngpkgdir = $(libdir)/evas/modules/image_savers/png/$(MODULE_ARCH)
+saverpngpkg_LTLIBRARIES = modules/evas/image_savers/png/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_saverpngpkgLTLIBRARIES = install-saverpngpkgLTLIBRARIES
+$(install_saverpngpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_savers_png_module_la_SOURCES = modules/evas/image_savers/png/evas_image_save_png.c
+modules_evas_image_savers_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_png_cflags@
+modules_evas_image_savers_png_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_png_libs@
+modules_evas_image_savers_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_savers_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_PSD
+if EVAS_STATIC_BUILD_PSD
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/psd/evas_image_load_psd.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_psd_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_psd_libs@
+else
+loaderpsdpkgdir = $(libdir)/evas/modules/image_loaders/psd/$(MODULE_ARCH)
+loaderpsdpkg_LTLIBRARIES = modules/evas/image_loaders/psd/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderpsdpkgLTLIBRARIES = install-loaderpsdpkgLTLIBRARIES
+$(install_loaderpsdpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_psd_module_la_SOURCES = modules/evas/image_loaders/psd/evas_image_load_psd.c
+modules_evas_image_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_psd_cflags@
+modules_evas_image_loaders_psd_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_psd_libs@
+modules_evas_image_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_TGA
+if EVAS_STATIC_BUILD_TGA
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/tga/evas_image_load_tga.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tga_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_tga_libs@
+else
+loadertgapkgdir = $(libdir)/evas/modules/image_loaders/tga/$(MODULE_ARCH)
+loadertgapkg_LTLIBRARIES = modules/evas/image_loaders/tga/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadertgapkgLTLIBRARIES = install-loadertgapkgLTLIBRARIES
+$(install_loadertgapkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_tga_module_la_SOURCES = modules/evas/image_loaders/tga/evas_image_load_tga.c
+modules_evas_image_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_tga_cflags@
+modules_evas_image_loaders_tga_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_tga_libs@
+modules_evas_image_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_TIFF
+if EVAS_STATIC_BUILD_TIFF
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/tiff/evas_image_load_tiff.c modules/evas/image_savers/tiff/evas_image_save_tiff.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tiff_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_tiff_libs@
+else
+loadertiffpkgdir = $(libdir)/evas/modules/image_loaders/tiff/$(MODULE_ARCH)
+loadertiffpkg_LTLIBRARIES = modules/evas/image_loaders/tiff/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadertiffpkgLTLIBRARIES = install-loadertiffpkgLTLIBRARIES
+$(install_loadertiffpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_tiff_module_la_SOURCES = modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+modules_evas_image_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_tiff_cflags@
+modules_evas_image_loaders_tiff_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_tiff_libs@
+modules_evas_image_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+savertiffpkgdir = $(libdir)/evas/modules/image_savers/tiff/$(MODULE_ARCH)
+savertiffpkg_LTLIBRARIES = modules/evas/image_savers/tiff/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_savertiffpkgLTLIBRARIES = install-savertiffpkgLTLIBRARIES
+$(install_savertiffpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_savers_tiff_module_la_SOURCES = modules/evas/image_savers/tiff/evas_image_save_tiff.c
+modules_evas_image_savers_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_tiff_cflags@
+modules_evas_image_savers_tiff_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_tiff_libs@
+modules_evas_image_savers_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_savers_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_WBMP
+if EVAS_STATIC_BUILD_WBMP
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_wbmp_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_wbmp_libs@
+else
+loaderwbmppkgdir = $(libdir)/evas/modules/image_loaders/wbmp/$(MODULE_ARCH)
+loaderwbmppkg_LTLIBRARIES = modules/evas/image_loaders/wbmp/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderwbmppkgLTLIBRARIES = install-loaderwbmppkgLTLIBRARIES
+$(install_loaderwbmppkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_wbmp_module_la_SOURCES = modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
+modules_evas_image_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_wbmp_cflags@
+modules_evas_image_loaders_wbmp_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_wbmp_libs@
+modules_evas_image_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_WEBP
+if EVAS_STATIC_BUILD_WEBP
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/webp/evas_image_load_webp.c modules/evas/image_savers/webp/evas_image_save_webp.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_webp_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_webp_libs@
+else
+loaderwebppkgdir = $(libdir)/evas/modules/image_loaders/webp/$(MODULE_ARCH)
+loaderwebppkg_LTLIBRARIES = modules/evas/image_loaders/webp/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderwebppkgLTLIBRARIES = install-loaderwebppkgLTLIBRARIES
+$(install_loaderwebppkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_webp_module_la_SOURCES = modules/evas/image_loaders/webp/evas_image_load_webp.c
+modules_evas_image_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_webp_cflags@
+modules_evas_image_loaders_webp_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_webp_libs@
+modules_evas_image_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+saverwebppkgdir = $(libdir)/evas/modules/image_savers/webp/$(MODULE_ARCH)
+saverwebppkg_LTLIBRARIES = modules/evas/image_savers/webp/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_saverwebppkgLTLIBRARIES = install-saverwebppkgLTLIBRARIES
+$(install_saverwebppkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_savers_webp_module_la_SOURCES = modules/evas/image_savers/webp/evas_image_save_webp.c
+modules_evas_image_savers_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_webp_cflags@
+modules_evas_image_savers_webp_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_webp_libs@
+modules_evas_image_savers_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_savers_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_savers_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_XPM
+if EVAS_STATIC_BUILD_XPM
+lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/xpm/evas_image_load_xpm.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_xpm_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_xpm_libs@
+else
+loaderxpmpkgdir = $(libdir)/evas/modules/image_loaders/xpm/$(MODULE_ARCH)
+loaderxpmpkg_LTLIBRARIES = modules/evas/image_loaders/xpm/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loaderxpmpkgLTLIBRARIES = install-loaderxpmpkgLTLIBRARIES
+$(install_loaderxpmpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_xpm_module_la_SOURCES = modules/evas/image_loaders/xpm/evas_image_load_xpm.c
+modules_evas_image_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@evas_image_loader_xpm_cflags@
+modules_evas_image_loaders_xpm_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
+@evas_image_loader_xpm_libs@
+modules_evas_image_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_TGV
+EXTRA_DIST2 += static_libs/rg_etc/README
+if EVAS_STATIC_BUILD_TGV
+lib_evas_libevas_la_SOURCES += \
+modules/evas/image_loaders/tgv/evas_image_load_tgv.c \
+modules/evas/image_savers/tgv/evas_image_save_tgv.c
+if ! ENABLE_LIBLZ4
+lib_evas_libevas_la_SOURCES += \
+static_libs/lz4/lz4.c \
+static_libs/lz4/lz4.h \
+static_libs/lz4/lz4hc.c \
+static_libs/lz4/lz4hc.h
+endif
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/static_libs/rg_etc
+if ! ENABLE_LIBLZ4
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/static_libs/lz4
+endif
+endif
+else
+loadertgvpkgdir = $(libdir)/evas/modules/image_loaders/tgv/$(MODULE_ARCH)
+loadertgvpkg_LTLIBRARIES = modules/evas/image_loaders/tgv/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_loadertgvpkgLTLIBRARIES = install-loadertgvpkgLTLIBRARIES
+$(install_loadertgvpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_loaders_tgv_module_la_SOURCES = \
+modules/evas/image_loaders/tgv/evas_image_load_tgv.c \
+static_libs/rg_etc/rg_etc1.c \
+static_libs/rg_etc/rg_etc2.c \
+static_libs/rg_etc/rg_etc1.h
+if ! ENABLE_LIBLZ4
+modules_evas_image_loaders_tgv_module_la_SOURCES += \
+static_libs/lz4/lz4.c \
+static_libs/lz4/lz4.h
+endif
+modules_evas_image_loaders_tgv_module_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/static_libs/rg_etc \
+-I$(top_srcdir)/src/lib/evas/ \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@ \
+@NEON_CFLAGS@
+if ! ENABLE_LIBLZ4
+modules_evas_image_loaders_tgv_module_la_CPPFLAGS += \
+-I$(top_srcdir)/src/static_libs/lz4
+endif
+modules_evas_image_loaders_tgv_module_la_LIBADD = \
+@USE_EVAS_LIBS@
+modules_evas_image_loaders_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_loaders_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_loaders_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+savertgvpkgdir = $(libdir)/evas/modules/image_savers/tgv/$(MODULE_ARCH)
+savertgvpkg_LTLIBRARIES = modules/evas/image_savers/tgv/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_savertgvpkgLTLIBRARIES = install-savertgvpkgLTLIBRARIES
+$(install_savertgvpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_evas_image_savers_tgv_module_la_SOURCES = \
+modules/evas/image_savers/tgv/evas_image_save_tgv.c \
+static_libs/rg_etc/rg_etc1.c \
+static_libs/rg_etc/rg_etc1.h \
+static_libs/rg_etc/etc2_encoder.c
+if ! ENABLE_LIBLZ4
+modules_evas_image_savers_tgv_module_la_SOURCES += \
+static_libs/lz4/lz4.c \
+static_libs/lz4/lz4.h \
+static_libs/lz4/lz4hc.c \
+static_libs/lz4/lz4hc.h
+endif
+modules_evas_image_savers_tgv_module_la_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/static_libs/rg_etc \
+-I$(top_srcdir)/src/lib/evas/ \
+-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
+@EVAS_CFLAGS@
+
+if ! ENABLE_LIBLZ4
+modules_evas_image_savers_tgv_module_la_CPPFLAGS += \
+-I$(top_srcdir)/src/static_libs/lz4
+endif
+modules_evas_image_savers_tgv_module_la_LIBADD = \
+@USE_EVAS_LIBS@
+modules_evas_image_savers_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_image_savers_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_evas_image_savers_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/evas/evas_suite
+TESTS += tests/evas/evas_suite
+
+tests_evas_evas_suite_SOURCES = \
+tests/evas/evas_suite.c \
+tests/evas/evas_test_init.c \
+tests/evas/evas_test_new.c \
+tests/evas/evas_test_object.c \
+tests/evas/evas_test_object_smart.c \
+tests/evas/evas_test_textblock.c \
+tests/evas/evas_test_text.c \
+tests/evas/evas_test_callbacks.c \
+tests/evas/evas_test_render_engines.c \
+tests/evas/evas_test_filters.c \
+tests/evas/evas_test_image.c \
+tests/evas/evas_test_mesh.c \
+tests/evas/evas_test_mask.c \
+tests/evas/evas_test_evasgl.c \
+tests/evas/evas_test_matrix.c \
+tests/evas/evas_tests_helpers.h \
+tests/evas/evas_suite.h
+
+tests_evas_evas_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_srcdir)/src/modules/evas/engines/buffer \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas\" \
+@CHECK_CFLAGS@ \
+@EVAS_CFLAGS@
+
+tests_evas_evas_suite_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@ @USE_ECORE_EVAS_LIBS@
+tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+endif
+
+EXTRA_DIST2 += \
+tests/evas/fonts/TestFont.eet \
+tests/evas/fonts/evas_test_font.ttf \
+tests/evas/images/HM7Y9233-50.tgv \
+tests/evas/images/HM7Y9233.jpg \
+tests/evas/images/Light-50.png \
+tests/evas/images/Light-50.tgv \
+tests/evas/images/Light.jpg \
+tests/evas/images/Light_exif.jpg \
+tests/evas/images/Light_exif_90.jpg \
+tests/evas/images/Light_exif_180.jpg \
+tests/evas/images/Light_exif_270.jpg \
+tests/evas/images/Pic1-10.png \
+tests/evas/images/Pic1-10.tgv \
+tests/evas/images/Pic1-100.png \
+tests/evas/images/Pic1-100.tgv \
+tests/evas/images/Pic1-50.png \
+tests/evas/images/Pic1-50.tgv \
+tests/evas/images/Pic1.png \
+tests/evas/images/Pic4-10.png \
+tests/evas/images/Pic4-10.tgv \
+tests/evas/images/Pic4-100.png \
+tests/evas/images/Pic4-100.tgv \
+tests/evas/images/Pic4-50.png \
+tests/evas/images/Pic4-50.tgv \
+tests/evas/images/Pic4.png \
+tests/evas/images/Sunrise-100.tgv \
+tests/evas/images/Temple-10.tgv \
+tests/evas/images/Temple.jpg \
+tests/evas/images/Temple3-10.tgv \
+tests/evas/images/Temple3.jpg \
+tests/evas/images/Train-10.png \
+tests/evas/images/Train-10.tgv \
+tests/evas/images/Train.jpg \
+tests/evas/images/mars_rover_panorama_half-size.jpg \
+tests/evas/images/Light_exif_flip_h.jpg \
+tests/evas/images/Light_exif_flip_v.jpg \
+tests/evas/images/Light_exif_transpose.jpg \
+tests/evas/images/Light_exif_transverse.jpg \
+tests/evas/images/Pic4-bmp.png \
+tests/evas/images/Pic4-dds.png \
+tests/evas/images/Pic4-gif.png \
+tests/evas/images/Pic4-png.png \
+tests/evas/images/Pic4-psd.png \
+tests/evas/images/Pic4-tga.png \
+tests/evas/images/Pic4-wbmp.png \
+tests/evas/images/Pic4-webp.png \
+tests/evas/images/Pic4-xpm.png \
+tests/evas/images/Pic4.bmp \
+tests/evas/images/Pic4.dds \
+tests/evas/images/Pic4.gif \
+tests/evas/images/Pic4.psd \
+tests/evas/images/Pic4.tga \
+tests/evas/images/Pic4.wbmp \
+tests/evas/images/Pic4.webp \
+tests/evas/images/Pic4.xpm \
+tests/evas/meshes/md2/sonic.md2 \
+tests/evas/meshes/obj/man_mesh.obj \
+tests/evas/images/gray.jpg \
+tests/evas/images/bg_gray.png \
+tests/evas/images/flower.jp2 \
+tests/evas/images/flower.jp2.png \
+tests/evas/images/train.j2k \
+tests/evas/images/train.j2k.png \
+tests/evas/dicts/hyph_en_US.dic \
+tests/evas/dicts/hyph_de_DE.dic
+
+if HAVE_LUA_BINDINGS
+
+evas_eolian_lua = $(evas_canvas_eolian_pub_files:%.eo=%.eo.lua) \
+                  $(evas_gesture_eolian_pub_files:%.eo=%.eo.lua)
+
+generated_evas_lua_all = $(evas_eolian_lua)
+
+GENERATED_LUA_BINDINGS += $(generated_evas_lua_all)
+
+installed_evasluadir = $(datadir)/elua/modules/evas
+nodist_installed_evaslua_DATA = $(generated_evas_lua_all)
+
+endif
+
+# Evas filters Lua stuff
+evas_filters_lua = \
+lib/evas/filters/lua/color.lua \
+$(NULL)
+
+installed_evasfiltersdir = $(datadir)/evas/filters/lua
+dist_installed_evasfilters_DATA = $(evas_filters_lua)
+
+if HAVE_JS
+
+generated_evas_js_bindings = $(evas_canvas_eolian_pub_files:%.eo=%.eo.js.cc) \
+                             $(evas_gesture_eolian_pub_files:%.eo=%.eo.js.cc)
+
+GENERATED_JS_BINDINGS += $(generated_evas_js_bindings)
+
+endif
+
+if HAVE_CXX
+evas_canvas_eolian_cxx_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.hh)
+evas_canvas_eolian_cxx_impl_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.impl.hh)
+evas_gesture_eolian_cxx_hh = $(evas_gesture_eolian_pub_files:%.eo=%.eo.hh)
+evas_gesture_eolian_cxx_impl_hh = $(evas_gesture_eolian_pub_files:%.eo=%.eo.impl.hh)
+endif
+
+EXTRA_DIST2 += \
+generic/evas/common/shmfile.c \
+generic/evas/common/shmfile.h \
+generic/evas/common/timeout.c \
+generic/evas/common/timeout.h
+
+evasgenericloadersdir = \
+$(libdir)/evas/utils
+
+evasgenericloaders_PROGRAMS =
+evasgenericloaders_SCRIPTS =
+
+### Libreoffice converter to pdf
+EXTRA_DIST2 += generic/evas/pdf/evas_generic_pdf_loader.libreoffice
+
+if HAVE_POPPLER
+
+evasgenericloaders_SCRIPTS += generic/evas/pdf/evas_generic_pdf_loader.libreoffice
+evasgenericloaders_PROGRAMS += generic/evas/pdf/evas_image_loader.pdf
+
+generic_evas_pdf_evas_image_loader_pdf_SOURCES = \
+generic/evas/pdf/main.cpp \
+generic/evas/common/shmfile.c \
+generic/evas/common/timeout.c
+generic_evas_pdf_evas_image_loader_pdf_CFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/generic/evas/common \
+@POPPLER_CFLAGS@ \
+@EINA_CFLAGS@
+generic_evas_pdf_evas_image_loader_pdf_CXXFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/generic/evas/common \
+@POPPLER_CFLAGS@ \
+@EINA_CFLAGS@
+generic_evas_pdf_evas_image_loader_pdf_LDADD = @USE_EINA_LIBS@ @POPPLER_LIBS@ @SHM_LIBS@
+generic_evas_pdf_evas_image_loader_pdf_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+EFL_INSTALL_EXEC_HOOK += \
+mkdir -p $(DESTDIR)$(libdir)/evas/utils; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ppt; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.pptx; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.odp; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xls; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xlsx; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ods; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.doc; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.docx; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.odt; \
+ln -sf evas_image_loader.pdf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rtf; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.ppt; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.pptx; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.odp; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.xls; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.xlsx; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.ods; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.doc; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.docx; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.odt; \
+ln -sf evas_generic_pdf_loader.libreoffice $(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.rtf;
+
+endif
+
+if HAVE_SPECTRE
+
+evasgenericloaders_PROGRAMS += generic/evas/ps/evas_image_loader.ps
+
+generic_evas_ps_evas_image_loader_ps_SOURCES = \
+generic/evas/ps/main.c \
+generic/evas/common/shmfile.c \
+generic/evas/common/timeout.c
+generic_evas_ps_evas_image_loader_ps_LDADD = @USE_EINA_LIBS@ @SPECTRE_LIBS@ @SHM_LIBS@
+generic_evas_ps_evas_image_loader_ps_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+generic_evas_ps_evas_image_loader_ps_CFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/generic/evas/common \
+@EINA_CFLAGS@
+
+endif
+
+if HAVE_LIBRAW
+
+evasgenericloaders_PROGRAMS += generic/evas/raw/evas_image_loader.raw
+
+generic_evas_raw_evas_image_loader_raw_SOURCES = \
+generic/evas/raw/main.c \
+generic/evas/common/shmfile.c \
+generic/evas/common/timeout.c
+generic_evas_raw_evas_image_loader_raw_LDADD = @USE_EINA_LIBS@ @SHM_LIBS@ @LIBRAW_LIBS@ -lm
+generic_evas_raw_evas_image_loader_raw_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+generic_evas_raw_evas_image_loader_raw_CFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/generic/evas/common \
+@LIBRAW_CFLAGS@ \
+@EINA_CFLAGS@
+
+EFL_INSTALL_EXEC_HOOK += \
+mkdir -p $(DESTDIR)$(libdir)/evas/utils; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.arw; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.cr2; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.crw; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.dcr; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.dng; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.k25; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.kdc; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.erf; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mrw; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nef; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nrf; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nrw; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.orf; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rw2; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.pef; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.raf; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.sr2; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.srf; \
+ln -sf evas_image_loader.raw $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.x3f;
+
+endif
+
+if HAVE_RSVG
+
+evasgenericloaders_PROGRAMS += generic/evas/svg/evas_image_loader.svg
+
+generic_evas_svg_evas_image_loader_svg_SOURCES = \
+generic/evas/svg/main.c \
+generic/evas/common/shmfile.c \
+generic/evas/common/timeout.c
+generic_evas_svg_evas_image_loader_svg_CFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/generic/evas/common \
+@RSVG_CFLAGS@ \
+@EINA_CFLAGS@
+generic_evas_svg_evas_image_loader_svg_LDADD = @USE_EINA_LIBS@ @RSVG_LIBS@ @SHM_LIBS@ -lm
+generic_evas_svg_evas_image_loader_svg_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+EFL_INSTALL_EXEC_HOOK += \
+mkdir -p $(DESTDIR)$(libdir)/evas/utils; \
+ln -sf evas_image_loader.svg $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.svgz; \
+ln -sf evas_image_loader.svg $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.svg.gz;
+
+endif
+
+EXTRA_DIST2 += generic/evas/xcf/common.h
+
+if HAVE_XCF
+
+evasgenericloaders_PROGRAMS += generic/evas/xcf/evas_image_loader.xcf
+
+generic_evas_xcf_evas_image_loader_xcf_SOURCES = \
+generic/evas/xcf/main.c \
+generic/evas/xcf/pixelfuncs.c \
+generic/evas/common/shmfile.c \
+generic/evas/common/timeout.c
+generic_evas_xcf_evas_image_loader_xcf_CFLAGS = \
+@EVAS_CFLAGS@ \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_srcdir)/src/generic/evas/common \
+@EINA_CFLAGS@
+generic_evas_xcf_evas_image_loader_xcf_LDADD = @USE_EINA_LIBS@ @SHM_LIBS@ -lm -lz
+generic_evas_xcf_evas_image_loader_xcf_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+EFL_INSTALL_EXEC_HOOK += \
+mkdir -p $(DESTDIR)$(libdir)/evas/utils; \
+ln -sf evas_image_loader.xcf $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xcf.gz;
+
+endif
+
+
+EXTRA_DIST2 += \
+  generic/evas/gst/main_0_10.c \
+  generic/evas/gst/main.c
+
+if HAVE_GSTREAMER
+EFL_INSTALL_EXEC_HOOK += \
+mkdir -p $(DESTDIR)$(libdir)/evas/utils; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.264; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3g2; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gp; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gp2; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gpp; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3gpp2; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.3p2; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.asf; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.avi; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.bdm; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.bdmv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.clpi; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.cpi; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.dv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.fla; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.flv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m1v; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m2t; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m2v; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.m4v; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mkv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mov; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mp2; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mp2ts; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mp4; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpe; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpeg; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpg; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpl; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mpls; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mts; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.mxf; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nut; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.nuv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ogg; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ogm; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ogv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.qt; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rm; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmj; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmm; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rms; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmx; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rmvb; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rv; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.swf; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ts; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.webm; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.weba; \
+ln -sf evas_image_loader.gst $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.wmv;
+endif
+
+if HAVE_GSTREAMER0
+evasgenericloaders_PROGRAMS += generic/evas/gst/evas_image_loader.gst
+generic_evas_gst_evas_image_loader_gst_SOURCES = \
+  generic/evas/gst/main_0_10.c \
+  generic/evas/common/shmfile.c \
+  generic/evas/common/timeout.c
+generic_evas_gst_evas_image_loader_gst_CFLAGS = \
+  -I$(top_srcdir)/src/lib/efl \
+  -I$(top_builddir)/src/lib/efl \
+  -I$(top_srcdir)/src/generic/evas/common \
+  @EMOTION_MODULE_GSTREAMER_CFLAGS@ \
+  @EINA_CFLAGS@
+generic_evas_gst_evas_image_loader_gst_LDADD = \
+  @USE_EINA_LIBS@ @SHM_LIBS@ -lm @EMOTION_MODULE_GSTREAMER_LIBS@
+generic_evas_gst_evas_image_loader_gst_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+endif
+
+if HAVE_GSTREAMER1
+evasgenericloaders_PROGRAMS += generic/evas/gst/evas_image_loader.gst
+generic_evas_gst_evas_image_loader_gst_SOURCES = \
+  generic/evas/gst/main.c \
+  generic/evas/common/shmfile.c \
+  generic/evas/common/timeout.c
+generic_evas_gst_evas_image_loader_gst_CFLAGS = \
+  -I$(top_srcdir)/src/lib/efl \
+  -I$(top_builddir)/src/lib/efl \
+  -I$(top_srcdir)/src/generic/evas/common \
+  @EMOTION_MODULE_GSTREAMER1_CFLAGS@ \
+  @EINA_CFLAGS@
+generic_evas_gst_evas_image_loader_gst_LDADD = \
+  @USE_EINA_LIBS@ @SHM_LIBS@ -lm @EMOTION_MODULE_GSTREAMER1_LIBS@
+generic_evas_gst_evas_image_loader_gst_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+endif
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
new file mode 100644
index 0000000000..5cf4c0d0f1
--- /dev/null
+++ b/src/Makefile_Evil.am
@@ -0,0 +1,80 @@
+
+if HAVE_WINDOWS
+### Library
+
+lib_LTLIBRARIES += lib/evil/libevil.la
+
+install_evilheadersdir = $(includedir)/evil-@VMAJ@
+dist_install_evilheaders_DATA = \
+lib/evil/Evil.h \
+lib/evil/evil_dlfcn.h \
+lib/evil/evil_fcntl.h \
+lib/evil/evil_langinfo.h \
+lib/evil/evil_locale.h \
+lib/evil/evil_macro_wrapper.h \
+lib/evil/evil_main.h \
+lib/evil/evil_stdio.h \
+lib/evil/evil_stdlib.h \
+lib/evil/evil_string.h \
+lib/evil/evil_time.h \
+lib/evil/evil_unistd.h \
+lib/evil/evil_util.h \
+lib/evil/pwd.h
+
+evilmmanheadersdir = $(includedir)/evil-@VMAJ@/sys
+dist_evilmmanheaders_DATA = \
+lib/evil/sys/mman.h
+
+lib_evil_libevil_la_SOURCES = \
+lib/evil/evil_dlfcn.c \
+lib/evil/evil_fcntl.c \
+lib/evil/evil_langinfo.c \
+lib/evil/evil_locale.c \
+lib/evil/evil_main.c \
+lib/evil/evil_mman.c \
+lib/evil/evil_pwd.c \
+lib/evil/evil_stdio.c \
+lib/evil/evil_stdlib.c \
+lib/evil/evil_string.c \
+lib/evil/evil_time.c \
+lib/evil/evil_unistd.c \
+lib/evil/evil_util.c \
+lib/evil/evil_private.h
+
+lib_evil_libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@ -DEFL_BUILD
+lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ @EVIL_CFLAGS_WRN@ -D__USE_MINGW_ANSI_STDIO
+lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
+lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+lib_evil_libevil_la_CPPFLAGS += -I$(top_srcdir)/src/lib/evil
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS += tests/evil/evil_suite
+TESTS += tests/evil/evil_suite
+
+tests_evil_evil_suite_SOURCES = \
+tests/evil/evil_suite.c \
+tests/evil/evil_suite.h \
+tests/evil/evil_test_dlfcn.c \
+tests/evil/evil_test_main.c \
+tests/evil/evil_test_stdio.c \
+tests/evil/evil_test_stdlib.c \
+tests/evil/evil_test_unistd.c
+
+tests_evil_evil_suite_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/eina \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evil\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evil\" \
+@CHECK_CFLAGS@ \
+@EVIL_CFLAGS@
+tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @CHECK_LIBS@
+tests_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
+
+endif
+
+endif
diff --git a/src/Makefile_Wayland_Protocols.am b/src/Makefile_Wayland_Protocols.am
new file mode 100644
index 0000000000..1bbfe20e77
--- /dev/null
+++ b/src/Makefile_Wayland_Protocols.am
@@ -0,0 +1,6 @@
+EXTRA_DIST2 += \
+wayland_protocol/efl-aux-hints.xml \
+wayland_protocol/efl-hints.xml \
+wayland_protocol/session-recovery.xml \
+wayland_protocol/teamwork.xml \
+wayland_protocol/www.xml
diff --git a/src/Makefile_efl_wl.am b/src/Makefile_efl_wl.am
new file mode 100644
index 0000000000..d90002e17b
--- /dev/null
+++ b/src/Makefile_efl_wl.am
@@ -0,0 +1,55 @@
+if HAVE_EFL_WL
+
+lib_LTLIBRARIES += lib/efl_wl/libefl_wl.la
+
+installed_eflwlmainheadersdir = $(includedir)/efl-wl-@VMAJ@
+dist_installed_eflwlmainheaders_DATA = lib/efl_wl/Efl_Wl.h
+
+lib_efl_wl_libefl_wl_la_SOURCES = \
+lib/efl_wl/efl_wl.c \
+lib/efl_wl/dmabuf.c \
+lib/efl_wl/dmabuf.h
+
+
+nodist_lib_efl_wl_libefl_wl_la_SOURCES = \
+lib/efl_wl/linux-dmabuf-unstable-v1-protocol.c \
+lib/efl_wl/linux-dmabuf-unstable-v1-server-protocol.h \
+lib/efl_wl/xdg-shell-protocol.c \
+lib/efl_wl/xdg-shell-server-protocol.h \
+lib/efl_wl/efl-hints-protocol.c \
+lib/efl_wl/efl-hints-server-protocol.h
+
+lib_efl_wl_libefl_wl_la_CPPFLAGS = -I$(top_builddir)/lib/efl @EFL_WL_CFLAGS@
+lib_efl_wl_libefl_wl_la_LIBADD = @EFL_WL_LIBS@
+lib_efl_wl_libefl_wl_la_DEPENDENCIES = @EFL_WL_INTERNAL_LIBS@ \
+lib/efl_wl/copiedfromweston.x \
+lib/efl_wl/x11.x
+
+lib_efl_wl_libefl_wl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+BUILT_SOURCES += $(nodist_lib_efl_wl_libefl_wl_la_SOURCES)
+
+bin_PROGRAMS += \
+bin/efl_wl/efl_wl_test \
+bin/efl_wl/efl_wl_test_stack
+
+bin_efl_wl_efl_wl_test_SOURCES = bin/efl_wl/efl_wl_test.c
+bin_efl_wl_efl_wl_test_stack_SOURCES = bin/efl_wl/efl_wl_test_stack.c
+
+bin_efl_wl_efl_wl_test_LDADD = @USE_EFL_WL_LIBS@ @USE_ELEMENTARY_LIBS@
+bin_efl_wl_efl_wl_test_DEPENDENCIES = @USE_EFL_WL_INTERNAL_LIBS@ @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_efl_wl_efl_wl_test_CPPFLAGS = \
+@EFL_WL_CFLAGS@ \
+@ELEMENTARY_CFLAGS@
+
+bin_efl_wl_efl_wl_test_stack_LDADD = @USE_EFL_WL_LIBS@ @USE_ELEMENTARY_LIBS@
+bin_efl_wl_efl_wl_test_stack_DEPENDENCIES = @USE_EFL_WL_INTERNAL_LIBS@ @USE_ELEMENTARY_INTERNAL_LIBS@
+bin_efl_wl_efl_wl_test_stack_CPPFLAGS = \
+@EFL_WL_CFLAGS@ \
+@ELEMENTARY_CFLAGS@
+
+endif
+
+EXTRA_DIST2 += \
+lib/efl_wl/copiedfromweston.x \
+lib/efl_wl/x11.x
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
new file mode 100644
index 0000000000..da6ceb913d
--- /dev/null
+++ b/src/benchmarks/eina/Makefile.am
@@ -0,0 +1,60 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DCITYHASH_BENCH \
+-DEINA_ENABLE_BENCH_E17 \
+@EINA_CFLAGS@ \
+@GLIB_CFLAGS@
+
+EXTRA_PROGRAMS = eina_bench
+
+benchmark: eina_bench libcity.la
+
+eina_bench_SOURCES = \
+eina_bench.c \
+eina_bench_sort.c \
+eina_bench_hash.c \
+eina_bench_crc_hash.c \
+eina_bench_stringshare.c \
+eina_bench_convert.c \
+eina_bench_mempool.c \
+eina_bench_stringshare_e17.c \
+eina_bench_array.c \
+eina_bench_rectangle_pool.c \
+ecore_list.c \
+ecore_strings.c \
+ecore_hash.c \
+ecore_sheap.c \
+evas_hash.c \
+evas_list.c \
+evas_mempool.c \
+evas_object_list.c \
+evas_stringshare.c \
+eina_bench_quad.c \
+eina_bench.h \
+Ecore_Data.h \
+Evas_Data.h \
+evas_mempool.h
+
+EXTRA_LTLIBRARIES = libcity.la
+libcity_la_SOURCES = city.cc city.h
+
+nodist_EXTRA_eina_bench_SOURCES = dummy.cc
+eina_bench_LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+libcity.la \
+@GLIB_LIBS@ \
+@EINA_LDFLAGS@
+
+EXTRA_DIST = strlog
+
+clean-local:
+	rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
+
+if ALWAYS_BUILD_EXAMPLES
+noinst_PROGRAMS = $(EXTRA_PROGRAMS)
+endif
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
new file mode 100644
index 0000000000..a2aac483f0
--- /dev/null
+++ b/src/benchmarks/eo/Makefile.am
@@ -0,0 +1,36 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+@EO_CFLAGS@
+
+EXTRA_PROGRAMS = eo_bench
+
+benchmark: eo_bench
+
+eo_bench_SOURCES = \
+class_simple.c \
+class_simple.h \
+eo_bench.c \
+eo_bench.h \
+eo_bench_callbacks.c \
+eo_bench_eo_do.c \
+eo_bench_eo_add.c
+
+eo_bench_LDADD = \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/eina/libeina.la \
+@EO_LDFLAGS@ \
+-lpthread
+
+clean-local:
+	rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
+
+if ALWAYS_BUILD_EXAMPLES
+noinst_PROGRAMS = $(EXTRA_PROGRAMS)
+endif
diff --git a/src/benchmarks/evas/Makefile.am b/src/benchmarks/evas/Makefile.am
new file mode 100644
index 0000000000..80ce560fc2
--- /dev/null
+++ b/src/benchmarks/evas/Makefile.am
@@ -0,0 +1,35 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/modules/evas/engines/buffer \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(abs_top_srcdir)/src/tests/evas\" \
+@EVAS_CFLAGS@
+
+EXTRA_PROGRAMS = evas_bench
+
+benchmark: evas_bench
+
+evas_bench_SOURCES = \
+evas_bench.c \
+evas_bench_loader.c \
+evas_bench_saver.c \
+evas_bench.h
+
+nodist_EXTRA_evas_bench_SOURCES = dummy.cc
+evas_bench_LDADD = \
+$(top_builddir)/src/lib/evas/libevas.la \
+$(top_builddir)/src/lib/eina/libeina.la \
+@EVAS_LDFLAGS@
+
+EXTRA_DIST =
+
+clean-local:
+	rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
+
+if ALWAYS_BUILD_EXAMPLES
+noinst_PROGRAMS = $(EXTRA_PROGRAMS)
+endif
diff --git a/src/bin/elementary/Makefile.am b/src/bin/elementary/Makefile.am
new file mode 100644
index 0000000000..8100fb40a0
--- /dev/null
+++ b/src/bin/elementary/Makefile.am
@@ -0,0 +1,223 @@
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+-I$(top_srcdir)/src/bin \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
+@ELEMENTARY_CFLAGS@
+
+bin_PROGRAMS = \
+@ELEMENTARY_TEST_PRG@ \
+@ELEMENTARY_CONFIG_PRG@  \
+@ELEMENTARY_CODEGEN_PRG@ \
+@ELM_PREFS_CC_PRG@
+
+if BUILD_QUICKLAUNCH
+bin_PROGRAMS += elementary_quicklaunch elementary_run
+endif
+
+EXTRA_PROGRAMS = elementary_test elementary_config elementary_codegen elm_prefs_cc
+
+elementary_test_SOURCES = \
+test.c \
+test_explode.c \
+test_explode.h \
+test_3d.c \
+test_access.c \
+test_actionslider.c \
+test_anim.c \
+test_efl_anim_alpha.c \
+test_efl_anim_rotate.c \
+test_efl_anim_scale.c \
+test_efl_anim_translate.c \
+test_efl_anim_group_parallel.c \
+test_efl_anim_group_sequential.c \
+test_efl_anim_pause.c \
+test_efl_anim_repeat.c \
+test_efl_anim_start_delay.c \
+test_efl_anim_interpolator.c \
+test_application_server.c \
+test_bg.c \
+test_box.c \
+test_bubble.c \
+test_button.c \
+test_ui_button.c \
+test_calendar.c \
+test_check.c \
+test_clock.c \
+test_cnp.c \
+test_colorselector.c \
+test_colorclass.c \
+test_combobox.c \
+test_config.c \
+test_conform.c \
+test_conform_indicator.c \
+test_ctxpopup.c \
+test_cursor.c \
+test_datetime.c \
+test_dayselector.c \
+test_disable.c \
+test_diskselector.c \
+test_dnd.c \
+test_eio.c \
+test_entry.c \
+test_entry_anchor.c \
+test_entry_anchor2.c \
+test_external.c \
+test_fileselector_button.c \
+test_fileselector.c \
+test_fileselector_entry.c \
+test_flip.c \
+test_flip_page.c \
+test_flipselector.c \
+test_floating.c \
+test_focus.c \
+test_focus_custom_chain.c \
+test_focus_policy.c \
+test_focus_style.c \
+test_gengrid.c \
+test_genlist.c \
+test_gesture_layer.c \
+test_gesture_layer2.c \
+test_gesture_layer3.c \
+test_glview_simple.c \
+test_glview.c \
+test_glview_manygears.c \
+test_grid.c \
+test_hover.c \
+test_hoversel.c \
+test_icon.c \
+test_icon_desktops.c \
+test_icon_animated.c \
+test_image.c \
+test_index.c \
+test_inwin.c \
+test_label.c \
+test_launcher.c \
+test_layout.c \
+test_list.c \
+test_map.c \
+test_main_menu.c \
+test_menu.c \
+test_multi.c \
+test_multibuttonentry.c \
+test_naviframe.c \
+test_naviframe_complex.c \
+test_notify.c \
+test_nstate.c \
+test_panel.c \
+test_panes.c \
+test_ui_panes.c \
+test_part_bg.c \
+test_photo.c \
+test_photocam.c \
+test_popup.c \
+test_prefs.c \
+test_progressbar.c \
+test_radio.c \
+test_scaling.c \
+test_scroller.c \
+test_segment_control.c \
+test_separator.c \
+test_slider.c \
+test_ui_slider.c \
+test_ui_slider_interval.c \
+test_slideshow.c \
+test_spinner.c \
+test_ui_spinner.c \
+test_ui_buttonspin.c \
+test_ui_datepicker.c \
+test_ui_timepicker.c \
+test_ui_tags.c \
+test_ui_panel.c \
+test_store.c \
+test_sys_notify.c \
+test_systray.c \
+test_task_switcher.c \
+test_table.c \
+test_thumb.c \
+test_toolbar.c \
+test_tooltip.c \
+test_transit.c \
+test_transit_bezier.c \
+test_ui_clock.c \
+test_ui_popup.c \
+test_video.c \
+test_weather.c \
+test_web.c \
+test_win_inline.c \
+test_win_keygrab.c \
+test_win_socket.c \
+test_win_plug.c \
+test_win_state.c \
+test_win_wm_rotation.c \
+test_win_dialog.c \
+test_gesture_framework.c \
+test_ui_tab_pager.c \
+test_ui_pager.c \
+test_ui_pager_scroll.c \
+test.h
+
+elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
+	@ELEMENTARY_LIBS@
+elementary_test_CFLAGS =
+elementary_test_LDFLAGS =
+
+elementary_config_SOURCES = \
+config.c
+
+elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
+	@ELEMENTARY_LIBS@
+elementary_config_LDFLAGS =
+
+elementary_codegen_SOURCES = \
+elementary_codegen.c
+
+elementary_codegen_LDADD = \
+	$(top_builddir)/src/lib/libelementary.la \
+	@ELEMENTARY_LIBS@
+elementary_codegen_LDFLAGS =
+
+noinst_HEADERS = \
+elm_prefs_cc.h
+
+elm_prefs_cc_SOURCES = \
+elm_prefs_cc.c \
+elm_prefs_cc_mem.c \
+elm_prefs_cc_out.c \
+elm_prefs_cc_parse.c \
+elm_prefs_cc_handlers.c
+
+elm_prefs_cc_LDADD = \
+$(top_builddir)/src/lib/libelementary.la \
+@ELEMENTARY_LIBS@
+
+if BUILD_QUICKLAUNCH
+elementary_quicklaunch_SOURCES = quicklaunch.c
+elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
+	@ELEMENTARY_LIBS@
+elementary_quicklaunch_LDFLAGS =
+
+if BUILD_RUN
+elementary_run_CPPFLAGS = -I$(top_srcdir) \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+-I$(top_srcdir)/src/bin \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
+
+elementary_run_SOURCES = run.c
+elementary_run_LDADD =
+elementary_run_LDFLAGS =
+endif
+endif
+
+EXTRA_DIST = \
+test_factory.c
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
new file mode 100644
index 0000000000..e987a44e59
--- /dev/null
+++ b/src/examples/Makefile.am
@@ -0,0 +1,287 @@
+AUTOMAKE_OPTIONS= -Wno-portability
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_PROGRAMS =
+DATA_FILES =
+EXTRA_DIST =
+EDCS =
+PHONIES =
+EOLIAN_FLAGS := \
+  -I$(srcdir) \
+  -I$(top_srcdir)/src/lib/eo \
+  -I$(top_srcdir)/src/lib/evas/canvas \
+  -I$(top_srcdir)/src/lib/evas/gesture \
+  -I$(top_srcdir)/src/lib/edje \
+  -I$(top_srcdir)/src/lib/efl \
+  -I$(top_srcdir)/src/lib/ecore \
+  -I$(top_srcdir)/src/lib/ecore_audio \
+  -I$(top_srcdir)/src/lib/elementary
+
+#defined in Makefile_Edje_Helper.am
+#EDJE_CC_FLAGS =
+
+CLEAN_EXAMPLES =
+INSTALL_EXAMPLES =
+UNINSTALL_EXAMPLES =
+
+include ../Makefile_Edje_Helper.am
+include $(top_srcdir)/src/Makefile_Eolian_Helper.am
+if HAVE_CXX
+include $(top_srcdir)/src/Makefile_Eolian_Cxx_Helper.am
+if ! HAVE_EOLIAN_CXX
+_EOLIAN_CXX_DEP = ../bin/eolian_cxx/eolian_cxx$(EXEEXT)
+bin/eolian_cxx/eolian_cxx$(EXEEXT):
+	false
+endif
+endif
+# Eolian_Files_Helper
+# Thus we need to override it here in order to make its pattern
+# rules work properly.
+if ! HAVE_EOLIAN_GEN
+_EOLIAN_GEN_DEP = ../bin/eolian/eolian_gen$(EXEEXT)
+endif
+
+if HAVE_CSHARP
+include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am
+endif
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_builddir)/src/bindings \
+-I$(top_srcdir)/src/bindings \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_builddir)/src/lib/evas/gesture \
+-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
+-I$(top_builddir)/src/bindings/cxx/eina_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eo_cxx \
+-I$(top_builddir)/src/bindings/cxx/eo_cxx \
+-I$(top_srcdir)/src/bindings/cxx/eldbus_cxx \
+-I$(top_builddir)/src/bindings/cxx/eldbus_cxx \
+-I$(top_srcdir)/src/bindings/cxx/ecore_cxx \
+-I$(top_builddir)/src/bindings/cxx/ecore_cxx \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_audio \
+-I$(top_srcdir)/src/lib/ecore_audio \
+-I$(top_builddir)/src/lib/ecore_avahi \
+-I$(top_srcdir)/src/lib/ecore_avahi \
+-I$(top_builddir)/src/lib/ecore_buffer \
+-I$(top_srcdir)/src/lib/ecore_buffer \
+-I$(top_builddir)/src/lib/ecore_cocoa \
+-I$(top_srcdir)/src/lib/ecore_cocoa \
+-I$(top_builddir)/src/lib/ecore_con \
+-I$(top_srcdir)/src/lib/ecore_con \
+-I$(top_builddir)/src/lib/ecore_drm \
+-I$(top_srcdir)/src/lib/ecore_drm \
+-I$(top_builddir)/src/lib/ecore_drm2 \
+-I$(top_srcdir)/src/lib/ecore_drm2 \
+-I$(top_builddir)/src/lib/ecore_evas \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/ecore_fb \
+-I$(top_srcdir)/src/lib/ecore_fb \
+-I$(top_builddir)/src/lib/ecore_file \
+-I$(top_srcdir)/src/lib/ecore_file \
+-I$(top_builddir)/src/lib/ecore_imf \
+-I$(top_srcdir)/src/lib/ecore_imf \
+-I$(top_builddir)/src/lib/ecore_imf_evas \
+-I$(top_srcdir)/src/lib/ecore_imf_evas \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_input_evas \
+-I$(top_srcdir)/src/lib/ecore_input_evas \
+-I$(top_builddir)/src/lib/ecore_ipc \
+-I$(top_srcdir)/src/lib/ecore_ipc \
+-I$(top_builddir)/src/lib/ecore_sdl \
+-I$(top_srcdir)/src/lib/ecore_sdl \
+-I$(top_builddir)/src/lib/ecore_wayland \
+-I$(top_srcdir)/src/lib/ecore_wayland \
+-I$(top_builddir)/src/lib/ecore_win32 \
+-I$(top_srcdir)/src/lib/ecore_win32 \
+-I$(top_builddir)/src/lib/ecore_wl2 \
+-I$(top_srcdir)/src/lib/ecore_wl2 \
+-I$(top_builddir)/src/lib/ecore_x \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/ector \
+-I$(top_srcdir)/src/lib/ector \
+-I$(top_builddir)/src/lib/edje \
+-I$(top_srcdir)/src/lib/edje \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eeze \
+-I$(top_srcdir)/src/lib/eeze \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl_mono \
+-I$(top_srcdir)/src/lib/efl_mono \
+-I$(top_builddir)/src/lib/efl_wl \
+-I$(top_srcdir)/src/lib/efl_wl \
+-I$(top_builddir)/src/lib/efreet \
+-I$(top_srcdir)/src/lib/efreet \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eio \
+-I$(top_srcdir)/src/lib/eio \
+-I$(top_builddir)/src/lib/eldbus \
+-I$(top_srcdir)/src/lib/eldbus \
+-I$(top_builddir)/src/lib/elementary \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elocation \
+-I$(top_srcdir)/src/lib/elocation \
+-I$(top_builddir)/src/lib/elput \
+-I$(top_srcdir)/src/lib/elput \
+-I$(top_builddir)/src/lib/elua \
+-I$(top_srcdir)/src/lib/elua \
+-I$(top_builddir)/src/lib/embryo \
+-I$(top_srcdir)/src/lib/embryo \
+-I$(top_builddir)/src/lib/emile \
+-I$(top_srcdir)/src/lib/emile \
+-I$(top_builddir)/src/lib/emotion \
+-I$(top_srcdir)/src/lib/emotion \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eolian \
+-I$(top_srcdir)/src/lib/eolian \
+-I$(top_builddir)/src/lib/eolian_cxx \
+-I$(top_srcdir)/src/lib/eolian_cxx \
+-I$(top_builddir)/src/lib/ephysics \
+-I$(top_srcdir)/src/lib/ephysics \
+-I$(top_builddir)/src/lib/escape \
+-I$(top_srcdir)/src/lib/escape \
+-I$(top_builddir)/src/lib/ethumb \
+-I$(top_srcdir)/src/lib/ethumb \
+-I$(top_builddir)/src/lib/ethumb_client \
+-I$(top_srcdir)/src/lib/ethumb_client \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+@ELEMENTARY_CFLAGS@
+
+if HAVE_WINDOWS
+AM_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil \
+@EFL_WINDOWS_VERSION_CFLAGS@
+endif
+
+AM_CXXFLAGS = \
+$(AM_CPPFLAGS) \
+@ELEMENTARY_CXX_CFLAGS@
+
+LDADD = \
+-lm \
+@EFL_PTHREAD_LIBS@ \
+$(top_builddir)/src/lib/ecore_avahi/libecore_avahi.la \
+$(top_builddir)/src/lib/ecore_con/libecore_con.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(top_builddir)/src/lib/ecore_file/libecore_file.la \
+$(top_builddir)/src/lib/ecore_imf_evas/libecore_imf_evas.la \
+$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
+$(top_builddir)/src/lib/ecore_input_evas/libecore_input_evas.la \
+$(top_builddir)/src/lib/ecore_input/libecore_input.la \
+$(top_builddir)/src/lib/ecore_ipc/libecore_ipc.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ector/libector.la \
+$(top_builddir)/src/lib/edje/libedje.la \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/efl/libefl.la \
+$(top_builddir)/src/lib/efreet/libefreet.la \
+$(top_builddir)/src/lib/efreet/libefreet_mime.la \
+$(top_builddir)/src/lib/efreet/libefreet_trash.la \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eio/libeio.la \
+$(top_builddir)/src/lib/eldbus/libeldbus.la \
+$(top_builddir)/src/lib/elementary/libelementary.la \
+$(top_builddir)/src/lib/elocation/libelocation.la \
+$(top_builddir)/src/lib/embryo/libembryo.la \
+$(top_builddir)/src/lib/emile/libemile.la \
+$(top_builddir)/src/lib/emotion/libemotion.la \
+$(top_builddir)/src/lib/eolian/libeolian.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/ethumb_client/libethumb_client.la \
+$(top_builddir)/src/lib/ethumb/libethumb.la \
+$(top_builddir)/src/lib/evas/libevas.la
+
+
+AM_LDFLAGS = @ELEMENTARY_LDFLAGS@
+
+if HAVE_ECORE_AUDIO
+LDADD += $(top_builddir)/src/lib/ecore_audio/libecore_audio.la
+endif
+
+if HAVE_EPHYSICS
+LDADD += $(top_builddir)/src/lib/ephysics/libephysics.la
+endif
+
+if HAVE_ECORE_WL2
+LDADD += \
+$(top_builddir)/src/lib/ecore_wl2/libecore_wl2.la \
+$(top_builddir)/src/lib/efl_wl/libefl_wl.la
+endif
+
+if HAVE_EEZE
+LDADD += $(top_builddir)/src/lib/eeze/libeeze.la
+endif
+
+if HAVE_ELPUT
+LDADD += $(top_builddir)/src/lib/elput/libelput.la
+endif
+
+if HAVE_ELUA
+LDADD += $(top_builddir)/src/lib/elua/libelua.la
+endif
+
+if HAVE_ECORE_X
+LDADD += $(top_builddir)/src/lib/ecore_x/libecore_x.la
+endif
+
+include ecore_avahi.mk
+include ecore.mk
+include edje.mk
+include eet.mk
+include efl_mono.mk
+include eina_cxx.mk
+include eina.mk
+include eio.mk
+include eldbus.mk
+include elementary.mk
+include elocation.mk
+include emile.mk
+include emotion.mk
+include eolian_cxx.mk
+include ephysics.mk
+include ethumb_client.mk
+include evas.mk
+
+$(top_builddir)/src/bin/edje_cc$(EXEEXT):
+	@test -f $(top_builddir)/src/bin/edje_cc$(EXEEXT) || $(MAKE) $(AM_MAKEFLAGS) -C ../ bin/edje_cc$(EXEEXT)
+
+# this is a bit hacky
+# currently all options from all directories are passed to all edje_cc cmds
+# so if there are any files with the same name in different dirs it will fail
+.edc.edj: $(top_builddir)/src/bin/edje_cc$(EXEEXT)
+	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $(builddir)/$@
+
+EXTRA_DIST += $(EDCS) $(DATA_FILES)
+EDJS = $(EDCS:%.edc=%.edj)
+
+examples: $(EXTRA_PROGRAMS) $(EDJS)
+
+clean-local: $(CLEAN_EXAMPLES)
+	rm -f $(EXTRA_PROGRAMS) $(EDJS)
+
+install-examples: $(INSTALL_EXAMPLES)
+uninstall-local: $(UNINSTALL_EXAMPLES)
+.PHONY: $(PHONIES)
+
+EXTRA_DIST += $(EDCS) $(DATA_FILES)
+
+if ALWAYS_BUILD_EXAMPLES
+noinst_PROGRAMS = $(EXTRA_PROGRAMS)
+nodist_pkgdata_DATA = $(EDJS)
+else
+endif
+
+check: ;
diff --git a/src/examples/ecore/Makefile.examples b/src/examples/ecore/Makefile.examples
new file mode 100644
index 0000000000..63e5f6b796
--- /dev/null
+++ b/src/examples/ecore/Makefile.examples
@@ -0,0 +1,60 @@
+CC=gcc
+
+if HAVE_GSTREAMER_1
+  GSTREAMER_DEP="gstreamer-1.0"
+else
+  GSTREAMER_DEP="gstreamer-0.10"
+endif
+
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,ecore-audio,ecore-con,ecore-file, \
+             eo,evas-software-buffer,gnutls,ecore-imf,ecore-imf-evas,$(GSTREAMER_DEP)` -lm
+
+EXAMPLES= ecore_animator_example \
+          ecore_audio_custom \
+          ecore_audio_playback \
+          ecore_audio_to_ogg \
+          ecore_client_bench \
+          ecore_con_client_example \
+          ecore_con_client_simple_example \
+          ecore_con_lookup_example \
+          ecore_con_server_example \
+          ecore_con_server_http_example \
+          ecore_con_server_simple_example \
+          ecore_con_url_cookies_example \
+          ecore_con_url_download_example \
+          ecore_con_url_headers_example \
+          ecore_evas_basics_example \
+          ecore_evas_buffer_example_01 \
+          ecore_evas_buffer_example_02 \
+          ecore_evas_callbacks \
+          ecore_evas_ews_example \
+          ecore_evas_object_example \
+          ecore_evas_window_sizes_example \
+          ecore_event_example_01 \
+          ecore_event_example_02 \
+          ecore_exe_example \
+          ecore_exe_example_child \
+          ecore_fd_handler_example \
+          ecore_fd_handler_gnutls_example \
+          ecore_file_download_example \
+          ecore_idler_example \
+          ecore_imf_example \
+          ecore_job_example \
+          ecore_pipe_gstreamer_example \
+          ecore_pipe_simple_example \
+          ecore_poller_example \
+          ecore_server_bench \
+          ecore_thread_example \
+          ecore_time_functions_example \
+          ecore_timer_example \
+          ecore_getopt_example
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/edje/Makefile.examples b/src/examples/edje/Makefile.examples
new file mode 100644
index 0000000000..8d7349499e
--- /dev/null
+++ b/src/examples/edje/Makefile.examples
@@ -0,0 +1,82 @@
+CC=gcc
+EDJE_CC=edje_cc
+EDJE_CODEGEN=edje_codegen
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,edje`
+
+EDJE_OBJS= animations.edj \
+           animations2.edj \
+           basic.edj \
+           basic2.edj \
+           box.edj \
+           codegen.edj \
+           color-class.edj \
+           drag.edj \
+           edje_example.edj \
+           edje-nested.edj \
+           embryo_custom_state.edj \
+           embryo_pong.edj \
+           embryo_run_program.edj \
+           embryo_set_state.edj \
+           embryo_set_text.edj \
+           embryo_timer.edj \
+           external_elm_anchorblock.edj \
+           external_elm_button.edj \
+           external_elm_check.edj \
+           external_elm_panes.edj \
+           external_emotion_elm.edj \
+           lua_script.edj \
+           messages_echo.edj \
+           multisense.edj \
+           perspective.edj \
+           physics_3d.edj \
+           physics_actions.edj \
+           physics_backcull.edj \
+           physics_basic.edj \
+           physics_complex.edj \
+           physics_soft_bodies.edj \
+           signalsBubble.edj \
+           signals-messages.edj \
+           sigtest.edj \
+           swallow.edj \
+           table.edj \
+           text.edj \
+           toggle_using_filter.edj
+
+EXAMPLES= animations2 \
+          edje-animations \
+          edje-basic \
+          edje-basic2 \
+          edje-box \
+          edje-box2 \
+          edje-color-class \
+          edje-drag \
+          edje_example \
+          edje-multisense \
+          edje-perspective \
+          edje-signals-messages \
+          edje-swallow \
+          edje-swallow2 \
+          edje-table \
+          edje-text \
+          signals2 \
+          sigtest
+
+all: edje examples edje-codegen-example
+edje: $(EDJE_OBJS)
+examples: $(EXAMPLES)
+
+%.edj: %.edc
+	$(EDJE_CC) $<
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+codegen:
+	$(EDJE_CODEGEN) --prefix=codegen_example codegen.edj example_group codegen_example_generated.c codegen_example_generated.h
+
+edje-codegen-example: codegen
+	$(CC) -o edje-codegen-example codegen_example_generated.c edje-codegen-example.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES) *.edj edje-codegen-example
diff --git a/src/examples/eet/Makefile.examples b/src/examples/eet/Makefile.examples
new file mode 100644
index 0000000000..6b419cb7ba
--- /dev/null
+++ b/src/examples/eet/Makefile.examples
@@ -0,0 +1,20 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina,eet`
+
+EXAMPLES= eet-basic \
+          eet-data-cipher_decipher \
+          eet-data-file_descriptor_01 \
+          eet-data-file_descriptor_02 \
+          eet-data-nested \
+          eet-data-simple \
+          eet-file
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/eina/Makefile.examples b/src/examples/eina/Makefile.examples
new file mode 100644
index 0000000000..e6614de053
--- /dev/null
+++ b/src/examples/eina/Makefile.examples
@@ -0,0 +1,52 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas`
+
+EXAMPLES= eina_accessor_01 \
+          eina_array_01 \
+          eina_array_02 \
+          eina_error_01 \
+          eina_file_01 \
+          eina_file_02 \
+          eina_hash_01 \
+          eina_hash_02 \
+          eina_hash_03 \
+          eina_hash_04 \
+          eina_hash_05 \
+          eina_hash_06 \
+          eina_hash_07 \
+          eina_hash_08 \
+          eina_inarray_01 \
+          eina_inarray_02 \
+          eina_inarray_03 \
+          eina_inlist_01 \
+          eina_inlist_02 \
+          eina_inlist_03 \
+          eina_iterator_01 \
+          eina_list_01 \
+          eina_list_02 \
+          eina_list_03 \
+          eina_list_04 \
+          eina_log_01 \
+          eina_log_02 \
+          eina_log_03 \
+          eina_magic_01 \
+          eina_simple_xml_parser_01 \
+          eina_str_01 \
+          eina_strbuf_01 \
+          eina_stringshare_01 \
+          eina_tiler_01 \
+          eina_value_01 \
+          eina_value_02 \
+          eina_value_03 \
+          eina_xattr_01 \
+          eina_xattr_02
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/eio/Makefile.examples b/src/examples/eio/Makefile.examples
new file mode 100644
index 0000000000..58070a92bd
--- /dev/null
+++ b/src/examples/eio/Makefile.examples
@@ -0,0 +1,15 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags ecore,eio`
+
+EXAMPLES= eio_file_copy \
+          eio_file_ls
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/eldbus/Makefile.examples b/src/examples/eldbus/Makefile.examples
new file mode 100644
index 0000000000..c6d2406288
--- /dev/null
+++ b/src/examples/eldbus/Makefile.examples
@@ -0,0 +1,22 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,eldbus`
+
+EXAMPLES= banshee client \
+          complex-types \
+          complex-types-client-eina-value \
+          complex-types-server \
+          connman-list-services \
+          ofono-dial \
+          server \
+          simple-signal-emit \
+          connect-address
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/elocation/Makefile.examples b/src/examples/elocation/Makefile.examples
new file mode 100644
index 0000000000..20ab2b2628
--- /dev/null
+++ b/src/examples/elocation/Makefile.examples
@@ -0,0 +1,14 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,eldbus,elocation`
+
+EXAMPLES= elocation
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/emile/Makefile.examples b/src/examples/emile/Makefile.examples
new file mode 100644
index 0000000000..3634a2d2a2
--- /dev/null
+++ b/src/examples/emile/Makefile.examples
@@ -0,0 +1,14 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina, emile`
+
+EXAMPLES= emile_base64
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/emotion/Makefile.examples b/src/examples/emotion/Makefile.examples
new file mode 100644
index 0000000000..e97882d850
--- /dev/null
+++ b/src/examples/emotion/Makefile.examples
@@ -0,0 +1,18 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,emotion`
+
+EXAMPLES= emotion_basic_example \
+          emotion_border_example \
+          emotion_generic_example \
+          emotion_generic_subtitle_example \
+          emotion_signals_example
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/eolian_cxx/Makefile.examples b/src/examples/eolian_cxx/Makefile.examples
new file mode 100644
index 0000000000..4ddd64d7e7
--- /dev/null
+++ b/src/examples/eolian_cxx/Makefile.examples
@@ -0,0 +1,47 @@
+
+CXX=g++
+CC=gcc
+EOLIAN_GEN=eolian_gen
+EOLIAN_CXX=eolian_cxx
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,emotion,eolian,eolian-cxx,eo-cxx,eina-cxx` -DEFL_BETA_API_SUPPORT
+EOLIAN_FLAGS=`pkg-config --variable=eolian_flags eo` -I.
+
+EOS = colourable.eo colourablesquare.eo
+
+IMPL = colourable.c colourablesquare.c
+
+GENERATED = \
+	colourable.eo.c \
+	colourable.eo.h \
+	colourable.eo.hh \
+	colourablesquare.eo.c \
+	colourablesquare.eo.h \
+	colourablesquare.eo.hh
+
+EXAMPLES= eolian_cxx_inherit_01 \
+          eolian_cxx_simple_01
+
+OBJS = colourable.o colourablesquare.o
+
+all: $(OBJS) examples
+
+codegen:
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I./colourable.eo -o colourable.eo.hh
+	$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I./colourablesquare.eo -o colourablesquare.eo.hh
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:colourable.eo.c colourable.eo
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:colourablesquare.eo.c colourablesquare.eo
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:colourable.eo.h colourable.eo
+	$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:colourablesquare.eo.h colourablesquare.eo
+
+$(OBJS): codegen
+	$(CC) -c colourable.c $(COMMON_FLAGS)
+	$(CC) -c colourablesquare.c $(COMMON_FLAGS)
+
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CXX) -o $@ $@.cc $(OBJS) $(COMMON_FLAGS) -std=c++11
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/ethumb_client/Makefile.examples b/src/examples/ethumb_client/Makefile.examples
new file mode 100644
index 0000000000..5d8d7ceb1b
--- /dev/null
+++ b/src/examples/ethumb_client/Makefile.examples
@@ -0,0 +1,14 @@
+CC=gcc
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,ethumb,ethumb_client`
+
+EXAMPLES= ethumb_dbus
+
+all: examples
+examples: $(EXAMPLES)
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES)
diff --git a/src/examples/evas/Makefile.examples b/src/examples/evas/Makefile.examples
new file mode 100644
index 0000000000..7e3f7c2dd3
--- /dev/null
+++ b/src/examples/evas/Makefile.examples
@@ -0,0 +1,43 @@
+CC=gcc
+EDJE_CC=edje_cc
+EDJE_CODEGEN=edje_codegen
+COMMON_FLAGS=`pkg-config --libs --cflags eina,ecore,evas,ecore-evas,edje,eo`
+
+EDJE_OBJS= aspect.edj
+
+EXAMPLES= evas-aspect-hints \
+          evas-box \
+          evas-buffer-simple \
+          evas-events \
+          evas-3d-fog \
+          evas-hints \
+          evas-images \
+          evas-images2 \
+          evas-images3 \
+          evas-images4 \
+          evas-images5 \
+          evas-images6 \
+          evas-init-shutdown \
+          evas-map-utils \
+          evas-object-manipulation \
+          evas-object-manipulation-eo \
+          evas-smart-interface \
+          evas-smart-object \
+          evas-stacking \
+          evas-table \
+          evas-text \
+          evas-textblock-obstacles
+
+all: edje examples
+edje: $(EDJE_OBJS)
+examples: $(EXAMPLES)
+
+%.edj: %.edc
+	$(EDJE_CC) $<
+
+$(EXAMPLES):
+	$(CC) -o $@ $@.c $(COMMON_FLAGS)
+
+clean:
+	@echo "Cleaning up built objects..."
+	@rm -Rf $(EXAMPLES) *.edj
diff --git a/src/tests/efreet/data/sub/Makefile.am b/src/tests/efreet/data/sub/Makefile.am
new file mode 100644
index 0000000000..7aaf7fc20e
--- /dev/null
+++ b/src/tests/efreet/data/sub/Makefile.am
@@ -0,0 +1,8 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+testdir = $(pkgdatadir)/test/sub
+test_DATA = \
+test.desktop
+
+EXTRA_DIST = $(test_DATA)