diff --git a/configure.ac b/configure.ac
index bff70be5d7..5e4283bb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,7 @@ AC_PROG_CXX
 AC_LANG(C)
 AC_PROG_CPP
 AC_PROG_CC
+AM_PROG_CC_C_O
 
 # pkg-config
 
@@ -881,27 +882,11 @@ src/Makefile
 src/benchmarks/Makefile
 src/benchmarks/eina/Makefile
 src/benchmarks/eo/Makefile
-src/bin/Makefile
-src/bin/evil/Makefile
-src/bin/eet/Makefile
-src/bin/embryo/Makefile
 src/examples/Makefile
 src/examples/eina/Makefile
 src/examples/eet/Makefile
 src/examples/eo/Makefile
-src/lib/Makefile
-src/lib/evil/Makefile
-src/lib/eina/Makefile
 src/lib/eina/eina_config.h
-src/lib/eet/Makefile
-src/lib/eo/Makefile
-src/lib/embryo/Makefile
-src/modules/Makefile
-src/modules/eina/Makefile
-src/modules/eina/mp/Makefile
-src/modules/eina/mp/chained_pool/Makefile
-src/modules/eina/mp/pass_through/Makefile
-src/modules/eina/mp/one_big/Makefile
 src/scripts/Makefile
 src/scripts/eina/Makefile
 src/tests/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b0b50e481..b0fc8b5da8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,21 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib modules bin scripts benchmarks tests examples
+SUBDIRS = . scripts benchmarks tests examples
+
+lib_LTLIBRARIES =
+bin_PROGRAMS =
+EXTRA_DIST =
+
+if HAVE_WINDOWS
+include Makefile_Evil.am
+endif
+
+include Makefile_Eina.am
+include Makefile_Eo.am
+include Makefile_Eet.am
+include Makefile_Embryo.am
 
 .PHONY: benchmark examples
 
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
new file mode 100644
index 0000000000..b6a198f626
--- /dev/null
+++ b/src/Makefile_Eet.am
@@ -0,0 +1,88 @@
+
+### 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 \
+lib/eet/lz4/lz4.c \
+lib/eet/lz4/lz4.h \
+lib/eet/lz4/lz4hc.c \
+lib/eet/lz4/lz4hc.h
+
+lib_eet_libeet_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/eet/lz4 \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet/lz4 \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DEFL_EET_BUILD \
+@EFL_CFLAGS@ \
+@EET_CFLAGS@
+
+if HAVE_WINDOWS
+lib_eet_libeet_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+lib_eet_libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
+
+if HAVE_WINDOWS
+lib_eet_libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
+endif
+
+lib_eet_libeet_la_LIBADD += @EET_LIBS@ -lm
+
+lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+EXTRA_DIST += lib/eet/lz4/README
+
+### Binary
+
+bin_PROGRAMS += bin/eet/eet
+
+bin_eet_eet_SOURCES = bin/eet/eet_main.c
+
+bin_eet_eet_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eet \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EFL_CFLAGS@ \
+@EET_CFLAGS@
+
+if HAVE_WINDOWS
+bin_eet_eet_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+bin_eet_eet_LDADD = \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/eina/libeina.la
+
+if HAVE_WINDOWS
+bin_eet_eet_LDADD += $(top_builddir)/src/lib/evil/libevil.la
+endif
+
+bin_eet_eet_LDADD += @EET_LIBS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
new file mode 100644
index 0000000000..930f62f973
--- /dev/null
+++ b/src/Makefile_Eina.am
@@ -0,0 +1,241 @@
+
+### 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_safety_checks.h \
+lib/eina/eina_error.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_list.h \
+lib/eina/eina_file.h \
+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_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_inline_lock_barrier.x \
+lib/eina/eina_tmpstr.h
+
+# Will be back for developper after 1.2.
+# lib/eina/eina_model.h
+# lib/eina/eina_object.h
+
+if HAVE_WINCE
+dist_installed_einaheaders_DATA += lib/eina/eina_inline_lock_wince.x
+else
+if HAVE_WIN32
+dist_installed_einaheaders_DATA += lib/eina/eina_inline_lock_win32.x
+else
+dist_installed_einaheaders_DATA += lib/eina/eina_inline_lock_posix.x
+endif
+endif
+
+lib_eina_libeina_la_SOURCES = \
+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_cpu.c \
+lib/eina/eina_error.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_log.c \
+lib/eina/eina_magic.c \
+lib/eina/eina_main.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_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_tiler.c \
+lib/eina/eina_thread.c \
+lib/eina/eina_unicode.c \
+lib/eina/eina_ustrbuf.c \
+lib/eina/eina_ustringshare.c \
+lib/eina/eina_value.c \
+lib/eina/eina_xattr.c \
+lib/eina/eina_share_common.h \
+lib/eina/eina_private.h \
+lib/eina/eina_strbuf_common.h \
+lib/eina/eina_tmpstr.c
+
+# Will be back for developper after 1.2
+# lib/eina/eina_model.c \
+# lib/eina/eina_object.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
+
+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 = chained_pool_module.la
+
+chained_pool_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-DEFL_EINA_BUILD \
+@VALGRIND_CFLAGS@
+chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
+chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
+chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
+chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@
+chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
+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/chained_pool/$(MODULE_ARCH)
+einamponebig_LTLIBRARIES = one_big_module.la
+
+one_big_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-DEFL_EINA_BUILD \
+@VALGRIND_CFLAGS@
+one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
+one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
+one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
+one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@
+one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
+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/chained_pool/$(MODULE_ARCH)
+einamppassthrough_LTLIBRARIES = pass_through_module.la
+
+pass_through_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-DEFL_EINA_BUILD \
+@VALGRIND_CFLAGS@
+pass_through_module_la_CFLAGS = @EINA_CFLAGS@
+pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
+pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
+pass_through_module_la_LDFLAGS = -no-undefined -module -avoid-version
+pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+lib_eina_libeina_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DEFL_EINA_BUILD \
+@EFL_CFLAGS@ \
+@EFL_PTHREAD_CFLAGS@ \
+@EINA_CFLAGS@ \
+@VALGRIND_CFLAGS@
+
+if HAVE_WINDOWS
+lib_eina_libeina_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+lib_eina_libeina_la_LIBADD = @EINA_LIBS@
+
+if HAVE_WINDOWS
+lib_eina_libeina_la_LIBADD += \
+$(top_builddir)/src/lib/evil/libevil.la \
+$(top_builddir)/src/lib/evil/libdl.la
+endif
+
+lib_eina_libeina_la_LIBADD += -lm
+
+lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
+
+EXTRA_DIST += \
+lib/eina/eina_config.h.in \
+lib/eina/eina_strbuf_template_c.x \
+lib/eina/eina_binbuf_template_c.x
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
new file mode 100644
index 0000000000..05bdd417c5
--- /dev/null
+++ b/src/Makefile_Embryo.am
@@ -0,0 +1,91 @@
+
+### 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_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DEFL_EMBRYO_BUILD \
+@EFL_CFLAGS@
+
+if HAVE_WINDOWS
+lib_embryo_libembryo_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+lib_embryo_libembryo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
+
+if HAVE_WINDOWS
+lib_embryo_libembryo_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
+endif
+
+lib_embryo_libembryo_la_LIBADD += -lm
+
+lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+### Binary
+
+bin_PROGRAMS += bin/embryo/embryo_cc
+
+bin_embryo_embryo_cc_SOURCES = \
+bin/embryo/embryo_cc_amx.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
+
+bin_embryo_embryo_cc_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/embryo \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/embryo \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EFL_CFLAGS@
+
+if HAVE_WINDOWS
+bin_embryo_embryo_cc_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+bin_embryo_embryo_cc_LDADD = \
+$(top_builddir)/src/lib/embryo/libembryo.la \
+$(top_builddir)/src/lib/eina/libeina.la
+
+if HAVE_WINDOWS
+bin_embryo_embryo_cc_LDADD += $(top_builddir)/src/lib/evil/libevil.la
+endif
+
+EXTRA_DIST += \
+bin/embryo/embryo_cc_sc5.scp \
+bin/embryo/embryo_cc_sc7.scp
+
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
new file mode 100644
index 0000000000..cc3b250f4f
--- /dev/null
+++ b/src/Makefile_Eo.am
@@ -0,0 +1,26 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/eo/libeo.la
+
+installed_eomainheadersdir = $(includedir)/eo-@VMAJ@
+dist_installed_eomainheaders_DATA = lib/eo/Eo.h
+
+lib_eo_libeo_la_SOURCES = \
+lib/eo/eo.c \
+lib/eo/eo_base_class.c \
+lib/eo/eo_private.h
+
+lib_eo_libeo_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-DNDEBUG \
+-DEFL_EO_BUILD \
+@EFL_CFLAGS@ \
+@EO_CFLAGS@
+
+lib_eo_libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@
+
+lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
new file mode 100644
index 0000000000..eb263c0453
--- /dev/null
+++ b/src/Makefile_Evil.am
@@ -0,0 +1,180 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la
+
+install_evilheadersdir = $(includedir)/evil-@VMAJ@
+dist_install_evilheaders_DATA = \
+lib/evil/Evil.h \
+lib/evil/evil_fcntl.h \
+lib/evil/evil_inet.h \
+lib/evil/evil_langinfo.h \
+lib/evil/evil_libgen.h \
+lib/evil/evil_macro.h \
+lib/evil/evil_macro_pop.h \
+lib/evil/evil_main.h \
+lib/evil/evil_print.h \
+lib/evil/evil_stdlib.h \
+lib/evil/evil_stdio.h \
+lib/evil/evil_string.h \
+lib/evil/evil_time.h \
+lib/evil/evil_unistd.h \
+lib/evil/evil_util.h
+
+evilstdheadersdir = $(includedir)/evil-@VMAJ@
+nobase_dist_evilstdheaders_DATA = \
+lib/evil/pwd.h \
+lib/evil/sys/mman.h \
+lib/evil/fnmatch.h \
+lib/evil/dirent.h \
+lib/evil/dlfcn.h
+
+if HAVE_WINCE
+nobase_dist_evilstdheaders_DATA += lib/evil/mingw32ce/errno.h
+endif
+
+# gdtoa
+lib_evil_libevil_la_SOURCES = \
+lib/evil/gdtoa/arithchk.c \
+lib/evil/gdtoa/dmisc.c \
+lib/evil/gdtoa/dtoa.c \
+lib/evil/gdtoa/gd_arith.h \
+lib/evil/gdtoa/g_dfmt.c \
+lib/evil/gdtoa/gd_qnan.h \
+lib/evil/gdtoa/gdtoa.c \
+lib/evil/gdtoa/gdtoa_fltrnds.h \
+lib/evil/gdtoa/gdtoa.h \
+lib/evil/gdtoa/gdtoaimp.h \
+lib/evil/gdtoa/gethex.c \
+lib/evil/gdtoa/g_ffmt.c \
+lib/evil/gdtoa/g__fmt.c \
+lib/evil/gdtoa/gmisc.c \
+lib/evil/gdtoa/g_xfmt.c \
+lib/evil/gdtoa/hd_init.c \
+lib/evil/gdtoa/hexnan.c \
+lib/evil/gdtoa/misc.c \
+lib/evil/gdtoa/qnan.c \
+lib/evil/gdtoa/smisc.c \
+lib/evil/gdtoa/strtodg.c \
+lib/evil/gdtoa/strtof.c \
+lib/evil/gdtoa/strtopx.c \
+lib/evil/gdtoa/sum.c \
+lib/evil/gdtoa/ulp.c
+
+#evil
+lib_evil_libevil_la_SOURCES += \
+lib/evil/evil_dirent.c \
+lib/evil/evil_fcntl.c \
+lib/evil/evil_fnmatch.c \
+lib/evil/evil_fnmatch_list_of_states.c \
+lib/evil/evil_inet.c \
+lib/evil/evil_langinfo.c \
+lib/evil/evil_libgen.c \
+lib/evil/evil_main.c \
+lib/evil/evil_mman.c \
+lib/evil/evil_pformata.c \
+lib/evil/evil_pformatw.c \
+lib/evil/evil_printa.c \
+lib/evil/evil_printw.c \
+lib/evil/evil_pwd.c \
+lib/evil/evil_stdlib.c \
+lib/evil/evil_stdio.c \
+lib/evil/evil_string.c \
+lib/evil/evil_time.c \
+lib/evil/evil_unistd.c \
+lib/evil/evil_util.c \
+lib/evil/evil_uuid.c \
+lib/evil/evil_pformat.h \
+lib/evil/evil_private.h \
+lib/evil/evil_fnmatch_private.h
+
+if HAVE_WINCE
+lib_evil_libevil_la_SOURCES += lib/evil/evil_errno.c lib/evil/evil_link_ce.c
+else
+lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp
+endif
+
+lib_evil_libevil_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil \
+@EVIL_CPPFLAGS@
+lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@
+lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
+lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
+lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@
+
+if HAVE_WINCE
+lib_evil_libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS)
+else
+lib_evil_libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
+endif
+
+lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
+
+lib_evil_libdl_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil \
+@EVIL_DLFCN_CPPFLAGS@
+
+lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
+
+lib_evil_libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@
+
+lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@
+
+EXTRA_DIST += lib/evil/gdtoa/README lib/evil/gdtoa/README.mingw
+
+### Binary
+
+bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil
+
+bin_evil_evil_suite_SOURCES = \
+bin/evil/evil_suite.c \
+bin/evil/evil_test_dlfcn.c \
+bin/evil/evil_test_environment.c \
+bin/evil/evil_test_gettimeofday.c \
+bin/evil/evil_test_link.c \
+bin/evil/evil_test_memcpy.c \
+bin/evil/evil_test_mkstemp.c \
+bin/evil/evil_test_pipe.c \
+bin/evil/evil_test_print.c \
+bin/evil/evil_test_realpath.c \
+bin/evil/evil_test_util.c \
+bin/evil/evil_suite.h \
+bin/evil/evil_test_dlfcn.h \
+bin/evil/evil_test_environment.h \
+bin/evil/evil_test_gettimeofday.h \
+bin/evil/evil_test_link.h \
+bin/evil/evil_test_memcpy.h \
+bin/evil/evil_test_mkstemp.h \
+bin/evil/evil_test_pipe.h \
+bin/evil/evil_test_print.h \
+bin/evil/evil_test_realpath.h \
+bin/evil/evil_test_util.h
+
+if HAVE_WINCE
+bin_evil_evil_suite_SOURCES +=  bin/evil/memcpy_glibc_arm.S
+#else
+#suite_SOURCES +=  bin/evil/memcpy_glibc_i686.S
+endif
+
+bin_evil_evil_suite_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil \
+@EFL_CFLAGS@ \
+@EVIL_CPPFLAGS@
+
+if HAVE_WINDOWS
+bin_evil_evil_suite_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+bin_evil_evil_suite_LDADD = \
+$(top_builddir)/src/lib/evil/libevil.la \
+$(top_builddir)/src/lib/eina/libdl.la \
+-lm
+
+bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
+
+bin_evil_test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
deleted file mode 100644
index ca26cca78a..0000000000
--- a/src/bin/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS =
-
-if HAVE_WINDOWS
-
-SUBDIRS += evil
-
-endif
-
-SUBDIRS += eet embryo
diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
deleted file mode 100644
index 504f36cf5f..0000000000
--- a/src/bin/eet/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eina \
--I$(top_builddir)/src/lib/eet \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_CFLAGS@ \
-@EET_CFLAGS@
-
-if HAVE_WINDOWS
-AM_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil
-endif
-
-bin_PROGRAMS = eet
-
-eet_SOURCES = eet_main.c
-eet_LDADD = \
-$(top_builddir)/src/lib/eet/libeet.la \
-$(top_builddir)/src/lib/eina/libeina.la
-
-if HAVE_WINDOWS
-eet_LDADD += $(top_builddir)/src/lib/evil/libdl.la
-endif
-
-eet_LDADD += @EET_LIBS@
diff --git a/src/bin/embryo/Makefile.am b/src/bin/embryo/Makefile.am
deleted file mode 100644
index e31a5bee62..0000000000
--- a/src/bin/embryo/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_srcdir)/src/lib/embryo \
--I$(top_builddir)/src/lib/eina \
--I$(top_builddir)/src/lib/embryo \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_CFLAGS@
-
-if HAVE_WINDOWS
-AM_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil
-endif
-
-bin_PROGRAMS = embryo_cc
-
-embryo_cc_SOURCES = \
-embryo_cc_amx.h \
-embryo_cc_sc.h \
-embryo_cc_sc1.c \
-embryo_cc_sc2.c \
-embryo_cc_sc3.c \
-embryo_cc_sc4.c \
-embryo_cc_sc5.c \
-embryo_cc_sc6.c \
-embryo_cc_sc7.c \
-embryo_cc_scexpand.c \
-embryo_cc_sclist.c \
-embryo_cc_scvars.c \
-embryo_cc_prefix.c \
-embryo_cc_prefix.h
-
-embryo_cc_LDADD = \
-$(top_builddir)/src/lib/embryo/libembryo.la \
-$(top_builddir)/src/lib/eina/libeina.la \
--lm
-
-if HAVE_WINDOWS
-embryo_cc_LDADD += $(top_builddir)/src/lib/evil/libevil.la
-endif
-
-EXTRA_DIST = \
-embryo_cc_sc5.scp \
-embryo_cc_sc7.scp
diff --git a/src/bin/evil/Makefile.am b/src/bin/evil/Makefile.am
deleted file mode 100644
index dfc2f4b7cb..0000000000
--- a/src/bin/evil/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil \
-@EFL_CFLAGS@ \
-@EVIL_CPPFLAGS@
-
-AM_CFLAGS = @EVIL_CFLAGS@
-
-bin_PROGRAMS = evil_suite test_evil
-
-evil_suite_SOURCES = \
-evil_suite.c \
-evil_test_dlfcn.c \
-evil_test_environment.c \
-evil_test_gettimeofday.c \
-evil_test_link.c \
-evil_test_memcpy.c \
-evil_test_mkstemp.c \
-evil_test_pipe.c \
-evil_test_print.c \
-evil_test_realpath.c \
-evil_test_util.c \
-evil_suite.h \
-evil_test_dlfcn.h \
-evil_test_environment.h \
-evil_test_gettimeofday.h \
-evil_test_link.h \
-evil_test_memcpy.h \
-evil_test_mkstemp.h \
-evil_test_pipe.h \
-evil_test_print.h \
-evil_test_realpath.h \
-evil_test_util.h
-
-if HAVE_WINCE
-
-evil_suite_SOURCES +=  memcpy_glibc_arm.S
-
-#else
-
-#suite_SOURCES +=  memcpy_glibc_i686.S
-
-endif
-
-evil_suite_LDADD = $(top_builddir)/src/lib/evil/libdl.la $(top_builddir)/src/lib/evil/libevil.la -lm
-evil_suite_LDFLAGS = -Wl,--enable-auto-import
-
-test_evil_SOURCES = test_evil.c
-test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la
-test_evil_LDFLAGS = -Wl,--enable-auto-import
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
deleted file mode 100644
index 3fe99e9629..0000000000
--- a/src/lib/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS =
-
-if HAVE_WINDOWS
-
-SUBDIRS += evil
-
-endif
-
-SUBDIRS += eina eo eet embryo
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
deleted file mode 100644
index d0f4aab088..0000000000
--- a/src/lib/eet/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/eet/lz4 \
--I$(top_builddir)/src/lib/eina \
--I$(top_builddir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet/lz4 \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DEFL_EET_BUILD \
-@EFL_CFLAGS@ \
-@EET_CFLAGS@
-
-if HAVE_WINDOWS
-AM_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil
-endif
-
-includes_HEADERS = Eet.h
-includesdir = $(includedir)/eet-@VMAJ@
-
-lib_LTLIBRARIES = libeet.la
-
-libeet_la_SOURCES = \
-Eet_private.h \
-eet_alloc.c \
-eet_cipher.c \
-eet_connection.c \
-eet_data.c \
-eet_dictionary.c \
-eet_image.c \
-eet_lib.c \
-eet_node.c \
-eet_utils.c \
-lz4/lz4.c \
-lz4/lz4.h \
-lz4/lz4hc.c \
-lz4/lz4hc.h
-
-libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
-
-if HAVE_WINDOWS
-libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
-endif
-
-libeet_la_LIBADD += @EET_LIBS@ -lm
-
-libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
-
-EXTRA_DIST = lz4/README
-
-clean-local:
-	@rm -rf *.gcno
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
deleted file mode 100644
index 5f90d03b3b..0000000000
--- a/src/lib/eina/Makefile.am
+++ /dev/null
@@ -1,203 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--DEFL_EINA_BUILD \
-@EFL_CFLAGS@ \
-@EFL_PTHREAD_CFLAGS@ \
-@EINA_CFLAGS@ \
-@VALGRIND_CFLAGS@
-
-if HAVE_WINDOWS
-AM_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil
-endif
-
-EINAHEADERS = \
-eina_safety_checks.h \
-eina_error.h \
-eina_log.h \
-eina_inline_log.x \
-eina_fp.h \
-eina_inline_f32p32.x \
-eina_inline_f16p16.x \
-eina_inline_f8p24.x \
-eina_inline_fp.x \
-eina_hash.h \
-eina_inline_hash.x \
-eina_lalloc.h \
-eina_clist.h \
-eina_inline_clist.x \
-eina_inarray.h \
-eina_inlist.h \
-eina_list.h \
-eina_file.h \
-eina_mempool.h \
-eina_module.h \
-eina_rectangle.h \
-eina_types.h \
-eina_array.h \
-eina_counter.h \
-eina_inline_array.x \
-eina_magic.h \
-eina_stringshare.h \
-eina_binshare.h \
-eina_binbuf.h \
-eina_ustringshare.h \
-eina_inline_stringshare.x \
-eina_inline_ustringshare.x \
-eina_inline_list.x \
-eina_accessor.h \
-eina_convert.h \
-eina_rbtree.h \
-eina_benchmark.h \
-eina_inline_rbtree.x \
-eina_inline_mempool.x \
-eina_inline_rectangle.x \
-eina_inline_trash.x \
-eina_thread.h \
-eina_trash.h \
-eina_iterator.h \
-eina_main.h \
-eina_cpu.h \
-eina_sched.h \
-eina_tiler.h \
-eina_hamster.h \
-eina_matrixsparse.h \
-eina_inline_tiler.x \
-eina_str.h \
-eina_inline_str.x \
-eina_strbuf.h \
-eina_ustrbuf.h \
-eina_unicode.h \
-eina_quadtree.h \
-eina_simple_xml_parser.h \
-eina_lock.h \
-eina_prefix.h \
-eina_refcount.h \
-eina_mmap.h \
-eina_xattr.h \
-eina_value.h \
-eina_inline_value.x \
-eina_inline_lock_barrier.x \
-eina_tmpstr.h
-
-# Will be back for developper after 1.2.
-# eina_model.h
-# eina_object.h
-
-if HAVE_WINCE
-EINAHEADERS += eina_inline_lock_wince.x
-else
-if HAVE_WIN32
-EINAHEADERS += eina_inline_lock_win32.x
-else
-EINAHEADERS += eina_inline_lock_posix.x
-endif
-endif
-
-installed_mainheaderdir = $(includedir)/eina-@VMAJ@
-dist_installed_mainheader_DATA = Eina.h eina_config.h
-
-installed_headersdir = $(includedir)/eina-@VMAJ@/eina
-dist_installed_headers_DATA = $(EINAHEADERS)
-
-lib_LTLIBRARIES = libeina.la
-
-libeina_la_SOURCES = \
-eina_accessor.c \
-eina_array.c \
-eina_benchmark.c \
-eina_binbuf.c \
-eina_binshare.c \
-eina_convert.c \
-eina_counter.c \
-eina_cpu.c \
-eina_error.c \
-eina_fp.c \
-eina_hamster.c \
-eina_hash.c \
-eina_inarray.c \
-eina_inlist.c \
-eina_iterator.c \
-eina_lalloc.c \
-eina_list.c \
-eina_log.c \
-eina_magic.c \
-eina_main.c \
-eina_matrixsparse.c \
-eina_mempool.c \
-eina_mmap.c \
-eina_module.c \
-eina_prefix.c \
-eina_quadtree.c \
-eina_rbtree.c \
-eina_rectangle.c \
-eina_safety_checks.c \
-eina_sched.c \
-eina_share_common.c \
-eina_simple_xml_parser.c \
-eina_str.c \
-eina_strbuf.c \
-eina_strbuf_common.c \
-eina_stringshare.c \
-eina_tiler.c \
-eina_thread.c \
-eina_unicode.c \
-eina_ustrbuf.c \
-eina_ustringshare.c \
-eina_value.c \
-eina_xattr.c \
-eina_share_common.h \
-eina_private.h \
-eina_strbuf_common.h \
-eina_tmpstr.c
-
-# Will be back for developper after 1.2
-# eina_model.c \
-# eina_object.c
-
-if HAVE_WIN32
-libeina_la_SOURCES += eina_file_win32.c
-else
-libeina_la_SOURCES += eina_file.c
-endif
-
-EXTRA_DIST = \
-eina_config.h.in \
-eina_strbuf_template_c.x \
-eina_binbuf_template_c.x
-
-
-
-if EINA_STATIC_BUILD_CHAINED_POOL
-libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
-endif
-
-if EINA_STATIC_BUILD_ONE_BIG
-libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/one_big/eina_one_big.c
-endif
-
-if EINA_STATIC_BUILD_PASS_THROUGH
-libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c
-endif
-
-libeina_la_LIBADD = @EINA_LIBS@
-
-if HAVE_WINDOWS
-libeina_la_LIBADD += \
-$(top_builddir)/src/lib/evil/libevil.la \
-$(top_builddir)/src/lib/evil/libdl.la
-endif
-
-libeina_la_LIBADD += -lm
-
-libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
-
-clean-local:
-	rm -rf *.gcno
diff --git a/src/lib/embryo/Makefile.am b/src/lib/embryo/Makefile.am
deleted file mode 100644
index 46fa323e8f..0000000000
--- a/src/lib/embryo/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--DEFL_EMBRYO_BUILD \
-@EFL_CFLAGS@
-
-if HAVE_WINDOWS
-AM_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil
-endif
-
-includes_HEADERS = Embryo.h
-includesdir = $(includedir)/embryo-@VMAJ@
-
-lib_LTLIBRARIES = libembryo.la
-
-libembryo_la_SOURCES  = \
-embryo_amx.c \
-embryo_args.c \
-embryo_float.c \
-embryo_main.c \
-embryo_rand.c \
-embryo_str.c \
-embryo_time.c \
-embryo_private.h
-
-libembryo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la -lm
-if HAVE_WINDOWS
-libembryo_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
-endif
-libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
deleted file mode 100644
index 09083593ef..0000000000
--- a/src/lib/eo/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eina \
--I$(top_builddir)/src/lib/eo \
--DNDEBUG \
--DEFL_EO_BUILD \
-@EFL_CFLAGS@ \
-@EO_CFLAGS@
-
-if HAVE_WINDOWS
-AM_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil \
--I$(top_builddir)/src/lib/evil
-endif
-
-installed_headerdir = $(includedir)/eo-@VMAJ@
-dist_installed_header_DATA = Eo.h
-
-lib_LTLIBRARIES = libeo.la
-
-libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h
-libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@
-libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
-
-clean-local:
-	rm -rf *.gcno
diff --git a/src/lib/evil/Makefile.am b/src/lib/evil/Makefile.am
deleted file mode 100644
index 65e240c892..0000000000
--- a/src/lib/evil/Makefile.am
+++ /dev/null
@@ -1,132 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-lib_LTLIBRARIES = libevil.la libdl.la
-
-install_evilheadersdir = $(includedir)/evil-@VMAJ@
-dist_install_evilheaders_DATA = \
-Evil.h \
-evil_fcntl.h \
-evil_inet.h \
-evil_langinfo.h \
-evil_libgen.h \
-evil_macro.h \
-evil_macro_pop.h \
-evil_main.h \
-evil_print.h \
-evil_stdlib.h \
-evil_stdio.h \
-evil_string.h \
-evil_time.h \
-evil_unistd.h \
-evil_util.h
-
-stdheadersdir = $(includedir)/evil-@VMAJ@
-nobase_dist_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h dlfcn.h
-
-if HAVE_WINCE
-
-nobase_dist_stdheaders_DATA += mingw32ce/errno.h
-
-endif
-
-# gdtoa
-libevil_la_SOURCES = \
-gdtoa/arithchk.c \
-gdtoa/dmisc.c \
-gdtoa/dtoa.c \
-gdtoa/gd_arith.h \
-gdtoa/g_dfmt.c \
-gdtoa/gd_qnan.h \
-gdtoa/gdtoa.c \
-gdtoa/gdtoa_fltrnds.h \
-gdtoa/gdtoa.h \
-gdtoa/gdtoaimp.h \
-gdtoa/gethex.c \
-gdtoa/g_ffmt.c \
-gdtoa/g__fmt.c \
-gdtoa/gmisc.c \
-gdtoa/g_xfmt.c \
-gdtoa/hd_init.c \
-gdtoa/hexnan.c \
-gdtoa/misc.c \
-gdtoa/qnan.c \
-gdtoa/smisc.c \
-gdtoa/strtodg.c \
-gdtoa/strtof.c \
-gdtoa/strtopx.c \
-gdtoa/sum.c \
-gdtoa/ulp.c
-
-#evil
-libevil_la_SOURCES += \
-evil_dirent.c \
-evil_fcntl.c \
-evil_fnmatch.c \
-evil_fnmatch_list_of_states.c \
-evil_inet.c \
-evil_langinfo.c \
-evil_libgen.c \
-evil_main.c \
-evil_mman.c \
-evil_pformata.c \
-evil_pformatw.c \
-evil_printa.c \
-evil_printw.c \
-evil_pwd.c \
-evil_stdlib.c \
-evil_stdio.c \
-evil_string.c \
-evil_time.c \
-evil_unistd.c \
-evil_util.c \
-evil_uuid.c \
-evil_pformat.h \
-evil_private.h \
-evil_fnmatch_private.h
-
-if HAVE_WINCE
-
-libevil_la_SOURCES += evil_errno.c evil_link_ce.c
-
-else
-
-libevil_la_SOURCES += evil_link_xp.cpp
-
-endif
-
-libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@
-libevil_la_CFLAGS = @EVIL_CFLAGS@
-libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
-libevil_la_LIBADD = @EVIL_LIBS@
-libevil_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
-
-if HAVE_WINCE
-
-libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS)
-
-else
-
-libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
-
-endif
-
-libdl_la_SOURCES = dlfcn.c
-
-libdl_la_CPPFLAGS = @EVIL_DLFCN_CPPFLAGS@
-libdl_la_CFLAGS = @EVIL_CFLAGS@
-libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@
-libdl_la_LDFLAGS = -no-undefined -Wl,--enable-auto-import -version-info @version_info@
-
-EXTRA_DIST = gdtoa/README gdtoa/README.mingw
-
-install-data-hook:
-	rm -f $(libdir)/libevil.la $(libdir)/libdl.la
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/libevil-@VMAJ@.dll
-	rm -f $(DESTDIR)$(bindir)/libdl-@VMAJ@.dll
-	rm -f $(DESTDIR)$(libdir)/libevil.dll.a
-	rm -f $(DESTDIR)$(libdir)/libevil.a
-	rm -f $(DESTDIR)$(libdir)/libdl.dll.a
-	rm -f $(DESTDIR)$(libdir)/libdl.a
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
deleted file mode 100644
index b8f642fb72..0000000000
--- a/src/modules/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = eina
diff --git a/src/modules/eina/Makefile.am b/src/modules/eina/Makefile.am
deleted file mode 100644
index 53e28b7bf9..0000000000
--- a/src/modules/eina/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = mp
-
-MAINTAINERCLEANFILES = \
-Makefile.in
\ No newline at end of file
diff --git a/src/modules/eina/mp/Makefile.am b/src/modules/eina/mp/Makefile.am
deleted file mode 100644
index cb6d26de25..0000000000
--- a/src/modules/eina/mp/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS =
-
-if EINA_BUILD_CHAINED_POOL
-if !EINA_STATIC_BUILD_CHAINED_POOL
-SUBDIRS += chained_pool
-endif
-endif
-
-if EINA_BUILD_ONE_BIG
-if !EINA_STATIC_BUILD_ONE_BIG
-SUBDIRS += one_big
-endif
-endif
-
-if EINA_BUILD_PASS_THROUGH
-if !EINA_STATIC_BUILD_PASS_THROUGH
-SUBDIRS += pass_through
-endif
-endif
diff --git a/src/modules/eina/mp/chained_pool/Makefile.am b/src/modules/eina/mp/chained_pool/Makefile.am
deleted file mode 100644
index 48feb46b41..0000000000
--- a/src/modules/eina/mp/chained_pool/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD \
-@VALGRIND_CFLAGS@
-
-controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
-controller_LTLIBRARIES = module.la
-
-module_la_SOURCES = eina_chained_mempool.c
-
-module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
-module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
-module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-install-data-hook:
-	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
-uninstall-hook:
-	rm -f $(DESTDIR)$(controllerdir)/module.*
-
-clean-local:
-	rm -rf *.gcno
diff --git a/src/modules/eina/mp/one_big/Makefile.am b/src/modules/eina/mp/one_big/Makefile.am
deleted file mode 100644
index 3ca78e092d..0000000000
--- a/src/modules/eina/mp/one_big/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD \
-@VALGRIND_CFLAGS@
-
-controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
-controller_LTLIBRARIES = module.la
-
-module_la_SOURCES = eina_one_big.c
-
-module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
-module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
-module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-install-data-hook:
-	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
-uninstall-hook:
-	rm -f $(DESTDIR)$(controllerdir)/module.*
-
-clean-local:
-	rm -rf *.gcno
diff --git a/src/modules/eina/mp/pass_through/Makefile.am b/src/modules/eina/mp/pass_through/Makefile.am
deleted file mode 100644
index 19622f552e..0000000000
--- a/src/modules/eina/mp/pass_through/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD
-
-controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
-controller_LTLIBRARIES = module.la
-
-module_la_SOURCES = eina_pass_through.c
-
-module_la_CFLAGS = @EINA_CFLAGS@
-module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-install-data-hook:
-	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
-uninstall-hook:
-	rm -f $(DESTDIR)$(controllerdir)/module.*
-
-clean-local:
-	rm -rf *.gcno