Remove EFL, since it's been released now.

304 files changed, 0 insertions, 73646 deletions

diff --git a/libraries/evas/src/modules/engines/Makefile.am b/libraries/evas/src/modules/engines/Makefile.am
deleted file mode 100644
index e29fb98..0000000
--- a/libraries/evas/src/modules/engines/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS =
-
-if !EVAS_STATIC_BUILD_SOFTWARE_GENERIC
-SUBDIRS += software_generic
-endif
-if !EVAS_STATIC_BUILD_BUFFER
-SUBDIRS += buffer
-endif
-if !EVAS_STATIC_BUILD_DIRECT3D
-SUBDIRS += direct3d
-endif
-if !EVAS_STATIC_BUILD_DIRECTFB
-SUBDIRS += directfb
-endif
-if !EVAS_STATIC_BUILD_FB
-SUBDIRS += fb
-endif
-
-if !EVAS_STATIC_BUILD_PSL1GHT
-SUBDIRS += psl1ght
-endif
-
-if !EVAS_STATIC_BUILD_GL_COMMON
-SUBDIRS += gl_common
-endif
-if !EVAS_STATIC_BUILD_GL_X11
-SUBDIRS += gl_x11
-endif
-if !EVAS_STATIC_BUILD_GL_SDL
-SUBDIRS += gl_sdl
-endif
-if !EVAS_STATIC_BUILD_GL_COCOA
-SUBDIRS += gl_cocoa
-endif
-
-if !EVAS_STATIC_BUILD_SOFTWARE_8
-SUBDIRS += software_8
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_8_X11
-SUBDIRS += software_8_x11
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_16
-SUBDIRS += software_16
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
-SUBDIRS += software_16_ddraw
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
-SUBDIRS += software_16_wince
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
-SUBDIRS += software_16_x11
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
-SUBDIRS += software_16_sdl
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
-SUBDIRS += software_ddraw
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_GDI
-SUBDIRS += software_gdi
-endif
-if !EVAS_STATIC_BUILD_SOFTWARE_X11
-SUBDIRS += software_x11
-endif
-if !EVAS_STATIC_BUILD_WAYLAND_SHM
-SUBDIRS += wayland_shm
-endif
-if !EVAS_STATIC_BUILD_WAYLAND_EGL
-SUBDIRS += wayland_egl
-endif
diff --git a/libraries/evas/src/modules/engines/Makefile.in b/libraries/evas/src/modules/engines/Makefile.in
deleted file mode 100644
index 7388a48..0000000
--- a/libraries/evas/src/modules/engines/Makefile.in
+++ /dev/null
@@ -1,771 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@am__append_1 = software_generic
-@EVAS_STATIC_BUILD_BUFFER_FALSE@am__append_2 = buffer
-@EVAS_STATIC_BUILD_DIRECT3D_FALSE@am__append_3 = direct3d
-@EVAS_STATIC_BUILD_DIRECTFB_FALSE@am__append_4 = directfb
-@EVAS_STATIC_BUILD_FB_FALSE@am__append_5 = fb
-@EVAS_STATIC_BUILD_PSL1GHT_FALSE@am__append_6 = psl1ght
-@EVAS_STATIC_BUILD_GL_COMMON_FALSE@am__append_7 = gl_common
-@EVAS_STATIC_BUILD_GL_X11_FALSE@am__append_8 = gl_x11
-@EVAS_STATIC_BUILD_GL_SDL_FALSE@am__append_9 = gl_sdl
-@EVAS_STATIC_BUILD_GL_COCOA_FALSE@am__append_10 = gl_cocoa
-@EVAS_STATIC_BUILD_SOFTWARE_8_FALSE@am__append_11 = software_8
-@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@am__append_12 = software_8_x11
-@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@am__append_13 = software_16
-@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@am__append_14 = software_16_ddraw
-@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@am__append_15 = software_16_wince
-@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@am__append_16 = software_16_x11
-@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am__append_17 = software_16_sdl
-@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@am__append_18 = software_ddraw
-@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@am__append_19 = software_gdi
-@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@am__append_20 = software_x11
-@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@am__append_21 = wayland_shm
-@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@am__append_22 = wayland_egl
-subdir = src/modules/engines
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-        html-recursive info-recursive install-data-recursive \
-        install-dvi-recursive install-exec-recursive \
-        install-html-recursive install-info-recursive \
-        install-pdf-recursive install-ps-recursive install-recursive \
-        installcheck-recursive installdirs-recursive pdf-recursive \
-        ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-        $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-        distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = software_generic buffer direct3d directfb fb psl1ght \
-        gl_common gl_x11 gl_sdl gl_cocoa software_8 software_8_x11 \
-        software_16 software_16_ddraw software_16_wince \
-        software_16_x11 software_16_sdl software_ddraw software_gdi \
-        software_x11 wayland_shm wayland_egl
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
-        $(am__append_4) $(am__append_5) $(am__append_6) \
-        $(am__append_7) $(am__append_8) $(am__append_9) \
-        $(am__append_10) $(am__append_11) $(am__append_12) \
-        $(am__append_13) $(am__append_14) $(am__append_15) \
-        $(am__append_16) $(am__append_17) $(am__append_18) \
-        $(am__append_19) $(am__append_20) $(am__append_21) \
-        $(am__append_22)
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-        @fail= failcom='exit 1'; \
-        for f in x $$MAKEFLAGS; do \
-          case $$f in \
-            *=* | --[!k]*);; \
-            *k*) failcom='fail=yes';; \
-          esac; \
-        done; \
-        dot_seen=no; \
-        target=`echo $@ | sed s/-recursive//`; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || eval $$failcom; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-        fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-        @fail= failcom='exit 1'; \
-        for f in x $$MAKEFLAGS; do \
-          case $$f in \
-            *=* | --[!k]*);; \
-            *k*) failcom='fail=yes';; \
-          esac; \
-        done; \
-        dot_seen=no; \
-        case "$@" in \
-          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-          *) list='$(SUBDIRS)' ;; \
-        esac; \
-        rev=''; for subdir in $$list; do \
-          if test "$$subdir" = "."; then :; else \
-            rev="$$subdir $$rev"; \
-          fi; \
-        done; \
-        rev="$$rev ."; \
-        target=`echo $@ | sed s/-recursive//`; \
-        for subdir in $$rev; do \
-          echo "Making $$target in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || eval $$failcom; \
-        done && test -z "$$fail"
-tags-recursive:
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-        done
-ctags-recursive:
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-        done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-          include_option=--etags-include; \
-          empty_fix=.; \
-        else \
-          include_option=--include; \
-          empty_fix=; \
-        fi; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
-              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-          fi; \
-        done; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-          if test "$$subdir" = .; then :; else \
-            test -d "$(distdir)/$$subdir" \
-            || $(MKDIR_P) "$(distdir)/$$subdir" \
-            || exit 1; \
-          fi; \
-        done
-        @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-          if test "$$subdir" = .; then :; else \
-            dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-            $(am__relativize); \
-            new_distdir=$$reldir; \
-            dir1=$$subdir; dir2="$(top_distdir)"; \
-            $(am__relativize); \
-            new_top_distdir=$$reldir; \
-            echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-            echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-            ($(am__cd) $$subdir && \
-              $(MAKE) $(AM_MAKEFLAGS) \
-                top_distdir="$$new_top_distdir" \
-                distdir="$$new_distdir" \
-                am__remove_distdir=: \
-                am__skip_length_check=: \
-                am__skip_mode_fix=: \
-                distdir) \
-              || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-        -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-        install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-        all all-am check check-am clean clean-generic clean-libtool \
-        ctags ctags-recursive distclean distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs installdirs-am maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-generic \
-        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-        uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h b/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h
deleted file mode 100644
index a9cbbfb..0000000
--- a/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _EVAS_ENGINE_BUFFER_H
-#define _EVAS_ENGINE_BUFFER_H
-
-#define EVAS_ENGINE_BUFFER_DEPTH_ARGB32 0
-#define EVAS_ENGINE_BUFFER_DEPTH_BGRA32 1
-#define EVAS_ENGINE_BUFFER_DEPTH_RGB24  2
-#define EVAS_ENGINE_BUFFER_DEPTH_BGR24  3
-#define EVAS_ENGINE_BUFFER_DEPTH_RGB32  4
-
-typedef struct _Evas_Engine_Info_Buffer Evas_Engine_Info_Buffer;
-
-struct _Evas_Engine_Info_Buffer
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-      int   depth_type;
-
-      void *dest_buffer;
-      int   dest_buffer_row_bytes;
-
-      char  use_color_key : 1;
-      int   alpha_threshold;
-      int   color_key_r;
-      int   color_key_g;
-      int   color_key_b;
-      struct {
-         void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
-         void   (*free_update_region) (int x, int y, int w, int h, void *data);
-         void * (*switch_buffer) (void *data, void *dest_buffer);
-      } func;
-
-      void *switch_data;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-#endif
-
-
diff --git a/libraries/evas/src/modules/engines/buffer/Makefile.am b/libraries/evas/src/modules/engines/buffer/Makefile.am
deleted file mode 100644
index 4090b6f..0000000
--- a/libraries/evas/src/modules/engines/buffer/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@
-
-if BUILD_ENGINE_BUFFER
-
-BUFFER_SOURCES = \
-evas_engine.c \
-evas_outbuf.c
-
-
-includes_HEADERS = Evas_Engine_Buffer.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_BUFFER
-
-pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(BUFFER_SOURCES)
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@
-module_la_LDFLAGS =  -no-undefined @lt_enable_auto_import@ -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_buffer.la
-
-libevas_engine_buffer_la_SOURCES = $(BUFFER_SOURCES)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/buffer/Makefile.in b/libraries/evas/src/modules/engines/buffer/Makefile.in
deleted file mode 100644
index bd9818e..0000000
--- a/libraries/evas/src/modules/engines/buffer/Makefile.in
+++ /dev/null
@@ -1,808 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/buffer
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-libevas_engine_buffer_la_LIBADD =
-am__libevas_engine_buffer_la_SOURCES_DIST = evas_engine.c \
-        evas_outbuf.c
-@BUILD_ENGINE_BUFFER_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_BUFFER_TRUE@      evas_outbuf.lo
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_TRUE@am_libevas_engine_buffer_la_OBJECTS = $(am__objects_1)
-libevas_engine_buffer_la_OBJECTS =  \
-        $(am_libevas_engine_buffer_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_TRUE@am_libevas_engine_buffer_la_rpath =
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_outbuf.c
-@BUILD_ENGINE_BUFFER_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_BUFFER_TRUE@      module_la-evas_outbuf.lo
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_buffer_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_buffer_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Buffer.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@
-
-@BUILD_ENGINE_BUFFER_TRUE@BUFFER_SOURCES = \
-@BUILD_ENGINE_BUFFER_TRUE@evas_engine.c \
-@BUILD_ENGINE_BUFFER_TRUE@evas_outbuf.c
-
-@BUILD_ENGINE_BUFFER_TRUE@includes_HEADERS = Evas_Engine_Buffer.h
-@BUILD_ENGINE_BUFFER_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@module_la_SOURCES = $(BUFFER_SOURCES)
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_TRUE@noinst_LTLIBRARIES = libevas_engine_buffer.la
-@BUILD_ENGINE_BUFFER_TRUE@@EVAS_STATIC_BUILD_BUFFER_TRUE@libevas_engine_buffer_la_SOURCES = $(BUFFER_SOURCES)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/buffer/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/buffer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_buffer.la: $(libevas_engine_buffer_la_OBJECTS) $(libevas_engine_buffer_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_buffer_la_rpath) $(libevas_engine_buffer_la_OBJECTS) $(libevas_engine_buffer_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_outbuf.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_outbuf.lo: evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_outbuf.Tpo -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_outbuf.Tpo $(DEPDIR)/module_la-evas_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_outbuf.c' object='module_la-evas_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/buffer/evas_engine.c b/libraries/evas/src/modules/engines/buffer/evas_engine.c
deleted file mode 100644
index 758ef10..0000000
--- a/libraries/evas/src/modules/engines/buffer/evas_engine.c
+++ /dev/null
@@ -1,444 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Buffer.h"
-
-/* domain for eina_log */
-/* the log macros are defined in evas_common.h */
-/* theirs names are EVAS_ERR, EVAS_DBG, EVAS_CRIT, EVAS_WRN and EVAS_INF */
-/* although we can use the EVAS_ERROR, etc... macros it will not work
-   when the -fvisibility=hidden option is passed to gcc */
-
-int _evas_engine_buffer_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-
-static Evas_Func func, pfunc;
-
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Tilebuf          *tb;
-   Outbuf           *ob;
-   Tilebuf_Rect     *rects;
-   Eina_Inlist *cur_rect;
-   Eina_Inarray      previous_rects;
-   int               end : 1;
-};
-
-/* prototypes we will use here */
-static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data);
-
-static void *eng_info(Evas *e __UNUSED__);
-static void eng_info_free(Evas *e __UNUSED__, void *info);
-static int eng_setup(Evas *e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-/* internal engine routines */
-static void *
-_output_setup(int w,
-              int h,
-              void *dest_buffer,
-              int dest_buffer_row_bytes,
-              int depth_type,
-              int use_color_key,
-              int alpha_threshold,
-              int color_key_r,
-              int color_key_g,
-              int color_key_b,
-              void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes),
-              void (*free_update_region) (int x, int y, int w, int h, void *data),
-              void *(*switch_buffer) (void *data, void *dest_buffer),
-              void *switch_data
-              )
-{
-   Render_Engine *re;
-
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   evas_buffer_outbuf_buf_init();
-
-     {
-        Outbuf_Depth dep;
-        DATA32 color_key = 0;
-
-        dep = OUTBUF_DEPTH_BGR_24BPP_888_888;
-        if      (depth_type == EVAS_ENGINE_BUFFER_DEPTH_ARGB32)
-          dep = OUTBUF_DEPTH_ARGB_32BPP_8888_8888;
-        else if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_RGB32)
-          dep = OUTBUF_DEPTH_RGB_32BPP_888_8888;
-        else if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_BGRA32)
-          dep = OUTBUF_DEPTH_BGRA_32BPP_8888_8888;
-        else if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_RGB24)
-          dep = OUTBUF_DEPTH_RGB_24BPP_888_888;
-        else if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_BGR24)
-          dep = OUTBUF_DEPTH_BGR_24BPP_888_888;
-        R_VAL(&color_key) = color_key_r;
-        G_VAL(&color_key) = color_key_g;
-        B_VAL(&color_key) = color_key_b;
-        A_VAL(&color_key) = 0;
-        re->ob = evas_buffer_outbuf_buf_setup_fb(w,
-                                                 h,
-                                                 dep,
-                                                 dest_buffer,
-                                                 dest_buffer_row_bytes,
-                                                 use_color_key,
-                                                 color_key,
-                                                 alpha_threshold,
-                                                 new_update_region,
-                                                 free_update_region,
-                                                 switch_buffer,
-                                                 switch_data);
-     }
-   re->tb = evas_common_tilebuf_new(w, h);
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   eina_inarray_setup(&re->previous_rects, sizeof (Eina_Rectangle), 8);
-   return re;
-}
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e __UNUSED__)
-{
-   Evas_Engine_Info_Buffer *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_Buffer));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_Buffer *in;
-   in = (Evas_Engine_Info_Buffer *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_Buffer *info;
-
-   info = (Evas_Engine_Info_Buffer *)in;
-   re = _output_setup(e->output.w,
-                      e->output.h,
-                      info->info.dest_buffer,
-                      info->info.dest_buffer_row_bytes,
-                      info->info.depth_type,
-                      info->info.use_color_key,
-                      info->info.alpha_threshold,
-                      info->info.color_key_r,
-                      info->info.color_key_g,
-                      info->info.color_key_b,
-                      info->info.func.new_update_region,
-                      info->info.func.free_update_region,
-                      info->info.func.switch_buffer,
-                      info->info.switch_data);
-   if (e->engine.data.output)
-     eng_output_free(e->engine.data.output);
-   e->engine.data.output = re;
-   if (!e->engine.data.output) return 0;
-   if (!e->engine.data.context)
-     e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_buffer_outbuf_buf_free(re->ob);
-   evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-     {
-        int      depth;
-        void    *dest;
-        int      dest_row_bytes;
-        int      alpha_level;
-        DATA32   color_key;
-        char     use_color_key;
-        void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
-        void   (*free_update_region) (int x, int y, int w, int h, void *data);
-        void * (*switch_buffer) (void *switch_data, void *dest);
-        void    *switch_data;
-
-        depth = re->ob->depth;
-        dest = re->ob->dest;
-        dest_row_bytes = re->ob->dest_row_bytes;
-        alpha_level = re->ob->alpha_level;
-        color_key = re->ob->color_key;
-        use_color_key = re->ob->use_color_key;
-        new_update_region = re->ob->func.new_update_region;
-        free_update_region = re->ob->func.free_update_region;
-        switch_buffer = re->ob->func.switch_buffer;
-        switch_data = re->ob->switch_data;
-        evas_buffer_outbuf_buf_free(re->ob);
-        re->ob = evas_buffer_outbuf_buf_setup_fb(w,
-                                                 h,
-                                                 depth,
-                                                 dest,
-                                                 dest_row_bytes,
-                                                 use_color_key,
-                                                 color_key,
-                                                 alpha_level,
-                                                 new_update_region,
-                                                 free_update_region,
-                                                 switch_buffer,
-                                                 switch_data);
-     }
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   RGBA_Image *surface;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-
-        /* handle double buffering */
-        if (re->ob->func.switch_buffer)
-          {
-             Eina_Rectangle *pushing;
-
-             if (re->ob->first_frame && !re->previous_rects.len)
-               {
-                  evas_common_tilebuf_add_redraw(re->tb, 0, 0, re->ob->w, re->ob->h);
-                  re->ob->first_frame = 0;
-               }
-
-             /* push previous frame */
-             EINA_INARRAY_FOREACH(&re->previous_rects, pushing)
-               evas_common_tilebuf_add_redraw(re->tb, pushing->x, pushing->y, pushing->w, pushing->h);
-             eina_inarray_flush(&re->previous_rects);
-
-             /* save current list of damage */
-             EINA_INLIST_FOREACH(re->rects, rect)
-               {
-                  Eina_Rectangle local;
-
-                  EINA_RECTANGLE_SET(&local, rect->x, rect->y, rect->w, rect->h);
-                  eina_inarray_append(&re->previous_rects, &local);
-               }
-
-             /* and regenerate the damage list by tacking into account the damage over two frames */
-             evas_common_tilebuf_free_render_rects(re->rects);
-             re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-          }
-
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect) return NULL;
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   if ((ux + uw) > re->ob->w) uw = re->ob->w - ux;
-   if ((uy + uh) > re->ob->h) uh = re->ob->h - uy;
-   if ((uw <= 0) || (uh <= 0)) return NULL;
-   surface = evas_buffer_outbuf_buf_new_region_for_update(re->ob,
-                                                          ux, uy, uw, uh,
-                                                          cx, cy, cw, ch);
-   *x = ux; *y = uy; *w = uw; *h = uh;
-   return surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-#ifdef BUILD_PIPE_RENDER
-   evas_common_pipe_map_begin(surface);
-#endif
-   evas_buffer_outbuf_buf_push_updated_region(re->ob, surface, x, y, w, h);
-   evas_buffer_outbuf_buf_free_region_for_update(re->ob, surface);
-   evas_common_cpu_end_opt();
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_buffer_outbuf_buf_switch_buffer(re->ob);
-}
-
-static void
-eng_output_idle_flush(void *data __UNUSED__)
-{
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context __UNUSED__)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->ob->priv.back_buf)
-     return re->ob->priv.back_buf->cache_entry.flags.alpha;
-   return EINA_TRUE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-
-   _evas_engine_buffer_log_dom = eina_log_domain_register
-     ("evas-buffer", EINA_COLOR_BLUE);
-   if (_evas_engine_buffer_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_engine_buffer_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "buffer",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, buffer);
-
-#ifndef EVAS_STATIC_BUILD_BUFFER
-EVAS_EINA_MODULE_DEFINE(engine, buffer);
-#endif
-
diff --git a/libraries/evas/src/modules/engines/buffer/evas_engine.h b/libraries/evas/src/modules/engines/buffer/evas_engine.h
deleted file mode 100644
index af82477..0000000
--- a/libraries/evas/src/modules/engines/buffer/evas_engine.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-#include "evas_common.h"
-/*  this thing is for eina_log */
-extern int _evas_engine_buffer_log_dom ;
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_buffer_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_buffer_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_buffer_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_buffer_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_buffer_log_dom, __VA_ARGS__)
-
-typedef struct _Outbuf                Outbuf;
-
-typedef enum   _Outbuf_Depth          Outbuf_Depth;
-
-enum _Outbuf_Depth
-{
-   OUTBUF_DEPTH_NONE,
-     OUTBUF_DEPTH_ARGB_32BPP_8888_8888,
-     OUTBUF_DEPTH_BGRA_32BPP_8888_8888,
-     OUTBUF_DEPTH_RGB_32BPP_888_8888,
-     OUTBUF_DEPTH_BGR_32BPP_888_8888,
-     OUTBUF_DEPTH_RGB_24BPP_888_888,
-     OUTBUF_DEPTH_BGR_24BPP_888_888,
-     OUTBUF_DEPTH_LAST
-};
-
-struct _Outbuf
-{
-   int                           w, h;
-   Outbuf_Depth                  depth;
-
-   void                         *dest;
-   unsigned int                  dest_row_bytes;
-   void                         *switch_data;
-
-   int                           alpha_level;
-   DATA32                        color_key;
-   char                          use_color_key : 1;
-   char                          first_frame : 1;
-
-   struct {
-      void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes);
-      void   (*free_update_region) (int x, int y, int w, int h, void *data);
-      void * (*switch_buffer) (void *data, void *dest_buffer);
-   } func;
-
-   struct {
-      RGBA_Image                *back_buf;
-   } priv;
-};
-
-/****/
-
-void         evas_buffer_outbuf_buf_init                   (void);
-void         evas_buffer_outbuf_buf_free                   (Outbuf *buf);
-
-Outbuf      *evas_buffer_outbuf_buf_setup_fb               (int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level,
-                                                            void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes),
-                                                            void   (*free_update_region) (int x, int y, int w, int h, void *data),
-                                                            void * (*switch_buffer)(void *switch_data, void *dest),
-                                                            void *switch_data);
-
-
-RGBA_Image  *evas_buffer_outbuf_buf_new_region_for_update  (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
-void         evas_buffer_outbuf_buf_free_region_for_update (Outbuf *buf, RGBA_Image *update);
-void         evas_buffer_outbuf_buf_push_updated_region    (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h);
-void         evas_buffer_outbuf_buf_switch_buffer          (Outbuf *buf);
-
-#endif
-
diff --git a/libraries/evas/src/modules/engines/buffer/evas_outbuf.c b/libraries/evas/src/modules/engines/buffer/evas_outbuf.c
deleted file mode 100644
index 0fa1842..0000000
--- a/libraries/evas/src/modules/engines/buffer/evas_outbuf.c
+++ /dev/null
@@ -1,357 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-void
-evas_buffer_outbuf_buf_init(void)
-{
-}
-
-void
-evas_buffer_outbuf_buf_free(Outbuf *buf)
-{
-   if (buf->priv.back_buf)
-     {
-        evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
-     }
-   free(buf);
-}
-
-Outbuf *
-evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level,
-                                void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes),
-                                void   (*free_update_region) (int x, int y, int w, int h, void *data),
-                                void * (*switch_buffer) (void *data, void *dest_buffer),
-                                void *switch_data
-                                )
-{
-   Outbuf *buf;
-   
-   buf = calloc(1, sizeof(Outbuf));
-   if (!buf) return NULL;
-
-   buf->w = w;
-   buf->h = h;
-   buf->depth = depth;
-
-   buf->dest = dest;
-   buf->dest_row_bytes = dest_row_bytes;
-
-   buf->alpha_level = alpha_level;
-   buf->color_key = color_key;
-   buf->use_color_key = use_color_key;
-   buf->first_frame = 1;
-
-   buf->func.new_update_region = new_update_region;
-   buf->func.free_update_region = free_update_region;
-   buf->func.switch_buffer = switch_buffer;
-   buf->switch_data = switch_data;
-
-   if ((buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888) &&
-       (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32))))
-     {
-        memset(buf->dest, 0, h * buf->dest_row_bytes);
-        buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
-                                                                  w, h,
-                                                                  buf->dest,
-                                                                  1, EVAS_COLORSPACE_ARGB8888);
-     }
-   else if ((buf->depth == OUTBUF_DEPTH_RGB_32BPP_888_8888) &&
-       (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32))))
-     {
-        buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
-                                                                  w, h,
-                                                                  buf->dest,
-                                                                  0, EVAS_COLORSPACE_ARGB8888);
-     }
-
-   return buf;
-}
-
-RGBA_Image *
-evas_buffer_outbuf_buf_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch)
-{
-   RGBA_Image *im;
-
-   if (buf->priv.back_buf)
-     {
-        *cx = x; *cy = y; *cw = w; *ch = h;
-        return buf->priv.back_buf;
-     }
-   else
-     {
-        *cx = 0; *cy = 0; *cw = w; *ch = h;
-        im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
-        if (im)
-          {
-             if (((buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888)) ||
-                 ((buf->depth == OUTBUF_DEPTH_BGRA_32BPP_8888_8888)))
-               {
-                  im->cache_entry.flags.alpha = 1;
-                  im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry, w, h);
-               }
-          }
-     }
-   return im;
-}
-
-void
-evas_buffer_outbuf_buf_free_region_for_update(Outbuf *buf, RGBA_Image *update)
-{
-   if (update != buf->priv.back_buf) evas_cache_image_drop(&update->cache_entry);
-}
-
-void
-evas_buffer_outbuf_buf_switch_buffer(Outbuf *buf)
-{
-   if (buf->func.switch_buffer)
-     {
-        buf->dest = buf->func.switch_buffer(buf->switch_data, buf->dest);
-        if (buf->priv.back_buf)
-          {
-             evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
-             buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
-                                                                       buf->w, buf->h,
-                                                                       buf->dest,
-                                                                       buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0,
-                                                                       EVAS_COLORSPACE_ARGB8888);
-          }
-     }
-}
-
-void
-evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h)
-{
-   /* copy update image to out buf & convert */
-   switch (buf->depth)
-     {
-      case OUTBUF_DEPTH_RGB_24BPP_888_888:
-        /* copy & pack into 24bpp - if colorkey is enabled... etc. */
-          {
-             DATA8 thresh;
-             int xx, yy;
-             int row_bytes;
-             DATA8 *dest;
-             DATA32 colorkey;
-             DATA32 *src;
-             DATA8 *dst;
-
-             colorkey = buf->color_key;
-             thresh = buf->alpha_level;
-             row_bytes = buf->dest_row_bytes;
-             dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 3);
-             if (buf->func.new_update_region)
-               {
-                  dest = buf->func.new_update_region(x, y, w, h, &row_bytes);
-               }
-             if (!dest) break;
-             if (buf->use_color_key)
-               {
-                  for (yy = 0; yy < h; yy++)
-                    {
-                       dst = dest + (yy * row_bytes);
-                       src = update->image.data + (yy * update->cache_entry.w);
-                       for (xx = 0; xx < w; xx++)
-                         {
-                            if (A_VAL(src) > thresh)
-                              {
-                                 *dst++ = R_VAL(src);
-                                 *dst++ = G_VAL(src);
-                                 *dst++ = B_VAL(src);
-                              }
-                            else
-                              {
-                                 *dst++ = R_VAL(&colorkey);
-                                 *dst++ = G_VAL(&colorkey);
-                                 *dst++ = B_VAL(&colorkey);
-                              }
-                            src++;
-                         }
-                    }
-               }
-             else
-               {
-                  for (yy = 0; yy < h; yy++)
-                    {
-                       dst = dest + (yy * row_bytes);
-                       src = update->image.data + (yy * update->cache_entry.w);
-                       for (xx = 0; xx < w; xx++)
-                         {
-                            *dst++ = R_VAL(src);
-                            *dst++ = G_VAL(src);
-                            *dst++ = B_VAL(src);
-                            src++;
-                         }
-                    }
-               }
-             if (buf->func.free_update_region)
-               {
-                  buf->func.free_update_region(x, y, w, h, dest);
-               }
-          }
-        break;
-      case OUTBUF_DEPTH_BGR_24BPP_888_888:
-        /* copy & pack into 24bpp - if colorkey is enabled... etc. */
-          {
-             DATA8 thresh;
-             int xx, yy;
-             int row_bytes;
-             DATA8 *dest;
-             DATA32 colorkey;
-             DATA32 *src;
-             DATA8 *dst;
-
-             colorkey = buf->color_key;
-             thresh = buf->alpha_level;
-             row_bytes = buf->dest_row_bytes;
-             dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 3);
-             if (buf->func.new_update_region)
-               {
-                  dest = buf->func.new_update_region(x, y, w, h, &row_bytes);
-               }
-             if (!dest) break;
-             if (buf->use_color_key)
-               {
-                  for (yy = 0; yy < h; yy++)
-                    {
-                       dst = dest + (yy * row_bytes);
-                       src = update->image.data + (yy * update->cache_entry.w);
-                       for (xx = 0; xx < w; xx++)
-                         {
-                            if (A_VAL(src) > thresh)
-                              {
-                                 *dst++ = B_VAL(src);
-                                 *dst++ = G_VAL(src);
-                                 *dst++ = R_VAL(src);
-                              }
-                            else
-                              {
-                                 *dst++ = B_VAL(&colorkey);
-                                 *dst++ = G_VAL(&colorkey);
-                                 *dst++ = R_VAL(&colorkey);
-                              }
-                            src++;
-                         }
-                    }
-               }
-             else
-               {
-                  for (yy = 0; yy < h; yy++)
-                    {
-                       dst = dest + (yy * row_bytes);
-                       src = update->image.data + (yy * update->cache_entry.w);
-                       for (xx = 0; xx < w; xx++)
-                         {
-                            *dst++ = B_VAL(src);
-                            *dst++ = G_VAL(src);
-                            *dst++ = R_VAL(src);
-                            src++;
-                         }
-                    }
-               }
-             if (buf->func.free_update_region)
-               {
-                  buf->func.free_update_region(x, y, w, h, dest);
-               }
-          }
-        break;
-      case OUTBUF_DEPTH_RGB_32BPP_888_8888:
-      case OUTBUF_DEPTH_ARGB_32BPP_8888_8888:
-          {
-             DATA32 *dest, *src, *dst;
-             int yy, row_bytes;
-
-             row_bytes = buf->dest_row_bytes;
-             dest = (DATA32 *)((DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4));
-             if (buf->func.new_update_region)
-               {
-                  dest = buf->func.new_update_region(x, y, w, h, &row_bytes);
-               }
-             /* no need src == dest */
-             if (!buf->priv.back_buf)
-               {
-                  Gfx_Func_Copy func;
-                  
-                  func = evas_common_draw_func_copy_get(w, 0);
-                  if (func)
-                    {
-                       for (yy = 0; yy < h; yy++)
-                         {
-                            src = update->image.data + (yy * update->cache_entry.w);
-                            dst = (DATA32 *)((DATA8 *)(buf->dest) + ((y + yy) * row_bytes));
-                            func(src, dst, w);
-                         }
-                       
-                    }
-               }
-             if (buf->func.free_update_region)
-               {
-                  buf->func.free_update_region(x, y, w, h, dest);
-               }
-          }
-        break;
-      case OUTBUF_DEPTH_BGR_32BPP_888_8888:
-          {
-             DATA32 *src, *dst;
-             DATA8 *dest;
-             int xx, yy, row_bytes;
-             
-             row_bytes = buf->dest_row_bytes;
-             dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4);
-             if (buf->func.new_update_region)
-               {
-                  dest = buf->func.new_update_region(x, y, w, h, &row_bytes);
-               }
-             for (yy = 0; yy < h; yy++)
-               {
-                  dst = (DATA32 *)(dest + (yy * row_bytes));
-                  src = update->image.data + (yy * update->cache_entry.w);
-                  for (xx = 0; xx < w; xx++)
-                    {
-                       A_VAL(dst) = B_VAL(src);
-                       R_VAL(dst) = G_VAL(src);
-                       G_VAL(dst) = R_VAL(src);
-                       dst++;
-                       src++;
-                    }
-               }
-             if (buf->func.free_update_region)
-               {
-                  buf->func.free_update_region(x, y, w, h, dest);
-               }
-         }
-        break;
-      case OUTBUF_DEPTH_BGRA_32BPP_8888_8888:
-          {
-             DATA32 *src, *dst;
-             DATA8 *dest;
-             int xx, yy, row_bytes;
-             
-             row_bytes = buf->dest_row_bytes;
-             dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4);
-             if (buf->func.new_update_region)
-               {
-                  dest = buf->func.new_update_region(x, y, w, h, &row_bytes);
-               }
-             for (yy = 0; yy < h; yy++)
-               {
-                  dst = (DATA32 *)(dest + (yy * row_bytes));
-                  src = update->image.data + (yy * update->cache_entry.w);
-                  for (xx = 0; xx < w; xx++)
-                    {
-                       A_VAL(dst) = B_VAL(src);
-                       R_VAL(dst) = G_VAL(src);
-                       G_VAL(dst) = R_VAL(src);
-                       dst++;
-                       src++;
-                    }
-               }
-             if (buf->func.free_update_region)
-               {
-                  buf->func.free_update_region(x, y, w, h, dest);
-               }
-         }
-        break;
-      default:
-        break;
-     }
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h b/libraries/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h
deleted file mode 100644
index f9b7a9c..0000000
--- a/libraries/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __EVAS_ENGINE_DIRECT3D_H__
-#define __EVAS_ENGINE_DIRECT3D_H__
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-typedef struct _Evas_Engine_Info_Direct3D Evas_Engine_Info_Direct3D;
-
-struct _Evas_Engine_Info_Direct3D
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-      HWND window;
-      int rotation;
-      int depth;
-      int fullscreen : 1;
-      int layered : 1;
-   } info;
-
-   struct {
-      unsigned short width;
-      unsigned short height;
-      unsigned char *mask;
-   } *shape;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-
-#endif /* __EVAS_ENGINE_DIRECT3D_H__ */
diff --git a/libraries/evas/src/modules/engines/direct3d/Makefile.am b/libraries/evas/src/modules/engines/direct3d/Makefile.am
deleted file mode 100644
index cdbfd52..0000000
--- a/libraries/evas/src/modules/engines/direct3d/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_direct3d_cflags@
-
-if BUILD_ENGINE_DIRECT3D
-
-DIRECT3D_SOURCES = \
-evas_engine.c \
-evas_direct3d_context.cpp \
-evas_direct3d_device.cpp \
-evas_direct3d_image_cache.cpp \
-evas_direct3d_main.cpp \
-evas_direct3d_object.cpp \
-evas_direct3d_object_font.cpp \
-evas_direct3d_object_image.cpp \
-evas_direct3d_object_line.cpp \
-evas_direct3d_object_rect.cpp \
-evas_direct3d_scene.cpp \
-evas_direct3d_shader_pack.cpp \
-evas_direct3d_vertex_buffer_cache.cpp
-
-DIRECT3D_LIBADD = @evas_engine_direct3d_libs@
-
-
-includes_HEADERS = Evas_Engine_Direct3D.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_DIRECT3D
-
-pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(DIRECT3D_SOURCES)
-module_la_CXXFLAGS = -fno-exceptions
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(DIRECT3D_LIBADD) @EINA_LIBS@
-module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_direct3d.la
-
-libevas_engine_direct3d_la_SOURCES = $(DIRECT3D_SOURCES)
-libevas_engine_direct3d_la_LIBADD = $(DIRECT3D_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = \
-array.h \
-evas_direct3d_context.h \
-evas_direct3d_device.h \
-evas_direct3d_image_cache.h \
-evas_direct3d_object.h \
-evas_direct3d_object_font.h \
-evas_direct3d_object_image.h \
-evas_direct3d_object_line.h \
-evas_direct3d_object_rect.h \
-evas_direct3d_scene.h \
-evas_direct3d_shader_pack.h \
-evas_direct3d_vertex_buffer_cache.h \
-evas_engine.h \
-ref.h
diff --git a/libraries/evas/src/modules/engines/direct3d/Makefile.in b/libraries/evas/src/modules/engines/direct3d/Makefile.in
deleted file mode 100644
index fe979a8..0000000
--- a/libraries/evas/src/modules/engines/direct3d/Makefile.in
+++ /dev/null
@@ -1,1025 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/direct3d
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_TRUE@libevas_engine_direct3d_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_direct3d_la_SOURCES_DIST = evas_engine.c \
-        evas_direct3d_context.cpp evas_direct3d_device.cpp \
-        evas_direct3d_image_cache.cpp evas_direct3d_main.cpp \
-        evas_direct3d_object.cpp evas_direct3d_object_font.cpp \
-        evas_direct3d_object_image.cpp evas_direct3d_object_line.cpp \
-        evas_direct3d_object_rect.cpp evas_direct3d_scene.cpp \
-        evas_direct3d_shader_pack.cpp \
-        evas_direct3d_vertex_buffer_cache.cpp
-@BUILD_ENGINE_DIRECT3D_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_context.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_device.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_image_cache.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_main.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_object.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_object_font.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_object_image.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_object_line.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_object_rect.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_scene.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_shader_pack.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    evas_direct3d_vertex_buffer_cache.lo
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_TRUE@am_libevas_engine_direct3d_la_OBJECTS = $(am__objects_1)
-libevas_engine_direct3d_la_OBJECTS =  \
-        $(am_libevas_engine_direct3d_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_TRUE@am_libevas_engine_direct3d_la_rpath =
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la \
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@  $(am__DEPENDENCIES_1)
-am__module_la_SOURCES_DIST = evas_engine.c evas_direct3d_context.cpp \
-        evas_direct3d_device.cpp evas_direct3d_image_cache.cpp \
-        evas_direct3d_main.cpp evas_direct3d_object.cpp \
-        evas_direct3d_object_font.cpp evas_direct3d_object_image.cpp \
-        evas_direct3d_object_line.cpp evas_direct3d_object_rect.cpp \
-        evas_direct3d_scene.cpp evas_direct3d_shader_pack.cpp \
-        evas_direct3d_vertex_buffer_cache.cpp
-@BUILD_ENGINE_DIRECT3D_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_context.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_device.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_image_cache.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_main.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_object.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_object_font.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_object_image.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_object_line.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_object_rect.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_scene.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_shader_pack.lo \
-@BUILD_ENGINE_DIRECT3D_TRUE@    module_la-evas_direct3d_vertex_buffer_cache.lo
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-        $(module_la_CXXFLAGS) $(CXXFLAGS) $(module_la_LDFLAGS) \
-        $(LDFLAGS) -o $@
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_direct3d_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_direct3d_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Direct3D.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_direct3d_cflags@
-
-@BUILD_ENGINE_DIRECT3D_TRUE@DIRECT3D_SOURCES = \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_engine.c \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_context.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_device.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_image_cache.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_main.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_object.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_object_font.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_object_image.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_object_line.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_object_rect.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_scene.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_shader_pack.cpp \
-@BUILD_ENGINE_DIRECT3D_TRUE@evas_direct3d_vertex_buffer_cache.cpp
-
-@BUILD_ENGINE_DIRECT3D_TRUE@DIRECT3D_LIBADD = @evas_engine_direct3d_libs@
-@BUILD_ENGINE_DIRECT3D_TRUE@includes_HEADERS = Evas_Engine_Direct3D.h
-@BUILD_ENGINE_DIRECT3D_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@module_la_SOURCES = $(DIRECT3D_SOURCES)
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@module_la_CXXFLAGS = -fno-exceptions
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(DIRECT3D_LIBADD) @EINA_LIBS@
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_TRUE@noinst_LTLIBRARIES = libevas_engine_direct3d.la
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_TRUE@libevas_engine_direct3d_la_SOURCES = $(DIRECT3D_SOURCES)
-@BUILD_ENGINE_DIRECT3D_TRUE@@EVAS_STATIC_BUILD_DIRECT3D_TRUE@libevas_engine_direct3d_la_LIBADD = $(DIRECT3D_LIBADD)
-EXTRA_DIST = \
-array.h \
-evas_direct3d_context.h \
-evas_direct3d_device.h \
-evas_direct3d_image_cache.h \
-evas_direct3d_object.h \
-evas_direct3d_object_font.h \
-evas_direct3d_object_image.h \
-evas_direct3d_object_line.h \
-evas_direct3d_object_rect.h \
-evas_direct3d_scene.h \
-evas_direct3d_shader_pack.h \
-evas_direct3d_vertex_buffer_cache.h \
-evas_engine.h \
-ref.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/direct3d/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/direct3d/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_direct3d.la: $(libevas_engine_direct3d_la_OBJECTS) $(libevas_engine_direct3d_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(CXXLINK) $(am_libevas_engine_direct3d_la_rpath) $(libevas_engine_direct3d_la_OBJECTS) $(libevas_engine_direct3d_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_context.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_image_cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_object.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_object_font.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_object_image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_object_line.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_object_rect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_scene.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_shader_pack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_direct3d_vertex_buffer_cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_context.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_image_cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_object.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_object_font.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_object_image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_object_line.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_object_rect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_scene.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_shader_pack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_direct3d_vertex_buffer_cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-.cpp.o:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
-
-module_la-evas_direct3d_context.lo: evas_direct3d_context.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_context.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_context.Tpo -c -o module_la-evas_direct3d_context.lo `test -f 'evas_direct3d_context.cpp' || echo '$(srcdir)/'`evas_direct3d_context.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_context.Tpo $(DEPDIR)/module_la-evas_direct3d_context.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_context.cpp' object='module_la-evas_direct3d_context.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_context.lo `test -f 'evas_direct3d_context.cpp' || echo '$(srcdir)/'`evas_direct3d_context.cpp
-
-module_la-evas_direct3d_device.lo: evas_direct3d_device.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_device.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_device.Tpo -c -o module_la-evas_direct3d_device.lo `test -f 'evas_direct3d_device.cpp' || echo '$(srcdir)/'`evas_direct3d_device.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_device.Tpo $(DEPDIR)/module_la-evas_direct3d_device.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_device.cpp' object='module_la-evas_direct3d_device.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_device.lo `test -f 'evas_direct3d_device.cpp' || echo '$(srcdir)/'`evas_direct3d_device.cpp
-
-module_la-evas_direct3d_image_cache.lo: evas_direct3d_image_cache.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_image_cache.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_image_cache.Tpo -c -o module_la-evas_direct3d_image_cache.lo `test -f 'evas_direct3d_image_cache.cpp' || echo '$(srcdir)/'`evas_direct3d_image_cache.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_image_cache.Tpo $(DEPDIR)/module_la-evas_direct3d_image_cache.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_image_cache.cpp' object='module_la-evas_direct3d_image_cache.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_image_cache.lo `test -f 'evas_direct3d_image_cache.cpp' || echo '$(srcdir)/'`evas_direct3d_image_cache.cpp
-
-module_la-evas_direct3d_main.lo: evas_direct3d_main.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_main.Tpo -c -o module_la-evas_direct3d_main.lo `test -f 'evas_direct3d_main.cpp' || echo '$(srcdir)/'`evas_direct3d_main.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_main.Tpo $(DEPDIR)/module_la-evas_direct3d_main.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_main.cpp' object='module_la-evas_direct3d_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_main.lo `test -f 'evas_direct3d_main.cpp' || echo '$(srcdir)/'`evas_direct3d_main.cpp
-
-module_la-evas_direct3d_object.lo: evas_direct3d_object.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_object.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_object.Tpo -c -o module_la-evas_direct3d_object.lo `test -f 'evas_direct3d_object.cpp' || echo '$(srcdir)/'`evas_direct3d_object.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_object.Tpo $(DEPDIR)/module_la-evas_direct3d_object.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_object.cpp' object='module_la-evas_direct3d_object.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_object.lo `test -f 'evas_direct3d_object.cpp' || echo '$(srcdir)/'`evas_direct3d_object.cpp
-
-module_la-evas_direct3d_object_font.lo: evas_direct3d_object_font.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_object_font.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_object_font.Tpo -c -o module_la-evas_direct3d_object_font.lo `test -f 'evas_direct3d_object_font.cpp' || echo '$(srcdir)/'`evas_direct3d_object_font.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_object_font.Tpo $(DEPDIR)/module_la-evas_direct3d_object_font.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_object_font.cpp' object='module_la-evas_direct3d_object_font.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_object_font.lo `test -f 'evas_direct3d_object_font.cpp' || echo '$(srcdir)/'`evas_direct3d_object_font.cpp
-
-module_la-evas_direct3d_object_image.lo: evas_direct3d_object_image.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_object_image.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_object_image.Tpo -c -o module_la-evas_direct3d_object_image.lo `test -f 'evas_direct3d_object_image.cpp' || echo '$(srcdir)/'`evas_direct3d_object_image.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_object_image.Tpo $(DEPDIR)/module_la-evas_direct3d_object_image.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_object_image.cpp' object='module_la-evas_direct3d_object_image.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_object_image.lo `test -f 'evas_direct3d_object_image.cpp' || echo '$(srcdir)/'`evas_direct3d_object_image.cpp
-
-module_la-evas_direct3d_object_line.lo: evas_direct3d_object_line.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_object_line.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_object_line.Tpo -c -o module_la-evas_direct3d_object_line.lo `test -f 'evas_direct3d_object_line.cpp' || echo '$(srcdir)/'`evas_direct3d_object_line.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_object_line.Tpo $(DEPDIR)/module_la-evas_direct3d_object_line.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_object_line.cpp' object='module_la-evas_direct3d_object_line.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_object_line.lo `test -f 'evas_direct3d_object_line.cpp' || echo '$(srcdir)/'`evas_direct3d_object_line.cpp
-
-module_la-evas_direct3d_object_rect.lo: evas_direct3d_object_rect.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_object_rect.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_object_rect.Tpo -c -o module_la-evas_direct3d_object_rect.lo `test -f 'evas_direct3d_object_rect.cpp' || echo '$(srcdir)/'`evas_direct3d_object_rect.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_object_rect.Tpo $(DEPDIR)/module_la-evas_direct3d_object_rect.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_object_rect.cpp' object='module_la-evas_direct3d_object_rect.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_object_rect.lo `test -f 'evas_direct3d_object_rect.cpp' || echo '$(srcdir)/'`evas_direct3d_object_rect.cpp
-
-module_la-evas_direct3d_scene.lo: evas_direct3d_scene.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_scene.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_scene.Tpo -c -o module_la-evas_direct3d_scene.lo `test -f 'evas_direct3d_scene.cpp' || echo '$(srcdir)/'`evas_direct3d_scene.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_scene.Tpo $(DEPDIR)/module_la-evas_direct3d_scene.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_scene.cpp' object='module_la-evas_direct3d_scene.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_scene.lo `test -f 'evas_direct3d_scene.cpp' || echo '$(srcdir)/'`evas_direct3d_scene.cpp
-
-module_la-evas_direct3d_shader_pack.lo: evas_direct3d_shader_pack.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_shader_pack.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_shader_pack.Tpo -c -o module_la-evas_direct3d_shader_pack.lo `test -f 'evas_direct3d_shader_pack.cpp' || echo '$(srcdir)/'`evas_direct3d_shader_pack.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_shader_pack.Tpo $(DEPDIR)/module_la-evas_direct3d_shader_pack.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_shader_pack.cpp' object='module_la-evas_direct3d_shader_pack.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_shader_pack.lo `test -f 'evas_direct3d_shader_pack.cpp' || echo '$(srcdir)/'`evas_direct3d_shader_pack.cpp
-
-module_la-evas_direct3d_vertex_buffer_cache.lo: evas_direct3d_vertex_buffer_cache.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_direct3d_vertex_buffer_cache.lo -MD -MP -MF $(DEPDIR)/module_la-evas_direct3d_vertex_buffer_cache.Tpo -c -o module_la-evas_direct3d_vertex_buffer_cache.lo `test -f 'evas_direct3d_vertex_buffer_cache.cpp' || echo '$(srcdir)/'`evas_direct3d_vertex_buffer_cache.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_direct3d_vertex_buffer_cache.Tpo $(DEPDIR)/module_la-evas_direct3d_vertex_buffer_cache.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_direct3d_vertex_buffer_cache.cpp' object='module_la-evas_direct3d_vertex_buffer_cache.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_direct3d_vertex_buffer_cache.lo `test -f 'evas_direct3d_vertex_buffer_cache.cpp' || echo '$(srcdir)/'`evas_direct3d_vertex_buffer_cache.cpp
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/direct3d/array.h b/libraries/evas/src/modules/engines/direct3d/array.h
deleted file mode 100644
index dfd80b7..0000000
--- a/libraries/evas/src/modules/engines/direct3d/array.h
+++ /dev/null
@@ -1,305 +0,0 @@
-#ifndef __ARRAY_H__
-#define __ARRAY_H__
-
-#include "ref.h"
-#include <assert.h>
-
-template <class T>
-class TArray : virtual public Referenc
-{
-public:
-   TArray();
-   TArray(const TArray<T> &arr)
-   {
-      data = NULL;
-      size = num = 0;
-      block_size = arr.block_size;
-      keep_order = arr.keep_order;
-
-      //assert(0 && "Direct assignment for arrays is NOT allowed");
-      // risky probably, but anyway
-      arr.CopyTo(*this);
-   }
-   ~TArray();
-
-   bool Allocate(int new_num);
-   bool Resize(int new_size = 0);
-   bool Add(T &el);
-   bool Add(const T &el);
-
-   inline T &operator[](int i);
-   inline const T &operator[](int i) const;
-   inline const TArray<T> &operator =(const TArray<T> &arr)
-   {
-      block_size = arr.block_size;
-      keep_order = arr.keep_order;
-
-      //assert(0 && "Direct assignment for arrays is NOT allowed");
-      // risky probably, but anyway
-      arr.CopyTo(*this);
-      return *this;
-   }
-
-   T *Last()
-   {
-      if (num > 0)
-         return &data[num - 1];
-      return NULL;
-   }
-
-   inline int Length() const
-   {
-      return num;
-   }
-
-   inline int Size() const
-   {
-      return size;
-   }
-
-   inline int BlockSize() const
-   {
-      return block_size;
-   }
-
-   inline T *Data()
-   {
-      return data;
-   }
-
-   inline T **DataPtr()
-   {
-      return &data;
-   }
-
-   inline const T *Data() const
-   {
-      return data;
-   }
-
-   inline void SetKeepOrder(bool enable)
-   {
-      keep_order = enable;
-   }
-
-   bool Find(const T &el);
-
-   bool Add(TArray<T> &arr);
-   bool CopyTo(TArray<T> &dest) const;
-   bool Init(const T *arr, int len);
-
-   void Swap(int to, int from);
-   void Replace(int i);
-
-   bool SetBlockSize(int new_size);
-   void Set(T &el);
-   void Set(const T &el);
-
-protected:
-   T     *data;
-   int   size;
-   int   num;
-   int   block_size;
-   // Some operations restricted, order of the elements is fixed
-   bool  keep_order;
-
-};
-
-namespace Array
-{
-   const int default_block_size = 16;
-   const int max_array_size = 0xffffff;
-}
-
-
-template <class T> TArray<T>::TArray()
-: data(NULL), size(0), num(0), block_size(Array::default_block_size), keep_order(false)
-{
-}
-
-template <class T> TArray<T>::~TArray()
-{
-   if (data != NULL)
-      Resize();
-}
-
-template <class T> bool TArray<T>::Allocate(int new_num)
-{
-   assert(new_num >= 0 && new_num <= Array::max_array_size);
-   if (new_num > size)
-   {
-      if (!Resize(new_num))
-         return false;
-   }
-   num = new_num;
-   return true;
-}
-
-template <class T> bool TArray<T>::Resize(int new_size)
-{
-   assert(new_size >= 0 && new_size <= Array::max_array_size);
-   if (new_size == 0)
-   {
-      delete[] data;
-      data = NULL;
-      size = 0;
-      num = 0;
-      return true;
-   }
-   if (new_size == size)
-      return true;
-
-   T *new_data = new T[new_size];
-   if (new_data == NULL)
-      return false;
-
-   if (data != NULL && num > 0)
-   {
-      //CopyMemory(new_data, data, num * sizeof(T));
-      for (int i = 0; i < num && i < new_size; i++)
-         new_data[i] = data[i];
-   }
-   delete[] data;
-
-   data = new_data;
-   size = new_size;
-   return true;
-}
-
-template <class T> bool TArray<T>::Add(T &el)
-{
-   if (data == NULL)
-      Resize(1);
-
-   if (num < size)
-   {
-      data[num++] = el;
-      return true;
-   }
-   // num >= size
-   int new_size = size + block_size;
-   if (!Resize(new_size))
-      return false;
-
-   data[num++] = el;
-   return true;
-}
-
-template <class T> bool TArray<T>::Add(const T &el)
-{
-   if (data == NULL)
-      Resize(1);
-
-   if (num < size)
-   {
-      data[num++] = *(T *)&el;
-      return true;
-   }
-   // num >= size
-   int new_size = size + block_size;
-   if (!Resize(new_size))
-      return false;
-
-   data[num++] = *(T *)&el;
-   return true;
-}
-
-template <class T> bool TArray<T>::Add(TArray<T> &arr)
-{
-   if (arr.Length() == 0)
-      return true;
-   int numf = num;
-   if (!Allocate(Length() + arr.Length()))
-      return false;
-   CopyMemory(&data[numf], arr.Data(), arr.Length() * sizeof(T));
-   return true;
-}
-
-template <class T> T &TArray<T>::operator [](int i)
-{
-   assert(i >= 0 && i < num);
-   return data[i];
-}
-
-template <class T> const T &TArray<T>::operator [](int i) const
-{
-   assert(i >= 0 && i < num);
-   return data[i];
-}
-
-template <class T> bool TArray<T>::SetBlockSize(int new_size)
-{
-   assert(new_size >= 0 && new_size <= Array::max_array_size);
-   block_size = new_size;
-   return true;
-}
-
-template <class T> void TArray<T>::Set(T &el)
-{
-   for (int i = 0; i < num; i++)
-      data[i] = el;
-}
-
-template <class T> void TArray<T>::Set(const T &el)
-{
-   for (int i = 0; i < num; i++)
-      data[i] = el;
-}
-
-template <class T> bool TArray<T>::CopyTo(TArray<T> &dest) const
-{
-   if (!dest.Resize(size))
-      return false;
-   dest.num = 0;
-   for (int i = 0; i < num; i++)
-      dest.Add(data[i]);
-
-   return true;
-}
-
-template <class T> bool TArray<T>::Init(const T *arr, int len)
-{
-   assert(arr != NULL);
-   if (!Resize(len))
-      return false;
-   num = 0;
-   for (int i = 0; i < len; i++)
-      Add((T)arr[i]);
-
-   return true;
-}
-
-template <class T> void TArray<T>::Swap(int to, int from)
-{
-   assert(to >= 0 && to < num && from >= 0 && from < num);
-   if (keep_order)
-      return;
-   T t = data[to];
-   data[to] = data[from];
-   data[from] = t;
-}
-
-template <class T> void TArray<T>::Replace(int i)
-{
-   assert(i >= 0 && i < num);
-   if (keep_order)
-      return;
-   if (num >= 1)
-   {
-      data[i] = data[num - 1];
-      num--;
-   }
-}
-
-// operator == for type T should be defined
-template <class T> bool TArray<T>::Find(const T &el)
-{
-   for (int i = 0; i < num; i++)
-   {
-      if (data[i] == el)
-         return true;
-   }
-   return false;
-}
-
-#endif  // __ARRAY_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp
deleted file mode 100644
index 07cfa3d..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#include "evas_direct3d_context.h"
-
-D3DContext::D3DContext()
-{
-   color = 0xff000000;
-   color_mul = 0xffffffff;
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_context.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_context.h
deleted file mode 100644
index 763d189..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_context.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __EVAS_DIRECT3D_CONTEXT_H__
-#define __EVAS_DIRECT3D_CONTEXT_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "evas_direct3d_object.h"
-
-class D3DContext : virtual public Referenc
-{
-public:
-   D3DContext();
-
-public:
-   DWORD color;
-   DWORD color_mul;
-
-   Ref<D3DObject> font;
-
-};
-
-#endif  // __EVAS_DIRECT3D_CONTEXT_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp
deleted file mode 100644
index ce0d985..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-//#define ENABLE_LOG_PRINTF
-
-#include "evas_direct3d_device.h"
-
-#include "evas_direct3d_vertex_buffer_cache.h"
-
-D3DDevice::D3DDevice()
-{
-   ResetParams();
-}
-
-bool D3DDevice::Init(HWND window, int depth, bool fullscreen)
-{
-   D3DPRESENT_PARAMETERS pp;
-   D3DDISPLAYMODE dm;
-   D3DCAPS9 caps;
-   RECT rect;
-   DWORD flag;
-   HRESULT hr;
-
-   if (window == NULL)
-      return false;
-
-   Destroy();
-
-   _object = Direct3DCreate9(D3D_SDK_VERSION);
-   if (_object == NULL)
-     return false;
-
-   if (FAILED(hr = _object->GetAdapterDisplayMode(D3DADAPTER_DEFAULT, &dm)))
-     {
-       ERR("GetAdapterDisplayMode failed: %x", hr);
-       Destroy();
-       return false;
-     }
-
-   if (FAILED(hr = _object->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps)))
-     {
-     ERR("GetDeviceCaps failed: %x", hr);
-     Destroy();
-     return false;
-     }
-
-   if (!GetClientRect(window, &rect))
-     {
-     ERR("GetClientRect failed: %x", GetLastError());
-     Destroy();
-     return false;
-     }
-
-   if (SUCCEEDED(_object->CheckDeviceFormat(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-     dm.Format, 0, D3DRTYPE_TEXTURE, (depth == 16) ? D3DFMT_R5G6B5 : D3DFMT_A8R8G8B8)))
-     {
-     dm.Format = (depth == 16) ? D3DFMT_R5G6B5 : D3DFMT_A8R8G8B8;
-     }
-
-   flag = (caps.VertexProcessingCaps != 0) ?
-     (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE) :
-     D3DCREATE_SOFTWARE_VERTEXPROCESSING;
-
-   ZeroMemory(&pp, sizeof(pp));
-   if (!fullscreen)
-   {
-      pp.BackBufferWidth = rect.right - rect.left;
-      pp.BackBufferHeight = rect.bottom - rect.top;
-   }
-   else
-   {
-      pp.BackBufferWidth = ::GetSystemMetrics(SM_CXSCREEN);
-      pp.BackBufferHeight = ::GetSystemMetrics(SM_CYSCREEN);
-   }
-   pp.BackBufferFormat = dm.Format;
-   pp.BackBufferCount = 1;
-   pp.MultiSampleType = D3DMULTISAMPLE_NONE;
-   pp.MultiSampleQuality = 0;
-   pp.SwapEffect = D3DSWAPEFFECT_DISCARD;
-   pp.hDeviceWindow = window;
-   pp.Windowed  = fullscreen ? FALSE : TRUE;
-   //pp.EnableAutoDepthStencil = TRUE;
-   //pp.AutoDepthStencilFormat = D3DFMT_D16;
-   pp.FullScreen_RefreshRateInHz = 0;
-   pp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
-
-   if (FAILED(hr = _object->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-     window, flag, &pp, &_device)))
-     {
-     WRN("CreateDevice failed: %x", hr);
-     Destroy();
-     return false;
-     }
-
-   LPDIRECT3DSURFACE9 backbuffer = NULL;
-   _device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
-   backbuffer->GetDesc(&_backbuffer_desc);
-   backbuffer->Release();
-
-   switch (dm.Format) {
-   case D3DFMT_A8R8G8B8:
-   case D3DFMT_X8R8G8B8:
-     _depth = 32;
-     break;
-   case D3DFMT_R5G6B5:
-     _depth = 16;
-     break;
-   default:
-     WRN("No supported format found");
-     Destroy();
-     return false;
-   }
-
-   //_render_to_texture = false;
-
-   _d3dpp = pp;
-   _device_lost = FALSE;
-   _scene_rendering = FALSE;
-   _width = rect.right - rect.left;
-   _height = rect.bottom - rect.top;
-   _window = window;
-
-   if (FAILED(CreateRenderTarget()))
-   {
-      ERR("Failed to create render target");
-      Destroy();
-      return false;
-   }
-
-   Log("initialized");
-   return true;
-}
-
-bool D3DDevice::Reset(int width, int height, int fullscreen)
-{
-   D3DPRESENT_PARAMETERS pp = _d3dpp;
-   _d3dpp.BackBufferWidth = (width > 0) ? width : _d3dpp.BackBufferWidth;
-   _d3dpp.BackBufferHeight = (height > 0) ? height : _d3dpp.BackBufferHeight;
-   _d3dpp.Windowed = (fullscreen == 1) ? FALSE : ((fullscreen == 0) ? TRUE : _d3dpp.Windowed);
-   if (FAILED(ResetDevice()))
-   {
-      WRN("Couldnt restore device");
-      _d3dpp = pp;
-      return SUCCEEDED(ResetDevice());
-   }
-   _width = _d3dpp.BackBufferWidth;
-   _height = _d3dpp.BackBufferHeight;
-   return true;
-}
-
-void D3DDevice::Destroy()
-{
-   //if (_render_target != NULL)
-   //{
-   //   _render_target->Release();
-   //   _render_target = NULL;
-   //}
-   if (_render_target_data != NULL)
-   {
-      _render_target_data->Release();
-      _render_target_data = NULL;
-   }
-   if (_device != NULL)
-   {
-      int num = _device->Release();
-      assert(num == 0);
-   }
-   if (_object != NULL)
-      _object->Release();
-   ResetParams();
-
-   INF("uninitialized");
-}
-
-void D3DDevice::ResetParams()
-{
-   _window = NULL;
-   _object = NULL;
-   _device = NULL;
-   _width = 0;
-   _height = 0;
-   _rot = 0;
-   _depth = 0;
-   _device_lost = false;
-   _scene_rendering = false;
-   ZeroMemory(&_d3dpp, sizeof(_d3dpp));
-   ZeroMemory(&_backbuffer_desc, sizeof(_backbuffer_desc));
-   //_render_target = NULL;
-   _render_target_data = NULL;
-   _render_data_updated = false;
-   _render_data.Resize();
-   //_original_render_target = NULL;
-   //_render_to_texture = false;
-}
-
-HRESULT D3DDevice::RestoreDevice()
-{
-   Log("restore");
-   assert(_device != NULL);
-
-   HRESULT hr = S_OK;
-
-   // Test the cooperative level to see if it's okay to render
-   if (SUCCEEDED(hr = _device->TestCooperativeLevel()))
-   {
-      _device_lost = FALSE;
-      DBG("render test ok");
-      return S_OK;
-   }
-
-   // If the device was lost, do not render until we get it back
-   if (hr == D3DERR_DEVICELOST)
-      return E_FAIL;
-
-   // Check if the device needs to be reset.
-   if (hr == D3DERR_DEVICENOTRESET)
-   {
-      if (FAILED(hr = ResetDevice()))
-         return hr;
-   }
-   return hr;
-}
-
-HRESULT D3DDevice::ResetDevice()
-{
-   DBG("reset");
-   HRESULT hr = S_OK;
-
-   _scene_rendering = FALSE;
-
-   // Release all video memory objects
-   // Bad to call such, make better
-   D3DVertexBufferCache::Current()->Uninitialize();
-
-   //if (_render_target != NULL)
-   //{
-   //   _render_target->Release();
-   //   _render_target = NULL;
-   //}
-   if (_render_target_data != NULL)
-   {
-      _render_target_data->Release();
-      _render_target_data = NULL;
-   }
-
-   // Reset the device
-   if (FAILED(hr = _device->Reset(&_d3dpp)))
-   {
-      ERR("D3DDevice: Reset of the device failed! Error (%X)", (DWORD)hr);
-      return hr;
-   }
-
-   // Store render target surface desc
-   LPDIRECT3DSURFACE9 backbuffer = NULL;
-   _device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
-   if (backbuffer != NULL)
-   {
-      backbuffer->GetDesc(&_backbuffer_desc);
-      backbuffer->Release();
-   }
-
-   // Initialize the app's device-dependent objects
-   hr = CreateRenderTarget();
-
-   if (FAILED(hr))
-   {
-      WRN("Restoration of device objects failed");
-      // Invalidate objects
-
-      return E_FAIL;
-   }
-
-   DBG("Device objects were successfuly restored");
-   _textures.Set(NULL);
-
-   //_device_objects_restored = true;
-   return S_OK;
-}
-
-bool D3DDevice::Begin()
-{
-   if (FAILED(RestoreDevice()))
-      return false;
-
-   //if (_render_to_texture && _render_target != NULL)
-   //{
-   //   if (FAILED(_device->GetRenderTarget(0, &_original_render_target)))
-   //      return false;
-   //   if (FAILED(_device->SetRenderTarget(0, _render_target)))
-   //      return false;
-   //}
-
-   HRESULT hr;
-   if (FAILED(hr = _device->BeginScene()))
-   {
-      WRN("Cannot begin scene: %X", (DWORD)hr);
-      return false;
-   }
-
-   //static const D3DVIEWPORT9 vp = {0, 0, _width, _height, 0.f, 1.f};
-   //_device->SetViewport(&vp);
-   //_device->SetRenderState(D3DRS_ZENABLE, D3DZB_TRUE);
-
-   //_device->Clear(0, NULL, D3DCLEAR_TARGET /*| D3DCLEAR_ZBUFFER*/, 0xff8080ff, 1.f, 0);
-   return true;
-}
-
-bool D3DDevice::End()
-{
-   _device->EndScene();
-   _device->Present(NULL, NULL, NULL, NULL);
-
-   _render_data_updated = false;
-
-   //if (_render_to_texture && _render_target != NULL && _original_render_target != NULL)
-   //{
-   //   if (FAILED(_device->SetRenderTarget(0, _original_render_target)))
-   //      return false;
-   //}
-
-   return true;
-}
-
-TArray<DWORD> &D3DDevice::GetRenderData()
-{
-   if (_render_data_updated)
-      return _render_data;
-   _render_data.Allocate(0);
-   if (_render_target_data == NULL)
-      return _render_data;
-
-   LPDIRECT3DSURFACE9 surf = NULL;
-   HRESULT hr;
-   if (FAILED(_device->GetRenderTarget(0, &surf)))
-      return _render_data;
-   if (FAILED(hr = _device->GetRenderTargetData(surf, _render_target_data)))
-   {
-      WRN("Failed to get render target data (%X)", (DWORD)hr);
-      surf->Release();
-      return _render_data;
-   }
-   D3DLOCKED_RECT lr;
-   if (FAILED(_render_target_data->LockRect(&lr, NULL, D3DLOCK_READONLY)))
-   {
-      surf->Release();
-      return _render_data;
-   }
-   _render_data.Allocate(_width * _height);
-
-   for (int i = 0; i < _height; i++)
-   {
-      CopyMemory(&_render_data[i * _width], (BYTE *)lr.pBits + i * lr.Pitch,
-         _width * sizeof(DWORD));
-   }
-
-   _render_target_data->UnlockRect();
-   _render_data_updated = true;
-   surf->Release();
-   return _render_data;
-}
-
-HRESULT D3DDevice::SetTexture(DWORD stage, LPDIRECT3DTEXTURE9 tex)
-{
-   if (stage >= 8)
-      return E_FAIL;
-   if (_textures.Length() <= (int)stage)
-      _textures.Allocate(stage + 1);
-   if (_textures[stage] != tex)
-   {
-      _textures[stage] = tex;
-      return _device->SetTexture(stage, tex);
-   }
-   return S_OK;
-}
-
-HRESULT D3DDevice::CreateRenderTarget()
-{
-   if (_device == NULL)
-      return E_FAIL;
-   //if (_render_target != NULL &&
-   if (_render_target_data != NULL)
-      return S_OK;
-
-   //if (FAILED(_device->CreateRenderTarget(_width, _height, _backbuffer_desc.Format,
-   //   D3DMULTISAMPLE_NONE, 0, FALSE, &_render_target, NULL)))
-   //{
-   //   return E_FAIL;
-   //}
-   if (FAILED(_device->CreateOffscreenPlainSurface(_backbuffer_desc.Width,
-      _backbuffer_desc.Height, _backbuffer_desc.Format, D3DPOOL_SYSTEMMEM,
-      &_render_target_data, NULL)))
-   {
-      return E_FAIL;
-   }
-   return S_OK;
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_device.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_device.h
deleted file mode 100644
index c5a4b49..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_device.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef __EVAS_DIRECT3D_DEVICE_H__
-#define __EVAS_DIRECT3D_DEVICE_H__
-
-#include "evas_engine.h"
-
-#include <assert.h>
-
-#include "ref.h"
-#include "array.h"
-
-
-class D3DDevice : virtual public Referenc
-{
-public:
-   D3DDevice();
-
-   bool Init(HWND window, int depth, bool fullscreen = false);
-   bool Reset(int width, int height, int fullscreen);
-   void Destroy();
-   bool Begin();
-   bool End();
-
-   inline LPDIRECT3DDEVICE9 GetDevice();
-   inline int GetWidth();
-   inline int GetHeight();
-   inline HWND GetWindow();
-   inline bool GetFullscreen();
-
-   TArray<DWORD> &GetRenderData();
-
-   HRESULT SetTexture(DWORD stage, LPDIRECT3DTEXTURE9 tex);
-
-private:
-   HRESULT RestoreDevice();
-   HRESULT ResetDevice();
-   void ResetParams();
-
-   HRESULT CreateRenderTarget();
-
-private:
-   HWND _window;
-   LPDIRECT3D9 _object;
-   LPDIRECT3DDEVICE9 _device;
-   int _width;
-   int _height;
-   int _rot;
-   int _depth;
-   bool _device_lost;
-   bool _scene_rendering;
-   D3DPRESENT_PARAMETERS _d3dpp;
-   D3DSURFACE_DESC _backbuffer_desc;
-   //LPDIRECT3DSURFACE9 _render_target;
-   LPDIRECT3DSURFACE9 _render_target_data;
-   //LPDIRECT3DSURFACE9 _original_render_target;
-   //bool _render_to_texture;
-   TArray<DWORD> _render_data;
-   bool _render_data_updated;
-
-   TArray<LPDIRECT3DTEXTURE9> _textures;
-};
-
-LPDIRECT3DDEVICE9 D3DDevice::GetDevice()
-{
-   return _device;
-}
-
-int D3DDevice::GetWidth()
-{
-   return _width;
-}
-
-int D3DDevice::GetHeight()
-{
-   return _height;
-}
-
-HWND D3DDevice::GetWindow()
-{
-   return _window;
-}
-
-bool D3DDevice::GetFullscreen()
-{
-   return (_d3dpp.Windowed == 0);
-}
-
-#endif  // __EVAS_DIRECT3D_DEVICE_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp
deleted file mode 100644
index aa44eb9..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-#include "evas_direct3d_image_cache.h"
-
-#include "evas_direct3d_device.h"
-
-#include <assert.h>
-
-Ref<D3DImageCache> D3DImageCache::_this;
-
-D3DImageCache::D3DImageCache()
-{
-   _max_width = 512;
-   _max_height = 512;
-   _margin = 0;
-}
-
-D3DImageCache::~D3DImageCache()
-{
-   Uninitialize();
-}
-
-D3DImageCache *D3DImageCache::Current()
-{
-   if (_this.IsNull())
-      _this = new D3DImageCache();
-   return _this;
-}
-
-void D3DImageCache::SetCurrent(D3DImageCache *obj)
-{
-   _this = obj;
-}
-
-void D3DImageCache::Uninitialize()
-{
-   for (int i = 0; i < _cache.Length(); i++)
-   {
-      // In normal case they all will be NULL
-      if (_cache[i].texture != NULL)
-         _cache[i].texture->Release();
-   }
-   _cache.Resize();
-}
-
-bool D3DImageCache::SelectImageToDevice(D3DDevice *d3d, int id)
-{
-   if (id < 0 || id >= _cache.Length())
-      return false;
-   assert(_cache[id].texture != NULL);
-   return SUCCEEDED(d3d->SetTexture(_cache[id].stage, _cache[id].texture));
-}
-
-void D3DImageCache::RemoveImageUser(int id)
-{
-   if (id < 0 || id >= _cache.Length())
-      return;
-   assert(_cache[id].texture != NULL);
-   _cache[id].users--;
-   if (_cache[id].users == 0)
-   {
-      _cache[id].texture->Release();
-      ZeroMemory(&_cache[id], sizeof(_cache[id]));
-   }
-}
-
-void D3DImageCache::AddImageUser(int id)
-{
-   if (id < 0 || id >= _cache.Length())
-      return;
-   assert(_cache[id].texture != NULL);
-   _cache[id].users++;
-}
-
-bool D3DImageCache::InsertImage(D3DDevice *d3d, DWORD *data, int w, int h, CacheEntryInfo &info)
-{
-   CacheEntry *ce = NULL;
-   int id = -1;
-   for (int i = 0; i < _cache.Length(); i++)
-   {
-      if (!_cache[i].locked && RequestInsert(_cache[i], w, h))
-      {
-         ce = &_cache[i];
-         id = i;
-         break;
-      }
-   }
-   if (ce == NULL)
-   {
-      CacheEntry new_entry;
-      if (!CreateEntry(d3d, new_entry, w, h))
-         return false;
-      for (id = 0; id < _cache.Length(); id++)
-      {
-         if (_cache[id].texture == NULL)
-            break;
-      }
-
-      if (id < _cache.Length())
-      {
-         _cache[id] = new_entry;
-         ce = &_cache[id];
-      }
-      else
-      {
-         _cache.Add(new_entry);
-         ce = _cache.Last();
-         id = _cache.Length() - 1;
-      }
-   }
-
-   assert(ce != NULL && ce->texture != NULL);
-
-   if (!InsertData(*ce, data, w, h))
-      return false;
-
-   info.id = id;
-   info.u = FLOAT(ce->cur_x) / FLOAT(ce->width);
-   info.v = FLOAT(ce->cur_y) / FLOAT(ce->height);
-   info.du = FLOAT(w) / FLOAT(ce->width);
-   info.dv = FLOAT(h) / FLOAT(ce->height);
-   info.width = w;
-   info.height = h;
-
-   UpdateInsert(*ce, w, h);
-   return true;
-}
-
-bool D3DImageCache::InsertImage(D3DDevice *d3d, int id, DWORD *data, int w, int h, CacheEntryInfo &info)
-{
-   if (id < 0 || id >= _cache.Length())
-      return false;
-   assert(_cache[id].texture != NULL);
-   CacheEntry *ce = &_cache[id];
-   if (!RequestInsert(*ce, w, h))
-      return false;
-   if (!InsertData(*ce, data, w, h))
-      return false;
-
-   info.id = id;
-   info.u = FLOAT(ce->cur_x) / FLOAT(ce->width);
-   info.v = FLOAT(ce->cur_y) / FLOAT(ce->height);
-   info.du = FLOAT(w) / FLOAT(ce->width);
-   info.dv = FLOAT(h) / FLOAT(ce->height);
-   info.width = w;
-   info.height = h;
-
-   UpdateInsert(*ce, w, h);
-   return true;
-}
-
-bool D3DImageCache::CreateImage(D3DDevice *d3d, int w, int h, bool locked, CacheEntryInfo &info)
-{
-   int id;
-   CacheEntry new_entry;
-   CacheEntry *ce = NULL;
-
-   if (!CreateEntry(d3d, new_entry, w, h, true))
-      return false;
-   for (id = 0; id < _cache.Length(); id++)
-   {
-      if (_cache[id].texture == NULL)
-         break;
-   }
-
-   if (id < _cache.Length())
-   {
-      _cache[id] = new_entry;
-      ce = &_cache[id];
-   }
-   else
-   {
-      _cache.Add(new_entry);
-      ce = _cache.Last();
-      id = _cache.Length() - 1;
-   }
-
-   assert(ce != NULL && ce->texture != NULL);
-
-   // Fill with zero
-   if (!InsertData(*ce, NULL, w, h))
-      return false;
-
-   info.id = id;
-   info.u = 0;
-   info.v = 0;
-   info.du = 1;
-   info.dv = 1;
-   info.width = w;
-   info.height = h;
-
-   UpdateInsert(*ce, 0, 0);
-   ce->locked = locked;
-   return true;
-}
-
-bool D3DImageCache::ResizeImage(D3DDevice *d3d, int nw, int nh, int id)
-{
-   if (id < 0 || id >= _cache.Length())
-      return false;
-   assert(_cache[id].texture != NULL);
-   CacheEntry *ce = &_cache[id];
-
-   if (ce->width == nw && ce->height == nh)
-      return true;
-
-   LPDIRECT3DTEXTURE9 tex = NULL;
-
-   HRESULT hr;
-   if (FAILED(hr = d3d->GetDevice()->CreateTexture(nw, nh, 0, 0, D3DFMT_A8R8G8B8,
-      D3DPOOL_MANAGED, &tex, NULL)))
-   {
-      WRN("Failed to create texture: %X", hr);
-      return false;
-   }
-   assert(tex != NULL);
-
-   ce->texture->Release();
-   ce->texture = tex;
-   ce->width = nw;
-   ce->height = nh;
-   return true;
-}
-
-bool D3DImageCache::RequestInsert(CacheEntry &entry, int w, int h)
-{
-   // If we already have large image entry
-   if (entry.width > _max_width || entry.height > _max_height)
-      return false;
-   // If requested size does not fit into this entry at all
-   if (entry.height - entry.cur_h < h + _margin * 2 || entry.width < w + _margin * 2)
-      return false;
-
-   // If requested size does not fit into the current line of the entry
-   if (entry.width - entry.cur_x < w + _margin * 2)
-   {
-      entry.cur_y = entry.cur_h + _margin;
-      entry.cur_x = _margin;
-      return true;
-   }
-   entry.cur_x += _margin;
-
-   return true;
-}
-
-bool D3DImageCache::CreateEntry(D3DDevice *d3d, CacheEntry &entry, int w, int h, bool exact_size)
-{
-   int width = exact_size ? w : max(_max_width, w);
-   int height = exact_size ? h : max(_max_height, h);
-   HRESULT hr;
-   if (FAILED(hr = d3d->GetDevice()->CreateTexture(width, height, 0, 0, D3DFMT_A8R8G8B8,
-      D3DPOOL_MANAGED, &entry.texture, NULL)))
-   {
-      WRN("Failed to create texture: %X", hr);
-      return false;
-   }
-
-   entry.cur_x = entry.cur_y = entry.cur_h = 0;
-   entry.width = width;
-   entry.height = height;
-   entry.users = 0;
-   entry.locked = false;
-   entry.stage = 0;
-   return true;
-}
-
-bool D3DImageCache::InsertData(CacheEntry &entry, DWORD *data, int w, int h)
-{
-   if (entry.texture == NULL)
-      return false;
-
-   RECT rc = {entry.cur_x, entry.cur_y, entry.cur_x + w, entry.cur_y + h};
-   D3DLOCKED_RECT lr;
-   if (FAILED(entry.texture->LockRect(0, &lr, &rc, 0)))
-   {
-      WRN("Failed to lock texture");
-      return false;
-   }
-
-   if (data != NULL)
-   {
-      for (int i = 0; i < h; i++)
-         CopyMemory(((BYTE *)lr.pBits) + i * lr.Pitch, data + i * w, sizeof(DWORD) * w);
-   }
-   else
-   {
-      for (int i = 0; i < h; i++)
-         ZeroMemory(((BYTE *)lr.pBits) + i * lr.Pitch, sizeof(DWORD) * w);
-   }
-
-   if (FAILED(entry.texture->UnlockRect(0)))
-   {
-      WRN("Failed to unlock texture");
-      return false;
-   }
-   return true;
-}
-
-
-bool D3DImageCache::RetrieveData(CacheEntry &entry, DWORD *data, int w, int h)
-{
-   if (entry.texture == NULL || data == NULL)
-      return false;
-
-   RECT rc = {entry.cur_x, entry.cur_y, entry.cur_x + w, entry.cur_y + h};
-   D3DLOCKED_RECT lr;
-   if (FAILED(entry.texture->LockRect(0, &lr, &rc, D3DLOCK_READONLY)))
-   {
-      WRN("Failed to lock texture");
-      return false;
-   }
-
-   for (int i = 0; i < h; i++)
-      CopyMemory(data + i * w, ((BYTE *)lr.pBits) + i * lr.Pitch, sizeof(DWORD) * w);
-
-   if (FAILED(entry.texture->UnlockRect(0)))
-   {
-      WRN("Failed to unlock texture");
-      return false;
-   }
-   return true;
-}
-
-void D3DImageCache::UpdateInsert(CacheEntry &entry, int w, int h)
-{
-   entry.cur_h = max(entry.cur_h, entry.cur_y + h + _margin);
-   entry.cur_x += w + _margin;
-   entry.users++;
-}
-
-bool D3DImageCache::UpdateImageData(CacheEntryInfo &info, DWORD *data)
-{
-   assert(data != NULL);
-   if (info.id < 0 || info.id >= _cache.Length())
-      return false;
-   CacheEntry ce_copy = _cache[info.id];
-   ce_copy.cur_x = int(info.u * FLOAT(ce_copy.width));
-   ce_copy.cur_y = int(info.v * FLOAT(ce_copy.height));
-   return InsertData(ce_copy, data, info.width, info.height);
-}
-
-bool D3DImageCache::UpdateImageDataWithDirtyInfo(CacheEntryInfo &info, DWORD *data, POINT *dirty)
-{
-   if (info.id < 0 || info.id >= _cache.Length())
-      return false;
-   CacheEntry &entry = _cache[info.id];
-   if (entry.texture == NULL)
-      return false;
-
-   RECT rc = {0, 0, entry.width, entry.height};
-   D3DLOCKED_RECT lr;
-   if (FAILED(entry.texture->LockRect(0, &lr, &rc, 0)))
-   {
-      WRN("Failed to lock texture");
-      return false;
-   }
-
-   if (data != NULL)
-   {
-      for (int i = 0; i < rc.bottom; i++)
-      {
-         if (dirty[i].x < 0 && dirty[i].y < 0)
-            continue;
-         if (dirty[i].x >= 0 && dirty[i].y >= 0)
-         {
-            CopyMemory(((BYTE *)lr.pBits) + i * lr.Pitch + dirty[i].x * 4,
-               data + i * rc.right + dirty[i].x, sizeof(DWORD) * (dirty[i].y - dirty[i].x + 1));
-            dirty[i].y = -dirty[i].y;
-         }
-         else if (dirty[i].x >= 0 && dirty[i].y < 0)
-         {
-            ZeroMemory(((BYTE *)lr.pBits) + i * lr.Pitch + dirty[i].x * 4,
-               sizeof(DWORD) * (-dirty[i].y - dirty[i].x + 1));
-            dirty[i].x = -dirty[i].x;
-         }
-      }
-   }
-   else
-   {
-      for (int i = 0; i < rc.bottom; i++)
-      {
-         if (dirty[i].x < 0 || dirty[i].y < 0)
-            continue;
-         ZeroMemory(((BYTE *)lr.pBits) + i * lr.Pitch + dirty[i].x * 4,
-            sizeof(DWORD) * (dirty[i].y - dirty[i].x + 1));
-      }
-   }
-
-   if (FAILED(entry.texture->UnlockRect(0)))
-   {
-      WRN("Failed to unlock texture");
-      return false;
-   }
-   return true;
-}
-
-bool D3DImageCache::UpdateImageDataDiscard(CacheEntryInfo &info, DWORD *data)
-{
-   assert(data != NULL);
-   if (info.id < 0 || info.id >= _cache.Length())
-      return false;
-   CacheEntry &entry = _cache[info.id];
-   if (entry.texture == NULL)
-      return false;
-
-   RECT rc = {0, 0, entry.width, entry.height};
-   D3DLOCKED_RECT lr;
-   if (FAILED(entry.texture->LockRect(0, &lr, &rc, 0)))
-   {
-      WRN("Failed to lock texture");
-      return false;
-   }
-
-   for (int i = 0; i < rc.bottom; i++)
-   {
-      CopyMemory(((BYTE *)lr.pBits) + i * lr.Pitch,
-         data + i * rc.right, sizeof(DWORD) * rc.right);
-   }
-
-   if (FAILED(entry.texture->UnlockRect(0)))
-   {
-      WRN("Failed to unlock texture");
-      return false;
-   }
-   return true;
-}
-
-bool D3DImageCache::GetImageData(CacheEntryInfo &info, TArray<DWORD> &data)
-{
-   if (info.id < 0 || info.id >= _cache.Length())
-      return false;
-   CacheEntry ce_copy = _cache[info.id];
-   ce_copy.cur_x = int(info.u * FLOAT(ce_copy.width));
-   ce_copy.cur_y = int(info.v * FLOAT(ce_copy.height));
-   data.Allocate(info.width * info.height);
-
-   return RetrieveData(ce_copy, data.Data(), info.width, info.height);
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h
deleted file mode 100644
index 6fb4c18..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef __EVAS_DIRECT3D_IMAGE_CACHE_H__
-#define __EVAS_DIRECT3D_IMAGE_CACHE_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-class D3DDevice;
-
-class D3DImageCache : virtual public Referenc
-{
-public:
-   struct CacheEntryInfo
-   {
-      int id;
-      int width, height;
-      FLOAT u, v;
-      FLOAT du, dv;
-   };
-
-public:
-   ~D3DImageCache();
-
-   static D3DImageCache *Current();
-   static void SetCurrent(D3DImageCache *obj);
-
-   inline void SetMaxSize(int w, int h);
-   inline void SetMargin(int margin);
-
-   bool InsertImage(D3DDevice *d3d, DWORD *data, int w, int h, CacheEntryInfo &info);
-   bool InsertImage(D3DDevice *d3d, int id, DWORD *data, int w, int h, CacheEntryInfo &info);
-   bool CreateImage(D3DDevice *d3d, int w, int h, bool locked, CacheEntryInfo &info);
-   bool ResizeImage(D3DDevice *d3d, int nw, int nh, int id);
-   bool SelectImageToDevice(D3DDevice *d3d, int id);
-   void RemoveImageUser(int id);
-   void AddImageUser(int id);
-   bool UpdateImageData(CacheEntryInfo &info, DWORD *data);
-   bool UpdateImageDataWithDirtyInfo(CacheEntryInfo &info, DWORD *data, POINT *dirty);
-   bool UpdateImageDataDiscard(CacheEntryInfo &info, DWORD *data);
-   bool GetImageData(CacheEntryInfo &info, TArray<DWORD> &data);
-   void Uninitialize();
-
-   inline int GetImageWidth(int image_id);
-   inline int GetImageHeight(int image_id);
-
-   inline void SetImageStage(int image_id, int stage);
-
-private:
-   struct CacheEntry
-   {
-      LPDIRECT3DTEXTURE9 texture;
-      int width;
-      int height;
-      int cur_x;
-      int cur_y;
-      int cur_h;
-      int users;
-      bool locked;
-      int stage;
-   };
-
-private:
-   D3DImageCache();
-
-   bool RequestInsert(CacheEntry &entry, int w, int h);
-   bool CreateEntry(D3DDevice *d3d, CacheEntry &entry, int w, int h, bool exact_size = false);
-   bool InsertData(CacheEntry &entry, DWORD *data, int w, int h);
-   bool RetrieveData(CacheEntry &entry, DWORD *data, int w, int h);
-   void UpdateInsert(CacheEntry &entry, int w, int h);
-
-private:
-   TArray<CacheEntry> _cache;
-   int _max_width;
-   int _max_height;
-
-   int _margin;
-
-   static Ref<D3DImageCache> _this;
-};
-
-void D3DImageCache::SetMaxSize(int w, int h)
-{
-   _max_width = w;
-   _max_height = h;
-}
-
-void D3DImageCache::SetMargin(int margin)
-{
-   _margin = margin;
-}
-
-int D3DImageCache::GetImageWidth(int image_id)
-{
-   return _cache[image_id].width;
-}
-
-int D3DImageCache::GetImageHeight(int image_id)
-{
-   return _cache[image_id].height;
-}
-
-void D3DImageCache::SetImageStage(int image_id, int stage)
-{
-   _cache[image_id].stage = stage;
-}
-
-#endif  // __EVAS_DIRECT3D_IMAGE_CACHE_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp
deleted file mode 100644
index fe1e13f..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp
+++ /dev/null
@@ -1,774 +0,0 @@
-// Force the layered windows APIs to be visible.
-#define _WIN32_WINNT 0x0500
-
-#include "evas_engine.h"
-#include <assert.h>
-
-#include <d3dx9.h>
-
-#include "evas_direct3d_device.h"
-#include "evas_direct3d_context.h"
-#include "evas_direct3d_shader_pack.h"
-#include "evas_direct3d_scene.h"
-#include "evas_direct3d_image_cache.h"
-#include "evas_direct3d_object_line.h"
-#include "evas_direct3d_object_rect.h"
-#include "evas_direct3d_object_image.h"
-#include "evas_direct3d_vertex_buffer_cache.h"
-#include "evas_direct3d_object_font.h"
-
-// Internal structure that joins two types of objects
-struct ImagePtr
-{
-   Ref<D3DObjectImage> ref;
-   RGBA_Image *img;
-};
-
-struct DevicePtr
-{
-   Ref<D3DDevice> device;
-   Ref<D3DScene> scene;
-   Ref<D3DContext> context;
-   Ref<D3DImageCache> image_cache;
-   Ref<D3DShaderPack> shader_pack;
-   Ref<D3DVertexBufferCache> vb_cache;
-
-   int fonts_buffer_image_id;
-
-   // Layered windows cannot render D3D in the normal way
-   bool layered;
-
-   // Window shape mask
-   struct
-   {
-      // Width and height may be different from target size
-      int width;
-      int height;
-      // Pointer to external memory location, dont do anything with it
-      unsigned char *mask;
-   } shape;
-
-   // GDI output target
-   struct
-   {
-      HBITMAP image;
-      HDC hdc;
-      BITMAPINFO info;
-      BYTE *data;
-   } dib;
-
-};
-
-DevicePtr *SelectDevice(Direct3DDeviceHandler d3d)
-{
-   DevicePtr *dev_ptr = (DevicePtr *)d3d;
-   D3DImageCache::SetCurrent(dev_ptr->image_cache);
-   D3DShaderPack::SetCurrent(dev_ptr->shader_pack);
-   D3DVertexBufferCache::SetCurrent(dev_ptr->vb_cache);
-   return dev_ptr;
-}
-
-void DeleteDIBObjects(DevicePtr *dev_ptr)
-{
-   assert(dev_ptr != NULL);
-   if (dev_ptr->dib.image != NULL)
-      DeleteObject(dev_ptr->dib.image);
-   if (dev_ptr->dib.hdc != NULL)
-      DeleteDC(dev_ptr->dib.hdc);
-   ZeroMemory(&dev_ptr->dib, sizeof(dev_ptr->dib));
-}
-
-bool CreateDIBObjects(DevicePtr *dev_ptr)
-{
-   assert(dev_ptr != NULL);
-   if ((dev_ptr->dib.hdc = CreateCompatibleDC(NULL)) == NULL)
-   {
-      WRN("Failed to create compatible DC");
-      return false;
-   }
-   ZeroMemory(&dev_ptr->dib.info, sizeof(dev_ptr->dib.info));
-   dev_ptr->dib.info.bmiHeader.biSize = sizeof(dev_ptr->dib.info.bmiHeader);
-   dev_ptr->dib.info.bmiHeader.biBitCount = 32;
-   dev_ptr->dib.info.bmiHeader.biWidth = dev_ptr->device->GetWidth();
-   dev_ptr->dib.info.bmiHeader.biHeight = -dev_ptr->device->GetHeight();
-   dev_ptr->dib.info.bmiHeader.biCompression = BI_RGB;
-   dev_ptr->dib.info.bmiHeader.biPlanes = 1;
-   if ((dev_ptr->dib.image = CreateDIBSection(dev_ptr->dib.hdc, &dev_ptr->dib.info,
-      DIB_RGB_COLORS, (void **)&dev_ptr->dib.data, NULL, 0)) == NULL)
-   {
-      WRN("Failed to create dib section");
-      DeleteDIBObjects(dev_ptr);
-      return false;
-   }
-   assert(dev_ptr->dib.data != NULL);
-   GdiFlush();
-   return true;
-}
-
-
-
-
-extern "C" {
-
-Direct3DDeviceHandler evas_direct3d_init(HWND window, int depth, int fullscreen)
-{
-   Ref<D3DDevice> device = new D3DDevice();
-   if (!device->Init(window, depth, fullscreen == 1))
-      return NULL;
-
-   D3DImageCache::SetCurrent(NULL);
-   D3DShaderPack::SetCurrent(NULL);
-   D3DVertexBufferCache::SetCurrent(NULL);
-
-   if (!D3DShaderPack::Current()->Initialize(device))
-   {
-      ERR("Failed to build shader pack");
-      device->Destroy();
-      return NULL;
-   }
-
-   DevicePtr *dev_ptr = new DevicePtr;
-   ZeroMemory(dev_ptr, sizeof(DevicePtr));
-   dev_ptr->device = device;
-   dev_ptr->scene = new D3DScene();
-   dev_ptr->context = new D3DContext();
-   dev_ptr->image_cache = D3DImageCache::Current();
-   dev_ptr->shader_pack = D3DShaderPack::Current();
-   dev_ptr->vb_cache = D3DVertexBufferCache::Current();
-   dev_ptr->fonts_buffer_image_id = -1;
-
-   D3DImageCache::CacheEntryInfo info;
-   if (!D3DImageCache::Current()->CreateImage(device, device->GetWidth(), device->GetHeight(),
-      true, info))
-   {
-      WRN("Failed to create fonts image buffer");
-      return NULL;
-   }
-   dev_ptr->fonts_buffer_image_id = info.id;
-   D3DImageCache::Current()->SetImageStage(info.id, 1);
-
-   return (Direct3DDeviceHandler)dev_ptr;
-}
-
-void
-evas_direct3d_free(Direct3DDeviceHandler d3d)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-
-   DeleteDIBObjects(dev_ptr);
-
-   dev_ptr->context = NULL;
-   dev_ptr->scene = NULL;
-   dev_ptr->image_cache = NULL;
-   dev_ptr->shader_pack = NULL;
-   D3DShaderPack::Current()->Uninitialize();
-   D3DImageCache::Current()->Uninitialize();
-   D3DVertexBufferCache::Current()->Uninitialize();
-   D3DShaderPack::SetCurrent(NULL);
-   D3DImageCache::SetCurrent(NULL);
-   D3DVertexBufferCache::SetCurrent(NULL);
-
-   dev_ptr->device = NULL;
-   delete dev_ptr;
-
-   DBG("uninitialized");
-}
-
-void
-evas_direct3d_resize(Direct3DDeviceHandler d3d, int width, int height)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   if (!device->Reset(width, height, -1))
-   {
-      ERR("Failed to resize");
-      return;
-   }
-   if (!D3DImageCache::Current()->ResizeImage(device, width, height,
-      dev_ptr->fonts_buffer_image_id))
-   {
-      WRN("Failed to resize fonts image buffer");
-   }
-   if (dev_ptr->layered)
-   {
-      DeleteDIBObjects(dev_ptr);
-      if (!CreateDIBObjects(dev_ptr))
-         WRN("Failed to create dib objects");
-   }
-}
-
-void
-evas_direct3d_set_fullscreen(Direct3DDeviceHandler d3d, int width, int height, int fullscreen)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-
-   if (width < 0)
-      width = ::GetSystemMetrics(SM_CXSCREEN);
-   if (height < 0)
-      height = ::GetSystemMetrics(SM_CYSCREEN);
-
-   if (!device->Reset(width, height, fullscreen))
-   {
-      WRN("Failed to resize");
-      return;
-   }
-   if (!D3DImageCache::Current()->ResizeImage(device, width, height,
-      dev_ptr->fonts_buffer_image_id))
-   {
-      WRN("Failed to resize fonts image buffer");
-   }
-
-   if (fullscreen == 0)
-      InvalidateRect(HWND_DESKTOP, NULL, TRUE);
-}
-
-void
-evas_direct3d_set_layered(Direct3DDeviceHandler d3d, int layered,
-   int mask_width, int mask_height, unsigned char *mask)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   dev_ptr->layered = (layered != 0);
-   dev_ptr->shape.width = mask_width;
-   dev_ptr->shape.height = mask_height;
-   dev_ptr->shape.mask = mask;
-
-   if (dev_ptr->layered && dev_ptr->dib.data == NULL)
-      CreateDIBObjects(dev_ptr);
-   else if (!dev_ptr->layered)
-      DeleteDIBObjects(dev_ptr);
-}
-
-void
-evas_direct3d_context_color_set(Direct3DDeviceHandler d3d, int r, int g, int b, int a)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   dev_ptr->context->color = ((a & 0xff) << 24) | ((r & 0xff) << 16) |
-      ((g & 0xff) << 8) | (b & 0xff);
-}
-
-void
-evas_direct3d_context_set_multiplier(Direct3DDeviceHandler d3d, int r, int g, int b, int a)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   dev_ptr->context->color_mul = ((a & 0xff) << 24) | ((r & 0xff) << 16) |
-      ((g & 0xff) << 8) | (b & 0xff);
-}
-
-void
-evas_direct3d_render_all(Direct3DDeviceHandler d3d)
-{
-   DBG("render");
-   assert(d3d != NULL);
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-
-   if (!device->Begin())
-      return;
-
-   device->GetDevice()->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-   device->GetDevice()->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
-   device->GetDevice()->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
-
-   //device->GetDevice()->SetSamplerState(1, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-   //device->GetDevice()->SetSamplerState(1, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-
-   D3DObjectLine::BeginCache();
-   D3DObjectRect::BeginCache();
-   D3DObjectImage::BeginCache();
-   scene->DrawAll(device);
-   D3DObjectLine::EndCache(device);
-   D3DObjectRect::EndCache(device);
-   D3DObjectImage::EndCache(device);
-   D3DObjectFont::EndCache(device);
-
-   device->End();
-
-   if (dev_ptr->layered && !device->GetFullscreen() && dev_ptr->dib.data != NULL)
-   {
-      HDC hdc = GetDC(device->GetWindow());
-      if (hdc != NULL)
-      {
-         POINT dest = {0, 0};
-         POINT src = {0, 0};
-         SIZE client = {device->GetWidth(), device->GetHeight()};
-         BLENDFUNCTION blend_func = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
-
-         if (device->GetRenderData().Length() == client.cx * client.cy)
-         {
-            CopyMemory(dev_ptr->dib.data, device->GetRenderData().Data(),
-               sizeof(DWORD) * client.cx * client.cy);
-         }
-
-         for (int i = 0; i < client.cy; i++)
-         {
-            for (int j = 0; j < client.cx; j++)
-            {
-               int mask_i = int(dev_ptr->shape.height * float(i) / float(client.cy));
-               int mask_j = int(dev_ptr->shape.width * float(j) / float(client.cx));
-               if (mask_i < 0)
-                  mask_i = 0;
-               else if (mask_i >= dev_ptr->shape.height)
-                  mask_i = dev_ptr->shape.height - 1;
-               if (mask_j < 0)
-                  mask_j = 0;
-               else if (mask_j >= dev_ptr->shape.width)
-                  mask_j = dev_ptr->shape.width - 1;
-               BYTE mask_b = dev_ptr->shape.mask[mask_i * dev_ptr->shape.width + mask_j];
-               float alpha = float(mask_b) / 255.f;
-
-               dev_ptr->dib.data[j * 4 + 0 + i * 4 * client.cx] = BYTE(float(dev_ptr->dib.data[j * 4 + 0 + i * 4 * client.cx]) * alpha);
-               dev_ptr->dib.data[j * 4 + 1 + i * 4 * client.cx] = BYTE(float(dev_ptr->dib.data[j * 4 + 1 + i * 4 * client.cx]) * alpha);
-               dev_ptr->dib.data[j * 4 + 2 + i * 4 * client.cx] = BYTE(float(dev_ptr->dib.data[j * 4 + 2 + i * 4 * client.cx]) * alpha);
-               dev_ptr->dib.data[j * 4 + 3 + i * 4 * client.cx] = mask_b;
-            }
-         }
-         HGDIOBJ prev_obj = SelectObject(dev_ptr->dib.hdc, dev_ptr->dib.image);
-         ClientToScreen(device->GetWindow(), &dest);
-
-         UpdateLayeredWindow(device->GetWindow(), hdc, &dest, &client,
-            dev_ptr->dib.hdc, &src, 0, &blend_func, ULW_ALPHA);
-
-         SelectObject(dev_ptr->dib.hdc, prev_obj);
-         ReleaseDC(device->GetWindow(), hdc);
-      }
-   }
-   scene->FreeObjects();
-}
-
-void evas_direct3d_line_draw(Direct3DDeviceHandler d3d, int x1, int y1, int x2, int y2)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-   D3DContext *context = dev_ptr->context;
-
-   Ref<D3DObjectLine> line = scene->GetFreeObject<D3DObjectLine>();
-   if (line == NULL)
-   {
-      line = new D3DObjectLine();
-      scene->AddObject(line);
-      DBG("New line object (total objects: %d)", scene->GetObjectCount());
-   }
-   else
-   {
-      line->SetFree(false);
-      DBG("Line reused (object: %p)", line.Addr());
-   }
-
-   line->Setup(
-      2.f * float(x1) / float(device->GetWidth()) - 1.f,
-      2.f * (1.f - float(y1) / float(device->GetHeight())) - 1.f,
-      2.f * float(x2) / float(device->GetWidth()) - 1.f,
-      2.f * (1.f - float(y2) / float(device->GetHeight())) - 1.f,
-      context->color);
-}
-
-void evas_direct3d_rectangle_draw(Direct3DDeviceHandler d3d, int x, int y, int w, int h)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-   D3DContext *context = dev_ptr->context;
-
-   Ref<D3DObjectRect> rect = scene->GetFreeObject<D3DObjectRect>();
-   if (rect == NULL)
-   {
-      rect = new D3DObjectRect();
-      scene->AddObject(rect);
-      DBG("New rect object (total objects: %d)", scene->GetObjectCount());
-   }
-   else
-   {
-      rect->SetFree(false);
-      DBG("Rect reused (object: %p)", rect.Addr());
-   }
-
-   rect->Setup(
-      2.f * float(x) / float(device->GetWidth()) - 1.f,
-      2.f * (1.f - float(y) / float(device->GetHeight())) - 1.f,
-      2.f * float(w) / float(device->GetWidth()),
-      -2.f * float(h) / float(device->GetHeight()),
-      context->color);
-}
-
-Direct3DImageHandler evas_direct3d_image_load(Direct3DDeviceHandler d3d,
-   const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-
-   RGBA_Image *evas_image = evas_common_load_image_from_file(file, key, lo);
-   if (evas_image == NULL)
-   {
-      WRN("Failed to load image from %s", file);
-      return NULL;
-   }
-   int image_width = evas_image->cache_entry.w;
-   int image_height = evas_image->cache_entry.h;
-   assert(image_width > 0 && image_height > 0);
-
-   D3DImageCache::CacheEntryInfo info;
-   ZeroMemory(&info, sizeof(info));
-   info.id = -1;
-
-   Ref<D3DObjectImage> image = new D3DObjectImage();
-   image->Init(info.u, info.v, info.du, info.dv, info.id,
-      info.width, info.height, evas_image->cache_entry.file);
-   image->SetFree(true);
-   scene->AddObject(image);
-
-   DBG("New image object (total objects: %d)", scene->GetObjectCount());
-
-   ImagePtr *ptr = new ImagePtr;
-   ptr->ref = image;
-   ptr->img = evas_image;
-
-   return (Direct3DImageHandler)ptr;
-}
-
-Direct3DImageHandler evas_direct3d_image_new_from_data(Direct3DDeviceHandler d3d,
-   int w, int h, DWORD *image_data, int alpha, int cspace)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-
-   int image_width = w;
-   int image_height = h;
-   assert(image_width > 0 && image_height > 0);
-
-   Ref<D3DObjectImage> image = new D3DObjectImage();
-
-   D3DImageCache::CacheEntryInfo info;
-   ZeroMemory(&info, sizeof(info));
-   if (!D3DImageCache::Current()->InsertImage(device, image_data,
-      image_width, image_height, info))
-   {
-      WRN("Couldnt add image to the cache");
-      return NULL;
-   }
-   char buf[64];
-   sprintf(buf, "%p", image_data);
-   image->Init(info.u, info.v, info.du, info.dv, info.id,
-      info.width, info.height, buf);
-
-   image->SetFree(true);
-   scene->AddObject(image);
-
-   DBG("New image object (total objects: %d)", scene->GetObjectCount());
-
-   ImagePtr *ptr = new ImagePtr;
-   ptr->ref = image;
-   ptr->img = NULL;
-
-   return (Direct3DImageHandler)ptr;
-}
-
-Direct3DImageHandler evas_direct3d_image_new_from_copied_data(Direct3DDeviceHandler d3d,
-   int w, int h, DWORD *image_data, int alpha, int cspace)
-{
-   return evas_direct3d_image_new_from_data(d3d, w, h, image_data, alpha, cspace);
-}
-
-void evas_direct3d_image_free(Direct3DDeviceHandler d3d, Direct3DImageHandler image)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-
-   ImagePtr *ptr = (ImagePtr *)image;
-
-   Ref<D3DObjectImage> image_ref = ptr->ref;
-   assert(!image_ref.IsNull());
-   scene->DeleteObject(image_ref);
-
-   delete ptr;
-}
-
-void evas_direct3d_image_data_put(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   DWORD *image_data)
-{
-   ImagePtr *ptr = (ImagePtr *)image;
-   Ref<D3DObjectImage> image_ref = ptr->ref;
-   //assert(!image_ref.IsNull());
-   if (image_ref.IsNull())
-      return;
-
-   if (!image_ref->UpdateImageData(image_data))
-      ERR("Failed to update image data");
-}
-
-void evas_direct3d_image_data_get(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int to_write, DATA32 **image_data)
-{
-   ImagePtr *ptr = (ImagePtr *)image;
-   Ref<D3DObjectImage> image_ref = ptr->ref;
-   if (image_ref.IsNull())
-      return;
-   if (image_data == NULL)
-      return;
-   assert(sizeof(DATA32) == sizeof(DWORD));
-   *image_data = (DATA32 *)image_ref->GetImageData();
-}
-
-void evas_direct3d_image_draw(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int src_x, int src_y, int src_w, int src_h,
-   int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   ImagePtr *ptr = (ImagePtr *)image;
-   Ref<D3DObjectImage> image_ref = ptr->ref;
-   RGBA_Image *evas_image = ptr->img;
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   D3DScene *scene = dev_ptr->scene;
-   //assert(!image_ref.IsNull());
-   if (image_ref.IsNull())
-      return;
-
-   if (!image_ref->IsValid())
-   {
-      TArray<D3DObjectImage *> images;
-      scene->GetObjectsOfType<D3DObjectImage>(images);
-      bool found = false;
-      for (int i = 0; i < images.Length(); i++)
-      {
-         if (images[i]->IsValid() &&
-            _stricmp(images[i]->GetSource(), image_ref->GetSource()) == 0)
-         {
-            images[i]->CopyTo(image_ref);
-            found = true;
-            WRN("Image object info reused, source: \"%s\"", image_ref->GetSource());
-            break;
-         }
-      }
-      if (!found && evas_image != NULL)
-         evas_cache_image_load_data(&evas_image->cache_entry);
-   }
-
-   // If the image object wasn't initialized yet
-   if (evas_image != NULL && evas_image->image.data != NULL && !image_ref->IsValid())
-   {
-      D3DImageCache::CacheEntryInfo info;
-      ZeroMemory(&info, sizeof(info));
-      if (!D3DImageCache::Current()->InsertImage(device, (DWORD *)evas_image->image.data,
-         evas_image->cache_entry.w, evas_image->cache_entry.h, info))
-      {
-         WRN("Couldnt add image to the cache");
-         return;
-      }
-      image_ref->Init(info.u, info.v, info.du, info.dv, info.id,
-         info.width, info.height, evas_image->cache_entry.file);
-   }
-
-   // Do not draw invalid objects
-   if (!image_ref->IsValid())
-   {
-      image_ref->SetFree(true);
-      return;
-   }
-
-   image_ref->Setup(
-      2.f * float(dst_x) / float(device->GetWidth()) - 1.f,
-      2.f * (1.f - float(dst_y) / float(device->GetHeight())) - 1.f,
-      2.f * float(dst_w) / float(device->GetWidth()),
-      -2.f * float(dst_h) / float(device->GetHeight()),
-      src_x, src_y, src_w, src_h);
-
-   image_ref->SetupColorFilter(dev_ptr->context->color_mul);
-
-   image_ref->SetFree(false);
-}
-
-void evas_direct3d_image_size_get(Direct3DImageHandler image, int *w, int *h)
-{
-   ImagePtr *ptr = (ImagePtr *)image;
-   if (ptr == NULL)
-      return;
-   if (ptr->img != NULL)
-   {
-      if (w != NULL)
-         *w = ptr->img->cache_entry.w;
-      if (h != NULL)
-         *h = ptr->img->cache_entry.h;
-   }
-   else if (!ptr->ref.IsNull())
-   {
-      if (w != NULL)
-         *w = ptr->ref->GetWidth();
-      if (h != NULL)
-         *h = ptr->ref->GetHeight();
-   }
-}
-
-void evas_direct3d_image_border_set(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int l, int r, int t, int b)
-{
-   ImagePtr *ptr = (ImagePtr *)image;
-   Ref<D3DObjectImage> image_ref = ptr->ref;
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   if (image_ref.IsNull())
-      return;
-
-   int im_w, im_h;
-   if (ptr->img != NULL)
-   {
-      im_w = ptr->img->cache_entry.w;
-      im_h = ptr->img->cache_entry.h;
-   }
-   else
-   {
-      im_w = image_ref->GetWidth();
-      im_h = image_ref->GetHeight();
-   }
-
-   image_ref->SetupBorder(
-      D3DXVECTOR4(
-         2.f * float(l) / float(device->GetWidth()),
-         -2.f * float(t) / float(device->GetHeight()),
-         2.f * float(r) / float(device->GetWidth()),
-         -2.f * float(b) / float(device->GetHeight())),
-      D3DXVECTOR4(float(l) / float(im_w),
-         float(t) / float(im_h),
-         float(r) / float(im_w),
-         float(b) / float(im_h)));
-}
-
-void evas_direct3d_image_border_get(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int *l, int *r, int *t, int *b)
-{
-   ImagePtr *ptr = (ImagePtr *)image;
-   Ref<D3DObjectImage> image_ref = ptr->ref;
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DDevice *device = dev_ptr->device;
-   if (image_ref.IsNull())
-      return;
-   assert(l != NULL && r != NULL && b != NULL && t != NULL);
-   *l = (int)(0.5f * image_ref->GetBorderLeft() * device->GetWidth());
-   *r = (int)(0.5f * image_ref->GetBorderRight() * device->GetWidth());
-   *t = (int)(-0.5f * image_ref->GetBorderTop() * device->GetHeight());
-   *b = (int)(-0.5f * image_ref->GetBorderBottom() * device->GetHeight());
-}
-
-
-Direct3DFontGlyphHandler evas_direct3d_font_texture_new(Direct3DDeviceHandler d3d,
-   RGBA_Font_Glyph *fg)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DContext *context = dev_ptr->context;
-   D3DDevice *device = dev_ptr->device;
-
-   if (context->font.IsNull())
-      return NULL;
-
-   D3DObjectFont *font = (D3DObjectFont *)context->font.Addr();
-   // This is not reliable
-   //D3DObjectFont::Glyph *glyph = (D3DObjectFont::Glyph *)fg->ext_dat;
-   D3DObjectFont::Glyph *glyph = font->GetGlyph(fg);
-   if (glyph != NULL)
-   {
-      assert(glyph->Compare(fg));
-      return glyph;
-   }
-   glyph = font->AddGlyph(device, fg, fg->glyph_out->bitmap.buffer,
-      fg->glyph_out->bitmap.width, fg->glyph_out->bitmap.rows, fg->glyph_out->bitmap.pitch);
-   return (Direct3DFontGlyphHandler)glyph;
-}
-
-void evas_direct3d_font_texture_free(Direct3DFontGlyphHandler ft)
-{
-   if (ft == NULL)
-      return;
-   D3DObjectFont::Glyph *glyph = (D3DObjectFont::Glyph *)ft;
-   RGBA_Font_Glyph *fg = (RGBA_Font_Glyph *)glyph->Source();
-   fg->ext_dat = NULL;
-}
-
-void evas_direct3d_font_texture_draw(Direct3DDeviceHandler d3d, void *, void *,
-   RGBA_Font_Glyph *fg, int x, int y)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DContext *context = dev_ptr->context;
-   D3DDevice *device = dev_ptr->device;
-
-   if (context->font.IsNull())
-      return;
-
-   D3DObjectFont *font = (D3DObjectFont *)context->font.Addr();
-   D3DObjectFont::Glyph *glyph = (D3DObjectFont::Glyph *)fg->ext_dat;
-   if (glyph == NULL)
-      return;
-   assert(glyph->Compare(fg));
-
-   font->SetColor(context->color);
-   font->PushForDraw(glyph, x, y);
-   font->SetFree(false);
-}
-
-void evas_direct3d_select_or_create_font(Direct3DDeviceHandler d3d, void *font)
-{
-   // The Plan
-   // 1. Create D3DObjectFont with source string = "%p" (font)
-   // 2. Or find this object in the scene
-   // 3. On each texture_new call - fill internal texture with glyph, remember the
-   //    glyph pointer - we'll use it.
-
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DContext *context = dev_ptr->context;
-
-   if (!context->font.IsNull() && ((D3DObjectFont *)context->font.Addr())->Compare(font))
-      return;
-
-   D3DScene *scene = dev_ptr->scene;
-
-   static TArray<D3DObjectFont *> fonts;
-   scene->GetObjectsOfType<D3DObjectFont>(fonts);
-   for (int i = 0; i < fonts.Length(); i++)
-   {
-      if (fonts[i]->Compare(font))
-      {
-         context->font = fonts[i];
-         return;
-      }
-   }
-
-   D3DDevice *device = dev_ptr->device;
-
-   assert(dev_ptr->fonts_buffer_image_id >= 0);
-
-   Ref<D3DObjectFont> new_font = new D3DObjectFont(font, dev_ptr->fonts_buffer_image_id);
-   scene->AddObject(new_font);
-   context->font = new_font;
-}
-
-void evas_direct3d_font_free(Direct3DDeviceHandler d3d, void *font)
-{
-   DevicePtr *dev_ptr = SelectDevice(d3d);
-   D3DContext *context = dev_ptr->context;
-   D3DScene *scene = dev_ptr->scene;
-
-   if (context->font.IsNull() || !((D3DObjectFont *)context->font.Addr())->Compare(font))
-   {
-      D3DScene *scene = dev_ptr->scene;
-
-      static TArray<D3DObjectFont *> fonts;
-      scene->GetObjectsOfType<D3DObjectFont>(fonts);
-      for (int i = 0; i < fonts.Length(); i++)
-      {
-         if (fonts[i]->Compare(font))
-         {
-            context->font = fonts[i];
-            break;
-         }
-      }
-   }
-
-   scene->DeleteObject(context->font);
-   context->font = NULL;
-}
-
-
-}  // extern "C"
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp
deleted file mode 100644
index 15a801e..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include "evas_direct3d_object.h"
-
-D3DObject::D3DObject()
-{
-   _free = false;
-}
-
-D3DObject::~D3DObject()
-{
-}
-
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object.h
deleted file mode 100644
index 8c4e6df..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __EVAS_DIRECT3D_OBJECT_H__
-#define __EVAS_DIRECT3D_OBJECT_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-
-class D3DDevice;
-
-class D3DObject : virtual public Referenc
-{
-public:
-   D3DObject();
-   virtual ~D3DObject();
-
-   virtual void Draw(D3DDevice *d3d) = 0;
-
-   inline bool IsFree();
-   inline void SetFree(bool state);
-
-private:
-   bool _free;
-};
-
-bool D3DObject::IsFree()
-{
-   return _free;
-}
-
-void D3DObject::SetFree(bool state)
-{
-   _free = state;
-}
-
-#endif  // __EVAS_DIRECT3D_OBJECT_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp
deleted file mode 100644
index f072e87..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-//#define ENABLE_LOG_PRINTF
-
-#include <string.h>
-
-#include "evas_direct3d_object_font.h"
-#include "evas_direct3d_image_cache.h"
-#include "evas_direct3d_device.h"
-#include "evas_direct3d_shader_pack.h"
-#include "evas_direct3d_vertex_buffer_cache.h"
-
-D3DObjectFont::Cache D3DObjectFont::_cache;
-
-D3DObjectFont::D3DObjectFont(void *source, int image_id)
-{
-   _image_id = image_id;
-   _color = 0xff000000;
-   _source = source;
-   D3DImageCache::Current()->AddImageUser(_image_id);
-}
-
-D3DObjectFont::~D3DObjectFont()
-{
-   D3DImageCache::Current()->RemoveImageUser(_image_id);
-}
-
-void D3DObjectFont::CopyTo(D3DObjectFont *font)
-{
-   assert(font != NULL);
-   font->_image_id = _image_id;
-   font->_source = _source;
-   D3DImageCache::Current()->AddImageUser(font->_image_id);
-   _glyphs.CopyTo(font->_glyphs);
-}
-
-void D3DObjectFont::BeginCache(int image_id)
-{
-   if (_cache.enabled)
-      return;
-   int w = D3DImageCache::Current()->GetImageWidth(image_id);
-   int h = D3DImageCache::Current()->GetImageHeight(image_id);
-   _cache.enabled = true;
-   _cache.image_id = image_id;
-   _cache.data.Allocate(w * h);
-
-   if (_cache.dirty.Length() != h)
-   {
-      _cache.dirty.Allocate(h);
-      memset(_cache.dirty.Data(), 0xff, sizeof(POINT) * _cache.dirty.Length());
-   }
-
-   ZeroMemory(_cache.data.Data(), sizeof(DWORD) * _cache.data.Length());
-   _cache.width = w;
-   _cache.height = h;
-
-   _cache.valid_rect.left = w;
-   _cache.valid_rect.right = 0;
-   _cache.valid_rect.top = h;
-   _cache.valid_rect.bottom = 0;
-}
-
-void D3DObjectFont::Draw(D3DDevice *d3d)
-{
-   assert(_cache.image_id == _image_id);
-}
-
-void D3DObjectFont::EndCache(D3DDevice *d3d)
-{
-   if (!_cache.enabled)
-      return;
-   _cache.enabled = false;
-
-   if (_cache.data.Length() == 0)
-      return;
-
-   D3DImageCache::CacheEntryInfo info;
-   ZeroMemory(&info, sizeof(info));
-   info.id = _cache.image_id;
-   info.width = _cache.width;
-   info.height = _cache.height;
-   if (!D3DImageCache::Current()->UpdateImageDataWithDirtyInfo(info,
-      _cache.data.Data(), _cache.dirty.Data()))
-   //if (!D3DImageCache::Current()->UpdateImageDataDiscard(info, _cache.data.Data()));
-   {
-      return;
-   }
-
-   D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYUV);
-   D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_UV);
-   D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_TEX_2);  // This image is in s1
-   D3DImageCache::Current()->SelectImageToDevice(d3d, _cache.image_id);
-
-   const FLOAT half_x = 0.5f / FLOAT(_cache.width);
-   const FLOAT half_y = 0.5f / FLOAT(_cache.height);
-   FLOAT left = FLOAT(_cache.valid_rect.left - 5) / FLOAT(_cache.width),
-      top = FLOAT(_cache.valid_rect.top - 5) / FLOAT(_cache.height),
-      right = FLOAT(_cache.valid_rect.right + 5) / FLOAT(_cache.width),
-      bottom = FLOAT(_cache.valid_rect.bottom + 5) / FLOAT(_cache.height);
-
-   const Vertex data[6] = {
-      {left * 2 - 1, 2 * (1 - bottom) - 1,      left + half_x, bottom + half_y},
-      {left * 2 - 1, 2 * (1 - top) - 1,         left + half_x, top + half_y},
-      {right * 2 - 1, 2 * (1 - bottom) - 1,     right + half_x, bottom + half_y},
-      {right * 2 - 1, 2 * (1 - bottom) - 1,     right + half_x, bottom + half_y},
-      {left * 2 - 1, 2 * (1 - top) - 1,         left + half_x, top + half_y},
-      {right * 2 - 1, 2 * (1 - top) - 1,        right + half_x, top + half_y}};
-
-   d3d->GetDevice()->DrawPrimitiveUP(D3DPT_TRIANGLELIST, 2, data, sizeof(Vertex));
-
-   //D3DImageCache::Current()->UpdateImageDataWithDirtyInfo(info, NULL, _cache.dirty.Data());
-}
-
-D3DObjectFont::Glyph *D3DObjectFont::GetGlyph(void *source)
-{
-   if (_image_id < 0)
-   {
-      WRN("Font is not initialized");
-      return NULL;
-   }
-   for (int i = 0; i < _glyphs.Length(); i++)
-   {
-      if (_glyphs[i]->Compare(source))
-         return _glyphs[i];
-   }
-   return NULL;
-}
-
-D3DObjectFont::Glyph *D3DObjectFont::AddGlyph(D3DDevice *d3d, void *source,
-   BYTE *data8, int width, int height, int pitch)
-{
-   if (_image_id < 0)
-   {
-      WRN("Font is not initialized");
-      return NULL;
-   }
-   for (int i = 0; i < _glyphs.Length(); i++)
-   {
-      if (_glyphs[i]->Compare(source))
-         return _glyphs[i];
-   }
-   Ref<Glyph> glyph = new Glyph(source);
-   glyph->_data.Allocate(width * height);
-   glyph->_width = width;
-   glyph->_height = height;
-
-   for (int i = 0; i < height; i++)
-      CopyMemory(&glyph->_data[i * width], &data8[i * pitch], width);
-
-   Log("Glyph added (%p) (%dx%d)", source, width, height);
-   _glyphs.Add(glyph);
-   return _glyphs.Last()->Addr();
-}
-
-void D3DObjectFont::PushForDraw(Glyph *glyph, int x, int y)
-{
-   BeginCache(_image_id);
-
-   // Uff, I'm not sure about multiple windows...
-
-#define LERP(a, b, t1, t2)  (BYTE)(FLOAT(a) * (t1) + FLOAT(b) * (t2))
-
-   Color dc, sc;
-   FLOAT a;
-   sc.color = _color;
-
-   const FLOAT color_alpha = sc.Alpha();
-
-   DWORD *data = _cache.data.Data();
-   BYTE *gdata = glyph->_data.Data();
-   const int glyph_height = glyph->_height;
-   const int cache_height = _cache.height;
-   const int glyph_width = glyph->_width;
-   const int cache_width = _cache.width;
-
-   for (int i = 0, yi = y; i < glyph_height && yi < cache_height; i++, yi++)
-   {
-      if (yi < 0)
-         continue;
-      DWORD *dst = data + ((yi) * cache_width + x);
-      BYTE *src = gdata + (i * glyph_width);
-      POINT *dirty_yi = &_cache.dirty[yi];
-
-      if (_cache.valid_rect.top > yi)
-         _cache.valid_rect.top = yi;
-      if (_cache.valid_rect.bottom < yi)
-         _cache.valid_rect.bottom = yi;
-
-      for (int j = 0, xj = x; j < glyph_width && xj < cache_width; j++, xj++, dst++, src++)
-      {
-         if (xj < 0)
-            continue;
-         BYTE glyph_pix = *src;
-         if (glyph_pix == 0)
-            continue;
-
-         if (dirty_yi->x >= 0 && dirty_yi->y < 0)
-            dirty_yi->x = 0, dirty_yi->y = cache_width - 1;
-         else
-         {
-            if (dirty_yi->x < 0 || dirty_yi->x > xj)
-               dirty_yi->x = xj;
-            if (dirty_yi->y < 0 || dirty_yi->y < xj)
-               dirty_yi->y = xj;
-         }
-
-         if (_cache.valid_rect.left > xj)
-            _cache.valid_rect.left = xj;
-         if (_cache.valid_rect.right < xj)
-            _cache.valid_rect.right = xj;
-
-         if (glyph_pix == 0xff && sc.a == 0xff)
-         {
-            *dst = sc.color;
-            continue;
-         }
-         a = FLOAT(glyph_pix) * color_alpha / 255.f;
-         if (*dst == 0)
-         {
-            *dst = (BYTE(255.f * a) << 24) | (0x00ffffff & sc.color);
-            continue;
-         }
-
-         dc.color = *dst;
-
-         dc.r = LERP(dc.r, sc.r, 1 - a, a);
-         dc.g = LERP(dc.g, sc.g, 1 - a, a);
-         dc.b = LERP(dc.b, sc.b, 1 - a, a);
-         dc.a = max(dc.a, BYTE(255.f * a));
-         *dst = dc.color;
-      }
-   }
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h
deleted file mode 100644
index e8c0196..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef __EVAS_DIRECT3D_OBJECT_FONT_H__
-#define __EVAS_DIRECT3D_OBJECT_FONT_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-#include "evas_direct3d_object.h"
-
-class D3DObjectFont : public D3DObject
-{
-public:
-
-   class Glyph : public Referenc
-   {
-   public:
-      Glyph(void *source)
-         : _source(source), _width(0), _height(0) {};
-
-      bool Compare(void *source)
-      {
-         return (_source == source);
-      }
-      void *Source()
-      {
-         return _source;
-      }
-
-   private:
-      friend class D3DObjectFont;
-      void *_source;
-      TArray<BYTE> _data;
-      int _width;
-      int _height;
-   };
-
-public:
-   D3DObjectFont(void *source, int image_id);
-   ~D3DObjectFont();
-
-   inline bool Compare(void *source);
-   void CopyTo(D3DObjectFont *font);
-
-   virtual void Draw(D3DDevice *d3d);
-   static void EndCache(D3DDevice *d3d);
-
-   inline void SetColor(DWORD color);
-
-   Glyph *GetGlyph(void *source);
-   Glyph *AddGlyph(D3DDevice *d3d, void *source, BYTE *data8, int width, int height, int pitch);
-   void PushForDraw(Glyph *glyph, int x, int y);
-
-protected:
-   static void BeginCache(int image_id);
-
-private:
-   struct Vertex
-   {
-      FLOAT x, y;
-      FLOAT u, v;
-   };
-
-   struct Color
-   {
-      union
-      {
-         struct
-         {
-            BYTE b, g, r, a;
-         };
-         DWORD color;
-      };
-
-      FLOAT Alpha() { return FLOAT(a) / 255.f; }
-   };
-
-   class Cache
-   {
-   public:
-      Cache()
-         : enabled(false), image_id(-1), width(0), height(0) {};
-   public:
-      TArray<DWORD> data;
-      TArray<POINT> dirty;  // Start, End
-      bool enabled;
-      int image_id;
-      int width;
-      int height;
-      RECT valid_rect;
-   };
-
-private:
-   DWORD _color;
-   void *_source;
-   int _image_id;
-
-   TArray<Ref<Glyph> > _glyphs;
-
-   static Cache _cache;
-};
-
-bool D3DObjectFont::Compare(void *source)
-{
-   return (_source == source);
-}
-
-void D3DObjectFont::SetColor(DWORD color)
-{
-   _color = color;
-}
-
-#endif  // __EVAS_DIRECT3D_OBJECT_FONT_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp
deleted file mode 100644
index 3bfbe1e..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-//#define ENABLE_LOG_PRINTF
-
-#include <string.h>
-
-#include <d3dx9.h>
-
-#include "evas_direct3d_object_image.h"
-#include "evas_direct3d_image_cache.h"
-#include "evas_direct3d_device.h"
-#include "evas_direct3d_shader_pack.h"
-#include "evas_direct3d_vertex_buffer_cache.h"
-
-TArray<D3DObjectImage *> D3DObjectImage::_cache;
-bool D3DObjectImage::_cache_enabled = false;
-
-D3DObjectImage::D3DObjectImage()
-{
-   _x = _y = _w = _h = 0;
-   _sx = _sy = _sw = _sh = 0;
-   _u = _v = _du = _dv = 0;
-   _image_id = -1;
-   _width = _height = 0;
-   _source[0] = 0;
-   _color = 0xffffffff;
-   _cache_i = 0;
-   _border = D3DXVECTOR4(0, 0, 0, 0);
-   _uvborder = D3DXVECTOR4(0, 0, 0, 0);
-   _with_border = false;
-   _dirty = false;
-   _image_data_updated = false;
-}
-
-D3DObjectImage::~D3DObjectImage()
-{
-   D3DImageCache::Current()->RemoveImageUser(_image_id);
-}
-
-void D3DObjectImage::CopyTo(D3DObjectImage *image)
-{
-   assert(image != NULL);
-   image->_u = _u;
-   image->_v = _v;
-   image->_du = _du;
-   image->_dv = _dv;
-   image->_image_id = _image_id;
-   image->_width = _width;
-   image->_height = _height;
-   CopyMemory(image->_source, _source, sizeof(_source));
-   D3DImageCache::Current()->AddImageUser(image->_image_id);
-}
-
-void D3DObjectImage::BeginCache()
-{
-   _cache.Allocate(0);
-   _cache_enabled = true;
-}
-
-void D3DObjectImage::EndCache(D3DDevice *d3d)
-{
-   if (!_cache_enabled || _cache.Length() == 0)
-      return;
-   D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYUVC);
-   D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_UV_COLOR);
-   D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_TEX_COLOR_FILTER);
-
-   static TArray<Vertex> sorted;
-   static TArray<GroupDesc> groups;
-   sorted.Allocate(0);
-   groups.Allocate(0);
-
-   bool found = true;
-   while (found)
-   {
-      found = false;
-      int cur_id = -1;
-      int num = 0;
-      for (int i = 0; i < _cache.Length(); i++)
-      {
-         // We have processed this
-         if (_cache[i]->_image_id < 0)
-            continue;
-         found = true;
-         if (cur_id < 0)
-            cur_id = _cache[i]->_image_id;
-         if (_cache[i]->_image_id == cur_id)
-         {
-            if (!_cache[i]->_with_border)
-            {
-               Vertex *data = _cache[i]->MakeData();
-               sorted.Add(data[0]);
-               sorted.Add(data[1]);
-               sorted.Add(data[2]);
-               sorted.Add(data[3]);
-               sorted.Add(data[4]);
-               sorted.Add(data[5]);
-               _cache[i]->_image_id = -_cache[i]->_image_id - 1;
-               num++;
-            }
-            else
-            {
-               Vertex *data = _cache[i]->MakeDataBorder();
-               int last_len = sorted.Length();
-               sorted.Allocate(last_len + 6 * 9);
-               CopyMemory(&sorted[last_len], data, sizeof(Vertex) * 6 * 9);
-               _cache[i]->_image_id = -_cache[i]->_image_id - 1;
-               num += 9;
-            }
-         }
-      }
-      if (num > 0)
-      {
-         GroupDesc gd = {num, cur_id};
-         groups.Add(gd);
-      }
-   }
-
-   // Restore ids
-   for (int i = 0; i < _cache.Length(); i++)
-      _cache[i]->_image_id = -_cache[i]->_image_id - 1;
-
-   D3DVertexBufferCache::CacheEntryInfo ce_info;
-   if (!D3DVertexBufferCache::Current()->InitBuffer(d3d, (BYTE *)sorted.Data(),
-      sorted.Length() * sizeof(Vertex), ce_info))
-   {
-      return;
-   }
-   D3DVertexBufferCache::Current()->SelectBufferToDevice(d3d, ce_info.id, sizeof(Vertex));
-
-   HRESULT hr;
-   for (int i = 0, cur = 0; i < groups.Length(); i++)
-   {
-      if (FAILED(hr = D3DImageCache::Current()->SelectImageToDevice(d3d, groups[i].id)))
-      {
-         Log("Failed to select texture: %X", (DWORD)hr);
-      }
-//      d3d->GetDevice()->DrawPrimitiveUP(D3DPT_TRIANGLELIST, groups[i].num * 2,
-//         &sorted[cur], sizeof(Vertex));
-      d3d->GetDevice()->DrawPrimitive(D3DPT_TRIANGLELIST, cur, groups[i].num * 2);
-      cur += groups[i].num * 6;
-   }
-
-   DBG("Image cache drawn: %d items, %d groups", _cache.Length(), groups.Length());
-   _cache_enabled = false;
-}
-
-void D3DObjectImage::Draw(D3DDevice *d3d)
-{
-   _dirty = false;
-
-   DBG("Image draw: (%.3f, %.3f, %.3f, %.3f)", _x, _y, _w, _h);
-
-   if (_cache_enabled)
-   {
-      _cache.Add(this);
-      _cache_i = _cache.Length() - 1;
-      return;
-   }
-
-   D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYUVC);
-   D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_UV_COLOR);
-   D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_TEX_COLOR_FILTER);
-   D3DImageCache::Current()->SelectImageToDevice(d3d, _image_id);
-
-   if (!_with_border)
-      d3d->GetDevice()->DrawPrimitiveUP(D3DPT_TRIANGLELIST, 2, MakeData(), sizeof(Vertex));
-   else
-      d3d->GetDevice()->DrawPrimitiveUP(D3DPT_TRIANGLELIST, 18, MakeDataBorder(), sizeof(Vertex));
-}
-
-void D3DObjectImage::Init(FLOAT u, FLOAT v, FLOAT du, FLOAT dv,
-   int image_id, int width, int height, const char *source)
-{
-   _u = u;
-   _v = v;
-   _du = du;
-   _dv = dv;
-   _image_id = image_id;
-   _width = width;
-   _height = height;
-#ifdef __MINGW32__
-   strncpy(_source, source, sizeof(_source) - 1);
-#else
-   strncpy_s(_source, sizeof(_source), source, sizeof(_source) - 1);
-#endif // ! __MINGW32__
-}
-
-void D3DObjectImage::Setup(FLOAT x, FLOAT y, FLOAT w, FLOAT h,
-   int sx, int sy, int sw, int sh)
-{
-   if (!_dirty)
-   {
-      _x = 1.f;
-      _y = -1.f;
-      _w = _h = 0.f;
-      _sx = _sy = 1.f;
-      _sw = _sh = 0.f;
-   }
-
-   if (!_with_border)
-   {
-      _x = x;
-      _y = y;
-      _w = w;
-      _h = h;
-      _sx = FLOAT(sx) / FLOAT(_width);
-      _sy = FLOAT(sy) / FLOAT(_height);
-      _sw = FLOAT(sw) / FLOAT(_width);
-      _sh = FLOAT(sh) / FLOAT(_height);
-   }
-   else
-   {
-      _x = min(_x, x);
-      _y = max(_y, y);
-      _w += w / 3;
-      _h += h / 3;
-      _sx = min(_sx, FLOAT(sx) / FLOAT(_width));
-      _sy = min(_sy, FLOAT(sy) / FLOAT(_height));
-      _sw += FLOAT(sw) / (3.f * FLOAT(_width));
-      _sh += FLOAT(sh) / (3.f * FLOAT(_height));
-   }
-   _dirty = true;
-
-}
-
-void D3DObjectImage::SetupColorFilter(DWORD color)
-{
-   //_color = ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
-   _color = color;
-}
-
-D3DObjectImage::Vertex *D3DObjectImage::MakeData()
-{
-   //FLOAT z = (FLOAT(_cache_i) + 0.5f) / _cache.Length();
-   Vertex data[6] = {
-      {_x, _y,             _u + _sx * _du, _v + _sy * _dv,                 _color},
-      {_x + _w, _y,        _u + (_sx + _sw) * _du, _v + _sy * _dv,         _color},
-      {_x, _y + _h,        _u + _sx * _du, _v + (_sy + _sh) * _dv,         _color},
-      {_x, _y + _h,        _u + _sx * _du, _v + (_sy + _sh) * _dv,         _color},
-      {_x + _w, _y,        _u + (_sx + _sw) * _du, _v + _sy * _dv,         _color},
-      {_x + _w, _y + _h,   _u + (_sx + _sw) * _du, _v + (_sy + _sh) * _dv, _color}};
-   CopyMemory(_data, data, sizeof(data));
-   return _data;
-}
-
-D3DObjectImage::Vertex *D3DObjectImage::MakeDataBorder()
-{
-   //FLOAT z = (FLOAT(_cache_i) + 0.5f) / _cache.Length();
-   if (_border.x + _border.z > _w)
-      _border.x = _border.z = _w / 2;
-   if (_border.y + _border.w < _h)
-      _border.y = _border.w = _h / 2;
-
-   FLOAT ul, ut, ur, ub;
-   ul = _uvborder.x * _du;
-   ut = _uvborder.y * _dv;
-   ur = _uvborder.z * _du;
-   ub = _uvborder.w * _dv;
-   FLOAT bl, bt, br, bb;
-   bl = _border.x;
-   bt = _border.y;
-   br = _border.z;
-   bb = _border.w;
-
-   const FLOAT half_x = 0.5f * _du / FLOAT(_width);
-   const FLOAT half_y = 0.5f * _dv / FLOAT(_height);
-
-   // Diagonal knots
-   Vertex data[4] = {
-      {_x, _y,                         _u + _sx * _du + half_x,     _v + _sy * _dv + half_y,         _color},
-      {_x + bl, _y + bt,               _u + ul + _sx * _du,         _v + ut + _sy * _dv,             _color},
-      {_x + _w - br, _y + _h - bb,     _u - ur + (_sx + _sw) * _du, _v - ub + (_sy + _sh) * _dv,     _color},
-      {_x + _w, _y + _h,               _u + (_sx + _sw) * _du - half_x, _v + (_sy + _sh) * _dv - half_y, _color}};
-
-   static const int yshift[6] = {0, 0, 1, 1, 0, 1};
-   static const int xshift[6] = {0, 1, 0, 0, 1, 1};
-
-   int vi = 0;
-   for (int i = 0; i < 3; i++)
-   {
-      for (int j = 0; j < 3; j++)
-      {
-         for (int v = 0; v < 6; v++)
-         {
-            _data[vi].x = data[xshift[v] + j].x;
-            _data[vi].y = data[yshift[v] + i].y;
-            _data[vi].u = data[xshift[v] + j].u;
-            _data[vi].v = data[yshift[v] + i].v;
-            _data[vi].col = data[0].col;
-            vi++;
-         }
-      }
-   }
-
-   return _data;
-}
-
-void D3DObjectImage::SetupBorder(const D3DXVECTOR4 &world_border, const D3DXVECTOR4 &pix_border)
-{
-   _border = world_border;
-   _uvborder = pix_border;
-   _with_border = (_border.x > 0.0001f || _border.y > 0.0001f ||
-      _border.z > 0.0001f || _border.w > 0.0001f);
-}
-
-bool D3DObjectImage::UpdateImageData(DWORD *image_data)
-{
-   D3DImageCache::CacheEntryInfo info = {_image_id, _width, _height, _u, _v, _du, _dv};
-   _image_data_updated = false;
-   return D3DImageCache::Current()->UpdateImageData(info, image_data);
-}
-
-DWORD *D3DObjectImage::GetImageData()
-{
-   if (_image_data_updated)
-      return _image_data.Data();
-   _image_data_updated = true;
-   D3DImageCache::CacheEntryInfo info = {_image_id, _width, _height, _u, _v, _du, _dv};
-   D3DImageCache::Current()->GetImageData(info, _image_data);
-   return _image_data.Data();
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h
deleted file mode 100644
index 379207b..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef __EVAS_DIRECT3D_OBJECT_IMAGE_H__
-#define __EVAS_DIRECT3D_OBJECT_IMAGE_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-#include "evas_direct3d_object.h"
-
-class D3DObjectImage : public D3DObject
-{
-public:
-   D3DObjectImage();
-   virtual ~D3DObjectImage();
-
-   void CopyTo(D3DObjectImage *image);
-
-   static void BeginCache();
-   virtual void Draw(D3DDevice *d3d);
-   static void EndCache(D3DDevice *d3d);
-
-   void Init(FLOAT u, FLOAT v, FLOAT du, FLOAT dv, int image_id,
-      int width, int height, const char *source);
-   void Setup(FLOAT x, FLOAT y, FLOAT w, FLOAT h,
-      int sx, int sy, int sw, int sh);
-   void SetupColorFilter(DWORD color);
-   void SetupBorder(const D3DXVECTOR4 &world_border, const D3DXVECTOR4 &pix_border);
-
-   inline bool IsValid();
-   inline const char *GetSource();
-   inline int GetWidth();
-   inline int GetHeight();
-   inline FLOAT GetBorderLeft();
-   inline FLOAT GetBorderRight();
-   inline FLOAT GetBorderTop();
-   inline FLOAT GetBorderBottom();
-
-   bool UpdateImageData(DWORD *image_data);
-   DWORD *GetImageData();
-
-private:
-   struct Vertex
-   {
-      FLOAT x, y;
-      FLOAT u, v;
-      D3DCOLOR col;
-   };
-
-   struct GroupDesc
-   {
-      int num;
-      int id;
-   };
-
-private:
-   Vertex *MakeData();
-   Vertex *MakeDataBorder();
-
-private:
-   FLOAT _x, _y, _w, _h;
-   FLOAT _sx, _sy, _sw, _sh;
-   D3DXVECTOR4 _border;
-   D3DXVECTOR4 _uvborder;
-
-   FLOAT _u, _v, _du, _dv;
-   int _image_id;
-   int _width, _height;
-
-   D3DCOLOR _color;
-   int _cache_i;
-   bool _with_border;
-   bool _dirty;
-
-   TArray<DWORD> _image_data;
-   bool _image_data_updated;
-
-   char _source[256];
-
-   Vertex _data[54];
-
-   static TArray<D3DObjectImage *> _cache;
-   static bool _cache_enabled;
-};
-
-bool D3DObjectImage::IsValid()
-{
-   return _image_id >= 0 && _width > 0 && _height > 0;
-}
-
-const char *D3DObjectImage::GetSource()
-{
-   return _source;
-}
-
-int D3DObjectImage::GetWidth()
-{
-   return _width;
-}
-
-int D3DObjectImage::GetHeight()
-{
-   return _height;
-}
-
-FLOAT D3DObjectImage::GetBorderLeft()
-{
-   return _border.x;
-}
-
-FLOAT D3DObjectImage::GetBorderRight()
-{
-   return _border.z;
-}
-
-FLOAT D3DObjectImage::GetBorderTop()
-{
-   return _border.y;
-}
-
-FLOAT D3DObjectImage::GetBorderBottom()
-{
-   return _border.w;
-}
-
-
-#endif  // __EVAS_DIRECT3D_OBJECT_IMAGE_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp
deleted file mode 100644
index 9442243..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#include "evas_direct3d_object_line.h"
-#include "evas_direct3d_device.h"
-#include "evas_direct3d_shader_pack.h"
-
-TArray<D3DObjectLine::Vertex> D3DObjectLine::_cache;
-bool D3DObjectLine::_cache_enabled = false;
-
-D3DObjectLine::D3DObjectLine()
-{
-   _x1 = _y1 = 0;
-   _x2 = _y2 = 0;
-}
-
-void D3DObjectLine::BeginCache()
-{
-   _cache.Allocate(0);
-   _cache_enabled = true;
-}
-
-void D3DObjectLine::EndCache(D3DDevice *d3d)
-{
-   if (!_cache_enabled || _cache.Length() == 0)
-      return;
-   D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYC);
-   D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_COLOR);
-   D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_COLOR);
-   d3d->GetDevice()->DrawPrimitiveUP(D3DPT_LINELIST, _cache.Length() / 2, 
-      _cache.Data(), sizeof(Vertex));
-
-   DBG("Line cache drawn: %d items", _cache.Length() / 2);
-   _cache_enabled = false;
-}
-
-void D3DObjectLine::Draw(D3DDevice *d3d)
-{
-   Vertex data[2] = {{_x1, _y1, _color}, {_x2, _y2, _color}};
-
-   if (!_cache_enabled)
-   {
-      D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYC);
-      D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_COLOR);
-      D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_COLOR);
-      d3d->GetDevice()->DrawPrimitiveUP(D3DPT_LINELIST, 1, data, sizeof(Vertex));
-   }
-   else
-   {
-      _cache.Add(data[0]);
-      _cache.Add(data[1]);
-   }
-}
-
-void D3DObjectLine::Setup(FLOAT x1, FLOAT y1, FLOAT x2, FLOAT y2, DWORD color)
-{
-   _x1 = x1;
-   _y1 = y1;
-   _x2 = x2;
-   _y2 = y2;
-   _color = color;
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h
deleted file mode 100644
index 0e5d807..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __EVAS_DIRECT3D_OBJECT_LINE_H__
-#define __EVAS_DIRECT3D_OBJECT_LINE_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-#include "evas_direct3d_object.h"
-
-class D3DObjectLine : public D3DObject
-{
-public:
-   D3DObjectLine();
-
-   static void BeginCache();
-   virtual void Draw(D3DDevice *d3d);
-   static void EndCache(D3DDevice *d3d);
-
-   void Setup(FLOAT x1, FLOAT y1, FLOAT x2, FLOAT y2, DWORD color);
-
-private:
-   FLOAT _x1, _y1, _x2, _y2;
-   DWORD _color;
-
-private:
-   struct Vertex
-   {
-      FLOAT x, y;
-      DWORD color;
-   };
-
-   static TArray<Vertex> _cache;
-   static bool _cache_enabled;
-};
-
-#endif  // __EVAS_DIRECT3D_OBJECT_LINE_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp
deleted file mode 100644
index ebdd22b..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "evas_direct3d_object_rect.h"
-#include "evas_direct3d_device.h"
-#include "evas_direct3d_shader_pack.h"
-
-TArray<D3DObjectRect::Vertex> D3DObjectRect::_cache;
-bool D3DObjectRect::_cache_enabled = false;
-
-D3DObjectRect::D3DObjectRect()
-{
-   _x = _y = 0;
-   _w = _h = 0;
-}
-
-void D3DObjectRect::BeginCache()
-{
-   _cache.Allocate(0);
-   _cache_enabled = true;
-}
-
-void D3DObjectRect::EndCache(D3DDevice *d3d)
-{
-   if (!_cache_enabled || _cache.Length() == 0)
-      return;
-   D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYC);
-   D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_COLOR);
-   D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_COLOR);
-   d3d->GetDevice()->DrawPrimitiveUP(D3DPT_TRIANGLELIST, _cache.Length() / 3,
-      _cache.Data(), sizeof(Vertex));
-
-   DBG("Rect cache drawn: %d items", _cache.Length() / 6);
-   _cache_enabled = false;
-}
-
-void D3DObjectRect::Draw(D3DDevice *d3d)
-{
-   Vertex data[6] = {
-      {_x, _y, _color}, {_x + _w, _y, _color}, {_x, _y + _h, _color},
-      {_x, _y + _h, _color}, {_x + _w, _y, _color}, {_x + _w, _y + _h, _color}};
-
-   if (!_cache_enabled)
-   {
-      D3DShaderPack::Current()->SetVDecl(d3d, D3DShaderPack::VDECL_XYC);
-      D3DShaderPack::Current()->SetVS(d3d, D3DShaderPack::VS_COPY_COLOR);
-      D3DShaderPack::Current()->SetPS(d3d, D3DShaderPack::PS_COLOR);
-      d3d->GetDevice()->DrawPrimitiveUP(D3DPT_TRIANGLELIST, 2, data, sizeof(Vertex));
-   }
-   else
-   {
-      _cache.Add(data[0]);
-      _cache.Add(data[1]);
-      _cache.Add(data[2]);
-      _cache.Add(data[3]);
-      _cache.Add(data[4]);
-      _cache.Add(data[5]);
-   }
-}
-
-void D3DObjectRect::Setup(FLOAT x, FLOAT y, FLOAT w, FLOAT h, DWORD color)
-{
-   _x = x;
-   _y = y;
-   _w = w;
-   _h = h;
-   _color = color;
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h
deleted file mode 100644
index f7ef084..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __EVAS_DIRECT3D_OBJECT_RECT_H__
-#define __EVAS_DIRECT3D_OBJECT_RECT_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-#include "evas_direct3d_object.h"
-
-class D3DObjectRect : public D3DObject
-{
-public:
-   D3DObjectRect();
-
-   static void BeginCache();
-   virtual void Draw(D3DDevice *d3d);
-   static void EndCache(D3DDevice *d3d);
-
-   void Setup(FLOAT x, FLOAT y, FLOAT w, FLOAT h, DWORD color);
-
-private:
-   FLOAT _x, _y, _w, _h;
-   DWORD _color;
-
-private:
-   struct Vertex
-   {
-      FLOAT x, y;
-      DWORD color;
-   };
-
-   static TArray<Vertex> _cache;
-   static bool _cache_enabled;
-};
-
-#endif  // __EVAS_DIRECT3D_OBJECT_RECT_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp
deleted file mode 100644
index b171fc0..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#include "evas_direct3d_scene.h"
-
-D3DScene::D3DScene()
-{
-}
-
-void D3DScene::FreeObjects()
-{
-   for (int i = 0; i < _objects.Length(); i++)
-      _objects[i]->SetFree(true);
-}
-
-void D3DScene::DrawAll(D3DDevice *d3d)
-{
-   for (int i = 0; i < _objects.Length(); i++)
-   {
-      if (!_objects[i]->IsFree())
-         _objects[i]->Draw(d3d);
-   }
-}
-
-void D3DScene::DeleteObject(D3DObject *object)
-{
-   for (int i = 0; i < _objects.Length(); i++)
-   {
-      if (_objects[i].Addr() == object)
-      {
-         _objects.Replace(i);
-         return;
-      }
-   }
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_scene.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_scene.h
deleted file mode 100644
index e2f5f94..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_scene.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef __EVAS_DIRECT3D_SCENE_H__
-#define __EVAS_DIRECT3D_SCENE_H__
-
-#include "evas_engine.h"
-
-#include <assert.h>
-#include <typeinfo>
-
-#include "ref.h"
-#include "array.h"
-
-#include "evas_direct3d_object.h"
-
-class D3DDevice;
-
-class D3DScene : virtual public Referenc
-{
-public:
-   D3DScene();
-
-   void FreeObjects();
-
-   inline void AddObject(D3DObject *object);
-   inline int GetObjectCount();
-   void DeleteObject(D3DObject *object);
-
-   void DrawAll(D3DDevice *d3d);
-
-   template <class T> T *GetFreeObject()
-   {
-      for (int i = 0; i < _objects.Length(); i++)
-      {
-         if (typeid(T) == typeid(*_objects[i].Addr()) && _objects[i]->IsFree())
-            return (T *)_objects[i].Addr();
-      }
-      return NULL;
-   }
-
-   template <class T> void GetObjectsOfType(TArray<T *> &res)
-   {
-      for (int i = 0; i < _objects.Length(); i++)
-      {
-         if (typeid(T) == typeid(*_objects[i].Addr()))
-            res.Add((T *)_objects[i].Addr());
-      }
-   }
-
-private:
-   TArray<Ref<D3DObject> > _objects;
-};
-
-void D3DScene::AddObject(D3DObject *object)
-{
-   assert(object != NULL);
-   _objects.Add(object);
-}
-
-int D3DScene::GetObjectCount()
-{
-   return _objects.Length();
-}
-
-#endif  // __EVAS_DIRECT3D_SCENE_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp
deleted file mode 100644
index d9c868f..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-
-#include <assert.h>
-
-#include <d3dx9.h>
-
-#include "evas_direct3d_shader_pack.h"
-#include "evas_direct3d_device.h"
-
-Ref<D3DShaderPack> D3DShaderPack::_this;
-
-D3DShaderPack::D3DShaderPack()
-{
-}
-
-D3DShaderPack::~D3DShaderPack()
-{
-   Uninitialize();
-}
-
-D3DShaderPack *D3DShaderPack::Current()
-{
-   if (_this.IsNull())
-      _this = new D3DShaderPack();
-   return _this;
-}
-
-void D3DShaderPack::SetCurrent(D3DShaderPack *obj)
-{
-   _this = obj;
-}
-
-
-bool D3DShaderPack::Initialize(D3DDevice *d3d)
-{
-   bool res = true;
-   if (!(res = InitVertexDeclarations(d3d) && res))
-      WRN("Failed to create vdecl set");
-   if (!(res = InitVertexShaders(d3d) && res))
-      WRN("Failed to create vs set");
-   if (!(res = InitPixelShaders(d3d) && res))
-      WRN("Failed to create ps set");
-   return res;
-}
-
-void D3DShaderPack::Uninitialize()
-{
-   for (int i = 0; i < _vdecl.Length(); i++)
-   {
-      if (_vdecl[i] != NULL)
-      {
-         _vdecl[i]->Release();
-         _vdecl[i] = NULL;
-      }
-   }
-
-   for (int i = 0; i < _vs.Length(); i++)
-   {
-      if (_vs[i] != NULL)
-      {
-         _vs[i]->Release();
-         _vs[i] = NULL;
-      }
-   }
-
-   for (int i = 0; i < _ps.Length(); i++)
-   {
-      if (_ps[i] != NULL)
-      {
-         _ps[i]->Release();
-         _ps[i] = NULL;
-      }
-   }
-}
-
-bool D3DShaderPack::InitVertexDeclarations(D3DDevice *d3d)
-{
-   _vdecl.Allocate(VDECL_NUM);
-   _vdecl.Set(NULL);
-
-   LPDIRECT3DVERTEXDECLARATION9 vdecl = NULL;
-   {
-      D3DVERTEXELEMENT9 elements[] = {
-         {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-         {0, 8, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
-         D3DDECL_END()
-         };
-      if (FAILED(d3d->GetDevice()->CreateVertexDeclaration(elements, &vdecl)))
-         return false;
-      if (vdecl == NULL)
-         return false;
-   }
-   _vdecl[VDECL_XYC] = vdecl;
-   vdecl = NULL;
-   {
-      D3DVERTEXELEMENT9 elements[] = {
-         {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-         {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
-         D3DDECL_END()
-         };
-      if (FAILED(d3d->GetDevice()->CreateVertexDeclaration(elements, &vdecl)))
-         return false;
-      if (vdecl == NULL)
-         return false;
-   }
-   _vdecl[VDECL_XYUV] = vdecl;
-   vdecl = NULL;
-   {
-      D3DVERTEXELEMENT9 elements[] = {
-         {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-         {0, 8, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
-         {0, 16, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
-         D3DDECL_END()
-         };
-      if (FAILED(d3d->GetDevice()->CreateVertexDeclaration(elements, &vdecl)))
-         return false;
-      if (vdecl == NULL)
-         return false;
-   }
-   _vdecl[VDECL_XYUVC] = vdecl;
-   vdecl = NULL;
-   {
-      D3DVERTEXELEMENT9 elements[] = {
-         {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-         {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
-         {0, 20, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
-         D3DDECL_END()
-         };
-      if (FAILED(d3d->GetDevice()->CreateVertexDeclaration(elements, &vdecl)))
-         return false;
-      if (vdecl == NULL)
-         return false;
-   }
-   _vdecl[VDECL_XYZUVC] = vdecl;
-
-   return true;
-}
-
-bool D3DShaderPack::InitVertexShaders(D3DDevice *d3d)
-{
-   _vs.Allocate(VS_NUM);
-   _vs.Set(NULL);
-
-   {
-      char buf[] =
-         "struct VsInput {      float2 pos : POSITION; float4 col : COLOR; };\n"
-         "struct VsOutput { float4 pos : POSITION; float4 col : COLOR0; };\n"
-         "VsOutput main(VsInput vs_in) {\n"
-         "VsOutput vs_out;\n"
-              "vs_out.pos = float4(vs_in.pos, 0, 1);\n"
-         "vs_out.col = vs_in.col;\n"
-              "return vs_out;}";
-
-      _vs[VS_COPY_COLOR] = (LPDIRECT3DVERTEXSHADER9)
-         CompileShader(d3d, true, "CopyColor", buf, sizeof(buf) - 1);
-      if (_vs[VS_COPY_COLOR] == NULL)
-         return false;
-   }
-
-   {
-      char buf[] =
-         "struct VsInput {      float2 pos : POSITION; float2 tex : TEXCOORD0; };\n"
-         "struct VsOutput { float4 pos : POSITION; float2 tex : TEXCOORD0; };\n"
-         "VsOutput main(VsInput vs_in) {\n"
-         "VsOutput vs_out;\n"
-              "vs_out.pos = float4(vs_in.pos, 0, 1);\n"
-         "vs_out.tex = vs_in.tex;\n"
-              "return vs_out;}";
-
-      _vs[VS_COPY_UV] = (LPDIRECT3DVERTEXSHADER9)
-         CompileShader(d3d, true, "CopyUV", buf, sizeof(buf) - 1);
-      if (_vs[VS_COPY_UV] == NULL)
-         return false;
-   }
-
-   {
-      char buf[] =
-         "struct VsInput {      float2 pos : POSITION; float2 tex : TEXCOORD0; float4 col : COLOR; };\n"
-         "struct VsOutput { float4 pos : POSITION; float2 tex : TEXCOORD0; float4 col : COLOR0; };\n"
-         "VsOutput main(VsInput vs_in) {\n"
-         "VsOutput vs_out;\n"
-              "vs_out.pos = float4(vs_in.pos, 0, 1);\n"
-         "vs_out.tex = vs_in.tex;\n"
-         "vs_out.col = vs_in.col;\n"
-              "return vs_out;}";
-
-      _vs[VS_COPY_UV_COLOR] = (LPDIRECT3DVERTEXSHADER9)
-         CompileShader(d3d, true, "CopyUVColor", buf, sizeof(buf) - 1);
-      if (_vs[VS_COPY_UV_COLOR] == NULL)
-         return false;
-   }
-
-   {
-      char buf[] =
-         "struct VsInput {      float3 pos : POSITION; float2 tex : TEXCOORD0; float4 col : COLOR; };\n"
-         "struct VsOutput { float4 pos : POSITION; float2 tex : TEXCOORD0; float4 col : COLOR0; };\n"
-         "VsOutput main(VsInput vs_in) {\n"
-         "VsOutput vs_out;\n"
-              "vs_out.pos = float4(vs_in.pos, 1);\n"
-         "vs_out.tex = vs_in.tex;\n"
-         "vs_out.col = vs_in.col;\n"
-              "return vs_out;}";
-
-      _vs[VS_COPY_UV_COLOR_Z] = (LPDIRECT3DVERTEXSHADER9)
-         CompileShader(d3d, true, "CopyUVColorZ", buf, sizeof(buf) - 1);
-      if (_vs[VS_COPY_UV_COLOR_Z] == NULL)
-         return false;
-   }
-
-   return true;
-}
-
-bool D3DShaderPack::InitPixelShaders(D3DDevice *d3d)
-{
-   _ps.Allocate(PS_NUM);
-   _ps.Set(NULL);
-
-   {
-      char buf[] =
-         "struct VsOutput { float4 pos : POSITION; float4 col : COLOR0; };\n"
-         "float4 main(VsOutput ps_in) : COLOR0 {\n"
-         "return ps_in.col;}";
-
-      _ps[PS_COLOR] = (LPDIRECT3DPIXELSHADER9)
-         CompileShader(d3d, false, "Color", buf, sizeof(buf) - 1);
-      if (_ps[PS_COLOR] == NULL)
-         return false;
-   }
-
-   {
-      char buf[] =
-         "sampler Texture : register(s0);\n"
-         "struct VsOutput { float4 pos : POSITION; float2 tex : TEXCOORD0; };\n"
-         "float4 main(VsOutput ps_in) : COLOR0 {\n"
-         "return tex2D(Texture, ps_in.tex);}";
-
-      _ps[PS_TEX] = (LPDIRECT3DPIXELSHADER9)
-         CompileShader(d3d, false, "Tex", buf, sizeof(buf) - 1);
-      if (_ps[PS_TEX] == NULL)
-         return false;
-   }
-
-   {
-      char buf[] =
-         "sampler Texture : register(s0);\n"
-         "struct VsOutput { float4 pos : POSITION; float2 tex : TEXCOORD0; float4 col : COLOR0; };\n"
-         "float4 main(VsOutput ps_in) : COLOR0 {\n"
-         "return tex2D(Texture, ps_in.tex) * ps_in.col;}";
-
-      _ps[PS_TEX_COLOR_FILTER] = (LPDIRECT3DPIXELSHADER9)
-         CompileShader(d3d, false, "TexColorFilter", buf, sizeof(buf) - 1);
-      if (_ps[PS_TEX_COLOR_FILTER] == NULL)
-         return false;
-   }
-
-   {
-      char buf[] =
-         "sampler Texture : register(s1);\n"
-         "struct VsOutput { float4 pos : POSITION; float2 tex : TEXCOORD0; };\n"
-         "float4 main(VsOutput ps_in) : COLOR0 {\n"
-         "return tex2D(Texture, ps_in.tex);}";
-
-      _ps[PS_TEX_2] = (LPDIRECT3DPIXELSHADER9)
-         CompileShader(d3d, false, "Tex2", buf, sizeof(buf) - 1);
-      if (_ps[PS_TEX_2] == NULL)
-         return false;
-   }
-
-   return true;
-}
-
-void *D3DShaderPack::CompileShader(D3DDevice *d3d, bool make_vs,
-   const char *name, const char *buf, int size)
-{
-   LPD3DXBUFFER compiled_res = NULL;
-   LPD3DXBUFFER error_msgs = NULL;
-
-   HRESULT res = D3DXCompileShader(buf, size, NULL, NULL,
-      "main", make_vs ? "vs_2_0" : "ps_2_0",  // ?
-      0, &compiled_res, &error_msgs, NULL);
-
-   if (FAILED(res))
-   {
-      ERR("Shader %s compilation failed, code = %X", name, res);
-      if (error_msgs == NULL)
-         return NULL;
-      const char *mess = (const char *)error_msgs->GetBufferPointer();
-      ERR("Error output:\n%s", mess);
-      error_msgs->Release();
-      return NULL;
-   }
-
-   if (error_msgs != NULL)
-      error_msgs->Release();
-
-   void *res_ptr = NULL;
-   if (make_vs)
-   {
-      LPDIRECT3DVERTEXSHADER9 vs;
-      res = d3d->GetDevice()->CreateVertexShader((DWORD *)compiled_res->GetBufferPointer(), &vs);
-      res_ptr = (void *)vs;
-   }
-   else
-   {
-      LPDIRECT3DPIXELSHADER9 ps;
-      res = d3d->GetDevice()->CreatePixelShader((DWORD *)compiled_res->GetBufferPointer(), &ps);
-      res_ptr = (void *)ps;
-   }
-
-   compiled_res->Release();
-
-   if (FAILED(res))
-   {
-      WRN("Shader %s creation failed, code = %X", name, res);
-      return NULL;
-   }
-   return res_ptr;
-}
-
-bool D3DShaderPack::SetVDecl(D3DDevice *d3d, int id)
-{
-   if (id < 0 || id >= _vdecl.Length() || _vdecl[id] == NULL)
-      return false;
-   assert(d3d != NULL);
-   d3d->GetDevice()->SetVertexDeclaration(_vdecl[id]);
-   return true;
-}
-
-bool D3DShaderPack::SetVS(D3DDevice *d3d, int id)
-{
-   if (id < 0 || id >= _vs.Length() || _vs[id] == NULL)
-      return false;
-   assert(d3d != NULL);
-   d3d->GetDevice()->SetVertexShader(_vs[id]);
-   return true;
-}
-
-bool D3DShaderPack::SetPS(D3DDevice *d3d, int id)
-{
-   if (id < 0 || id >= _ps.Length() || _ps[id] == NULL)
-      return false;
-   assert(d3d != NULL);
-   d3d->GetDevice()->SetPixelShader(_ps[id]);
-   return true;
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h
deleted file mode 100644
index b865f78..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef __EVAS_DIRECT3D_SHADER_PACK_H__
-#define __EVAS_DIRECT3D_SHADER_PACK_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-class D3DDevice;
-
-class D3DShaderPack : virtual public Referenc
-{
-public:
-   ~D3DShaderPack();
-
-   static D3DShaderPack *Current();
-   static void SetCurrent(D3DShaderPack *obj);
-
-   bool Initialize(D3DDevice *d3d);
-   void Uninitialize();
-
-   bool SetVDecl(D3DDevice *d3d, int id);
-   bool SetVS(D3DDevice *d3d, int id);
-   bool SetPS(D3DDevice *d3d, int id);
-
-public:
-   enum VDECL
-   {
-      VDECL_XYC = 0,
-      VDECL_XYUV,
-      VDECL_XYUVC,
-      VDECL_XYZUVC,
-
-      VDECL_NUM
-   };
-
-   enum VS
-   {
-      VS_COPY_COLOR = 0,
-      VS_COPY_UV,
-      VS_COPY_UV_COLOR,
-      VS_COPY_UV_COLOR_Z,
-
-      VS_NUM
-   };
-
-   enum PS
-   {
-      PS_COLOR = 0,
-      PS_TEX,
-      PS_TEX_COLOR_FILTER,
-      PS_TEX_2,
-
-      PS_NUM
-   };
-
-private:
-   D3DShaderPack();
-
-   bool InitVertexDeclarations(D3DDevice *d3d);
-   bool InitVertexShaders(D3DDevice *d3d);
-   bool InitPixelShaders(D3DDevice *d3d);
-
-   void *CompileShader(D3DDevice *d3d, bool make_vs, const char *name,
-      const char *buf, int size);
-
-private:
-   TArray<LPDIRECT3DVERTEXDECLARATION9> _vdecl;
-   TArray<LPDIRECT3DVERTEXSHADER9> _vs;
-   TArray<LPDIRECT3DPIXELSHADER9> _ps;
-
-   static Ref<D3DShaderPack> _this;
-};
-
-#endif  // __EVAS_DIRECT3D_SHADER_PACK_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp
deleted file mode 100644
index 8d3dd45..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-
-//#define ENABLE_LOG_PRINTF
-
-#include "evas_direct3d_vertex_buffer_cache.h"
-#include "evas_direct3d_device.h"
-
-#include <assert.h>
-
-
-Ref<D3DVertexBufferCache> D3DVertexBufferCache::_this;
-
-D3DVertexBufferCache::D3DVertexBufferCache()
-{
-   size_border_low = 0.6;  // We can reuse buffer on 60%
-   size_border_high = 0.2;  // We can reallocate the buffer on 20%
-}
-
-D3DVertexBufferCache::~D3DVertexBufferCache()
-{
-   Uninitialize();
-}
-
-D3DVertexBufferCache *D3DVertexBufferCache::Current()
-{
-   if (_this.IsNull())
-      _this = new D3DVertexBufferCache();
-   return _this;
-}
-
-void D3DVertexBufferCache::SetCurrent(D3DVertexBufferCache *obj)
-{
-   _this = obj;
-}
-
-void D3DVertexBufferCache::Uninitialize()
-{
-   for (int i = 0; i < _cache.Length(); i++)
-   {
-      assert(_cache[i].vb != NULL);
-      _cache[i].vb->Release();
-   }
-   _cache.Resize();
-}
-
-bool D3DVertexBufferCache::InitBuffer(D3DDevice *d3d, BYTE *data, int size, CacheEntryInfo &info)
-{
-   assert(d3d != NULL);
-   assert(data != NULL);
-   assert(size > 0);
-
-   int best = FindBestEntry(size);
-   CacheEntry *ce = NULL;
-
-   // Reallocate
-   if (best >= 0 && _cache[best].size < size)
-   {
-      DeleteEntry(best);
-      best = -1;
-   }
-
-   // New
-   if (best < 0)
-   {
-      CacheEntry new_entry;
-      if (!CreateEntry(d3d, new_entry, size))
-      {
-        WRN("Failed to create new vbcache entry");
-         return false;
-      }
-      _cache.Add(new_entry);
-      info.id = _cache.Length() - 1;
-      ce = _cache.Last();
-   }
-   else
-   {
-      info.id = best;
-      ce = &_cache[best];
-   }
-
-   assert(ce != NULL);
-   if (!InsertData(*ce, data, size))
-   {
-      WRN("Failed to insert vbcache data");
-      return false;
-   }
-   return true;
-}
-
-bool D3DVertexBufferCache::SelectBufferToDevice(D3DDevice *device, int id, int vertex_size)
-{
-   if (id < 0 || id >= _cache.Length())
-      return false;
-   return SUCCEEDED(device->GetDevice()->SetStreamSource(0, _cache[id].vb, 0, vertex_size));
-}
-
-int D3DVertexBufferCache::FindBestEntry(int size)
-{
-   // Search for buffer that fits in borders
-   for (int i = 0; i < _cache.Length(); i++)
-   {
-      const int vs = _cache[i].size;
-      if (size >= (vs - FLOAT(vs) * size_border_low) && size <= vs)
-         return i;
-   }
-   bool less_than_all = true;
-   for (int i = 0; i < _cache.Length(); i++)
-   {
-      const int vs = _cache[i].size;
-      if (size >= (vs - FLOAT(vs) * size_border_low))
-         less_than_all = false;
-   }
-   // Requested size is too small to reuse in any buffer
-   if (less_than_all)
-      return -1;
-   // Search for buffer that can be reallocated
-   for (int i = 0; i < _cache.Length(); i++)
-   {
-      const int vs = _cache[i].size;
-      if (size <= (vs + FLOAT(vs) * size_border_high))
-         return i;
-   }
-   // No buffer can be reused or reallocated, create a new one
-   return -1;
-}
-
-bool D3DVertexBufferCache::CreateEntry(D3DDevice *d3d, CacheEntry &entry, int size)
-{
-   assert(d3d != NULL);
-   if (FAILED(d3d->GetDevice()->CreateVertexBuffer(size, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY,
-      0, D3DPOOL_DEFAULT, &entry.vb, NULL)))
-   {
-      return false;
-   }
-   entry.size = size;
-   return true;
-}
-
-void D3DVertexBufferCache::DeleteEntry(int id)
-{
-   if (id < 0 || id >= _cache.Length())
-      return;
-   assert(_cache[id].vb != NULL);
-   _cache[id].vb->Release();
-   _cache.Replace(id);
-}
-
-bool D3DVertexBufferCache::InsertData(CacheEntry &entry, BYTE *data, int size)
-{
-   BYTE *ptr = NULL;
-   if (FAILED(entry.vb->Lock(0, size, (void **)&ptr, D3DLOCK_DISCARD)))
-      return false;
-   CopyMemory(ptr, data, size);
-   return SUCCEEDED(entry.vb->Unlock());
-}
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h b/libraries/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h
deleted file mode 100644
index 822ac80..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __EVAS_DIRECT3D_VERTEX_BUFFER_CACHE_H__
-#define __EVAS_DIRECT3D_VERTEX_BUFFER_CACHE_H__
-
-#include "evas_engine.h"
-
-#include "ref.h"
-#include "array.h"
-
-class D3DDevice;
-
-class D3DVertexBufferCache : virtual public Referenc
-{
-public:
-   struct CacheEntryInfo
-   {
-      int id;
-   };
-
-public:
-   ~D3DVertexBufferCache();
-
-   static D3DVertexBufferCache *Current();
-   static void SetCurrent(D3DVertexBufferCache *obj);
-
-   inline void SetSizeBorders(FLOAT low, FLOAT high);
-
-   bool InitBuffer(D3DDevice *d3d, BYTE *data, int size, CacheEntryInfo &info);
-   bool SelectBufferToDevice(D3DDevice *device, int id, int vertex_size);
-   void Uninitialize();
-
-private:
-   struct CacheEntry
-   {
-      LPDIRECT3DVERTEXBUFFER9 vb;
-      int size;
-   };
-
-private:
-   D3DVertexBufferCache();
-
-   int FindBestEntry(int size);
-   bool CreateEntry(D3DDevice *d3d, CacheEntry &entry, int size);
-   void DeleteEntry(int id);
-   bool InsertData(CacheEntry &entry, BYTE *data, int size);
-
-private:
-   TArray<CacheEntry> _cache;
-   FLOAT size_border_low;
-   FLOAT size_border_high;
-
-   static Ref<D3DVertexBufferCache> _this;
-};
-
-void D3DVertexBufferCache::SetSizeBorders(FLOAT low, FLOAT high)
-{
-   size_border_low = low;
-   size_border_high = high;
-}
-
-#endif  // __EVAS_DIRECT3D_VERTEX_BUFFER_CACHE_H__
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_engine.c b/libraries/evas/src/modules/engines/direct3d/evas_engine.c
deleted file mode 100644
index f7722d8..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_engine.c
+++ /dev/null
@@ -1,503 +0,0 @@
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_engine.h"
-#include "evas_private.h"
-#include "Evas_Engine_Direct3D.h"
-
-#undef EAPI
-#define EAPI __declspec(dllexport)
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine
-{
-   Direct3DDeviceHandler d3d;
-   int width, height;
-   int end : 1;
-   int in_redraw : 1;
-};
-
-int _evas_engine_direct3d_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-//////////////////////////////////////////////////////////////////////////////
-// Prototypes
-
-static void *eng_info(Evas *e);
-static void  eng_info_free(Evas *e, void *info);
-static int   eng_setup(Evas *e, void *info);
-static void  eng_output_free(void *data);
-static void  eng_output_resize(void *data, int width, int height);
-
-//////////////////////////////////////////////////////////////////////////////
-// Init / shutdown methods
-//
-
-static void *
-_output_setup(int width, int height, int rotation, HWND window, int depth, int fullscreen)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-   
-   if ((re->d3d = evas_direct3d_init(window, depth, fullscreen)) == 0)
-     {
-     free(re);
-     return NULL;
-     }
-
-   re->width = width;
-   re->height = height;
-
-   return re;
-}
-
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_Direct3D *info;
-   info = (Evas_Engine_Info_Direct3D *)calloc(1, sizeof(Evas_Engine_Info_Direct3D));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   memset(&info->info, 0, sizeof(info->info));
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e, void *info)
-{
-   Evas_Engine_Info_Direct3D *in;
-   in = (Evas_Engine_Info_Direct3D *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *info)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_Direct3D *in;
-   re = (Render_Engine *)e->engine.data.output;   
-   in = (Evas_Engine_Info_Direct3D *)info;
-   if (!e->engine.data.output)
-     {
-        e->engine.data.output = _output_setup(e->output.w,
-                                              e->output.h,
-                                              in->info.rotation,
-                                              in->info.window,
-                                              in->info.depth,
-                                              in->info.fullscreen);
-     }
-   else if (in->info.fullscreen != 0)
-   {
-      if (re)
-         evas_direct3d_set_layered(re->d3d, 0, 0, 0, NULL);
-      evas_direct3d_set_fullscreen(re->d3d, -1, -1, 1);
-   }
-   else if (in->info.fullscreen == 0)
-   {
-      evas_direct3d_set_fullscreen(re->d3d, re->width, re->height, 0);
-      if (re && in->info.layered == 0)
-         evas_direct3d_set_layered(re->d3d, 0, 0, 0, NULL);
-      else if (re && in->info.layered != 0 && in->shape)
-         evas_direct3d_set_layered(re->d3d, 1, in->shape->width, in->shape->height, in->shape->mask);
-   }
-
-   if (!e->engine.data.output)
-     return 0;
-   if (!e->engine.data.context)
-     e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-
-   evas_direct3d_free(re->d3d);
-
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Context
-//
-
-static void
-eng_context_color_set(void *data, void *context, int r, int g, int b, int a)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_context_color_set(re->d3d, r, g, b, a);
-
-   evas_common_draw_context_set_color(context, r, g, b, a);
-}
-
-static void
-eng_context_multiplier_set(void *data, void *context, int r, int g, int b, int a)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_context_set_multiplier(re->d3d, 255, 255, 255, a);
-
-   evas_common_draw_context_set_multiplier(context, r, g, b, a);
-}
-
-static void
-eng_context_multiplier_unset(void *data, void *context)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_context_set_multiplier(re->d3d, 255, 255, 255, 255);
-
-   evas_common_draw_context_unset_multiplier(context);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Output manipulating
-//
-
-static void
-eng_output_resize(void *data, int width, int height)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   re->width = width;
-   re->height = height;
-   evas_direct3d_resize(re->d3d, width, height);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int width, int height)
-{
-   Render_Engine *re = (Render_Engine *)data;
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int width, int height)
-{
-   Render_Engine *re = (Render_Engine *)data;
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h,
-  int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-     re->end = 0;
-     re->in_redraw = 0;
-     return NULL;
-     }
-
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = 800;  //re->d3d.width;
-   if (h) *h = 600;  //re->d3d.height;
-   if (cx) *cx = 0;
-   if (cy) *cy = 0;
-   if (cw) *cw = 800;  //re->d3d.width;
-   if (ch) *ch = 600;  //re->d3d.height;
-
-   re->in_redraw = 1;
-
-   return re;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface,
-  int x, int y, int w, int h)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   re->end = 1;
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_render_all(re->d3d);
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-// Draw objects
-//
-
-static void
-eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   if (re->in_redraw == 0)
-      return;
-   evas_direct3d_line_draw(re->d3d, x1, y1, x2, y2);
-}
-
-static void
-eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   if (re->in_redraw == 0)
-      return;
-   evas_direct3d_rectangle_draw(re->d3d, x, y, w, h);
-}
-
-static void *
-eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   *error = 0;
-   return evas_direct3d_image_load(re->d3d, file, key, NULL, lo);
-}
-
-static void *
-eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   return evas_direct3d_image_new_from_data(re->d3d, w, h, image_data, alpha, cspace);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   return evas_direct3d_image_new_from_copied_data(re->d3d, w, h, image_data, alpha, cspace);
-}
-
-static void
-eng_image_free(void *data, void *image)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_image_free(re->d3d, image);
-}
-
-static void *
-eng_image_data_put(void *data, void *image, DATA32 *image_data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_image_data_put(re->d3d, image, image_data);
-   return image;
-}
-
-static void *
-eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
-{
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_image_data_get(re->d3d, image, to_write, image_data);
-   if (err) *err = EVAS_LOAD_ERROR_NONE;
-   return image;
-}
-
-static void
-eng_image_draw(void *data, void *context, void *surface, void *image,
-   int src_x, int src_y, int src_w, int src_h,
-   int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_image_draw(re->d3d, image,
-      src_x, src_y, src_w, src_h,
-      dst_x, dst_y, dst_w, dst_h, smooth);
-}
-
-static void
-eng_image_size_get(void *data, void *image, int *w, int *h)
-{
-   evas_direct3d_image_size_get(image, w, h);
-}
-
-static int
-eng_image_alpha_get(void *data, void *image)
-{
-   // Hm:)
-   if (!image)
-      return 1;
-   return 0;
-}
-
-static int
-eng_image_colorspace_get(void *data, void *image)
-{
-   // Well, change that when you think about other colorspace
-   return EVAS_COLORSPACE_ARGB8888;
-}
-
-static void *
-eng_image_border_set(void *data, void *image, int l, int r, int t, int b)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_image_border_set(re->d3d, image, l, t, r, b);
-   return image;
-}
-
-static void
-eng_image_border_get(void *data, void *image, int *l, int *r, int *t, int *b)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_direct3d_image_border_get(re->d3d, image, l, t, r, b);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-}
-
-static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w, int h, int ow, int oh, const Evas_Text_Props *intl_props)
-{
-   Render_Engine *re = (Render_Engine *)data;
-        RGBA_Image im;
-   im.image.data = NULL;
-   im.cache_entry.w = re->width;
-   im.cache_entry.h = re->height;
-
-   evas_direct3d_select_or_create_font(re->d3d, font);
-
-   evas_common_draw_context_font_ext_set(context, re->d3d,
-      evas_direct3d_font_texture_new,
-      evas_direct3d_font_texture_free,
-      evas_direct3d_font_texture_draw);
-   evas_common_font_draw(&im, context, (RGBA_Font *) font, x, y, intl_props);
-   evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
-}
-
-static void
-eng_font_free(void *data, void *font)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   evas_common_font_free(font);
-   evas_direct3d_font_free(re->d3d, font);
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-    /* Initialize the log domain */
-   _evas_engine_direct3d_log_dom = eina_log_domain_register
-     ("evas-direct3d", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_direct3d_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(context_color_set);
-   ORD(context_multiplier_set);
-   ORD(context_multiplier_unset);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(line_draw);
-   ORD(rectangle_draw);
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_free);
-   ORD(image_data_put);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_draw);
-   ORD(image_size_get);
-   ORD(image_alpha_get);
-   ORD(image_colorspace_get);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(font_draw);
-   ORD(font_free);
-
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-
-//   ORD(image_map_draw);
-//   ORD(image_map_surface_new);
-//   ORD(image_map_surface_free);
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-  eina_log_domain_unregister(_evas_engine_direct3d_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-  EVAS_MODULE_API_VERSION,
-  "direct3d",
-  "none",
-  {
-    module_open,
-    module_close
-  }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, direct3d);
-
-#ifndef EVAS_STATIC_BUILD_DIRECT3D
-EVAS_EINA_MODULE_DEFINE(engine, direct3d);
-#endif
diff --git a/libraries/evas/src/modules/engines/direct3d/evas_engine.h b/libraries/evas/src/modules/engines/direct3d/evas_engine.h
deleted file mode 100644
index da1ebff..0000000
--- a/libraries/evas/src/modules/engines/direct3d/evas_engine.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef __EVAS_ENGINE_H__
-#define __EVAS_ENGINE_H__
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <d3d9.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EVAS_INLINE_ARRAY_H  // We dont need that and it is buggy
-
-#include "evas_common.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-
-//#define ENABLE_LOG_PRINTF
-
-extern int _evas_engine_direct3d_log_dom ;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_direct3d_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_direct3d_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_direct3d_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_direct3d_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_direct3d_log_dom, __VA_ARGS__)
-
-#ifdef ENABLE_LOG_PRINTF
-#define Log(str, ...) INF("D3D "str, __VA_ARGS__)
-#else
-#define Log(str, ...)
-#endif
-
-typedef void * Direct3DDeviceHandler;
-typedef void * Direct3DImageHandler;
-typedef void * Direct3DFontGlyphHandler;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Main engine functions
-
-Direct3DDeviceHandler evas_direct3d_init(HWND window, int depth, int fullscreen);
-void         evas_direct3d_free(Direct3DDeviceHandler d3d);
-void         evas_direct3d_render_all(Direct3DDeviceHandler d3d);
-void         evas_direct3d_resize(Direct3DDeviceHandler d3d, int width, int height);
-void         evas_direct3d_set_fullscreen(Direct3DDeviceHandler d3d,
-   int width, int height, int fullscreen);
-void         evas_direct3d_set_layered(Direct3DDeviceHandler d3d, int layered,
-   int mask_width, int mask_height, unsigned char *mask);
-
-
-// Context manipulations
-
-void         evas_direct3d_context_color_set(Direct3DDeviceHandler d3d, int r, int g, int b, int a);
-void         evas_direct3d_context_set_multiplier(Direct3DDeviceHandler d3d, int r, int g, int b, int a);
-
-// Simple objects
-
-void         evas_direct3d_line_draw(Direct3DDeviceHandler d3d, int x1, int y1, int x2, int y2);
-void         evas_direct3d_rectangle_draw(Direct3DDeviceHandler d3d, int x, int y, int w, int h);
-
-// Images
-
-Direct3DImageHandler evas_direct3d_image_load(Direct3DDeviceHandler d3d,
-   const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo);
-Direct3DImageHandler evas_direct3d_image_new_from_data(Direct3DDeviceHandler d3d,
-   int w, int h, DWORD *image_data, int alpha, int cspace);
-Direct3DImageHandler evas_direct3d_image_new_from_copied_data(Direct3DDeviceHandler d3d,
-   int w, int h, DWORD *image_data, int alpha, int cspace);
-void evas_direct3d_image_free(Direct3DDeviceHandler d3d, Direct3DImageHandler image);
-void evas_direct3d_image_data_put(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   DWORD *image_data);
-void evas_direct3d_image_data_get(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int to_write, DATA32 **image_data);
-void evas_direct3d_image_draw(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int src_x, int src_y, int src_w, int src_h,
-   int dst_x, int dst_y, int dst_w, int dst_h, int smooth);
-void evas_direct3d_image_size_get(Direct3DImageHandler image, int *w, int *h);
-void evas_direct3d_image_border_set(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int l, int r, int t, int b);
-void evas_direct3d_image_border_get(Direct3DDeviceHandler d3d, Direct3DImageHandler image,
-   int *l, int *r, int *t, int *b);
-
-// Fonts
-
-Direct3DFontGlyphHandler evas_direct3d_font_texture_new(Direct3DDeviceHandler d3d,
-   RGBA_Font_Glyph *fg);
-void evas_direct3d_font_texture_free(Direct3DFontGlyphHandler ft);
-void evas_direct3d_font_texture_draw(Direct3DDeviceHandler d3d, void *dest, void *context,
-   RGBA_Font_Glyph *fg, int x, int y);
-void evas_direct3d_select_or_create_font(Direct3DDeviceHandler d3d, void *font);
-void evas_direct3d_font_free(Direct3DDeviceHandler d3d, void *font);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __EVAS_ENGINE_H__ */
diff --git a/libraries/evas/src/modules/engines/direct3d/ref.h b/libraries/evas/src/modules/engines/direct3d/ref.h
deleted file mode 100644
index 0853f2e..0000000
--- a/libraries/evas/src/modules/engines/direct3d/ref.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef __REF_H__
-#define __REF_H__
-
-//////////////////////////////////////////////////////////////////////////////
-// class Referenc
-// Desc: Base class enabling reference interface
-// Note: Class should derive as virtual
-//
-class Referenc
-{
-public:
-   Referenc()
-      : refs_count(0) {};
-
-   inline int AddRef()
-   {
-      return ++refs_count;
-   }
-   inline int RemRef()
-   {
-      return --refs_count;
-   }
-   inline int RefCount()
-   {
-      return refs_count;
-   }
-
-private:
-   int refs_count;
-};
-
-
-//////////////////////////////////////////////////////////////////////////////
-// template Ref
-// Desc: Holder in smart-pointers system.
-// Important: Only Referenc subclasses may be used as template param.
-//
-
-template <class T>
-class Ref
-{
-public:
-   // Constructors & destructor
-   Ref();
-   //Ref(Ref<T> &ref);
-   Ref(const Ref<T> &ref);
-   Ref(T *ptr);
-   Ref(const T *ptr);
-   ~Ref();
-
-   Ref<T> &operator =(Ref<T> &ref);
-   Ref<T> &operator =(T *ptr);
-
-   inline T *Addr();
-   inline T *Addr() const;
-   inline int RefCount();
-   inline bool IsNull();
-
-   inline T *operator ->();
-   inline operator const T *() const;
-   inline operator T *();
-
-//private:
-   void RemRef();
-
-private:
-   T *m_ptr;
-};
-
-//////////////////////////////////////////////////////////////////////////////
-// Constructors & destructor
-template <class T> Ref<T>::Ref()
-: m_ptr(NULL)
-{
-}
-
-//template <class T> Ref<T>::Ref(Ref<T> &ref)
-//: m_ptr(NULL)
-//{
-//   if (ref.Addr() != NULL)
-//   {
-//      m_ptr = ref.Addr();
-//      ((Referenc *)m_ptr)->AddRef();
-//   }
-//}
-
-template <class T> Ref<T>::Ref(const Ref<T> &ref)
-: m_ptr(NULL)
-{
-   if (ref.Addr() != NULL)
-   {
-      m_ptr = ref.Addr();
-      ((Referenc *)m_ptr)->AddRef();
-   }
-}
-
-template <class T> Ref<T>::Ref(T *ptr)
-: m_ptr(NULL)
-{
-   if (ptr != NULL)
-   {
-      m_ptr = ptr;
-      ((Referenc *)m_ptr)->AddRef();
-   }
-}
-
-template <class T> Ref<T>::Ref(const T *ptr)
-: m_ptr(NULL)
-{
-   if (ptr != NULL)
-   {
-      m_ptr = ptr;
-      ((Referenc *)m_ptr)->AddRef();
-   }
-}
-
-template <class T> Ref<T>::~Ref()
-{
-   if (m_ptr == NULL)
-      return;
-   RemRef();
-}
-
-// Check pointer on correctness
-template <class T> bool Ref<T>::IsNull()
-{
-   return (m_ptr == NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Operators
-
-template <class T> Ref<T> &Ref<T>::operator =(T *ptr)
-{
-   if (ptr != NULL)
-   {
-      if (m_ptr != ptr)
-      {
-         RemRef();
-         m_ptr = ptr;
-         ((Referenc *)m_ptr)->AddRef();
-      }
-   }
-   else if (m_ptr != NULL)
-      RemRef();
-   return *this;
-}
-
-template <class T> Ref<T> &Ref<T>::operator =(Ref<T> &ref)
-{
-   if (ref.Addr() != NULL)
-   {
-      if (m_ptr != ref.Addr())
-      {
-         RemRef();
-         m_ptr = ref.Addr();
-         ((Referenc *)m_ptr)->AddRef();
-      }
-   }
-   else if (m_ptr != NULL)
-      RemRef();
-   return *this;
-}
-
-// Get pointer
-template <class T> T *Ref<T>::Addr()
-{
-   return m_ptr;
-}
-
-template <class T> T *Ref<T>::Addr() const
-{
-   return m_ptr;
-}
-
-// Get refs count
-template <class T> int Ref<T>::RefCount()
-{
-   if (m_ptr == NULL)
-      return 0;
-   return ((Referenc *)m_ptr)->RefCount();
-}
-
-// Remove ref to the object and delete it if necessary
-// WARNING: arrays cannot be deleted
-template <class T> void Ref<T>::RemRef()
-{
-   if (m_ptr == NULL)
-      return;
-   if (((Referenc *)m_ptr)->RemRef() == 0)
-      delete m_ptr;
-   m_ptr = NULL;
-}
-
-template <class T> T *Ref<T>::operator ->()
-{
-   return m_ptr;
-}
-
-template <class T> Ref<T>::operator const T *() const
-{
-   return m_ptr;
-}
-
-template <class T> Ref<T>::operator T *()
-{
-   return m_ptr;
-}
-
-#endif  // __REF_H__
diff --git a/libraries/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h b/libraries/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h
deleted file mode 100644
index 53352b7..0000000
--- a/libraries/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _EVAS_ENGINE_DIRECTFB_H
-#define _EVAS_ENGINE_DIRECTFB_H
-
-#include <Evas.h>
-#include <directfb.h>
-
-typedef struct _Evas_Engine_Info_DirectFB Evas_Engine_Info_DirectFB;
-
-struct _Evas_Engine_Info_DirectFB
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct Evas_Engine_DirectFB_Spec {
-      IDirectFB                 *dfb;
-      IDirectFBSurface          *surface;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-#endif
-
-
diff --git a/libraries/evas/src/modules/engines/directfb/Makefile.am b/libraries/evas/src/modules/engines/directfb/Makefile.am
deleted file mode 100644
index 967e594..0000000
--- a/libraries/evas/src/modules/engines/directfb/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_directfb_cflags@
-
-if BUILD_ENGINE_DIRECTFB
-
-DIRECTFB_SOURCES = evas_engine.c polygon.c
-DIRECTFB_LIBADD = @evas_engine_directfb_libs@
-
-
-includes_HEADERS = Evas_Engine_DirectFB.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_DIRECTFB
-
-pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES  = $(DIRECTFB_SOURCES)
-
-module_la_LIBADD = @EINA_LIBS@ $(DIRECTFB_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_directfb.la
-
-libevas_engine_directfb_la_SOURCES = $(DIRECTFB_SOURCES)
-libevas_engine_directfb_la_LIBADD = $(DIRECTFB_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/directfb/Makefile.in b/libraries/evas/src/modules/engines/directfb/Makefile.in
deleted file mode 100644
index 7d642c9..0000000
--- a/libraries/evas/src/modules/engines/directfb/Makefile.in
+++ /dev/null
@@ -1,808 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/directfb
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_TRUE@libevas_engine_directfb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_directfb_la_SOURCES_DIST = evas_engine.c polygon.c
-@BUILD_ENGINE_DIRECTFB_TRUE@am__objects_1 = evas_engine.lo polygon.lo
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_TRUE@am_libevas_engine_directfb_la_OBJECTS = $(am__objects_1)
-libevas_engine_directfb_la_OBJECTS =  \
-        $(am_libevas_engine_directfb_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_TRUE@am_libevas_engine_directfb_la_rpath =
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@  $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c polygon.c
-@BUILD_ENGINE_DIRECTFB_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_DIRECTFB_TRUE@    module_la-polygon.lo
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_directfb_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_directfb_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_DirectFB.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_directfb_cflags@
-
-@BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_SOURCES = evas_engine.c polygon.c
-@BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_LIBADD = @evas_engine_directfb_libs@
-@BUILD_ENGINE_DIRECTFB_TRUE@includes_HEADERS = Evas_Engine_DirectFB.h
-@BUILD_ENGINE_DIRECTFB_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@module_la_SOURCES = $(DIRECTFB_SOURCES)
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@module_la_LIBADD = @EINA_LIBS@ $(DIRECTFB_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@module_la_LDFLAGS = -module -avoid-version
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_TRUE@noinst_LTLIBRARIES = libevas_engine_directfb.la
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_TRUE@libevas_engine_directfb_la_SOURCES = $(DIRECTFB_SOURCES)
-@BUILD_ENGINE_DIRECTFB_TRUE@@EVAS_STATIC_BUILD_DIRECTFB_TRUE@libevas_engine_directfb_la_LIBADD = $(DIRECTFB_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/directfb/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/directfb/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_directfb.la: $(libevas_engine_directfb_la_OBJECTS) $(libevas_engine_directfb_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_directfb_la_rpath) $(libevas_engine_directfb_la_OBJECTS) $(libevas_engine_directfb_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-polygon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polygon.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-polygon.lo: polygon.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-polygon.lo -MD -MP -MF $(DEPDIR)/module_la-polygon.Tpo -c -o module_la-polygon.lo `test -f 'polygon.c' || echo '$(srcdir)/'`polygon.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-polygon.Tpo $(DEPDIR)/module_la-polygon.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='polygon.c' object='module_la-polygon.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-polygon.lo `test -f 'polygon.c' || echo '$(srcdir)/'`polygon.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/directfb/evas_engine.c b/libraries/evas/src/modules/engines/directfb/evas_engine.c
deleted file mode 100644
index 5347d2d..0000000
--- a/libraries/evas/src/modules/engines/directfb/evas_engine.c
+++ /dev/null
@@ -1,1754 +0,0 @@
-#include <assert.h>
-#include <math.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include "evas_engine.h"
-#include "evas_common.h" /* Also includes international specific stuff */
-
-/* Uses Evas own image_draw primitive, for comparison purposes only. */
-//#define DFB_USE_EVAS_IMAGE_DRAW 1
-//#define DFB_USE_EVAS_RECT_DRAW 1
-//#define DFB_USE_EVAS_POLYGON_DRAW 1
-//#define DFB_UPDATE_INDIVIDUAL_RECTS 1
-#define DFB_FLIP_FLAGS DSFLIP_NONE
-//#define DFB_FLIP_FLAGS (DSFLIP_ONSYNC | DSFLIP_WAIT)
-
-/* Turn on debug */
-//#define DFB_DEBUG_IMAGE 1
-//#define DFB_DEBUG_FLAGS 1
-//#define DFB_DEBUG_ACCELERATION 1
-int _evas_engine_directfb_log_dom = -1;
-
-static Evas_Func func = {};
-static Evas_Func parent_func = {};
-static IDirectFB *dfb = NULL; /* XXX HACK to work around evas image cache
-                               * lack of extra data. Fix it instead later.
-                               */
-
-
-/***********************************************************************
- * Evas helpers
- **********************************************************************/
-static void
-_context_get_color(RGBA_Draw_Context *dc, int *r, int *g, int *b, int *a)
-{
-   DATA32 col;
-
-   if (dc->mul.use)
-     col = dc->mul.col;
-   else
-     col = dc->col.col;
-
-   *r = R_VAL(&col);
-   *g = G_VAL(&col);
-   *b = B_VAL(&col);
-   *a = A_VAL(&col);
-}
-
-
-/***********************************************************************
- * DirectFB helpers
- **********************************************************************/
-static void
-_dfb_surface_clear(IDirectFBSurface *surface, int x, int y, int w, int h)
-{
-   DFBRegion cr;
-   DFBResult r;
-
-   cr.x1 = x;
-   cr.y1 = y;
-   cr.x2 = x + w - 1;
-   cr.y2 = y + h - 1;
-   r = surface->SetClip(surface, &cr);
-   if (r != DFB_OK)
-     goto error;
-
-   r = surface->Clear(surface, 0, 0, 0, 0);
-   if (r != DFB_OK)
-     goto error;
-
-   return;
-
- error:
-   ERR("DirectFB: could not clear surface: %s",
-         DirectFBErrorString(r));
-}
-
-static void
-_image_clear(DirectFB_Engine_Image_Entry *image, int x, int y, int w, int h)
-{
-   if (image->cache_entry.src->flags.alpha)
-     _dfb_surface_clear(image->surface, x, y, w, h);
-}
-
-static void
-_image_autoset_alpha(DirectFB_Engine_Image_Entry *image)
-{
-   DFBResult r;
-   DFBSurfacePixelFormat fmt;
-   IDirectFBSurface *surface;
-   RGBA_Image *im;
-   int has_alpha;
-
-   surface = image->surface;
-   r = surface->GetPixelFormat(surface, &fmt);
-   if (r != DFB_OK)
-     {
-       ERR("Could not get pixel format: %s",
-                DirectFBErrorString(r));
-        return;
-     }
-
-   /* XXX: check this in more depth in future, if other PF are supported */
-   image->cache_entry.src->flags.alpha = (fmt == DSPF_ARGB);
-}
-
-static void
-_dfb_surface_update(IDirectFBSurface *surface, int x, int y, int w, int h)
-{
-   DFBRegion cr;
-   DFBResult r;
-
-   cr.x1 = x;
-   cr.y1 = y;
-   cr.x2 = x + w - 1;
-   cr.y2 = y + h - 1;
-   r = surface->Flip(surface, &cr, DSFLIP_NONE);
-   if (r != DFB_OK)
-     WRN("Could not update surface: %s",
-           DirectFBErrorString(r));
-}
-
-static IDirectFBSurface *
-_dfb_surface_from_data(IDirectFB *dfb, int w, int h, void *data)
-{
-   IDirectFBSurface *s;
-   DFBSurfaceDescription desc;
-   DFBResult r;
-
-   desc.flags = (DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT |
-                 DSDESC_PIXELFORMAT | DSDESC_PREALLOCATED);
-   desc.caps = DSCAPS_PREMULTIPLIED;
-   desc.width = w;
-   desc.height = h;
-   desc.preallocated[0].data = data;
-   desc.preallocated[0].pitch = w * 4;
-   desc.preallocated[1].data = NULL;
-   desc.preallocated[1].pitch = 0;
-   desc.pixelformat = DSPF_ARGB;
-   r = dfb->CreateSurface(dfb, &desc, &s);
-   if (r != DFB_OK)
-     {
-        ERR("Cannot create DirectFB surface: %s",
-                     DirectFBErrorString(r));
-        return NULL;
-     }
-
-   s->SetPorterDuff(s, DSPD_SRC_OVER);
-
-   return s;
-}
-
-static void
-_dfb_surface_free(IDirectFBSurface *surface)
-{
-   if (surface)
-     surface->Release(surface);
-}
-
-static void
-_dfb_blit_accel_caps_print(IDirectFBSurface *dst, IDirectFBSurface *src)
-{
-#ifdef DFB_DEBUG_ACCELERATION
-   DFBAccelerationMask mask;
-   DFBResult r;
-
-   r = dst->GetAccelerationMask(dst, src, &mask);
-   if (r != DFB_OK)
-     {
-        ERR("Could not retrieve acceleration mask: %s",
-                DirectFBErrorString(r));
-        return;
-     }
-
-   DBG("Acceleration: ");
-
-#define O(m) if (mask & m) DBG(#m " ")
-   O(DFXL_FILLRECTANGLE);
-   O(DFXL_DRAWRECTANGLE);
-   O(DFXL_DRAWLINE);
-   O(DFXL_FILLTRIANGLE);
-   O(DFXL_BLIT);
-   O(DFXL_STRETCHBLIT);
-   O(DFXL_TEXTRIANGLES);
-   O(DFXL_DRAWSTRING);
-#undef O
-
-   if (mask == DFXL_NONE) DBG("<NONE>");
-#endif /* DFB_DEBUG_ACCELERATION */
-}
-
-#ifdef DFB_DEBUG_FLAGS
-static const char *
-_dfb_blit_flags_str(DFBSurfaceBlittingFlags flags)
-{
-   static char buf[1024];
-
-   buf[0] = 0;
-
-#define T(m, n)                                 \
-   do {                                         \
-      if (flags & m) {                          \
-         if (buf[0] != 0) strcat(buf, " | ");   \
-         strcat(buf, n);                        \
-      }                                         \
-   } while (0)
-
-   T(DSBLIT_BLEND_ALPHACHANNEL, "BLEND_ALPHACHANNEL");
-   T(DSBLIT_BLEND_COLORALPHA, "BLEND_COLORALPHA");
-   T(DSBLIT_COLORIZE, "COLORIZE");
-   T(DSBLIT_SRC_COLORKEY, "SRC_COLORKEY");
-   T(DSBLIT_DST_COLORKEY, "DST_COLORKEY");
-   T(DSBLIT_SRC_PREMULTIPLY, "SRC_PREMULTIPLY");
-   T(DSBLIT_DST_PREMULTIPLY, "DST_PREMULTIPLY");
-   T(DSBLIT_DEMULTIPLY, "DEMULTIPLY");
-   T(DSBLIT_DEINTERLACE, "DSBLIT_DEINTERLACE");
-   T(DSBLIT_SRC_PREMULTCOLOR, "SRC_PREMULTCOLOR");
-   T(DSBLIT_XOR, "XOR");
-   T(DSBLIT_INDEX_TRANSLATION, "INDEX_TRANSLATION");
-#undef T
-
-   if (buf[0] == 0)
-     strcpy(buf, "NOFX");
-
-   return buf;
-}
-
-static const char *
-_dfb_draw_flags_str(DFBSurfaceDrawingFlags flags)
-{
-   static char buf[1024];
-
-   buf[0] = 0;
-
-#define T(m, n)                                 \
-   do {                                         \
-      if (flags & m) {                          \
-         if (buf[0] != 0) strcat(buf, " | ");   \
-         strcat(buf, n);                        \
-      }                                         \
-   } while (0)
-   T(DSDRAW_BLEND, "BLEND");
-   T(DSDRAW_DST_COLORKEY, "DST_COLORKEY");
-   T(DSDRAW_SRC_PREMULTIPLY, "SRC_PREMULTIPLY");
-   T(DSDRAW_DST_PREMULTIPLY, "DST_PREMULTIPLY");
-   T(DSDRAW_DEMULTIPLY, "DEMULTIPLY");
-   T(DSDRAW_XOR, "DSDRAW_XOR");
-#undef T
-   if (buf[0] == 0)
-     strcpy(buf, "NOFX");
-
-   return buf;
-}
-
-static const char *
-_dfb_blend_func_str(DFBSurfaceBlendFunction func)
-{
-   static char *names[] = {
-     "ZERO",
-     "ONE",
-     "SRCCOLOR",
-     "INVSRCCOLOR",
-     "SRCALPHA",
-     "INVSRCALPHA",
-     "DESTALPHA",
-     "INVDESTALPHA",
-     "DESTCOLOR",
-     "INVDESTCOLOR",
-     "SRCALPHASAT"
-   };
-   func--;
-   if ((func >= 0) && (func <= sizeof(names)/sizeof(*names)))
-     return names[func];
-   else
-     return NULL;
-}
-#endif /* DFB_DEBUG_FLAGS */
-
-int
-_dfb_surface_set_color_from_context(IDirectFBSurface *surface, RGBA_Draw_Context *dc)
-{
-   DFBSurfaceDrawingFlags flags;
-   int r, g, b, a;
-   DFBResult res;
-
-   _context_get_color(dc, &r, &g, &b, &a);
-   if (a == 0)
-     return 0;
-
-   r = 0xff * r / a;
-   g = 0xff * g / a;
-   b = 0xff * b / a;
-
-   res = surface->SetColor(surface, r, g, b, a);
-   if (res != DFB_OK)
-     goto error;
-
-   flags = (a != 255) ? DSDRAW_BLEND : DSDRAW_NOFX;
-   res = surface->SetDrawingFlags(surface, flags);
-   if (res != DFB_OK)
-     goto error;
-
-#ifdef DFB_DEBUG_FLAGS
-   DBG("Color=%d %d %d %d, flags=%s",
-          r, g, b, a, _dfb_draw_flags_str(flags));
-#endif /* DFB_DEBUG_FLAGS */
-
-   return 1;
-
- error:
-   ERR("Could not set color from context: %s",
-           DirectFBErrorString(res));
-   return 0;
-}
-
-static int
-_dfb_surface_set_blit_params(DirectFB_Engine_Image_Entry *d, DirectFB_Engine_Image_Entry *s, RGBA_Draw_Context *dc)
-{
-   IDirectFBSurface *surface;
-   DFBSurfaceBlittingFlags blit_flags = DSBLIT_NOFX;
-   DFBResult res;
-   int r, g, b, a;
-
-   _context_get_color(dc, &r, &g, &b, &a);
-   if (a == 0)
-     return 0;
-
-   if (a != 255)
-     blit_flags = DSBLIT_BLEND_COLORALPHA | DSBLIT_SRC_PREMULTCOLOR;
-
-   if ((r != a) || (g != a) || (b != a))
-     {
-        blit_flags |= DSBLIT_COLORIZE;
-
-        r = 0xff * r / a;
-        g = 0xff * g / a;
-        b = 0xff * b / a;
-   }
-
-   if (s->cache_entry.src->flags.alpha)
-     blit_flags |= DSBLIT_BLEND_ALPHACHANNEL;
-
-   surface = d->surface;
-
-   if (blit_flags &
-       (DSBLIT_BLEND_COLORALPHA | DSBLIT_SRC_PREMULTCOLOR | DSBLIT_COLORIZE))
-     {
-        res = surface->SetColor(surface, r, g, b, a);
-        if (res != DFB_OK)
-          goto error;
-     }
-
-   res = surface->SetBlittingFlags(surface, blit_flags);
-   if (res != DFB_OK)
-     goto error;
-
-#ifdef DFB_DEBUG_FLAGS
-   DBG("sfunc=%s, dfunc=%s, color=%d %d %d %d, blit=%s, draw=%s",
-          _dfb_blend_func_str(src_func), _dfb_blend_func_str(dst_func),
-          r, g, b, a,
-          _dfb_blit_flags_str(blit_flags), _dfb_draw_flags_str(draw_flags));
-#endif /* DFB_DEBUG_FLAGS */
-
-   return 1;
-
- error:
-   ERR("Could not set blit params: %s",
-         DirectFBErrorString(res));
-   return 0;
-}
-
-static int
-_dfb_lock_and_sync_image(IDirectFBSurface *surface, RGBA_Image *image, DFBSurfaceLockFlags flags)
-{
-   DFBResult r;
-   int pitch, sw, sh;
-   void *pixels;
-
-   r = surface->GetSize(surface, &sw, &sh);
-   if (r != DFB_OK)
-     return 0;
-
-   r = surface->Lock(surface, flags, &pixels, &pitch);
-   if (r != DFB_OK)
-     return 0;
-
-   if (pitch != (sw * 4))
-     {
-        /* XXX TODO: support other pixel formats. */
-       ERR("IDirectFBSurface pitch(%d) is not supported: "
-                "should be %d.",
-                pitch, sw * 4);
-        surface->Unlock(surface);
-        return 0;
-     }
-
-   image->cache_entry.w = sw;
-   image->cache_entry.h = sh;
-   image->image.data = pixels;
-   return 1;
-}
-
-typedef void (*_cb_for_each_cutout_t)(IDirectFBSurface *surface, RGBA_Draw_Context *dc, const DFBRegion *region, void *data);
-static void
-_dfb_surface_for_each_cutout(IDirectFBSurface *surface, RGBA_Draw_Context *dc, _cb_for_each_cutout_t cb, void *data)
-{
-   Cutout_Rects *rects;
-   int i;
-
-   rects = evas_common_draw_context_apply_cutouts(dc);
-   if (!rects)
-     {
-        DFBRegion cr;
-        cr.x1 = 0;
-        cr.y1 = 0;
-        surface->GetSize(surface, &cr.x2, &cr.y2);
-        cr.x2 -= 1;
-        cr.y2 -= 1;
-        surface->SetClip(surface, NULL);
-        cb(surface, dc, &cr, data);
-        return;
-     }
-
-   for (i = 0; i < rects->active; ++i)
-     {
-        Cutout_Rect *r;
-        DFBRegion cr;
-
-        r = rects->rects + i;
-
-        cr.x1 = r->x;
-        cr.y1 = r->y;
-        cr.x2 = r->x + r->w - 1;
-        cr.y2 = r->y + r->h - 1;
-        surface->SetClip(surface, &cr);
-        cb(surface, dc, &cr, data);
-     }
-   evas_common_draw_context_apply_clear_cutouts(rects);
-}
-
-static void
-_dfb_rect_set(DFBRectangle *r, int x, int y, int w, int h)
-{
-   r->x = x;
-   r->y = y;
-   r->w = w;
-   r->h = h;
-}
-
-
-/***********************************************************************
- * Image Cache
- **********************************************************************/
-static Engine_Image_Entry *
-evas_cache_image_dfb_alloc(void)
-{
-   DirectFB_Engine_Image_Entry *deie;
-
-   deie = calloc(1, sizeof (DirectFB_Engine_Image_Entry));
-
-   return (Engine_Image_Entry *)deie;
-}
-
-static void
-evas_cache_image_dfb_delete(Engine_Image_Entry *eie)
-{
-   free(eie);
-}
-
-static int
-evas_cache_image_dfb_constructor(Engine_Image_Entry *eie, void *data)
-{
-   DirectFB_Engine_Image_Entry *deie = (DirectFB_Engine_Image_Entry *)eie;
-   Render_Engine *re = data;
-   IDirectFBSurface *s;
-   RGBA_Image *im;
-
-   im = (RGBA_Image *)eie->src;
-   if (!im)
-     return EVAS_LOAD_ERROR_NONE; // XXX TODO: confirm?
-
-   evas_cache_image_load_data(&im->cache_entry);
-   if (!im->image.data)
-     return EVAS_LOAD_ERROR_NONE; // XXX TODO: confirm?
-
-   s = _dfb_surface_from_data(re->spec->dfb, eie->w, eie->h, im->image.data);
-   if (!s)
-     return EVAS_LOAD_ERROR_GENERIC;
-
-   deie->surface = s;
-   deie->flags.engine_surface = 0;
-
-   return EVAS_LOAD_ERROR_NONE;
-}
-
-static void
-evas_cache_image_dfb_destructor(Engine_Image_Entry *eie)
-{
-   DirectFB_Engine_Image_Entry *deie = (DirectFB_Engine_Image_Entry *)eie;
-
-   if (!deie->flags.engine_surface)
-     _dfb_surface_free(deie->surface);
-   deie->surface = NULL;
-}
-
-/* note: dst have some properties set, like desired size (w, h) */
-static int
-_cache_image_copy(Engine_Image_Entry *dst, const Engine_Image_Entry *src)
-{
-   DirectFB_Engine_Image_Entry *dst_deie;
-   const DirectFB_Engine_Image_Entry *src_deie;
-   IDirectFBSurface *s;
-   RGBA_Image *im;
-
-   dst_deie = (DirectFB_Engine_Image_Entry *)dst;
-   src_deie = (const DirectFB_Engine_Image_Entry *)src;
-   im = (RGBA_Image *)dst->src;
-   s = _dfb_surface_from_data(dfb, dst->w, dst->h, im->image.data);
-   if (!s)
-     return -1;
-
-   dst_deie->surface = s;
-   dst_deie->flags.engine_surface = 0;
-
-   return 0;
-}
-
-static int
-evas_cache_image_dfb_dirty(Engine_Image_Entry *dst, const Engine_Image_Entry *src)
-{
-   return _cache_image_copy(dst, src);
-}
-
-static void
-evas_cache_image_dfb_dirty_region(Engine_Image_Entry *eim, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-   RGBA_Image *im;
-
-   im = (RGBA_Image *)eim->src;
-   im->flags |= RGBA_IMAGE_IS_DIRTY;
-}
-
-static int
-evas_cache_image_dfb_update_data(Engine_Image_Entry *dst, void *engine_data)
-{
-   DirectFB_Engine_Image_Entry *deie = (DirectFB_Engine_Image_Entry *)dst;
-   IDirectFBSurface *s = engine_data;
-   Image_Entry *ie;
-   RGBA_Image *im;
-
-   ie = dst->src;
-   im = (RGBA_Image *)ie;
-
-   if (s)
-     {
-        deie->surface = s;
-
-        /* XXX why size is required here? */
-        s->GetSize(s, &dst->w, &dst->h);
-
-        if (im)
-          {
-             im->image.data = NULL; /* IDirectFBSurface requires lock */
-             im->image.no_free = 1;
-             ie->w = dst->w;
-             ie->h = dst->h;
-             _image_autoset_alpha(deie);
-          }
-     }
-   else
-     {
-        _dfb_surface_free(deie->surface);
-        s = _dfb_surface_from_data(dfb, dst->w, dst->h, im->image.data);
-        deie->surface = s;
-     }
-
-   return 0;
-}
-
-static int
-evas_cache_image_dfb_size_set(Engine_Image_Entry *dst, const Engine_Image_Entry *src)
-{
-   return _cache_image_copy(dst, src);
-}
-
-static void
-evas_cache_image_dfb_load(Engine_Image_Entry *eim, const Image_Entry *ie)
-{
-   DirectFB_Engine_Image_Entry *deie = (DirectFB_Engine_Image_Entry *)eim;
-   IDirectFBSurface *s;
-   const RGBA_Image *im;
-
-   if (deie->surface)
-     return;
-
-   im = (const RGBA_Image *)ie;
-   s = _dfb_surface_from_data(dfb, eim->w, eim->h, im->image.data);
-   deie->surface = s;
-}
-
-static int
-evas_cache_image_dfb_mem_size_get(Engine_Image_Entry *eie)
-{
-   DirectFB_Engine_Image_Entry *deie = (DirectFB_Engine_Image_Entry *)eie;
-   DFBResult r;
-   int size, w, h;
-
-   if (!deie->surface)
-     return 0;
-
-   size = sizeof(*deie->surface);
-
-   r = deie->surface->GetSize(deie->surface, &w, &h);
-   if (r != DFB_OK)
-     {
-        ERR("Could not get surface size: %s",
-                DirectFBErrorString(r));
-        return size;
-     }
-
-   size += w * h * 4; // XXX get correct surface size using pixelformat
-
-   return size;
-}
-
-#ifdef DFB_DEBUG_IMAGE
-static void
-evas_cache_image_dfb_debug(const char *context, Engine_Image_Entry* eie)
-{
-   DirectFB_Engine_Image_Entry *eim = (DirectFB_Engine_Image_Entry *)eie;
-
-   DBG("*** %s image (%p) ***", context, eim);
-   if (eim)
-     {
-       DBG("W: %d, H: %d, R: %d, Key: %s, DFB Surface: %p",
-           eie->w, eie->h, eie->references, eie->cache_key, eim->surface);
-
-        if (eie->src)
-          DBG("Pixels: %p", ((RGBA_Image*) eie->src)->image.data);
-     }
-   DBG("*** ***");
-}
-#endif
-
-static const Evas_Cache_Engine_Image_Func _dfb_cache_engine_image_cb = {
-  NULL /* key */,
-  evas_cache_image_dfb_alloc /* alloc */,
-  evas_cache_image_dfb_delete /* dealloc */,
-  evas_cache_image_dfb_constructor /* constructor */,
-  evas_cache_image_dfb_destructor /* destructor */,
-  evas_cache_image_dfb_dirty_region /* dirty_region */,
-  evas_cache_image_dfb_dirty /* dirty */,
-  evas_cache_image_dfb_size_set /* size_set */,
-  evas_cache_image_dfb_update_data /* update_data */,
-  evas_cache_image_dfb_load /* load */,
-  evas_cache_image_dfb_mem_size_get /* mem_size_get */,
-#ifdef DFB_DEBUG_IMAGE  /* debug */
-  evas_cache_image_dfb_debug
-#else
-  NULL
-#endif
-};
-
-
-/***********************************************************************
- * Evas Engine
- **********************************************************************/
-static void *
-evas_engine_dfb_info(Evas* e __UNUSED__)
-{
-   Evas_Engine_Info_DirectFB *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_DirectFB));
-   if (!info)
-     return NULL;
-   info->magic.magic = rand();
-   return info;
-}
-
-static void
-evas_engine_dfb_info_free(Evas *e __UNUSED__, void *in)
-{
-   Evas_Engine_Info_DirectFB *info = in;
-   free(info);
-}
-
-static Eina_Bool
-_is_dfb_data_ok(IDirectFB *idfb, IDirectFBSurface *surface, int w, int h)
-{
-   DFBResult r;
-   int sw, sh;
-
-   if (!idfb)
-     {
-        ERR("missing IDirectFB");
-        return EINA_FALSE;
-     }
-   dfb = idfb;
-
-   if (!surface)
-     {
-       ERR("missing IDirectFBSurface");
-        return EINA_FALSE;
-     }
-
-   r = surface->GetSize(surface, &sw, &sh);
-   if (r != DFB_OK)
-     {
-       ERR("Could not get surface %p size: %s",
-             surface, DirectFBErrorString(r));
-        return EINA_FALSE;
-     }
-
-   if ((w > sw) || (h > sh))
-     {
-       ERR("Requested size is larger than surface: %dx%d > %dx%d",
-                w, h, sw, sh);
-        return EINA_FALSE;
-     }
-   else if ((w <= 0) || (h <= 0))
-     {
-        w = sw;
-        h = sh;
-     }
-
-   return EINA_TRUE;
-}
-
-static void
-_evas_common_init(void)
-{
-   evas_common_cpu_init();
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();  
-}
-
-static int
-evas_engine_dfb_output_reconfigure(Render_Engine *re, int w, int h)
-{
-   if (re->screen_image)
-     evas_cache_engine_image_drop(&re->screen_image->cache_entry);
-
-   if (re->tb)
-     evas_common_tilebuf_free(re->tb);
-
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (!re->tb)
-     {
-        ERR("Could not allocate tile buffer.");
-        goto failed_tilebuf;
-     }
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   /* We create a "fake" RGBA_Image which points to the IDirectFB surface.
-    * Each access to that surface is wrapped in Lock / Unlock calls whenever
-    * the data is manipulated directly.
-    */
-   re->screen_image = (DirectFB_Engine_Image_Entry *)
-     evas_cache_engine_image_engine(re->cache, re->spec->surface);
-   if (!re->screen_image)
-     {
-        ERR("RGBA_Image allocation from DFB failed");
-        goto failed_image;
-     }
-   re->screen_image->flags.engine_surface = 1;
-
-   _image_autoset_alpha(re->screen_image);
-   _image_clear(re->screen_image, 0, 0, w, h);
-
-   return 1;
-
- failed_image:
-   evas_common_tilebuf_free(re->tb);
-   re->tb = NULL;
- failed_tilebuf:
-   re->screen_image = NULL;
-   ERR("Evas DirectFB reconfigure failed");
-   return 0;
-}
-
-static void *
-_dfb_output_setup(int w, int h, const struct Evas_Engine_DirectFB_Spec *spec)
-{
-   Render_Engine *re;
-
-   if (!_is_dfb_data_ok(spec->dfb, spec->surface, w, h))
-     goto fatal;
-
-   _evas_common_init();
-
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     {
-        perror("calloc");
-        goto fatal;
-     }
-   re->dfb = spec->dfb;
-   re->spec = spec;
-   re->cache = evas_cache_engine_image_init(&_dfb_cache_engine_image_cb,
-                                            evas_common_image_cache_get());
-   if (!re->cache)
-     {
-        ERR("Evas_Cache_Engine_Image allocation failed!");
-        goto fatal_after_engine;
-     }
-
-   if (!evas_engine_dfb_output_reconfigure(re, w, h))
-     {
-        ERR("Could not reconfigure evas engine.");
-        goto fatal_after_reconfigure;
-     }
-
-   _dfb_blit_accel_caps_print(spec->surface, NULL);
-
-   return re;
-
-
- fatal_after_reconfigure:
-   evas_cache_engine_image_shutdown(re->cache);
- fatal_after_engine:
-   free(re);
- fatal:
-   CRIT("DirectFB: unable to continue, abort()!");
-   abort();
-   return NULL;
-}
-
-static int
-evas_engine_dfb_setup(Evas *e, void *in)
-{
-   Evas_Engine_Info_DirectFB *info = in;
-
-   if (!e->engine.data.output)
-     e->engine.data.output = _dfb_output_setup(e->output.w, e->output.h,
-                                               &info->info);
-   // XXX TODO: else reconfigure existing...
-
-   if (!e->engine.data.output)
-     return 0;
-
-   if (!e->engine.data.context)
-     e->engine.data.context =
-       e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-evas_engine_dfb_output_free(void *data)
-{
-   Render_Engine *re = data;
-
-   if (!re)
-     return;
-
-   if (re->cache)
-     evas_cache_engine_image_shutdown(re->cache);
-
-   evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-evas_engine_dfb_output_resize(void *data, int w, int h)
-{
-   if (!evas_engine_dfb_output_reconfigure(data, w, h))
-     ERR("Failed to resize DirectFB evas");
-}
-
-static void
-evas_engine_dfb_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re = data;
-
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-evas_engine_dfb_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re = data;
-
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-evas_engine_dfb_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re = data;
-
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-evas_engine_dfb_output_redraws_clear(void *data)
-{
-   Render_Engine *re = data;
-
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-evas_engine_dfb_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re = data;
-   Tilebuf_Rect *tb_rect;
-
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect)
-      return NULL;
-
-   tb_rect = (Tilebuf_Rect*) re->cur_rect;
-   *cx = *x = tb_rect->x;
-   *cy = *y = tb_rect->y;
-   *cw = *w = tb_rect->w;
-   *ch = *h = tb_rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   return re->screen_image;
-}
-
-static void
-evas_engine_dfb_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
-{
-   Render_Engine *re = data;
-   DFBRegion *r;
-
-   if (re->update_regions_count >= re->update_regions_limit)
-     {
-        void *tmp;
-
-        re->update_regions_limit += 16;
-
-        tmp = realloc(re->update_regions,
-                      sizeof(DFBRegion) * re->update_regions_limit);
-        if (!tmp)
-          {
-             perror("realloc");
-             return;
-          }
-        re->update_regions = tmp;
-     }
-
-   r = re->update_regions + re->update_regions_count;
-   re->update_regions_count++;
-
-   r->x1 = x;
-   r->y1 = y;
-   r->x2 = x + w - 1;
-   r->y2 = y + h - 1;
-}
-
-static void
-evas_engine_dfb_output_flush(void *data)
-{
-   Render_Engine *re = data;
-   IDirectFBSurface *s = re->screen_image->surface;
-   DFBRegion *r, *r_end;
-
-   r = re->update_regions;
-   r_end = re->update_regions + re->update_regions_count;
-
-#ifdef DFB_UPDATE_INDIVIDUAL_RECTS
-   for (; r < r_end; r++)
-     s->Flip(s, r, DFB_FLIP_FLAGS);
-#else
-   DFBRegion bb;
-
-   bb.x1 = bb.y1 = 10000;
-   bb.x2 = bb.y2 = 0;
-   for (; r < r_end; r++)
-     {
-        if (bb.x1 > r->x1)
-          bb.x1 = r->x1;
-        if (bb.y1 > r->y1)
-          bb.y1 = r->y1;
-
-        if (bb.x2 < r->x2)
-          bb.x2 = r->x2;
-        if (bb.y2 < r->y2)
-          bb.y2 = r->y2;
-     }
-
-   s->Flip(s, &bb, DFB_FLIP_FLAGS);
-#endif
-
-   re->update_regions_count = 0;
-}
-
-static void
-evas_engine_dfb_output_idle_flush(void *data)
-{
-   Render_Engine *re = data;
-
-   if (re->update_regions_count != 0)
-     ERR("update_regions_count not 0 as it should be!");
-
-   free(re->update_regions);
-   re->update_regions_count = 0;
-   re->update_regions_limit = 0;
-   re->update_regions = NULL;
-}
-
-/* HACK!!! -- KLUDGE!!!
- *
- * This should really use IDirectFBFont and IDirectFBSurface::DrawString(),
- * but to be edje-compatible IDirectFBFont::CreateFont() should be able to
- * load fonts from non-files, which it does not.
- *
- * Try to find a way to create own IDirectFBFont in future and load from
- * memory.
- */
-static void
-evas_engine_dfb_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   IDirectFBSurface *screen;
-   Render_Engine *re = data;
-   RGBA_Image *im;
-
-   im = (RGBA_Image *)eim->cache_entry.src;
-   screen = eim->surface;
-   if (!_dfb_lock_and_sync_image(screen, im, DSLF_READ | DSLF_WRITE))
-     return;
-
-   evas_common_font_draw(im, context, font, x, y, intl_props);
-   evas_common_cpu_end_opt();
-
-   im->image.data = NULL;
-
-   screen->Unlock(screen);
-}
-
-
-static void
-_cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
-{
-   const Eina_Rectangle *r = data;
-
-   surface->DrawLine(surface, r->x, r->y, r->w, r->h); /* x2, y2 really */
-}
-
-static void
-evas_engine_dfb_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   Eina_Rectangle r;
-
-   if (!_dfb_surface_set_color_from_context(eim->surface, context))
-     return;
-
-   EINA_RECTANGLE_SET(&r, x1, y1, x2, y2); /* x2, y2 (ab)used as w, h */
-   _dfb_surface_for_each_cutout(eim->surface, context, _cb_draw_line, &r);
-}
-
-#ifndef DFB_USE_EVAS_RECT_DRAW
-static void
-_cb_draw_rectangle(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
-{
-   const Eina_Rectangle *r = data;
-
-   surface->FillRectangle(surface, r->x, r->y, r->w, r->h);
-}
-
-static void
-evas_engine_dfb_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   IDirectFBSurface *screen;
-   Render_Engine *re = data;
-   RGBA_Draw_Context *dc = context;
-   Eina_Rectangle r;
-
-   screen = eim->surface;
-   if (!_dfb_surface_set_color_from_context(screen, context))
-     {
-        if (dc->render_op != EVAS_RENDER_COPY)
-          return;
-        if (!eim->cache_entry.src->flags.alpha)
-          return;
-        screen->SetColor(screen, 0, 0, 0, 0);
-        screen->SetDrawingFlags(screen, DSDRAW_NOFX);
-     }
-
-   EINA_RECTANGLE_SET(&r, x, y, w, h);
-   _dfb_surface_for_each_cutout(screen, context, _cb_draw_rectangle, &r);
-}
-#else
-static void
-evas_engine_dfb_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   IDirectFBSurface *screen;
-   Render_Engine *re = data;
-   RGBA_Image *dst;
-
-   dst = (RGBA_Image *)eim->cache_entry.src;
-   screen = eim->surface;
-   if (!_dfb_lock_and_sync_image(screen, dst, DSLF_READ | DSLF_WRITE))
-     return;
-
-   evas_common_rectangle_draw(dst, context, x, y, w, h);
-   evas_common_cpu_end_opt();
-
-   dst->image.data = NULL;
-
-   screen->Unlock(screen);
-}
-#endif
-
-#ifndef DFB_USE_EVAS_POLYGON_DRAW
-static void
-evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   _dfb_polygon_draw(eim->surface, context, polygon, x, y);
-}
-#else
-static void
-evas_engine_dfb_polygon_draw(void *data, void *context, void *surface, void *polygon, int x, int y)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   IDirectFBSurface *screen;
-   Render_Engine *re = data;
-   RGBA_Image *dst;
-
-   dst = (RGBA_Image *)eim->cache_entry.src;
-   screen = eim->surface;
-   if (!_dfb_lock_and_sync_image(screen, dst, DSLF_READ | DSLF_WRITE))
-     return;
-
-   evas_common_polygon_draw(dst, context, polygon, x, y);
-   evas_common_cpu_end_opt();
-
-   dst->image.data = NULL;
-
-   screen->Unlock(screen);
-}
-#endif
-
-/** Image Object *******************************************************/
-static void *
-evas_engine_dfb_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine *re = data;
-
-   *error = 0;
-   return evas_cache_engine_image_request(re->cache, file, key, lo,
-                                          data, error);
-}
-
-static int
-evas_engine_dfb_image_alpha_get(void *data __UNUSED__, void *image)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-   Image_Entry *ie;
-   RGBA_Image *im;
-
-   if (!eim) return 1;
-   ie = eim->cache_entry.src;
-   im = (RGBA_Image *)ie;
-   switch (ie->space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (ie->flags.alpha) return 1;
-      default:
-         break;
-     }
-   return 0;
-}
-
-static void
-evas_engine_dfb_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-   Image_Entry *ie;
-
-   ie = eim->cache_entry.src;
-   if (w) *w = ie->w;
-   if (h) *h = ie->h;
-}
-
-static int
-evas_engine_dfb_image_colorspace_get(void *data __UNUSED__, void *image)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-
-   if (!eim) return EVAS_COLORSPACE_ARGB8888;
-   return eim->cache_entry.src->space;
-}
-
-static void
-evas_engine_dfb_image_colorspace_set(void *data, void *image, int cspace)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-
-   if (!eim) return;
-   if (eim->cache_entry.src->space == cspace) return;
-
-   evas_cache_engine_image_colorspace(&eim->cache_entry, cspace, data);
-}
-
-static void *
-evas_engine_dfb_image_new_from_copied_data(void *data, int w, int h, DATA32* image_data, int alpha, int cspace)
-{
-   Render_Engine *re = data;
-
-   return evas_cache_engine_image_copied_data(re->cache, w, h, image_data,
-                                              alpha, cspace, NULL);
-}
-
-static void *
-evas_engine_dfb_image_new_from_data(void *data, int w, int h, DATA32* image_data, int alpha, int cspace)
-{
-   Render_Engine *re = data;
-
-   return evas_cache_engine_image_data(re->cache, w, h, image_data,
-                                       alpha, cspace, NULL);
-}
-
-static void
-evas_engine_dfb_image_free(void *data __UNUSED__, void *image)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-
-   evas_cache_engine_image_drop(&eim->cache_entry);
-}
-
-static void *
-evas_engine_dfb_image_size_set(void *data __UNUSED__, void *image, int w, int h)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-
-   return evas_cache_engine_image_size_set(&eim->cache_entry, w, h);
-}
-
-static void *
-evas_engine_dfb_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-
-   return evas_cache_engine_image_dirty(&eim->cache_entry, x, y, w, h);
-}
-
-static void *
-evas_engine_dfb_image_data_get(void *data __UNUSED__, void *image, int to_write, DATA32** image_data)
-{
-   DirectFB_Engine_Image_Entry *deie = image;
-   Engine_Image_Entry *ce;
-   Image_Entry *ie;
-   RGBA_Image *im;
-
-   if (!deie)
-     {
-        *image_data = NULL;
-        return NULL;
-     }
-
-   ce = (Engine_Image_Entry *)deie;
-   ie = ce->src;
-   im = (RGBA_Image *)ie;
-
-   switch (ie->space)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-       {
-          DFBResult r;
-          IDirectFBSurface *s;
-          void *pixels;
-          int pitch;
-
-          if (to_write)
-            deie = (DirectFB_Engine_Image_Entry *)
-              evas_cache_engine_image_dirty(ce, 0, 0, ie->w, ie->h);
-
-          evas_cache_engine_image_load_data(ce);
-
-          ce = (Engine_Image_Entry *)deie;
-          ie = ce->src;
-          im = (RGBA_Image *)ie;
-          s = deie->surface;
-
-          if (to_write)
-            {
-               r = s->Lock(s, DSLF_WRITE, &pixels, &pitch);
-               if (r != DFB_OK)
-                 goto error;
-               deie->flags.is_locked = 1;
-            }
-          else
-            {
-               r = s->Lock(s, DSLF_READ, &pixels, &pitch);
-               if (r != DFB_OK)
-                 goto error;
-               s->Unlock(s);
-            }
-
-          *image_data = pixels;
-          im->image.data = pixels; /* remember for _put() */
-          break;
-
-       error:
-          ERR("Could not lock surface %p: %s",
-                  s, DirectFBErrorString(r));
-          *image_data = NULL;
-          break;
-       }
-     case EVAS_COLORSPACE_YCBCR422P709_PL:
-     case EVAS_COLORSPACE_YCBCR422P601_PL:
-     case EVAS_COLORSPACE_YCBCR422601_PL:
-        /* XXX untested */
-        *image_data = im->cs.data;
-        break;
-     default:
-        abort();
-        break;
-     }
-   return deie;
-}
-
-static void *
-evas_engine_dfb_image_data_put(void *data, void *image, DATA32* image_data)
-{
-   DirectFB_Engine_Image_Entry *deie = image;
-   Render_Engine *re = data;
-   Engine_Image_Entry *ce;
-   Image_Entry *ie;
-   RGBA_Image *im;
-
-   if (!deie) return NULL;
-
-   ce = (Engine_Image_Entry *)deie;
-   ie = ce->src;
-   im = (RGBA_Image*)ie;
-
-   switch (ie->space)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-        if (image_data == im->image.data)
-          {
-             if (deie->flags.is_locked)
-               {
-                  deie->surface->Unlock(deie->surface);
-                  deie->flags.is_locked = 0;
-               }
-          }
-        else
-          {
-             int alpha, cspace;
-
-             alpha = func.image_alpha_get(re, deie);
-             cspace = func.image_colorspace_get(re, deie);
-
-             evas_cache_engine_image_drop(ce);
-             deie = (DirectFB_Engine_Image_Entry *)
-               evas_cache_engine_image_data(re->cache, ce->w, ce->h,
-                                            image_data, alpha, cspace, NULL);
-          }
-        break;
-     case EVAS_COLORSPACE_YCBCR422P601_PL:
-     case EVAS_COLORSPACE_YCBCR422P709_PL:
-     case EVAS_COLORSPACE_YCBCR422601_PL:
-        /* XXX untested */
-        if (image_data != im->cs.data)
-          {
-             if (im->cs.data)
-               if (!im->cs.no_free)
-                 free(im->cs.data);
-             im->cs.data = image_data;
-             evas_common_image_colorspace_dirty(im);
-          }
-        break;
-     default:
-        abort();
-        break;
-     }
-   return deie;
-}
-
-static void
-evas_engine_dfb_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   DirectFB_Engine_Image_Entry *deie = image;
-   RGBA_Image *im;
-
-   if (!deie) return ;
-   im = (RGBA_Image*) deie->cache_entry.src;
-   if (!im) return ;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-evas_engine_dfb_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   DirectFB_Engine_Image_Entry *deie = image;
-   RGBA_Image *im;
-
-   if (!deie) return ;
-   im = (RGBA_Image*) deie->cache_entry.src;
-   if (!im) return ;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void *
-evas_engine_dfb_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-   Engine_Image_Entry *ce;
-   Image_Entry *ie;
-   RGBA_Image *im;
-
-   if (!eim) return NULL;
-
-   ce = &eim->cache_entry;
-   ie = ce->src;
-   im = (RGBA_Image*)ie;
-
-   if (ie->space != EVAS_COLORSPACE_ARGB8888)
-     {
-        ie->flags.alpha = 0;
-        return eim;
-     }
-
-   eim = (DirectFB_Engine_Image_Entry *)
-     evas_cache_engine_image_dirty(ce, 0, 0, ce->w, ce->h);
-
-   ie->flags.alpha = !!has_alpha;
-   return eim;
-}
-
-struct _for_each_cutout_image
-{
-   IDirectFBSurface *image;
-   DFBRectangle src, dst;
-};
-
-static void
-_cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
-{
-   const struct _for_each_cutout_image *p = data;
-
-   surface->Blit(surface, p->image, &p->src, p->dst.x, p->dst.y);
-}
-
-static void
-_cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
-{
-   const struct _for_each_cutout_image *p = data;
-
-   surface->StretchBlit(surface, p->image, &p->src, &p->dst);
-}
-
-#ifndef DFB_USE_EVAS_IMAGE_DRAW
-static void
-evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth __UNUSED__)
-{
-   DirectFB_Engine_Image_Entry *eim = surface;
-   Render_Engine *re = data;
-   IDirectFBSurface *screen;
-   DirectFB_Engine_Image_Entry *deie = image;
-   struct _for_each_cutout_image p;
-   _cb_for_each_cutout_t cb;
-
-   screen = eim->surface;
-   if (deie->cache_entry.src->space == EVAS_COLORSPACE_ARGB8888)
-     evas_cache_engine_image_load_data(&deie->cache_entry);
-
-   evas_common_image_colorspace_normalize((RGBA_Image *)deie->cache_entry.src);
-
-   _dfb_surface_set_blit_params(eim, deie, context);
-
-   _dfb_rect_set(&p.src, src_x, src_y, src_w, src_h);
-   _dfb_rect_set(&p.dst, dst_x, dst_y, dst_w, dst_h);
-   p.image = deie->surface;
-
-   if ((src_w == dst_w) && (src_h == dst_h))
-     cb = _cb_draw_image_unscaled;
-   else
-     cb = _cb_draw_image_scaled;
-
-   _dfb_blit_accel_caps_print(screen, deie->surface);
-   _dfb_surface_for_each_cutout(screen, context, cb, &p);
-}
-#else /* DFB_USE_EVAS_IMAGE_DRAW */
-static void
-evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   DirectFB_Engine_Image_Entry *deie = image;
-   DirectFB_Engine_Image_Entry *eim = surface;
-   Render_Engine *re = data;
-   RGBA_Image *dst, *src;
-   IDirectFBSurface *screen;
-
-   screen = eim->surface;
-   if (deie->cache_entry.src->space == EVAS_COLORSPACE_ARGB8888)
-     evas_cache_engine_image_load_data(&deie->cache_entry);
-
-   evas_common_image_colorspace_normalize((RGBA_Image *)deie->cache_entry.src);
-
-   dst = (RGBA_Image *)eim->cache_entry.src;
-   if (!_dfb_lock_and_sync_image(screen, dst, DSLF_READ | DSLF_WRITE))
-     return;
-
-   src = (RGBA_Image *)deie->cache_entry.src;
-   if (!_dfb_lock_and_sync_image(deie->surface, src, DSLF_READ))
-     goto error_src;
-
-   if (smooth)
-     evas_common_scale_rgba_in_to_out_clip_smooth(src, dst, context,
-                                                  src_x, src_y, src_w, src_h,
-                                                  dst_x, dst_y, dst_w, dst_h);
-   else
-     evas_common_scale_rgba_in_to_out_clip_sample(src, dst, context,
-                                                  src_x, src_y, src_w, src_h,
-                                                  dst_x, dst_y, dst_w, dst_h);
-   evas_common_cpu_end_opt();
-
-   dst->image.data = NULL;
-
-   screen->Unlock(screen);
-   deie->surface->Unlock(deie->surface);
-
-   return;
-
- error_src:
-   screen->Unlock(screen);
-}
-#endif
-
-static void
-evas_engine_dfb_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   Render_Engine *re = (Render_Engine*) data;
-   DirectFB_Engine_Image_Entry *deie = image;
-   DirectFB_Engine_Image_Entry *eim = surface;
-   IDirectFBSurface *screen;
-   RGBA_Image *dst, *src;
-
-   if (!deie || !eim) return ;
-
-   screen = eim->surface;
-   dst = (RGBA_Image *) eim->cache_entry.src;
-   if (!_dfb_lock_and_sync_image(screen, dst, DSLF_READ | DSLF_WRITE))
-     return;
-
-   src = (RGBA_Image *)deie->cache_entry.src;
-   if (!_dfb_lock_and_sync_image(deie->surface, src, DSLF_READ))
-     goto error_src;
-
-   evas_common_map_rgba(src, dst, context, 4, p, smooth, level);
-   evas_common_cpu_end_opt();
-
-   screen->Unlock(screen);
-   deie->surface->Unlock(deie->surface);
-
-   return ;
-
- error_src:
-   screen->Unlock(screen);
-}
-
-static void *
-evas_engine_dfb_image_map_surface_new(void *data, int w, int h, int alpha)
-{
-   Render_Engine *re = (Render_Engine*) data;
-   void *surface;
-
-   surface = evas_cache_engine_image_copied_data(re->cache,
-                                                 w, h, NULL, alpha,
-                                                 EVAS_COLORSPACE_ARGB8888,
-                                                 NULL);
-   return surface;
-}
-
-static void
-evas_engine_dfb_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_cache_engine_image_drop(surface);
-}
-
-
-static void
-evas_engine_dfb_image_cache_flush(void *data)
-{
-   Render_Engine *re = data;
-   int size;
-
-   size = evas_cache_engine_image_get(re->cache);
-   evas_cache_engine_image_set(re->cache, 0);
-   evas_cache_engine_image_set(re->cache, size);
-}
-
-static void
-evas_engine_dfb_image_cache_set(void *data, int bytes)
-{
-   Render_Engine *re = data;
-
-   evas_cache_engine_image_set(re->cache, bytes);
-}
-
-static int
-evas_engine_dfb_image_cache_get(void *data)
-{
-   Render_Engine *re = data;
-
-   return evas_cache_engine_image_get(re->cache);
-}
-
-static char *
-evas_engine_dfb_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
-{
-   DirectFB_Engine_Image_Entry *eim = image;
-   RGBA_Image *im;
-
-   if (!eim) return NULL;
-   im = (RGBA_Image *)eim->cache_entry.src;
-
-   return im->info.comment;
-}
-
-static void
-evas_engine_dfb_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-}
-
-static int
-evas_engine_dfb_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-}
-
-static Eina_Bool
-evas_engine_dfb_canvas_alpha_get(void *data, void *context)
-{
-   Render_Engine *re = data;
-
-   return re->screen_image->cache_entry.src->flags.alpha;
-}
-
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&parent_func, "software_generic")) return 0;
-   _evas_engine_directfb_log_dom = eina_log_domain_register
-     ("evas-directfb", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_directfb_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = parent_func;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, evas_engine_dfb_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_free);
-   ORD(image_size_set);
-   ORD(image_size_get);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-   ORD(font_draw);
-   ORD(line_draw);
-   ORD(rectangle_draw);
-   ORD(polygon_draw);
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-
-   ORD(image_map_draw);
-   ORD(image_map_surface_new);
-   ORD(image_map_surface_free);
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-   eina_log_domain_unregister(_evas_engine_directfb_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-  EVAS_MODULE_API_VERSION,
-  "directfb",
-  "ProFUSION embedded systems",
-  {
-    module_open,
-    module_close
-  }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, directfb);
-
-#ifndef EVAS_STATIC_BUILD_DIRECTFB
-EVAS_EINA_MODULE_DEFINE(engine, directfb);
-#endif
diff --git a/libraries/evas/src/modules/engines/directfb/evas_engine.h b/libraries/evas/src/modules/engines/directfb/evas_engine.h
deleted file mode 100644
index 7ad1e38..0000000
--- a/libraries/evas/src/modules/engines/directfb/evas_engine.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef EVAS_ENGINE_DIRECTFB_H
-#define EVAS_ENGINE_DIRECTFB_H
-
-#include "evas_common.h"
-#include "evas_private.h"
-#include "Evas_Engine_DirectFB.h"
-
-extern int _evas_engine_directfb_log_dom ;
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_directfb_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_directfb_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_directfb_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_directfb_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_directfb_log_dom, __VA_ARGS__)
-
-typedef struct _DirectFB_Engine_Image_Entry DirectFB_Engine_Image_Entry;
-struct _DirectFB_Engine_Image_Entry
-{
-   Engine_Image_Entry            cache_entry;
-   IDirectFBSurface             *surface;
-
-   struct
-   {
-      Eina_Bool                   engine_surface : 1;
-      Eina_Bool                   is_locked : 1;
-   } flags;
-};
-
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine
-{
-   DirectFB_Engine_Image_Entry  *screen_image;
-   const struct Evas_Engine_DirectFB_Spec *spec;
-   IDirectFB                    *dfb;
-
-   Evas_Cache_Engine_Image      *cache;
-
-   Tilebuf                      *tb;
-   Tilebuf_Rect                 *rects;
-   Eina_Inlist                  *cur_rect;
-
-   DFBRegion                    *update_regions;
-   unsigned int                  update_regions_count;
-   unsigned int                  update_regions_limit;
-
-   Eina_Bool                     end : 1;
-};
-
-int _dfb_surface_set_color_from_context(IDirectFBSurface *surface, RGBA_Draw_Context *dc);
-void _dfb_polygon_draw(IDirectFBSurface *surface, RGBA_Draw_Context *dc, Eina_Inlist *points, int x, int y);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/directfb/polygon.c b/libraries/evas/src/modules/engines/directfb/polygon.c
deleted file mode 100644
index 715fd84..0000000
--- a/libraries/evas/src/modules/engines/directfb/polygon.c
+++ /dev/null
@@ -1,269 +0,0 @@
-#include <math.h>
-#include "evas_engine.h"
-
-/* reduce calls to DirectFB (FillSpans), but uses twice as much memory */
-//#define USE_SPAN_RECTS 1
-
-#define MAX_SPANS 512
-typedef struct _RGBA_Edge RGBA_Edge;
-typedef struct _RGBA_Vertex RGBA_Vertex;
-
-struct _RGBA_Edge
-{
-   double x, dx;
-   int i;
-};
-
-struct _RGBA_Vertex
-{
-   double x, y;
-   int i;
-};
-
-#define POLY_EDGE_DEL(_i)                                               \
-{                                                                       \
-   int _j;                                                              \
-                                                                        \
-   for (_j = 0; (_j < num_active_edges) && (edges[_j].i != _i); _j++);  \
-   if (_j < num_active_edges)                                           \
-     {                                                                  \
-        num_active_edges--;                                             \
-        memmove(&(edges[_j]), &(edges[_j + 1]),                         \
-                (num_active_edges - _j) * sizeof(RGBA_Edge));           \
-     }                                                                  \
-}
-
-#define POLY_EDGE_ADD(_i, _y)                                           \
-{                                                                       \
-   int _j;                                                              \
-   float _dx;                                                           \
-   RGBA_Vertex *_p, *_q;                                                \
-   if (_i < (n - 1)) _j = _i + 1;                                       \
-   else _j = 0;                                                         \
-   if (point[_i].y < point[_j].y)                                       \
-     {                                                                  \
-        _p = &(point[_i]);                                              \
-        _q = &(point[_j]);                                              \
-     }                                                                  \
-   else                                                                 \
-     {                                                                  \
-        _p = &(point[_j]);                                              \
-        _q = &(point[_i]);                                              \
-     }                                                                  \
-   edges[num_active_edges].dx = _dx = (_q->x - _p->x) / (_q->y - _p->y); \
-   edges[num_active_edges].x = (_dx * ((float)_y + 0.5 - _p->y)) + _p->x; \
-   edges[num_active_edges].i = _i;                                      \
-   num_active_edges++;                                                  \
-}
-
-static int
-polygon_point_sorter(const void *a, const void *b)
-{
-   RGBA_Vertex *p, *q;
-
-   p = (RGBA_Vertex *)a;
-   q = (RGBA_Vertex *)b;
-   if (p->y <= q->y) return -1;
-   return 1;
-}
-
-static int
-polygon_edge_sorter(const void *a, const void *b)
-{
-   RGBA_Edge *p, *q;
-
-   p = (RGBA_Edge *)a;
-   q = (RGBA_Edge *)b;
-   if (p->x <= q->x) return -1;
-   return 1;
-}
-
-#ifndef USE_SPAN_RECTS
-typedef DFBSpan span_t;
-
-static void
-polygon_span_add(span_t *span, int y __UNUSED__, int x, int w)
-{
-   span->x = x;
-   span->w = w;
-}
-
-static void
-polygon_spans_fill(IDirectFBSurface *surface, int y, const span_t *spans, int n_spans)
-{
-   /* directfb automatically increments y for each span */
-   for (; n_spans > 0; n_spans--, spans++)
-     surface->FillSpans(surface, y, spans, 1);
-}
-#else /* USE_SPAN_RECTS */
-typedef DFBRectangle span_t;
-
-static void
-polygon_span_add(span_t *span, int y, int x, int w)
-{
-   span->x = x;
-   span->y = y;
-   span->w = w;
-   span->h = 1;
-}
-
-static void
-polygon_spans_fill(IDirectFBSurface *surface, int y, const span_t *spans, int n_spans)
-{
-   surface->FillRectangles(surface, spans, n_spans);
-}
-#endif /* USE_SPAN_RECTS */
-
-
-void
-_dfb_polygon_draw(IDirectFBSurface *surface, RGBA_Draw_Context *dc, Eina_Inlist *points, int px, int py)
-{
-   RGBA_Polygon_Point *pt;
-   RGBA_Vertex        *point;
-   RGBA_Edge          *edges;
-   int                 num_active_edges;
-   int                 n;
-   int                 i, j, k;
-   int                 y0, y1, y;
-   int                 ext_x, ext_y, ext_w, ext_h;
-   int                *sorted_index;
-
-   ext_x = 0;
-   ext_y = 0;
-   surface->GetSize(surface, &ext_w, &ext_h);
-   if (dc->clip.use)
-     {
-        if (dc->clip.x > ext_x)
-          {
-             ext_w += ext_x - dc->clip.x;
-             ext_x = dc->clip.x;
-          }
-        if ((ext_x + ext_w) > (dc->clip.x + dc->clip.w))
-          {
-             ext_w = (dc->clip.x + dc->clip.w) - ext_x;
-          }
-        if (dc->clip.y > ext_y)
-          {
-             ext_h += ext_y - dc->clip.y;
-             ext_y = dc->clip.y;
-          }
-        if ((ext_y + ext_h) > (dc->clip.y + dc->clip.h))
-          {
-             ext_h = (dc->clip.y + dc->clip.h) - ext_y;
-          }
-     }
-   if ((ext_w <= 0) || (ext_h <= 0)) return;
-
-   evas_common_cpu_end_opt();
-
-   if (!_dfb_surface_set_color_from_context(surface, dc))
-     return;
-
-   n = 0; EINA_INLIST_FOREACH(points, pt) n++;
-   if (n < 3) return;
-   edges = malloc(sizeof(RGBA_Edge) * n);
-   if (!edges) return;
-   point = malloc(sizeof(RGBA_Vertex) * n);
-   if (!point)
-     {
-        free(edges);
-        return;
-     }
-   sorted_index = malloc(sizeof(int) * n);
-   if (!sorted_index)
-     {
-        free(edges);
-        free(point);
-        return;
-     }
-
-   k = 0;
-   EINA_INLIST_FOREACH(points, pt)
-     {
-        point[k].x = pt->x + px;
-        point[k].y = pt->y + py;
-        point[k].i = k;
-        k++;
-     }
-   qsort(point, n, sizeof(RGBA_Vertex), polygon_point_sorter);
-   for (k = 0; k < n; k++) sorted_index[k] = point[k].i;
-   k = 0;
-   EINA_INLIST_FOREACH(points, pt)
-     {
-        point[k].x = pt->x + px;
-        point[k].y = pt->y + py;
-        point[k].i = k;
-        k++;
-     }
-
-   y0 = MAX(ext_y, ceil(point[sorted_index[0]].y - 0.5));
-   y1 = MIN(ext_y + ext_h - 1, floor(point[sorted_index[n - 1]].y - 0.5));
-
-   k = 0;
-   num_active_edges = 0;
-
-   for (y = y0; y <= y1; y++)
-     {
-        span_t spans[MAX_SPANS];
-        unsigned int n_spans = 0;
-
-        for (; (k < n) && (point[sorted_index[k]].y <= ((double)y + 0.5)); k++)
-          {
-             i = sorted_index[k];
-
-             if (i > 0) j = i - 1;
-             else j = n - 1;
-             if (point[j].y <= ((double)y - 0.5))
-               {
-                  POLY_EDGE_DEL(j)
-               }
-             else if (point[j].y > ((double)y + 0.5))
-               {
-                  POLY_EDGE_ADD(j, y)
-               }
-             if (i < (n - 1)) j = i + 1;
-             else j = 0;
-             if (point[j].y <= ((double)y - 0.5))
-               {
-                  POLY_EDGE_DEL(i)
-               }
-             else if (point[j].y > ((double)y + 0.5))
-               {
-                  POLY_EDGE_ADD(i, y)
-               }
-          }
-
-        qsort(edges, num_active_edges, sizeof(RGBA_Edge), polygon_edge_sorter);
-
-        for (j = 0; j < num_active_edges; j += 2)
-          {
-             int x0, x1;
-
-             x0 = ceil(edges[j].x - 0.5);
-             if (j < (num_active_edges - 1))
-               x1 = floor(edges[j + 1].x - 0.5);
-             else
-               x1 = x0;
-             if ((x1 >= ext_x) && (x0 < (ext_x + ext_w)) && (x0 <= x1))
-               {
-                  if (n_spans == MAX_SPANS)
-                    {
-                       polygon_spans_fill(surface, y, spans, n_spans);
-                       n_spans = 0;
-                    }
-
-                  polygon_span_add(spans + n_spans, y, x0, (x1 - x0) + 1);
-                  n_spans++;
-               }
-             edges[j].x += edges[j].dx;
-             edges[j + 1].x += edges[j + 1].dx;
-          }
-
-        if (n_spans)
-          polygon_spans_fill(surface, y, spans, n_spans);
-     }
-
-   free(edges);
-   free(point);
-   free(sorted_index);
-}
diff --git a/libraries/evas/src/modules/engines/fb/Evas_Engine_FB.h b/libraries/evas/src/modules/engines/fb/Evas_Engine_FB.h
deleted file mode 100644
index b548237..0000000
--- a/libraries/evas/src/modules/engines/fb/Evas_Engine_FB.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _EVAS_ENGINE_FB_H
-#define _EVAS_ENGINE_FB_H
-
-typedef struct _Evas_Engine_Info_FB Evas_Engine_Info_FB;
-
-struct _Evas_Engine_Info_FB
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-
-      int virtual_terminal;
-      int device_number;
-      int refresh;
-      int rotation;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-#endif
-
-
diff --git a/libraries/evas/src/modules/engines/fb/Makefile.am b/libraries/evas/src/modules/engines/fb/Makefile.am
deleted file mode 100644
index 55127bb..0000000
--- a/libraries/evas/src/modules/engines/fb/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_fb_cflags@
-
-if BUILD_ENGINE_FB
-
-FB_SOURCES = \
-evas_engine.c \
-evas_fb_main.c \
-evas_outbuf.c
-
-FB_LIBADD = @evas_engine_fb_libs@
-
-
-includes_HEADERS = Evas_Engine_FB.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_FB
-
-pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(FB_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(FB_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_fb.la
-
-libevas_engine_fb_la_SOURCES = $(FB_SOURCES)
-libevas_engine_fb_la_LIBADD = $(FB_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.h \
-evas_fb.h
diff --git a/libraries/evas/src/modules/engines/fb/Makefile.in b/libraries/evas/src/modules/engines/fb/Makefile.in
deleted file mode 100644
index 31d222a..0000000
--- a/libraries/evas/src/modules/engines/fb/Makefile.in
+++ /dev/null
@@ -1,829 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/fb
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_TRUE@libevas_engine_fb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_fb_la_SOURCES_DIST = evas_engine.c evas_fb_main.c \
-        evas_outbuf.c
-@BUILD_ENGINE_FB_TRUE@am__objects_1 = evas_engine.lo evas_fb_main.lo \
-@BUILD_ENGINE_FB_TRUE@  evas_outbuf.lo
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_TRUE@am_libevas_engine_fb_la_OBJECTS = $(am__objects_1)
-libevas_engine_fb_la_OBJECTS = $(am_libevas_engine_fb_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_TRUE@am_libevas_engine_fb_la_rpath =
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@      $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_fb_main.c \
-        evas_outbuf.c
-@BUILD_ENGINE_FB_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_FB_TRUE@  module_la-evas_fb_main.lo \
-@BUILD_ENGINE_FB_TRUE@  module_la-evas_outbuf.lo
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@am_module_la_rpath =  \
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@      -rpath \
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_fb_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_fb_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_FB.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_fb_cflags@
-
-@BUILD_ENGINE_FB_TRUE@FB_SOURCES = \
-@BUILD_ENGINE_FB_TRUE@evas_engine.c \
-@BUILD_ENGINE_FB_TRUE@evas_fb_main.c \
-@BUILD_ENGINE_FB_TRUE@evas_outbuf.c
-
-@BUILD_ENGINE_FB_TRUE@FB_LIBADD = @evas_engine_fb_libs@
-@BUILD_ENGINE_FB_TRUE@includes_HEADERS = Evas_Engine_FB.h
-@BUILD_ENGINE_FB_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@module_la_SOURCES = $(FB_SOURCES)
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@module_la_LIBADD = @EINA_LIBS@ $(FB_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@module_la_LDFLAGS = -module -avoid-version
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_TRUE@noinst_LTLIBRARIES = libevas_engine_fb.la
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_TRUE@libevas_engine_fb_la_SOURCES = $(FB_SOURCES)
-@BUILD_ENGINE_FB_TRUE@@EVAS_STATIC_BUILD_FB_TRUE@libevas_engine_fb_la_LIBADD = $(FB_LIBADD)
-EXTRA_DIST = \
-evas_engine.h \
-evas_fb.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/fb/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/fb/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_fb.la: $(libevas_engine_fb_la_OBJECTS) $(libevas_engine_fb_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_fb_la_rpath) $(libevas_engine_fb_la_OBJECTS) $(libevas_engine_fb_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_fb_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_fb_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_outbuf.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_fb_main.lo: evas_fb_main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_fb_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_fb_main.Tpo -c -o module_la-evas_fb_main.lo `test -f 'evas_fb_main.c' || echo '$(srcdir)/'`evas_fb_main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_fb_main.Tpo $(DEPDIR)/module_la-evas_fb_main.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_fb_main.c' object='module_la-evas_fb_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_fb_main.lo `test -f 'evas_fb_main.c' || echo '$(srcdir)/'`evas_fb_main.c
-
-module_la-evas_outbuf.lo: evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_outbuf.Tpo -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_outbuf.Tpo $(DEPDIR)/module_la-evas_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_outbuf.c' object='module_la-evas_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/fb/evas_engine.c b/libraries/evas/src/modules/engines/fb/evas_engine.c
deleted file mode 100644
index e15c02b..0000000
--- a/libraries/evas/src/modules/engines/fb/evas_engine.c
+++ /dev/null
@@ -1,310 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_FB.h"
-
-int _evas_engine_fb_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Tilebuf          *tb;
-   Outbuf           *ob;
-   Tilebuf_Rect     *rects;
-   Eina_Inlist      *cur_rect;
-   int               end : 1;
-};
-
-/* prototypes we will use here */
-static void *_output_setup(int w, int h, int rot, int vt, int dev, int refresh);
-
-static void *eng_info(Evas *e);
-static void eng_info_free(Evas *e, void *info);
-static int eng_setup(Evas *e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-/* internal engine routines */
-static void *
-_output_setup(int w, int h, int rot, int vt, int dev, int refresh)
-{
-   Render_Engine *re;
-
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   evas_fb_outbuf_fb_init();
-
-   /* get any stored performance metrics from device (xserver) */
-   re->ob = evas_fb_outbuf_fb_setup_fb(w, h, rot, OUTBUF_DEPTH_INHERIT, vt, dev, refresh);
-   re->tb = evas_common_tilebuf_new(evas_fb_outbuf_fb_get_width(re->ob), evas_fb_outbuf_fb_get_height(re->ob));
-   /* no backbuf! */
-   evas_fb_outbuf_fb_set_have_backbuf(re->ob, 0);
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   return re;
-}
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e __UNUSED__)
-{
-   Evas_Engine_Info_FB *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_FB));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_FB *in;
-   in = (Evas_Engine_Info_FB *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_FB *info;
-
-   info = (Evas_Engine_Info_FB *)in;
-   re = _output_setup(e->output.w,
-                      e->output.h,
-                      info->info.rotation,
-                      info->info.virtual_terminal,
-                      info->info.device_number,
-                      info->info.refresh);
-   e->engine.data.output = re;
-   if (!e->engine.data.output) return 0;
-   e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_fb_outbuf_fb_free(re->ob);
-   evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_fb_outbuf_fb_reconfigure(re->ob, w, h,
-                                 evas_fb_outbuf_fb_get_rot(re->ob),
-                                 OUTBUF_DEPTH_INHERIT);
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   RGBA_Image *surface;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect) return NULL;
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   surface = evas_fb_outbuf_fb_new_region_for_update(re->ob,
-                                          ux, uy, uw, uh,
-                                          cx, cy, cw, ch);
-   *x = ux; *y = uy; *w = uw; *h = uh;
-   return surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-#ifdef BUILD_PIPE_RENDER
-   evas_common_pipe_map_begin(surface);
-#endif   
-   evas_fb_outbuf_fb_push_updated_region(re->ob, surface, x, y, w, h);
-   evas_fb_outbuf_fb_free_region_for_update(re->ob, surface);
-   evas_common_cpu_end_opt();
-}
-
-static void
-eng_output_flush(void *data __UNUSED__)
-{
-}
-
-static void
-eng_output_idle_flush(void *data __UNUSED__)
-{
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context __UNUSED__)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return (re->ob->priv.fb.fb->fb_var.transp.length > 0);
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_engine_fb_log_dom = eina_log_domain_register
-     ("evas-fb", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_fb_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_engine_fb_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-  EVAS_MODULE_API_VERSION,
-  "fb",
-  "none",
-  {
-    module_open,
-    module_close
-  }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, fb);
-
-#ifndef EVAS_STATIC_BUILD_FB
-EVAS_EINA_MODULE_DEFINE(engine, fb);
-#endif
diff --git a/libraries/evas/src/modules/engines/fb/evas_engine.h b/libraries/evas/src/modules/engines/fb/evas_engine.h
deleted file mode 100644
index 295e91e..0000000
--- a/libraries/evas/src/modules/engines/fb/evas_engine.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-#include "evas_fb.h"
-
-extern int _evas_engine_fb_log_dom;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_fb_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_fb_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_fb_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_fb_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_fb_log_dom, __VA_ARGS__)
-
-typedef struct _Outbuf                Outbuf;
-
-typedef enum   _Outbuf_Depth          Outbuf_Depth;
-
-enum _Outbuf_Depth
-{
-   OUTBUF_DEPTH_NONE,
-     OUTBUF_DEPTH_INHERIT,
-     OUTBUF_DEPTH_RGB_16BPP_565_565_DITHERED,
-     OUTBUF_DEPTH_RGB_16BPP_555_555_DITHERED,
-     OUTBUF_DEPTH_RGB_16BPP_444_444_DITHERED,
-     OUTBUF_DEPTH_RGB_16BPP_565_444_DITHERED,
-     OUTBUF_DEPTH_RGB_32BPP_888_8888,
-     OUTBUF_DEPTH_LAST
-};
-
-struct _Outbuf
-{
-   Outbuf_Depth    depth;
-   int             w, h;
-   int             rot;
-
-   struct {
-      struct {
-         FB_Mode  *fb;
-      } fb;
-      struct {
-         DATA32    r, g, b;
-      } mask;
-      RGBA_Image  *back_buf;
-   } priv;
-};
-
-/****/
-
-void         evas_fb_outbuf_fb_init                   (void);
-void         evas_fb_outbuf_fb_free                   (Outbuf *buf);
-
-Outbuf      *evas_fb_outbuf_fb_setup_fb               (int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev_no, int refresh);
-
-void         evas_fb_outbuf_fb_blit                   (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y);
-void         evas_fb_outbuf_fb_update                 (Outbuf *buf, int x, int y, int w, int h);
-RGBA_Image  *evas_fb_outbuf_fb_new_region_for_update  (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
-void         evas_fb_outbuf_fb_free_region_for_update (Outbuf *buf, RGBA_Image *update);
-void         evas_fb_outbuf_fb_push_updated_region    (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h);
-void         evas_fb_outbuf_fb_reconfigure            (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth);
-int          evas_fb_outbuf_fb_get_width              (Outbuf *buf);
-int          evas_fb_outbuf_fb_get_height             (Outbuf *buf);
-Outbuf_Depth evas_fb_outbuf_fb_get_depth              (Outbuf *buf);
-int          evas_fb_outbuf_fb_get_rot                (Outbuf *buf);
-int          evas_fb_outbuf_fb_get_have_backbuf       (Outbuf *buf);
-void         evas_fb_outbuf_fb_set_have_backbuf       (Outbuf *buf, int have_backbuf);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/fb/evas_fb.h b/libraries/evas/src/modules/engines/fb/evas_fb.h
deleted file mode 100644
index 76ab30b..0000000
--- a/libraries/evas/src/modules/engines/fb/evas_fb.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef _EVAS_FB_H
-#define _EVAS_FB_H 1
-
-/* -------------------------------------------------------------------- */
-/* LINUX FBCON FRAMEBUFFER UTILITY CODE                                 */
-/* makes setting up the framebuffer easy. Also makes it eays to port to */
-/* some other system if needed.                                         */
-/* Copyright (c) 1999 - Carsten Haitzler (The Rasterman)                */
-/* -------------------------------------------------------------------- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <linux/fb.h>
-
-typedef struct _fb_mode FB_Mode;
-
-struct _fb_mode
-{
-  unsigned int    width;
-  unsigned int    height;
-  unsigned int    refresh;
-  unsigned int    depth;
-  unsigned int    bpp;
-  int             fb_fd;
-  void           *mem;
-  unsigned int    mem_offset;
-  struct fb_var_screeninfo fb_var;
-};
-
-/* init a framebuffer (and switch to) vt number vt. If vt == 0 use current   */
-/* vt                                                                        */
-void fb_init(int vt, int device);
-/* call this afetr setting or getting the fb mode (whichever) to complete    */
-/* the dsetup                                                                */
-int  fb_postinit(FB_Mode *mode);
-/* console switching - if a switch was requested this with block if block    */
-/* is 1, otherwise it will return 1 if current console is active or 0 if     */
-/* the user has switched away in the meantime                                */
-int  fb_await_switch(int block);
-/* list all current possible video modes listed in /etc/fb.modes             */
-/* returns pointer to an aray of FB_Mode, and sets num_return to the number  */
-/* of elements in the returned array                                         */
-FB_Mode *fb_list_modes(unsigned int *num_return);
-/* sets the fb mode to the resolution width x height and the depth to depth. */
-/* and if refresh > 0 attempts to use a mode with a refresh rate (in Hz) of  */
-/* that. If this fails it will return NULL - if it succeeds it will return   */
-/* a pointer to the FB_Mode thatwas set. only modes in /etc/fb.modes will    */
-/* be used. If refresh is 0 it uses the DEFAULT mode (the one with no        */
-/* refresh rate at the end of its name (WIDTHxHEIGHT-REFRESH)                */
-/* NB: in 8bpp you get a 332 palette. This is fixed so all modes are         */
-/* "truecolor" - the only difference is how many bits bep red, green and     */
-/* blue channel. This is for speed reasons                                   */
-FB_Mode *fb_setmode(unsigned int width, unsigned int height, unsigned int depth, unsigned int refresh);
-/* returns the current fb mode being used in FB_Mode                         */
-FB_Mode *fb_getmode(void);
-/* changes the bit depth of the current fb mode to depth and returns a new   */
-/* handle to a new fb mode with updated parameters. frees cur_mode for you.  */
-FB_Mode *fb_changedepth(FB_Mode *cur_mode, unsigned int depth);
-/* changes resolution - retaining current depth of the current mode,         */
-/* returning a handle to the new mode once done. frees cur_mode for you.     */
-FB_Mode *fb_changeres(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigned int refresh);
-/* chnages both resolution and depth and returns a handle to the new mode    */
-/* when done. frees cur_mode for you                                         */
-FB_Mode *fb_changemode(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigned int depth, unsigned int refresh);
-
-/* ------------------------------------------------------------------------- */
-/* How to init:                                                              */
-/* (Example)                                                                 */
-
-/* FB_Mode *mode;                                                            */
-/* int fb_fd = -1;                                                           */
-/* fb_init(0);                                                               */
-/* mode = fb_setmode(640, 480, 8, 0);                                        */
-/* if (mode)                                                                 */
-/*   fb_fd = fb_postinit(mode);                                              */
-/* if (fb_fd == -1)                                                          */
-/*   {                                                                       */
-/*     fprintf(stderr, "Frambuffer init failed\n");                          */
-/*     exit(1);                                                              */
-/*   }                                                                       */
-/* .... code to play with the FB                                             */
-#endif
diff --git a/libraries/evas/src/modules/engines/fb/evas_fb_main.c b/libraries/evas/src/modules/engines/fb/evas_fb_main.c
deleted file mode 100644
index 1d61f1a..0000000
--- a/libraries/evas/src/modules/engines/fb/evas_fb_main.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/* -------------------------------------------------------------------- */
-/* LINUX FBCON FRAMEBUFFER UTILITY CODE                                 */
-/* makes setting up the framebuffer easy. Also makes it eays to port to */
-/* some other system if needed.                                         */
-/* Copyright (c) 1999 - Carsten Haitzler (The Rasterman)                */
-/* -------------------------------------------------------------------- */
-#include "evas_common.h"
-#include "evas_fb.h"
-
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <sys/user.h>
-
-#define FB_ACTIVE    0
-#define FB_REL_REQ   1
-#define FB_INACTIVE  2
-#define FB_ACQ_REQ   3
-
-/* -------------------------------------------------------------------- */
-/* internal variables                                                   */
-
-static struct fb_fix_screeninfo  fb_fix;
-static int                       fb, tty;
-static int                       bpp, depth;
-//static int                       orig_vt_no = 0;
-static int                       kd_mode;
-static struct vt_mode            vt_omode;
-static struct fb_var_screeninfo  fb_ovar;
-static unsigned short            ored[256], ogreen[256], oblue[256];
-static unsigned short            red[256],  green[256],  blue[256];
-static struct fb_cmap            ocmap = { 0, 256, ored, ogreen, oblue, NULL };
-static struct fb_cmap            cmap  = { 0, 256, red,  green,  blue, NULL };
-
-/* -------------------------------------------------------------------- */
-/* internal function prototypes                                         */
-
-static void fb_cleanup(void);
-//static void fb_cleanup_fork(void);
-//static void fb_setvt(int vtno);
-static void fb_init_palette_332(FB_Mode *mode);
-static void fb_init_palette_linear(FB_Mode *mode);
-
-/* -------------------------------------------------------------------- */
-/* palette setting                                                      */
-
-static void
-fb_init_palette_332(FB_Mode *mode)
-{
-   int r, g, b, i;
-   
-   if (mode->fb_var.bits_per_pixel != 8)
-      return;
-   i = 0;
-   
-   if (ioctl(fb, FBIOGETCMAP, &cmap) == -1)
-      perror("ioctl FBIOGETCMAP");
-   
-   /* generate the palette */
-   for (r = 0; r < 8; r++)
-     {
-        for (g = 0; g < 8; g++)
-          {
-             for (b = 0; b < 4; b++)
-               {
-                  int val;
-                  
-                  val = (r << 5) | (r << 2) | (r >> 1);
-                  red[i] = (val << 8) | val;
-                  val = (g << 5) | (g << 2) | (g >> 1);
-                  green[i] = (val << 8) | val;
-                  val = (b << 6) | (b << 4) | (b << 2) | (b);
-                  blue[i] = (val << 8) | val;
-                  i++;
-               }
-          }
-     }
-   
-   /* set colormap */
-   if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1)
-      perror("ioctl FBIOPUTCMAP");
-}
-
-static void
-fb_init_palette_linear(FB_Mode *mode)
-{
-   int i;
-   
-   if (mode->fb_var.bits_per_pixel != 8)
-      return;
-   
-   if (ioctl(fb, FBIOGETCMAP, &cmap) == -1)
-      perror("ioctl FBIOGETCMAP");
-   
-   /* generate the palette */
-   for (i = 0; i < 256; i++)
-      red[i] = (i << 8) | i;
-   for (i = 0; i < 256; i++)
-      green[i] = (i << 8) | i;
-   for (i = 0; i < 256; i++)
-      blue[i] = (i << 8) | i;
-   
-   /* set colormap */
-   if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1)
-      perror("ioctl FBIOPUTCMAP");
-}
-
-/* -------------------------------------------------------------------- */
-/* initialisation & cleanup                                             */
-
-FB_Mode *
-fb_list_modes(unsigned int *num_return)
-{
-   FILE *f;
-   char line[256], label[256], value[256];
-   FB_Mode *modes = NULL;
-   int num;
-   
-   num = 0;
-   f = fopen("/etc/fb.modes","r");
-   if (!f)
-     {
-        *num_return = 0;
-        return NULL;
-     }
-   while (fgets(line, sizeof(line) - 1, f))
-     {
-        if (sscanf(line, "mode \"%250[^\"]\"", label) == 1)
-          {
-             char f1[32], f2[32], f3[32], f4[32];
-             
-             f1[0] = 0; f2[0] = 0; f3[0] = 0; f4[0] = 0;
-             sscanf(label, "%30[^x]x%30[^-]-%30[^-]-%30s", f1, f2, f3, f4);
-             if ((f1[0]) && (f2[0]))
-               {
-                  int geometry = 0;
-                  int timings = 0;
-                  
-                  num++;
-                  modes = realloc(modes, num * sizeof(FB_Mode));
-                  modes[num - 1].width = atoi(f1);
-                  modes[num - 1].height = atoi(f2);
-                  if (f3[0])
-                     modes[num - 1].refresh = atoi(f3);
-                  else
-                     modes[num - 1].refresh = 0;
-                  modes[num - 1].fb_var.sync = 0;
-                  while ((fgets(line, sizeof(line) - 1, f)) &&
-                         (!strstr(line, "endmode")))
-                    {
-                       
-                       if (sscanf(line," geometry %i %i %i %i %i",
-                                  &modes[num - 1].fb_var.xres,
-                                  &modes[num - 1].fb_var.yres,
-                                  &modes[num - 1].fb_var.xres_virtual,
-                                  &modes[num - 1].fb_var.yres_virtual,
-                                  &modes[num - 1].fb_var.bits_per_pixel) == 5)
-                          geometry = 1;
-                       if (sscanf(line," timings %i %i %i %i %i %i %i",
-                                  &modes[num - 1].fb_var.pixclock,
-                                  &modes[num - 1].fb_var.left_margin,
-                                  &modes[num - 1].fb_var.right_margin,
-                                  &modes[num - 1].fb_var.upper_margin,
-                                  &modes[num - 1].fb_var.lower_margin,
-                                  &modes[num - 1].fb_var.hsync_len,
-                                  &modes[num - 1].fb_var.vsync_len) == 7)
-                          timings = 1;
-                       if ((sscanf(line, " hsync %15s", value) == 1) &&
-                           (!strcmp(value,"high")))
-                          modes[num - 1].fb_var.sync |= FB_SYNC_HOR_HIGH_ACT;
-                       if ((sscanf(line, " vsync %15s", value) == 1) &&
-                           (!strcmp(value,"high")))
-                          modes[num - 1].fb_var.sync |= FB_SYNC_VERT_HIGH_ACT;
-                       if ((sscanf(line, " csync %15s", value) == 1) &&
-                           (!strcmp(value,"high")))
-                          modes[num - 1].fb_var.sync |= FB_SYNC_COMP_HIGH_ACT;
-                       if ((sscanf(line, " extsync %15s", value) == 1) &&
-                           (!strcmp(value,"true")))
-                          modes[num - 1].fb_var.sync |= FB_SYNC_EXT;
-                       if ((sscanf(line, " laced %15s", value) == 1) &&
-                           (!strcmp(value,"true")))
-                          modes[num - 1].fb_var.vmode |= FB_VMODE_INTERLACED;
-                       if ((sscanf(line, " double %15s",value) == 1) &&
-                           (!strcmp(value,"true")))
-                          modes[num - 1].fb_var.vmode |= FB_VMODE_DOUBLE;
-                    }
-                  if ((!geometry) || (!timings))
-                    {
-                       num--;
-                       if (num == 0)
-                         {
-                            free(modes);
-                            modes = NULL;
-                         }
-                    }
-                  else
-                    {
-                       modes[num - 1].fb_var.xoffset = 0;
-                       modes[num - 1].fb_var.yoffset = 0;
-                    }
-               }
-          }
-     }
-   fclose(f);
-   *num_return = num;
-   return modes;
-}
-
-FB_Mode *
-fb_setmode(unsigned int width, unsigned int height, unsigned int pdepth, unsigned int refresh)
-{
-   FB_Mode *modes, *mode = NULL;
-   unsigned int i, num_modes;
-   
-   modes = fb_list_modes(&num_modes);
-   if (modes)
-     {
-        for (i = 0; i < num_modes; i++)
-          {
-             if ((modes[i].width == width) &&
-                 (modes[i].height == height) &&
-                 (!pdepth || modes[i].fb_var.bits_per_pixel == pdepth) &&
-                 (modes[i].refresh == refresh))
-               {
-                  if (pdepth) modes[i].fb_var.bits_per_pixel = pdepth;
-                  
-                  if (ioctl(fb, FBIOPUT_VSCREENINFO, &modes[i].fb_var) == -1)
-                     perror("ioctl FBIOPUT_VSCREENINFO");
-                  
-                  free(modes);
-                  return fb_getmode();
-               }
-          }
-        free(modes);
-     }
-   return mode;
-}
-
-FB_Mode *
-fb_changedepth(FB_Mode *cur_mode, unsigned int pdepth)
-{
-   cur_mode->fb_var.bits_per_pixel = pdepth;
-   
-   if (ioctl(fb, FBIOPUT_VSCREENINFO, &cur_mode->fb_var) == -1)
-      perror("ioctl FBIOPUT_VSCREENINFO");
-   
-   free(cur_mode);
-   return fb_getmode();
-}
-
-FB_Mode *
-fb_changeres(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigned int refresh)
-{
-   FB_Mode *modes;
-   unsigned int i, num_modes;
-   
-   modes = fb_list_modes(&num_modes);
-   if (modes)
-     {
-        for (i = 0; i < num_modes; i++)
-          {
-             if ((modes[i].width == width) &&
-                 (modes[i].height == height) &&
-                 (modes[i].refresh == refresh))
-               {
-                  modes[i].fb_var.bits_per_pixel = cur_mode->depth;
-                  
-                  if (ioctl(fb, FBIOPUT_VSCREENINFO, &modes[i].fb_var) == -1)
-                     perror("ioctl FBIOPUT_VSCREENINFO");
-                  
-                  free(modes);
-                  free(cur_mode);
-                  return fb_getmode();
-               }
-          }
-        free(modes);
-     }
-   return cur_mode;
-}
-
-FB_Mode *
-fb_changemode(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigned int pdepth, unsigned int refresh)
-{
-   FB_Mode *modes;
-   unsigned int i, num_modes;
-   
-   modes = fb_list_modes(&num_modes);
-   if (modes)
-     {
-        for (i = 0; i < num_modes; i++)
-          {
-             if ((modes[i].width == width) &&
-                 (modes[i].height == height) &&
-                 (!pdepth || modes[i].fb_var.bits_per_pixel == pdepth) &&
-                 (modes[i].refresh == refresh))
-               {
-                  if (pdepth) modes[i].fb_var.bits_per_pixel = pdepth;
-                  
-                  if (ioctl(fb, FBIOPUT_VSCREENINFO, &modes[i].fb_var) == -1)
-                     perror("ioctl FBIOPUT_VSCREENINFO");
-                  
-                  free(modes);
-                  free(cur_mode);
-                  return fb_getmode();
-               }
-          }
-        free(modes);
-     }
-   return cur_mode;
-}
-
-FB_Mode *
-fb_getmode(void)
-{
-   FB_Mode *mode = NULL;
-   int      hpix, lines, clockrate;
-   
-   mode = malloc(sizeof(FB_Mode));
-   /* look what we have now ... */
-   
-   if (ioctl(fb, FBIOGET_VSCREENINFO, &mode->fb_var) == -1)
-     {
-        perror("ioctl FBIOGET_VSCREENINFO");
-        return NULL;
-     }
-   
-   mode->width = mode->fb_var.xres_virtual;
-   mode->height = mode->fb_var.yres_virtual;
-   hpix =
-      mode->fb_var.left_margin +
-      mode->fb_var.xres +
-      mode->fb_var.right_margin +
-      mode->fb_var.hsync_len;
-   lines =
-      mode->fb_var.upper_margin +
-      mode->fb_var.yres +
-      mode->fb_var.lower_margin +
-      mode->fb_var.vsync_len;
-   if (mode->fb_var.pixclock > 0)
-      clockrate = 1000000 / mode->fb_var.pixclock;
-   else
-      clockrate = 0;
-   if ((lines > 0) && (hpix > 0))
-      mode->refresh = clockrate * 1000000 / (lines * hpix);
-   switch (mode->fb_var.bits_per_pixel)
-     {
-     case 1:
-        bpp = 1;
-        depth = 1;
-        break;
-     case 4:
-        bpp = 1;
-        depth = 4;
-        break;
-     case 8:
-        bpp = 1;
-        depth = 8;
-        break;
-     case 15:
-     case 16:
-        if (mode->fb_var.green.length == 6)
-           depth = 16;
-        else
-           depth = 15;
-        bpp = 2;
-        break;
-     case 24:
-        depth = 24;
-        bpp = mode->fb_var.bits_per_pixel / 8;
-        break;
-     case 32:
-        depth = 32;
-        bpp = mode->fb_var.bits_per_pixel / 8;
-        break;
-     default:
-        ERR("Cannot handle framebuffer of depth %i",
-            mode->fb_var.bits_per_pixel);
-        fb_cleanup();
-        free(mode);
-        return NULL;
-     }
-   mode->depth = depth;
-   mode->bpp = bpp;
-   if (mode->depth == 8) fb_init_palette_332(mode);
-   else fb_init_palette_linear(mode);
-   return mode;
-}
-
-/* XXX: unused
-static void
-fb_setvt(int vtno)
-{
-   struct vt_stat vts;
-   char vtname[32];
-   int vtfd;
-   
-   if (vtno < 0)
-     {
-        if ((ioctl(tty,VT_OPENQRY, &vtno) == -1))
-          {
-             perror("ioctl VT_OPENQRY");
-             return;
-          }
-        if (vtno <= 0 )
-          {
-             perror("ioctl VT_OPENQRY vtno <= 0");
-             return;
-          }
-     }
-   vtno &= 0xff;
-   sprintf(vtname, "/dev/tty%i", vtno);
-   if (chown(vtname, getuid(), getgid()) != 0)
-     {
-        vtfd = 0; // do nothing - don't worry about chown
-     }
-   if (access(vtname,R_OK | W_OK) == -1)
-     {
-        CRIT("Access %s: %s",vtname,strerror(errno));
-        return;
-     }
-   vtfd = open(vtname,O_RDWR);
-   
-   if (ioctl(tty, VT_GETSTATE, &vts) == -1)
-     {
-        perror("ioctl VT_GETSTATE");
-        close(vtfd);
-        return;
-     }
-   
-   orig_vt_no = vts.v_active;
-   close(vtfd);
-#if 0
-  if (ioctl(tty, VT_ACTIVATE, vtno) == -1)
-    {
-      perror("ioctl VT_ACTIVATE");
-      exit(1);
-    }
-  if (ioctl(tty, VT_WAITACTIVE, vtno) == -1)
-    {
-      perror("ioctl VT_WAITACTIVE");
-      exit(1);
-    }
-#endif
-}
-*/
-
-void
-fb_init(int vt __UNUSED__, int device)
-{
-   char dev[32];
-   
-   tty = 0;
-#if 0
-   if (vt != 0) fb_setvt(vt);
-#endif
-
-   if ( getenv("EVAS_FB_DEV") )
-     {
-        fb = open(getenv("EVAS_FB_DEV"), O_RDWR);
-     }
-   else
-     {
-        sprintf(dev, "/dev/fb/%i", device);
-        fb = open(dev, O_RDWR);
-        if ( fb == -1 )
-          {
-             sprintf(dev, "/dev/fb%i", device);
-             fb = open(dev, O_RDWR);
-          }
-     }
-   if (fb == -1)
-     {
-        CRIT("open %s: %s", dev, strerror(errno));
-        fb_cleanup();
-        return;
-     }
-   
-   if (ioctl(fb, FBIOGET_VSCREENINFO, &fb_ovar) == -1)
-     {
-        perror("ioctl FBIOGET_VSCREENINFO");
-        return;
-     }
-   if (ioctl(fb, FBIOGET_FSCREENINFO, &fb_fix) == -1)
-     {
-        perror("ioctl FBIOGET_FSCREENINFO");
-        return;
-     }
-
-   if ((fb_ovar.bits_per_pixel == 8) ||
-       (fb_fix.visual == FB_VISUAL_DIRECTCOLOR))
-     {
-        if (ioctl(fb,FBIOGETCMAP , &ocmap) == -1)
-          {
-             perror("ioctl FBIOGETCMAP");
-             return;
-          }
-     }
-#if 0
-   if (isatty(0))
-      tty = 0;
-   else if ((tty = open("/dev/tty",O_RDWR)) == -1)
-     {
-        CITICAL("open %s: %s", "/dev/tty", strerror(errno));
-        return;
-     }
-   if (tty)
-     {
-        if (ioctl(tty, KDGETMODE, &kd_mode) == -1)
-          {
-             perror("ioctl KDGETMODE");
-             return;
-          }
-        if (ioctl(tty, VT_GETMODE, &vt_omode) == -1)
-          {
-             perror("ioctl VT_GETMODE");
-             return;
-          }
-     }
-#endif
-}
-
-int
-fb_postinit(FB_Mode *mode)
-{
-   if (ioctl(fb,FBIOGET_FSCREENINFO, &fb_fix) == -1)
-     {
-        perror("ioctl FBIOGET_FSCREENINFO");
-        fb_cleanup();
-        return 0;
-     }
-   
-   if (fb_fix.type != FB_TYPE_PACKED_PIXELS)
-     {
-        CRIT("can handle only packed pixel frame buffers");
-        fb_cleanup();
-        return 0;
-     }
-   mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
-   mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
-                                     PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
-   if (mode->mem == MAP_FAILED)
-     {
-        perror("mmap");
-        fb_cleanup();
-     }
-   /* move viewport to upper left corner */
-   if ((mode->fb_var.xoffset != 0) || (mode->fb_var.yoffset != 0))
-     {
-        mode->fb_var.xoffset = 0;
-        mode->fb_var.yoffset = 0;
-        
-        if (ioctl(fb, FBIOPAN_DISPLAY, &(mode->fb_var)) == -1)
-          {
-             perror("ioctl FBIOPAN_DISPLAY");
-             fb_cleanup();
-          }
-     }
-#if 0
-   if (tty)
-     {
-        if (ioctl(tty,KDSETMODE, KD_GRAPHICS) == -1)
-          {
-             perror("ioctl KDSETMODE");
-             fb_cleanup();
-          }
-     }
-#endif
-  mode->fb_fd = fb;
-  return fb;
-}
-
-static void
-fb_cleanup(void)
-{
-   /* restore console */
-   if (ioctl(fb, FBIOPUT_VSCREENINFO, &fb_ovar) == -1)
-      perror("ioctl FBIOPUT_VSCREENINFO");
-   if (ioctl(fb, FBIOGET_FSCREENINFO, &fb_fix) == -1)
-      perror("ioctl FBIOGET_FSCREENINFO");
-   if ((fb_ovar.bits_per_pixel == 8) ||
-       (fb_fix.visual == FB_VISUAL_DIRECTCOLOR))
-     {
-        if (ioctl(fb, FBIOPUTCMAP, &ocmap) == -1)
-           perror("ioctl FBIOPUTCMAP");
-     }
-   close(fb);
-   if (tty)
-     {
-        if (ioctl(tty, KDSETMODE, kd_mode) == -1)
-           perror("ioctl KDSETMODE");
-        if (ioctl(tty, VT_SETMODE, &vt_omode) == -1)
-           perror("ioctl VT_SETMODE");
-#if 0        
-        if ((ioctl(tty, VT_ACTIVATE, orig_vt_no) == -1) && (orig_vt_no))
-           perror("ioctl VT_ACTIVATE");
-#endif        
-     }
-   close(tty);
-}
diff --git a/libraries/evas/src/modules/engines/fb/evas_outbuf.c b/libraries/evas/src/modules/engines/fb/evas_outbuf.c
deleted file mode 100644
index 7ae24c5..0000000
--- a/libraries/evas/src/modules/engines/fb/evas_outbuf.c
+++ /dev/null
@@ -1,402 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-#include <sys/time.h>
-#include <sys/utsname.h>
-
-void
-evas_fb_outbuf_fb_init(void)
-{
-}
-
-void
-evas_fb_outbuf_fb_free(Outbuf *buf)
-{
-   /* FIXME: implement */
-   WRN("destroying fb info.. not implemented!!!! WARNING. LEAK!");
-   if (buf->priv.back_buf)
-     evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
-   free(buf);
-}
-
-Outbuf *
-evas_fb_outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev_no, int refresh)
-{
-   /* create outbuf struct */
-   /* setup window and/or fb */
-   /* if (dithered) create backbuf */
-   Outbuf *buf;
-   int fb_fd;
-   int fb_depth;
-
-   fb_depth = -1;
-   if (depth == OUTBUF_DEPTH_RGB_16BPP_565_565_DITHERED) fb_depth = 16;
-   else if (depth == OUTBUF_DEPTH_RGB_16BPP_555_555_DITHERED) fb_depth = 15;
-   else if (depth == OUTBUF_DEPTH_RGB_16BPP_565_444_DITHERED) fb_depth = 16;
-   else if (depth == OUTBUF_DEPTH_RGB_16BPP_444_444_DITHERED) fb_depth = 12;
-   else if (depth == OUTBUF_DEPTH_RGB_32BPP_888_8888) fb_depth = 32;
-   else if (depth == OUTBUF_DEPTH_INHERIT) fb_depth = 0;
-   buf = calloc(1, sizeof(Outbuf));
-   if (!buf)
-     return NULL;
-
-   fb_init(vt_no, dev_no);
-   if (rot == 0 || rot == 180)
-     buf->priv.fb.fb = fb_setmode(w, h, fb_depth, refresh);
-   else if (rot == 90 || rot == 270)
-     buf->priv.fb.fb = fb_setmode(h, w, fb_depth, refresh);
-   if (!buf->priv.fb.fb) buf->priv.fb.fb = fb_getmode();
-   if (!buf->priv.fb.fb)
-     {
-        free(buf);
-        return NULL;
-     }
-   fb_fd = fb_postinit(buf->priv.fb.fb);
-   if (fb_fd < 1)
-     {
-        free(buf);
-        return NULL;
-     }
-
-   if (rot == 0 || rot == 180)
-     {
-        buf->w = buf->priv.fb.fb->width;
-        buf->h = buf->priv.fb.fb->height;
-     }
-   else if (rot == 90 || rot == 270)
-     {
-        buf->w = buf->priv.fb.fb->height;
-        buf->h = buf->priv.fb.fb->width;
-     }
-
-   buf->depth = depth;
-   buf->rot = rot;
-
-     {
-        Gfx_Func_Convert conv_func;
-        int i;
-
-        buf->priv.mask.r = 0;
-        for (i = 0; i < (int)buf->priv.fb.fb->fb_var.red.length; i++)
-          buf->priv.mask.r |= (1 << (buf->priv.fb.fb->fb_var.red.offset + i));
-        buf->priv.mask.g = 0;
-        for (i = 0; i < (int)buf->priv.fb.fb->fb_var.green.length; i++)
-          buf->priv.mask.g |= (1 << (buf->priv.fb.fb->fb_var.green.offset + i));
-        buf->priv.mask.b = 0;
-        for (i = 0; i < (int)buf->priv.fb.fb->fb_var.blue.length; i++)
-          buf->priv.mask.b |= (1 << (buf->priv.fb.fb->fb_var.blue.offset + i));
-
-        conv_func = NULL;
-        if (buf->rot == 0 || buf->rot == 180)
-          conv_func = evas_common_convert_func_get(0, buf->w, buf->h,
-                                       buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                       buf->priv.mask.r,
-                                       buf->priv.mask.g,
-                                       buf->priv.mask.b,
-                                       PAL_MODE_NONE,
-                                       buf->rot);
-        else if (buf->rot == 90 || buf->rot == 270)
-          conv_func = evas_common_convert_func_get(0, buf->h, buf->w,
-                                       buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                       buf->priv.mask.r,
-                                       buf->priv.mask.g,
-                                       buf->priv.mask.b,
-                                       PAL_MODE_NONE,
-                                       buf->rot);
-       if (!conv_func)
-          {
-             free(buf);
-             return NULL;
-          }
-     }
-//   if (buf->priv.fb.fb->fb_var.bits_per_pixel < 24)
-//     buf->priv.back_buf = evas_common_image_create(buf->w, buf->h);
-
-   return buf;
-}
-
-void
-evas_fb_outbuf_fb_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y)
-{
-   if (buf->priv.back_buf)
-     {
-        evas_common_blit_rectangle(buf->priv.back_buf, buf->priv.back_buf,
-                       src_x, src_y, w, h, dst_x, dst_y);
-        evas_fb_outbuf_fb_update(buf, dst_x, dst_y, w, h);
-     }
-   else
-     {
-        if (buf->priv.fb.fb)
-          {
-             /* FIXME: need to implement an fb call for "copy area" */
-          }
-     }
-}
-
-void
-evas_fb_outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h)
-{
-   if (!(buf->priv.back_buf)) return;
-   if (buf->priv.fb.fb)
-     {
-        Gfx_Func_Convert conv_func;
-        DATA8 *data;
-
-        data = NULL;
-        conv_func = NULL;
-        if (buf->rot == 0)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (x + (y * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, w, h, buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        else if (buf->rot == 180)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (buf->w - x - w + ((buf->h - y - h) * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, w, h, buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        else if (buf->rot == 270)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (buf->h - y - h + (x * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        else if (buf->rot == 90)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (y + ((buf->w - x - w) * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        if (conv_func)
-          {
-             DATA32 *src_data;
-
-             src_data = buf->priv.back_buf->image.data + (y * buf->w) + x;
-             if (buf->rot == 0 || buf->rot == 180)
-               {
-                  conv_func(src_data, data,
-                            buf->w - w,
-                            buf->priv.fb.fb->width - w,
-                            w, h,
-                            x, y, NULL);
-               }
-             else if (buf->rot == 90 || buf->rot == 270)
-               {
-                  conv_func(src_data, data,
-                            buf->w - w,
-                            buf->priv.fb.fb->width - h,
-                            h, w,
-                            x, y, NULL);
-               }
-          }
-     }
-}
-
-RGBA_Image *
-evas_fb_outbuf_fb_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch)
-{
-   if (buf->priv.back_buf)
-     {
-        *cx = x; *cy = y; *cw = w; *ch = h;
-        return buf->priv.back_buf;
-     }
-   else
-     {
-        RGBA_Image *im;
-
-        *cx = 0; *cy = 0; *cw = w; *ch = h;
-        im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.flags.alpha = 1;
-        im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry, w, h);
-
-        return im;
-     }
-   return NULL;
-}
-
-void
-evas_fb_outbuf_fb_free_region_for_update(Outbuf *buf, RGBA_Image *update)
-{
-   if (update != buf->priv.back_buf) evas_cache_image_drop(&update->cache_entry);
-}
-
-void
-evas_fb_outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h)
-{
-   if (!buf->priv.fb.fb) return;
-   if (buf->priv.back_buf)
-     {
-        if (update != buf->priv.back_buf)
-          evas_common_blit_rectangle(update, buf->priv.back_buf,
-                         0, 0, w, h, x, y);
-        evas_fb_outbuf_fb_update(buf, x, y, w, h);
-     }
-   else
-     {
-        Gfx_Func_Convert conv_func;
-        DATA8 *data;
-
-        data = NULL;
-        conv_func = NULL;
-        if (buf->rot == 0)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem +
-               buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (x + (y * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, w, h,
-                                          buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        else if (buf->rot == 180)  
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem +
-               buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *  
-               (buf->w - x - w + ((buf->h - y - h) * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, w, h,
-                                          buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        else if (buf->rot == 270)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem +
-               buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (buf->h - y - h + (x * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, h, w,
-                                          buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        else if (buf->rot == 90)
-          {
-             data = (DATA8 *)buf->priv.fb.fb->mem +
-               buf->priv.fb.fb->mem_offset +
-               buf->priv.fb.fb->bpp *
-               (y + ((buf->w - x - w) * buf->priv.fb.fb->width));
-             conv_func = evas_common_convert_func_get(data, h, w,
-                                          buf->priv.fb.fb->fb_var.bits_per_pixel,
-                                          buf->priv.mask.r, buf->priv.mask.g,
-                                          buf->priv.mask.b, PAL_MODE_NONE,
-                                          buf->rot);
-          }
-        if (conv_func)
-          {
-             DATA32 *src_data;
-
-             src_data = update->image.data;
-             if (buf->rot == 0 || buf->rot == 180)
-               {
-                  conv_func(src_data, data,
-                            0,
-                            buf->priv.fb.fb->width - w,
-                            w, h,
-                            x, y, NULL);
-               }
-             else if (buf->rot == 90 || buf->rot == 270)
-               {
-                  conv_func(src_data, data,
-                            0,
-                            buf->priv.fb.fb->width - h,
-                            h, w,
-                            x, y, NULL);
-               }
-          }
-     }
-}
-
-void
-evas_fb_outbuf_fb_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth)
-{
-   if ((w == buf->w) && (h == buf->h) &&
-       (rot == buf->rot) && (depth == buf->depth))
-     return;
-   if (buf->priv.back_buf)
-     {
-        evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
-        buf->priv.back_buf = NULL;
-     }
-   if (buf->priv.fb.fb)
-     {
-        /* FIXME: implement this */
-     }
-   /* if backbuf delet it */
-   /* resize window or reset fb mode */
-   /* if (dithered) create new backbuf */
-}
-
-int
-evas_fb_outbuf_fb_get_width(Outbuf *buf)
-{
-   return buf->w;
-}
-
-int
-evas_fb_outbuf_fb_get_height(Outbuf *buf)
-{
-   return buf->h;
-}
-
-Outbuf_Depth
-evas_fb_outbuf_fb_get_depth(Outbuf *buf)
-{
-   return buf->depth;
-}
-
-int
-evas_fb_outbuf_fb_get_rot(Outbuf *buf)
-{
-   return buf->rot;
-}
-
-int
-evas_fb_outbuf_fb_get_have_backbuf(Outbuf *buf)
-{
-   if (buf->priv.back_buf) return 1;
-   return 0;
-}
-
-void
-evas_fb_outbuf_fb_set_have_backbuf(Outbuf *buf, int have_backbuf)
-{
-   if (buf->priv.back_buf)
-     {
-        if (have_backbuf) return;
-        evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
-        buf->priv.back_buf = NULL;
-     }
-   else
-     {
-        if (!have_backbuf) return;
-        if (buf->priv.fb.fb)
-          {
-             if (buf->priv.fb.fb->fb_var.bits_per_pixel  < 24)
-               {
-                  buf->priv.back_buf = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
-                  buf->priv.back_buf = (RGBA_Image *) evas_cache_image_size_set(&buf->priv.back_buf->cache_entry, buf->w, buf->h);
-               }
-          }
-     }
-}
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h b/libraries/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
deleted file mode 100644
index eb04d28..0000000
--- a/libraries/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __EVAS_ENGINE_GL_COCOA_H__
-#define __EVAS_ENGINE_GL_COCOA_H__
-
-typedef struct _Evas_Engine_Info_GL_Cocoa Evas_Engine_Info_GL_Cocoa;
-
-struct _Evas_Engine_Info_GL_Cocoa
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   void   *window;
-   void   *view;
-   int   depth;
-
-};
-
-
-#endif /* __EVAS_ENGINE_GL_COCOA_H__ */
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/Makefile.am b/libraries/evas/src/modules/engines/gl_cocoa/Makefile.am
deleted file mode 100644
index d502846..0000000
--- a/libraries/evas/src/modules/engines/gl_cocoa/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@evas_engine_gl_cocoa_cflags@
-
-if BUILD_ENGINE_GL_COCOA
-
-GL_COCOA_SOURCES = evas_engine.c\
-evas_gl_cocoa_main.m
-
-
-GL_COCOA_LIBADD = @evas_engine_gl_cocoa_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-
-
-includes_HEADERS = Evas_Engine_GL_Cocoa.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_GL_COCOA
-
-pkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(GL_COCOA_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ $(GL_COCOA_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_gl_cocoa.la
-
-libevas_engine_gl_cocoa_la_SOURCES = $(GL_COCOA_SOURCES)
-libevas_engine_gl_cocoa_la_LIBADD = $(GL_COCOA_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in b/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in
deleted file mode 100644
index 049acb2..0000000
--- a/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in
+++ /dev/null
@@ -1,852 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/gl_cocoa
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-@BUILD_ENGINE_GL_COCOA_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_TRUE@libevas_engine_gl_cocoa_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_gl_cocoa_la_SOURCES_DIST = evas_engine.c \
-        evas_gl_cocoa_main.m
-@BUILD_ENGINE_GL_COCOA_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_GL_COCOA_TRUE@    evas_gl_cocoa_main.lo
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_TRUE@am_libevas_engine_gl_cocoa_la_OBJECTS = $(am__objects_1)
-libevas_engine_gl_cocoa_la_OBJECTS =  \
-        $(am_libevas_engine_gl_cocoa_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_TRUE@am_libevas_engine_gl_cocoa_la_rpath =
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@  $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_gl_cocoa_main.m
-@BUILD_ENGINE_GL_COCOA_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_GL_COCOA_TRUE@    module_la-evas_gl_cocoa_main.lo
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) $(module_la_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
-        $(OBJCFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
-LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_OBJCFLAGS) $(OBJCFLAGS)
-AM_V_OBJC = $(am__v_OBJC_$(V))
-am__v_OBJC_ = $(am__v_OBJC_$(AM_DEFAULT_VERBOSITY))
-am__v_OBJC_0 = @echo "  OBJC  " $@;
-OBJCLD = $(OBJC)
-OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-        --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_OBJCLD = $(am__v_OBJCLD_$(V))
-am__v_OBJCLD_ = $(am__v_OBJCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_OBJCLD_0 = @echo "  OBJCLD" $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_gl_cocoa_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_gl_cocoa_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_GL_Cocoa.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@evas_engine_gl_cocoa_cflags@
-
-@BUILD_ENGINE_GL_COCOA_TRUE@GL_COCOA_SOURCES = evas_engine.c\
-@BUILD_ENGINE_GL_COCOA_TRUE@evas_gl_cocoa_main.m
-
-@BUILD_ENGINE_GL_COCOA_TRUE@GL_COCOA_LIBADD = @evas_engine_gl_cocoa_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-@BUILD_ENGINE_GL_COCOA_TRUE@includes_HEADERS = Evas_Engine_GL_Cocoa.h
-@BUILD_ENGINE_GL_COCOA_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@pkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@module_la_SOURCES = $(GL_COCOA_SOURCES)
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@module_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ $(GL_COCOA_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@module_la_LDFLAGS = -module -avoid-version
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_TRUE@noinst_LTLIBRARIES = libevas_engine_gl_cocoa.la
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_TRUE@libevas_engine_gl_cocoa_la_SOURCES = $(GL_COCOA_SOURCES)
-@BUILD_ENGINE_GL_COCOA_TRUE@@EVAS_STATIC_BUILD_GL_COCOA_TRUE@libevas_engine_gl_cocoa_la_LIBADD = $(GL_COCOA_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .m .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/gl_cocoa/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/gl_cocoa/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_gl_cocoa.la: $(libevas_engine_gl_cocoa_la_OBJECTS) $(libevas_engine_gl_cocoa_la_DEPENDENCIES) 
-        $(AM_V_OBJCLD)$(OBJCLINK) $(am_libevas_engine_gl_cocoa_la_rpath) $(libevas_engine_gl_cocoa_la_OBJECTS) $(libevas_engine_gl_cocoa_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_OBJCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_cocoa_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_gl_cocoa_main.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-.m.o:
-@am__fastdepOBJC_TRUE@  $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepOBJC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $<
-
-.m.obj:
-@am__fastdepOBJC_TRUE@  $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepOBJC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.m.lo:
-@am__fastdepOBJC_TRUE@  $(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepOBJC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $<
-
-module_la-evas_gl_cocoa_main.lo: evas_gl_cocoa_main.m
-@am__fastdepOBJC_TRUE@  $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT module_la-evas_gl_cocoa_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_gl_cocoa_main.Tpo -c -o module_la-evas_gl_cocoa_main.lo `test -f 'evas_gl_cocoa_main.m' || echo '$(srcdir)/'`evas_gl_cocoa_main.m
-@am__fastdepOBJC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_gl_cocoa_main.Tpo $(DEPDIR)/module_la-evas_gl_cocoa_main.Plo
-@am__fastdepOBJC_FALSE@ $(AM_V_OBJC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     source='evas_gl_cocoa_main.m' object='module_la-evas_gl_cocoa_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@     DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@ $(LIBTOOL) $(AM_V_lt) $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o module_la-evas_gl_cocoa_main.lo `test -f 'evas_gl_cocoa_main.m' || echo '$(srcdir)/'`evas_gl_cocoa_main.m
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/evas_engine.c b/libraries/evas/src/modules/engines/gl_cocoa/evas_engine.c
deleted file mode 100644
index fd95688..0000000
--- a/libraries/evas/src/modules/engines/gl_cocoa/evas_engine.c
+++ /dev/null
@@ -1,1462 +0,0 @@
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_engine.h"
-
-#include "evas_private.h"
-
-#include <dlfcn.h>      /* dlopen,dlclose,etc */
-#define EVAS_GL_NO_GL_H_CHECK 1
-#include "Evas_GL.h"
-
-
-
-typedef struct _Render_Engine Render_Engine;
-typedef struct _Render_Engine_GL_Surface    Render_Engine_GL_Surface;
-typedef struct _Render_Engine_GL_Context    Render_Engine_GL_Context;
-
-struct _Render_Engine
-{
-   Evas_GL_Cocoa_Window *win;
-   int                  end;
-};
-
-
-struct _Render_Engine_GL_Surface
-{
-   int     initialized;
-   int     fbo_attached;
-   int     w, h;
-   int     depth_bits;
-   int     stencil_bits;
-
-   // Render target texture/buffers
-   GLuint  rt_tex;
-   GLint   rt_internal_fmt;
-   GLenum  rt_fmt; 
-   GLuint  rb_depth;
-   GLenum  rb_depth_fmt;
-   GLuint  rb_stencil;
-   GLenum  rb_stencil_fmt;
-
-   Render_Engine_GL_Context   *current_ctx;
-};
-
-struct _Render_Engine_GL_Context
-{
-   int         initialized;
-  //   EGLContext  context;
-
-   GLuint      fbo;     
-   
-   Render_Engine_GL_Surface   *current_sfc;
-};
-
-
-int _evas_engine_gl_cocoa_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* Function table for GL APIs */
-static Evas_GL_API gl_funcs;
-
-
-
-static void *
-eng_info(Evas *e __UNUSED__)
-{
-   Evas_Engine_Info_GL_Cocoa *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_GL_Cocoa));
-   DBG("Info %p", info);
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_GL_Cocoa *in;
-
-   DBG("Info %p", info);
-   eina_log_domain_unregister(_evas_engine_gl_cocoa_log_dom);
-   in = (Evas_Engine_Info_GL_Cocoa *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine            *re;
-   Evas_Engine_Info_GL_Cocoa *info;
-
-   DBG("Engine Setup");
-
-   info = (Evas_Engine_Info_GL_Cocoa *)in;
-   if (!e->engine.data.output)
-     {
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re) return 0;
-
-        e->engine.data.output = re;
-        re->win = eng_window_new(info->window,
-                                    e->output.w,
-                                    e->output.h);
-        info->view = re->win->view;
-        if (!re->win)
-          {
-             free(re);
-             e->engine.data.output = NULL;
-             return 0;
-          }
-
-        evas_common_cpu_init();
-
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-     }
-   else
-     {
-        re = e->engine.data.output;
-        eng_window_free(re->win);
-        re->win = eng_window_new(info->window,
-                                    e->output.w,
-                                    e->output.h);
-        info->view = re->win->view;
-     }
-   if (!e->engine.data.output) return 0;
-
-   if (!e->engine.data.context)
-     e->engine.data.context =
-       e->engine.func->context_new(e->engine.data.output);
-   eng_window_use(re->win);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   DBG("Output free");
-   re = (Render_Engine *)data;
-   eng_window_free(re->win);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   DBG("Output Resize %d %d", w, h);
-
-   re = (Render_Engine *)data;
-   re->win->width = w;
-   re->win->height = h;
-   
-   eng_window_resize(re->win, w, h);
-   evas_gl_common_context_resize(re->win->gl_context, w, h, 0);
-}
-
-static void
-eng_output_tile_size_set(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-  DBG("tile size set");
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   DBG("Redraw rect %d %d %d %d", x, y, w, h);
-   re = (Render_Engine *)data;
-   evas_gl_common_context_resize(re->win->gl_context, re->win->width, re->win->height, 0);
-   /* simple bounding box */
-   RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, re->win->width, re->win->height);
-   if ((w <= 0) || (h <= 0)) return;
-   if (!re->win->draw.redraw)
-     {
-#if 0
-        re->win->draw.x1 = x;
-        re->win->draw.y1 = y;
-        re->win->draw.x2 = x + w - 1;
-        re->win->draw.y2 = y + h - 1;
-#else
-        re->win->draw.x1 = 0;
-        re->win->draw.y1 = 0;
-        re->win->draw.x2 = re->win->width - 1;
-        re->win->draw.y2 = re->win->height - 1;
-#endif
-     }
-   else
-     {
-        if (x < re->win->draw.x1) re->win->draw.x1 = x;
-        if (y < re->win->draw.y1) re->win->draw.y1 = y;
-        if ((x + w - 1) > re->win->draw.x2) re->win->draw.x2 = x + w - 1;
-        if ((y + h - 1) > re->win->draw.y2) re->win->draw.y2 = y + h - 1;
-     }
-   re->win->draw.redraw = 1;
-}
-
-static void
-eng_output_redraws_rect_del(void *data __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->win->draw.redraw = 0;
-}
-
-//#define SLOW_GL_COPY_RECT 1
-/* vsync games - not for now though */
-#define VSYNC_TO_SCREEN 1
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_flush(re->win->gl_context);
-   /* get the upate rect surface - return engine data as dummy */
-   if (!re->win->draw.redraw)
-     {
-//      printf("GL: NO updates!\n");
-        return NULL;
-     }
-//   printf("GL: update....!\n");
-#ifdef SLOW_GL_COPY_RECT
-   /* if any update - just return the whole canvas - works with swap
-    * buffers then */
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = re->win->width;
-   if (h) *h = re->win->height;
-   if (cx) *cx = 0;
-   if (cy) *cy = 0;
-   if (cw) *cw = re->win->width;
-   if (ch) *ch = re->win->height;
-#else
-   /* 1 update - INCREDIBLY SLOW if combined with swap_rect in flush. a gl
-    * problem where there just is no hardware path for somethnig that
-    * obviously SHOULD be there */
-   /* only 1 update to minimise gl context games and rendering multiple update
-    * regions as evas does with other engines
-    */
-   if (x) *x = re->win->draw.x1;
-   if (y) *y = re->win->draw.y1;
-   if (w) *w = re->win->draw.x2 - re->win->draw.x1 + 1;
-   if (h) *h = re->win->draw.y2 - re->win->draw.y1 + 1;
-   if (cx) *cx = re->win->draw.x1;
-   if (cy) *cy = re->win->draw.y1;
-   if (cw) *cw = re->win->draw.x2 - re->win->draw.x1 + 1;
-   if (ch) *ch = re->win->draw.y2 - re->win->draw.y1 + 1;
-#endif
-// clear buffer. only needed for dest alpha
-//   glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-//   glClear(GL_COLOR_BUFFER_BIT);
-//x//   printf("frame -> new\n");
-   return re->win->gl_context->def_surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   /* put back update surface.. in this case just unflag redraw */
-   re->win->draw.redraw = 0;
-   re->win->draw.drew = 1;
-   evas_gl_common_context_flush(re->win->gl_context);
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!re->win->draw.drew) return;
-
-   re->win->draw.drew = 0;
-   eng_window_use(re->win);
-
-#ifdef VSYNC_TO_SCREEN
-   eng_window_vsync_set(1);
-#endif
-
-   eng_window_swap_buffers(re->win);
-
-}
-
-static void
-eng_output_idle_flush(void *data __UNUSED__)
-{
-}
-
-static void
-eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h)
-{
-   evas_common_draw_context_add_cutout(context, x, y, w, h);
-}
-
-static void
-eng_context_cutout_clear(void *data __UNUSED__, void *context)
-{
-   evas_common_draw_context_clear_cutouts(context);
-}
-
-static void
-eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_rect_draw(re->win->gl_context, x, y, w, h);
-}
-
-static void
-eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_line_draw(re->win->gl_context, x1, y1, x2, y2);
-}
-
-static void *
-eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_point_add(polygon, x, y);
-}
-
-static void *
-eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_points_clear(polygon);
-}
-
-static void
-eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_poly_draw(re->win->gl_context, polygon, x, y);
-}
-
-static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return 1;
-   im = image;
-   return im->alpha;
-}
-
-static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return EVAS_COLORSPACE_ARGB8888;
-   im = image;
-   return im->cs.space;
-}
-
-static void
-eng_image_mask_create(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return;
-   im = image;
-   if (!im->im->image.data)
-      evas_cache_image_load_data(&im->im->cache_entry);
-   if (!im->tex)
-      im->tex = evas_gl_common_texture_new(im->gc, im->im);
-}
-
-
-static void *
-eng_image_alpha_set(void *data, void *image, int has_alpha)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->alpha == has_alpha) return image;
-   if (im->native.data)
-     {
-        im->alpha = has_alpha;
-        return image;
-     }
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        im->alpha = has_alpha;
-        im->tex->alpha = im->alpha;
-        return image;
-     }
-   /* FIXME: can move to gl_common */
-   if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
-   if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image;
-   else if ((!has_alpha) && (!im->im->cache_entry.flags.alpha)) return image;
-   if (im->references > 1)
-     {
-        Evas_GL_Image *im_new;
-        
-        im_new = evas_gl_common_image_new_from_copied_data
-           (im->gc, im->im->cache_entry.w, im->im->cache_entry.h, 
-               im->im->image.data,
-               eng_image_alpha_get(data, image),
-               eng_image_colorspace_get(data, image));
-        if (!im_new) return im;
-        evas_gl_common_image_free(im);
-        im = im_new;
-     }
-   else
-     evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-   return evas_gl_common_image_alpha_set(im, has_alpha ? 1 : 0);
-//   im->im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
-//   return image;
-}
-
-static void *
-eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-   return image;
-}
-
-static void
-eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-}
-
-static char *
-eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (!im->im) return NULL;
-   return im->im->info.comment;
-}
-
-static char *
-eng_image_format_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   im = image;
-   return NULL;
-}
-
-static void
-eng_image_colorspace_set(void *data, void *image, int cspace)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   im = image;
-   if (im->native.data) return;
-   /* FIXME: can move to gl_common */
-   if (im->cs.space == cspace) return;
-   eng_window_use(re->win);
-   evas_cache_image_colorspace(&im->im->cache_entry, cspace);
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (im->cs.data)
-          {
-             if (!im->cs.no_free) free(im->cs.data);
-             im->cs.data = NULL;
-             im->cs.no_free = 0;
-          }
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-        if (im->tex) evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        if (im->cs.data)
-          {
-             if (!im->cs.no_free) free(im->cs.data);
-          }
-        if (im->im->cache_entry.h > 0)
-          im->cs.data = 
-          calloc(1, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-        else
-          im->cs.data = NULL;
-        im->cs.no_free = 0;
-        break;
-      default:
-        abort();
-        break;
-     }
-   im->cs.space = cspace;
-}
-
-/////////////////////////////////////////////////////////////////////////
-//
-//
-
-// FIXME: this is enabled so updates happen - but its SLOOOOOOOOOOOOOOOW
-// (i am sure this is the reason)  not to mention seemingly superfluous. but
-// i need to enable it for it to work on fglrx at least. havent tried nvidia.
-// 
-// why is this the case? does anyone know? has anyone tried it on other gfx
-// drivers?
-// 
-//#define GLX_TEX_PIXMAP_RECREATE 1
-#if 0
-static void
-eng_image_draw_filtered(void *data, void *context, void *surface,
-                        void *image, Evas_Filter_Info *filter)
-{
-   Render_Engine *re = data;
-
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-
-   evas_gl_common_filter_draw(re->win->gl_context, image, filter);
-}
-
-static Filtered_Image *
-eng_image_filtered_get(void *im, uint8_t *key, size_t keylen)
-{
-   return evas_gl_common_image_filtered_get(im, key, keylen);
-}
-
-static Filtered_Image *
-eng_image_filtered_save(void *im, void *fim, uint8_t *key, size_t keylen)
-{
-   return evas_gl_common_image_filtered_save(im, fim, key, keylen);
-}
-
-static void
-eng_image_filtered_free(void *im, Filtered_Image *fim)
-{
-   evas_gl_common_image_filtered_free(im, fim);
-}
-
-#endif
-
-//
-//
-/////////////////////////////////////////////////////////////////////////
-
-static void *
-eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   *error = EVAS_LOAD_ERROR_NONE;
-   eng_window_use(re->win);
-   return evas_gl_common_image_load(re->win->gl_context, file, key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   return evas_gl_common_image_new_from_data(re->win->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   return evas_gl_common_image_new_from_copied_data(re->win->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void
-eng_image_free(void *data, void *image)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_image_free(image);
-}
-
-static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   if (!image)
-     {
-        *w = 0;
-        *h = 0;
-        return;
-     }
-   if (w) *w = ((Evas_GL_Image *)image)->w;
-   if (h) *h = ((Evas_GL_Image *)image)->h;
-}
-
-static void *
-eng_image_size_set(void *data, void *image, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-   Evas_GL_Image *im_old;
-   
-   re = (Render_Engine *)data;
-   if (!im) return NULL;
-   if (im->native.data)
-     {
-        im->w = w;
-        im->h = h;
-        return image;
-     }
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        im->w = w;
-        im->h = h;
-        im->tex = evas_gl_common_texture_dynamic_new(im->gc, im);
-        return image;
-     }
-   im_old = image;
-   if ((eng_image_colorspace_get(data, image) == EVAS_COLORSPACE_YCBCR422P601_PL) ||
-       (eng_image_colorspace_get(data, image) == EVAS_COLORSPACE_YCBCR422P709_PL))
-     w &= ~0x1;
-   if ((im_old) &&
-       ((int)im_old->im->cache_entry.w == w) &&
-       ((int)im_old->im->cache_entry.h == h))
-     return image;
-   if (im_old)
-     {
-        im = evas_gl_common_image_new(re->win->gl_context, w, h,
-                                      eng_image_alpha_get(data, image),
-                                      eng_image_colorspace_get(data, image));
-/*
-        evas_common_load_image_data_from_file(im_old->im);
-        if (im_old->im->image->data)
-          {
-             evas_common_blit_rectangle(im_old->im, im->im, 0, 0, w, h, 0, 0);
-             evas_common_cpu_end_opt();
-          }
- */
-        evas_gl_common_image_free(im_old);
-     }
-   else
-     im = evas_gl_common_image_new(re->win->gl_context, w, h, 1, EVAS_COLORSPACE_ARGB8888);
-   return im;
-}
-
-static void *
-eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   if (im->native.data) return image;
-   eng_window_use(re->win);
-   evas_gl_common_image_dirty(image, x, y, w, h);
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-   int error;
-
-   re = (Render_Engine *)data;
-   if (!image)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_GENERIC;
-        return NULL;
-     }
-   im = image;
-   if (im->native.data)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-   if ((im->tex) && (im->tex->pt) && (im->tex->pt->dyn.data))
-     {
-        *image_data = im->tex->pt->dyn.data;
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-   eng_window_use(re->win);
-   error = evas_cache_image_load_data(&im->im->cache_entry);
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (to_write)
-          {
-             if (im->references > 1)
-               {
-                  Evas_GL_Image *im_new;
-
-                  im_new = evas_gl_common_image_new_from_copied_data
-                     (im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
-                         im->im->image.data,
-                         eng_image_alpha_get(data, image),
-                         eng_image_colorspace_get(data, image));
-                  if (!im_new)
-                    {
-                       *image_data = NULL;
-                       if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-                       return im;
-                    }
-                  evas_gl_common_image_free(im);
-                  im = im_new;
-               }
-             else
-               evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-          }
-        *image_data = im->im->image.data;
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-        *image_data = im->cs.data;
-        break;
-      default:
-        abort();
-        break;
-     }
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data, void *image, DATA32 *image_data)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im, *im2;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->native.data) return image;
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt) && (im->tex->pt->dyn.data))
-     {
-        if (im->tex->pt->dyn.data == image_data)
-          {
-             return image;
-          }
-        else
-          {
-             int w, h;
-
-             w = im->im->cache_entry.w;
-             h = im->im->cache_entry.h;
-             im2 = eng_image_new_from_data(data, w, h, image_data,
-                                           eng_image_alpha_get(data, image),
-                                           eng_image_colorspace_get(data, image));
-             if (!im2) return im;
-             evas_gl_common_image_free(im);
-             im = im2;
-             evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-             return im;
-          }
-     }
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (image_data != im->im->image.data)
-          {
-             int w, h;
-
-             w = im->im->cache_entry.w;
-             h = im->im->cache_entry.h;
-             im2 = eng_image_new_from_data(data, w, h, image_data,
-                                           eng_image_alpha_get(data, image),
-                                           eng_image_colorspace_get(data, image));
-             if (!im2) return im;
-             evas_gl_common_image_free(im);
-             im = im2;
-          }
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-        if (image_data != im->cs.data)
-          {
-             if (im->cs.data)
-               {
-                  if (!im->cs.no_free) free(im->cs.data);
-               }
-             im->cs.data = image_data;
-          }
-        break;
-      default:
-        abort();
-        break;
-     }
-   /* hmmm - but if we wrote... why bother? */
-   evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-   return im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_image_draw(re->win->gl_context, image,
-                             src_x, src_y, src_w, src_h,
-                             dst_x, dst_y, dst_w, dst_h,
-                             smooth);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   if (image) evas_gl_common_image_scale_hint_set(image, hint);
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE;
-   return gim->scale_hint;
-}
-
-static void
-eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   Evas_GL_Image *gim = image;
-   Render_Engine *re;
-   
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   if (npoints != 4)
-     {
-        // FIXME: nash - you didnt fix this
-        abort();
-     }
-   if ((p[0].x == p[3].x) &&
-       (p[1].x == p[2].x) &&
-       (p[0].y == p[1].y) &&
-       (p[3].y == p[2].y) &&
-       (p[0].x <= p[1].x) &&
-       (p[0].y <= p[2].y) &&
-       (p[0].u == 0) &&
-       (p[0].v == 0) &&
-       (p[1].u == (gim->w << FP)) &&
-       (p[1].v == 0) &&
-       (p[2].u == (gim->w << FP)) &&
-       (p[2].v == (gim->h << FP)) &&
-       (p[3].u == 0) &&
-       (p[3].v == (gim->h << FP)) &&
-       (p[0].col == 0xffffffff) &&
-       (p[1].col == 0xffffffff) &&
-       (p[2].col == 0xffffffff) &&
-       (p[3].col == 0xffffffff))
-     {
-        int dx, dy, dw, dh;
-        
-        dx = p[0].x >> FP;
-        dy = p[0].y >> FP;
-        dw = (p[2].x >> FP) - dx;
-        dh = (p[2].y >> FP) - dy;
-        eng_image_draw(data, context, surface, image,
-                       0, 0, gim->w, gim->h, dx, dy, dw, dh, smooth);
-     }
-   else
-     {
-        evas_gl_common_image_map_draw(re->win->gl_context, image, npoints, p,
-                                      smooth, level);
-     }
-}
-
-static void *
-eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
-{
-   Render_Engine *re;
-   
-   re = (Render_Engine *)data;
-   return evas_gl_common_image_surface_new(re->win->gl_context, w, h, alpha);
-}
-
-static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_gl_common_image_free(surface);
-}
-
-static void
-eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   if (image) evas_gl_common_image_content_hint_set(image, hint);
-}
-
-static int
-eng_image_content_hint_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE;
-   return gim->content_hint;
-}
-
-static void
-eng_image_cache_flush(void *data __UNUSED__)
-{
-   Render_Engine *re;
-   int tmp_size;
-   
-   re = (Render_Engine *)data;
-   
-   tmp_size = evas_common_image_get_cache();
-   evas_common_image_set_cache(0);
-   evas_common_rgba_image_scalecache_flush();
-   evas_gl_common_image_cache_flush(re->win->gl_context);
-   evas_common_image_set_cache(tmp_size);
-}
-
-static void
-eng_image_cache_set(void *data __UNUSED__, int bytes)
-{
-   Render_Engine *re;
-   
-   re = (Render_Engine *)data;
-   evas_common_image_set_cache(bytes);
-   evas_common_rgba_image_scalecache_size_set(bytes);
-   evas_gl_common_image_cache_flush(re->win->gl_context);
-}
-
-static int
-eng_image_cache_get(void *data __UNUSED__)
-{
-   Render_Engine *re;
-   
-   re = (Render_Engine *)data;
-   return evas_common_image_get_cache();
-}
-
-
-static void
-eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
-{
-   Evas_GL_Image *im = image;
-   *stride = im->w * 4;
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        *stride = im->tex->pt->dyn.w * 4;
-        // FIXME: for other image formats (yuv etc.) different stride needed
-     }
-}
-
-static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-     {
-        // FIXME: put im into context so we can free it
-        static RGBA_Image *im = NULL;
-        
-        if (!im)
-          im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.w = re->win->width;
-        im->cache_entry.h = re->win->height;
-        evas_common_draw_context_font_ext_set(context,
-                                              re->win->gl_context,
-                                              evas_gl_font_texture_new,
-                                              evas_gl_font_texture_free,
-                                              evas_gl_font_texture_draw);
-        evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
-                              intl_props);
-        evas_common_draw_context_font_ext_set(context,
-                                              NULL,
-                                              NULL,
-                                              NULL,
-                                              NULL);
-     }
-}
-
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__)
-{
-   // FIXME: support ARGB gl targets!!!
-   return EINA_FALSE;
-}
-
-
-#if 1
-static void
-evgl_glBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-   // Add logic to take care when framebuffer=0
-   glBindFramebuffer(target, framebuffer);
-}
-
-static void
-evgl_glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-   // Add logic to take care when renderbuffer=0
-   glBindRenderbuffer(target, renderbuffer);
-}
-
-static void
-evgl_glClearDepthf(GLclampf depth)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glClearDepthf(depth);
-#else
-   glClearDepth(depth);
-#endif
-}
-
-static void
-evgl_glDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glDepthRangef(zNear, zFar);
-#else
-   glDepthRange(zNear, zFar);
-#endif
-}
-
-static void
-evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-#else
-   if (range)
-     {
-        range[0] = -126; // floor(log2(FLT_MIN))
-        range[1] = 127; // floor(log2(FLT_MAX))
-     }
-   if (precision)
-     {
-        precision[0] = 24; // floor(-log2((1.0/16777218.0)));
-     }
-   return;
-   shadertype = precisiontype = 0;
-#endif
-}
-
-static void
-evgl_glReleaseShaderCompiler(void)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glReleaseShaderCompiler();
-#else
-#endif
-}
-
-static void
-evgl_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glShaderBinary(n, shaders, binaryformat, binary, length);
-#else
-// FIXME: need to dlsym/getprocaddress for this
-   return;
-   n = binaryformat = length = 0;
-   shaders = binary = 0;
-#endif
-}
-
-#endif 
-
-static void *
-eng_gl_api_get(void *data)
-{
-   Render_Engine *re;
-
-   re  = (Render_Engine *)data;
-
-   gl_funcs.version = EVAS_GL_API_VERSION;
-#if 1
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, )
-   ORD(glActiveTexture);
-   ORD(glAttachShader);
-   ORD(glBindAttribLocation);
-   ORD(glBindBuffer);
-   ORD(glBindTexture);
-   ORD(glBlendColor);
-   ORD(glBlendEquation);
-   ORD(glBlendEquationSeparate);
-   ORD(glBlendFunc);
-   ORD(glBlendFuncSeparate);
-   ORD(glBufferData);
-   ORD(glBufferSubData);
-   ORD(glCheckFramebufferStatus);
-   ORD(glClear);
-   ORD(glClearColor);
-//   ORD(glClearDepthf);
-   ORD(glClearStencil);
-   ORD(glColorMask);
-   ORD(glCompileShader);
-   ORD(glCompressedTexImage2D);
-   ORD(glCompressedTexSubImage2D);
-   ORD(glCopyTexImage2D);
-   ORD(glCopyTexSubImage2D);
-   ORD(glCreateProgram);
-   ORD(glCreateShader);
-   ORD(glCullFace);
-   ORD(glDeleteBuffers);
-   ORD(glDeleteFramebuffers);
-   ORD(glDeleteProgram);
-   ORD(glDeleteRenderbuffers);
-   ORD(glDeleteShader);
-   ORD(glDeleteTextures);
-   ORD(glDepthFunc);
-   ORD(glDepthMask);
-//   ORD(glDepthRangef);
-   ORD(glDetachShader);
-   ORD(glDisable);
-   ORD(glDisableVertexAttribArray);
-   ORD(glDrawArrays);
-   ORD(glDrawElements);
-   ORD(glEnable);
-   ORD(glEnableVertexAttribArray);
-   ORD(glFinish);
-   ORD(glFlush);
-   ORD(glFramebufferRenderbuffer);
-   ORD(glFramebufferTexture2D);
-   ORD(glFrontFace);
-   ORD(glGenBuffers);
-   ORD(glGenerateMipmap);
-   ORD(glGenFramebuffers);
-   ORD(glGenRenderbuffers);
-   ORD(glGenTextures);
-   ORD(glGetActiveAttrib);
-   ORD(glGetActiveUniform);
-   ORD(glGetAttachedShaders);
-   ORD(glGetAttribLocation);
-   ORD(glGetBooleanv);
-   ORD(glGetBufferParameteriv);
-   ORD(glGetError);
-   ORD(glGetFloatv);
-   ORD(glGetFramebufferAttachmentParameteriv);
-   ORD(glGetIntegerv);
-   ORD(glGetProgramiv);
-   ORD(glGetProgramInfoLog);
-   ORD(glGetRenderbufferParameteriv);
-   ORD(glGetShaderiv);
-   ORD(glGetShaderInfoLog);
-//   ORD(glGetShaderPrecisionFormat);
-   ORD(glGetShaderSource);
-   ORD(glGetString);
-   ORD(glGetTexParameterfv);
-   ORD(glGetTexParameteriv);
-   ORD(glGetUniformfv);
-   ORD(glGetUniformiv);
-   ORD(glGetUniformLocation);
-   ORD(glGetVertexAttribfv);
-   ORD(glGetVertexAttribiv);
-   ORD(glGetVertexAttribPointerv);
-   ORD(glHint);
-   ORD(glIsBuffer);
-   ORD(glIsEnabled);
-   ORD(glIsFramebuffer);
-   ORD(glIsProgram);
-   ORD(glIsRenderbuffer);
-   ORD(glIsShader);
-   ORD(glIsTexture);
-   ORD(glLineWidth);
-   ORD(glLinkProgram);
-   ORD(glPixelStorei);
-   ORD(glPolygonOffset);
-   ORD(glReadPixels);
-//   ORD(glReleaseShaderCompiler);
-   ORD(glRenderbufferStorage);
-   ORD(glSampleCoverage);
-   ORD(glScissor);
-//   ORD(glShaderBinary);
-   ORD(glShaderSource);
-   ORD(glStencilFunc);
-   ORD(glStencilFuncSeparate);
-   ORD(glStencilMask);
-   ORD(glStencilMaskSeparate);
-   ORD(glStencilOp);
-   ORD(glStencilOpSeparate);
-   ORD(glTexImage2D);
-   ORD(glTexParameterf);
-   ORD(glTexParameterfv);
-   ORD(glTexParameteri);
-   ORD(glTexParameteriv);
-   ORD(glTexSubImage2D);
-   ORD(glUniform1f);
-   ORD(glUniform1fv);
-   ORD(glUniform1i);
-   ORD(glUniform1iv);
-   ORD(glUniform2f);
-   ORD(glUniform2fv);
-   ORD(glUniform2i);
-   ORD(glUniform2iv);
-   ORD(glUniform3f);
-   ORD(glUniform3fv);
-   ORD(glUniform3i);
-   ORD(glUniform3iv);
-   ORD(glUniform4f);
-   ORD(glUniform4fv);
-   ORD(glUniform4i);
-   ORD(glUniform4iv);
-   ORD(glUniformMatrix2fv);
-   ORD(glUniformMatrix3fv);
-   ORD(glUniformMatrix4fv);
-   ORD(glUseProgram);
-   ORD(glValidateProgram);
-   ORD(glVertexAttrib1f);
-   ORD(glVertexAttrib1fv);
-   ORD(glVertexAttrib2f);
-   ORD(glVertexAttrib2fv);
-   ORD(glVertexAttrib3f);
-   ORD(glVertexAttrib3fv);
-   ORD(glVertexAttrib4f);
-   ORD(glVertexAttrib4fv);
-   ORD(glVertexAttribPointer);
-   ORD(glViewport);
-#undef ORD
-
-// Override functions wrapped by Evas_GL
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, evgl_)
-   ORD(glBindFramebuffer);         
-   ORD(glBindRenderbuffer);        
-   
-// GLES2.0 API compat on top of desktop gl
-   ORD(glClearDepthf);
-   ORD(glDepthRangef);
-   ORD(glGetShaderPrecisionFormat);
-   ORD(glReleaseShaderCompiler);
-   ORD(glShaderBinary);
-#undef ORD
-
-#endif 
-
-   return &gl_funcs;
-}
-
-static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-   
-   if (!image) return EVAS_LOAD_ERROR_NONE;
-   im = image;
-   return im->im->cache_entry.load_error;
-}
-
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_engine_gl_cocoa_log_dom = eina_log_domain_register("EvasGLCocoa", EVAS_DEFAULT_LOG_COLOR);
-   if(_evas_engine_gl_cocoa_log_dom < 0)
-     {
-       EINA_LOG_ERR("Impossible to create a log domain for GL (Cocoa) engine.");
-       return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-   #define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(context_cutout_add);
-   ORD(context_cutout_clear);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   //   ORD(output_dump);
-   ORD(rectangle_draw);
-   ORD(line_draw);
-   ORD(polygon_point_add);
-   ORD(polygon_points_clear);
-   ORD(polygon_draw);
-
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_free);
-   ORD(image_size_get);
-   ORD(image_size_set);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_mask_create);
-   //   ORD(image_native_set);
-   //   ORD(image_native_get);
-   //   ORD(image_draw_filtered);
-   //   ORD(image_filtered_get);
-   //   ORD(image_filtered_save);
-   //   ORD(image_filtered_free);
-   
-   ORD(font_draw);
-   
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-   ORD(image_stride_get);
-   
-   ORD(image_map_draw);
-   ORD(image_map_surface_new);
-   ORD(image_map_surface_free);
-   
-   ORD(image_content_hint_set);
-   ORD(image_content_hint_get);
-
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-
-   ORD(gl_api_get); 
-
-   ORD(image_load_error_get);    
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-  eina_log_domain_unregister(_evas_engine_gl_cocoa_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "gl_cocoa",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_cocoa);
-
-#ifndef EVAS_STATIC_BUILD_GL_COCOA
-EVAS_EINA_MODULE_DEFINE(engine, gl_cocoa);
-#endif
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/evas_engine.h b/libraries/evas/src/modules/engines/gl_cocoa/evas_engine.h
deleted file mode 100644
index a066d3e..0000000
--- a/libraries/evas/src/modules/engines/gl_cocoa/evas_engine.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef __EVAS_ENGINE_H__
-#define __EVAS_ENGINE_H__
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <OpenGL/gl.h>
-
-#include "evas_gl_common.h"
-#include "Evas_Engine_GL_Cocoa.h"
-
-extern int _evas_engine_gl_cocoa_log_dom;
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
-
-typedef struct _Evas_GL_Cocoa_Window Evas_GL_Cocoa_Window;
-
-struct _Evas_GL_Cocoa_Window
-{
-   void*            window;
-   void*            view;
-   int              width;
-   int              height;
-   int              depth;
-   Evas_Engine_GL_Context *gl_context;
-   struct {
-      int           x1;
-      int           y1;
-      int           x2;
-      int           y2;
-      int           redraw : 1;
-      int           drew : 1;
-   } draw;
-};
-
-Evas_GL_Cocoa_Window *eng_window_new(void *window,
-                                     int  width,
-                                     int  height);
-void eng_window_free(Evas_GL_Cocoa_Window *gw);
-void eng_window_use(Evas_GL_Cocoa_Window *gw);
-void eng_window_swap_buffers(Evas_GL_Cocoa_Window *gw);
-void eng_window_vsync_set(int on);
-void ng_window_resize(Evas_GL_Cocoa_Window *gw, int width, int height);
-
-#endif /* __EVAS_ENGINE_H__ */
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m b/libraries/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m
deleted file mode 100644
index aa6b895..0000000
--- a/libraries/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m
+++ /dev/null
@@ -1,134 +0,0 @@
-
-#include <Cocoa/Cocoa.h>
-
-#include "evas_engine.h"
-
-static Evas_GL_Cocoa_Window *_evas_gl_cocoa_window = NULL;
-
-@interface EvasGLView : NSOpenGLView
-{
-}
-
-+ (NSOpenGLPixelFormat*) basicPixelFormat;
-- (id) initWithFrame: (NSRect) frameRect;
-
-@end
-
-
-@implementation EvasGLView
-
-- (id) init
-{
-   self = [super init];
-   return self;
-}
-
-+ (NSOpenGLPixelFormat*) basicPixelFormat
-{
-   NSOpenGLPixelFormatAttribute attributes [] = {
-            NSOpenGLPFAWindow,
-            NSOpenGLPFAAccelerated,
-            NSOpenGLPFADoubleBuffer,
-            /*NSOpenGLPFAColorSize, 24,
-            NSOpenGLPFAAlphaSize, 8,
-            NSOpenGLPFADepthSize, 24,*/
-            0
-   };
-   return [[[NSOpenGLPixelFormat alloc] initWithAttributes:attributes] autorelease];
-}
-
-// ---------------------------------
-
--(id) initWithFrame: (NSRect) frameRect
-{
-   NSOpenGLPixelFormat * pf = [EvasGLView basicPixelFormat];
-   self = [super initWithFrame: frameRect pixelFormat: pf];
-   return self;
-}
-
-@end
-
-
-Evas_GL_Cocoa_Window *
-eng_window_new(void *window,
-               int      w,
-               int      h)
-{
-   Evas_GL_Cocoa_Window *gw;
-   int context_attrs[3];
-   int config_attrs[20];
-   int major_version, minor_version;
-   int num_config;
-
-   gw = calloc(1, sizeof(Evas_GL_Cocoa_Window));
-   if (!gw) return NULL;
- 
-   _evas_gl_cocoa_window = gw;
-   gw->window = window;
-   gw->view = [[EvasGLView alloc] initWithFrame:NSMakeRect(0,0,w,h)];
-   NSOpenGLContext *ctx = [(NSOpenGLView*)gw->view openGLContext];
-   [ctx makeCurrentContext];
-   gw->gl_context = evas_gl_common_context_new();
-
-   if (!gw->gl_context)
-     {
-        free(gw);
-        return NULL;
-     }
-   evas_gl_common_context_use(gw->gl_context);
-   evas_gl_common_context_resize(gw->gl_context, w, h, 0);
-
-   return gw;
-}
-
-void
-eng_window_free(Evas_GL_Cocoa_Window *gw)
-{
-   if (gw == _evas_gl_cocoa_window) _evas_gl_cocoa_window = NULL;
-   evas_gl_common_context_free(gw->gl_context);
-   free(gw);
-}
-
-void
-eng_window_use(Evas_GL_Cocoa_Window *gw)
-{
-   if (_evas_gl_cocoa_window != gw)
-     {
-        [[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];
-        if (_evas_gl_cocoa_window)
-          evas_gl_common_context_flush(_evas_gl_cocoa_window->gl_context);
-        _evas_gl_cocoa_window = gw;
-
-     }
-   evas_gl_common_context_use(gw->gl_context);
-}
-
-void
-eng_window_swap_buffers(Evas_GL_Cocoa_Window *gw)
-{
-   [[(NSOpenGLView*)gw->view openGLContext] flushBuffer];
-}
-
-void
-eng_window_vsync_set(int on)
-{
-
-}
-
-
-void
-eng_window_resize(Evas_GL_Cocoa_Window *gw, int width, int height)
-{
-  NSRect view_frame;
-
-  INF("Resize %d %d\n", width, height);
-
-  view_frame = [(EvasGLView*)gw->view frame];
-  printf("view_frame : %3.3f %3.3f\n", view_frame.size.height, view_frame.size.width);
-  view_frame.size.height = height;
-  view_frame.size.width = width;
-  printf("view_frame : %3.3f %3.3f\n", view_frame.size.height, view_frame.size.width);
-  [(EvasGLView*)gw->view setFrame:view_frame];
-  [[(NSOpenGLView*)gw->view openGLContext] flushBuffer];
-}
-
diff --git a/libraries/evas/src/modules/engines/gl_common/Makefile.am b/libraries/evas/src/modules/engines/gl_common/Makefile.am
deleted file mode 100644
index 15acc02..0000000
--- a/libraries/evas/src/modules/engines/gl_common/Makefile.am
+++ /dev/null
@@ -1,164 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@EINA_CFLAGS@
-
-if BUILD_ENGINE_GL_COMMON
-
-noinst_LTLIBRARIES = libevas_engine_gl_common.la
-libevas_engine_gl_common_la_SOURCES  = \
-evas_gl_private.h \
-evas_gl_common.h \
-evas_gl_context.c \
-evas_gl_shader.c \
-evas_gl_rectangle.c \
-evas_gl_texture.c \
-evas_gl_image.c \
-evas_gl_font.c \
-evas_gl_polygon.c \
-evas_gl_line.c \
-evas_gl_filter.c \
-shader/rect_frag.h \
-shader/rect_frag_bin_s3c6410.h \
-shader/rect_vert.h \
-shader/rect_vert_bin_s3c6410.h \
-shader/font_frag.h \
-shader/font_frag_bin_s3c6410.h \
-shader/font_vert.h \
-shader/font_vert_bin_s3c6410.h \
-shader/img_frag.h \
-shader/img_frag_bin_s3c6410.h \
-shader/img_vert.h \
-shader/img_vert_bin_s3c6410.h \
-shader/img_nomul_frag.h \
-shader/img_nomul_frag_bin_s3c6410.h \
-shader/img_nomul_vert.h \
-shader/img_nomul_vert_bin_s3c6410.h \
-shader/img_bgra_frag.h \
-shader/img_bgra_frag_bin_s3c6410.h \
-shader/img_bgra_vert.h \
-shader/img_bgra_vert_bin_s3c6410.h \
-shader/img_bgra_nomul_frag.h \
-shader/img_bgra_nomul_frag_bin_s3c6410.h \
-shader/img_bgra_nomul_vert.h \
-shader/img_bgra_nomul_vert_bin_s3c6410.h \
-shader/img_mask_frag.h \
-shader/img_mask_vert.h \
-shader/nv12_nomul_vert.h \
-shader/nv12_vert.h \
-shader/nv12_nomul_frag.h \
-shader/nv12_frag.h \
-shader/yuv_frag.h \
-shader/yuv_frag_bin_s3c6410.h \
-shader/yuv_vert.h \
-shader/yuv_vert_bin_s3c6410.h \
-shader/yuv_nomul_frag.h \
-shader/yuv_nomul_frag_bin_s3c6410.h \
-shader/yuv_nomul_vert.h \
-shader/yuv_nomul_vert_bin_s3c6410.h \
-shader/tex_frag.h \
-shader/tex_frag_bin_s3c6410.h \
-shader/tex_vert.h \
-shader/tex_vert_bin_s3c6410.h \
-shader/tex_nomul_frag.h \
-shader/tex_nomul_frag_bin_s3c6410.h \
-shader/tex_nomul_vert.h \
-shader/tex_nomul_vert_bin_s3c6410.h \
-shader/filter_invert.h \
-shader/filter_invert_nomul.h \
-shader/filter_invert_bgra.h \
-shader/filter_invert_bgra_nomul.h \
-shader/filter_sepia.h \
-shader/filter_sepia_nomul.h \
-shader/filter_sepia_bgra.h \
-shader/filter_sepia_bgra_nomul.h \
-shader/filter_greyscale.h \
-shader/filter_greyscale_nomul.h \
-shader/filter_greyscale_bgra.h \
-shader/filter_greyscale_bgra_nomul.h \
-shader/filter_blur.h \
-shader/filter_blur_nomul.h \
-shader/filter_blur_bgra.h \
-shader/filter_blur_bgra_nomul.h \
-shader/yuy2_frag.h \
-shader/yuy2_vert.h \
-shader/yuy2_nomul_frag.h \
-shader/yuy2_nomul_vert.h
-
-libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ @evas_engine_gl_common_libs@ @dlopen_libs@
-endif
-
-EXTRA_DIST = \
-shader/compile-s3c6410.sh \
-shader/compile-sgx.sh \
-shader/make-c-bin.sh \
-shader/make-c-str.sh \
-shader/rect_frag.shd \
-shader/rect_frag_s3c6410.asm \
-shader/rect_vert.shd \
-shader/font_frag.shd \
-shader/font_frag_s3c6410.asm \
-shader/font_vert.shd \
-shader/img_frag.shd \
-shader/img_frag_s3c6410.asm \
-shader/img_vert.shd \
-shader/img_nomul_frag.shd \
-shader/img_nomul_vert.shd \
-shader/img_bgra_vert.shd \
-shader/img_bgra_frag.shd \
-shader/img_bgra_vert.shd \
-shader/img_bgra_nomul_frag.shd \
-shader/img_bgra_nomul_vert.shd \
-shader/img_mask_frag.h \
-shader/img_mask_vert.h \
-shader/yuv_frag.shd \
-shader/yuv_frag_s3c6410.asm \
-shader/yuv_vert.shd \
-shader/yuv_nomul_frag.shd \
-shader/yuv_nomul_vert.shd \
-shader/tex_frag.shd \
-shader/tex_frag_s3c6410.asm \
-shader/tex_vert.shd \
-shader/tex_nomul_frag.shd \
-shader/tex_nomul_vert.shd \
-shader/filter_invert.shd \
-shader/filter_invert_nomul.shd \
-shader/filter_invert_bgra.shd \
-shader/filter_invert_bgra_nomul.shd \
-shader/filter_greyscale.shd \
-shader/filter_greyscale_nomul.shd \
-shader/filter_greyscale_bgra.shd \
-shader/filter_greyscale_bgra_nomul.shd \
-shader/filter_sepia.shd \
-shader/filter_sepia_nomul.shd \
-shader/filter_sepia_bgra.shd \
-shader/filter_sepia_bgra_nomul.shd \
-shader/filter_blur.shd \
-shader/filter_blur_nomul.shd \
-shader/filter_blur_bgra.shd \
-shader/filter_blur_bgra_nomul.shd \
-shader/nv12_frag.h \
-shader/nv12_frag.shd \
-shader/nv12_nomul_frag.h \
-shader/nv12_nomul_frag.shd \
-shader/nv12_nomul_vert.h \
-shader/nv12_nomul_vert.shd \
-shader/nv12_vert.h \
-shader/nv12_vert.shd \
-shader/yuy2_frag.h \
-shader/yuy2_frag.shd \
-shader/yuy2_nomul_frag.h \
-shader/yuy2_nomul_frag.shd \
-shader/yuy2_nomul_vert.h \
-shader/yuy2_nomul_vert.shd \
-shader/yuy2_vert.h \
-shader/yuy2_vert.shd
-
-
diff --git a/libraries/evas/src/modules/engines/gl_common/Makefile.in b/libraries/evas/src/modules/engines/gl_common/Makefile.in
deleted file mode 100644
index 5a9a1ef..0000000
--- a/libraries/evas/src/modules/engines/gl_common/Makefile.in
+++ /dev/null
@@ -1,875 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/gl_common
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libevas_engine_gl_common_la_DEPENDENCIES =
-am__libevas_engine_gl_common_la_SOURCES_DIST = evas_gl_private.h \
-        evas_gl_common.h evas_gl_context.c evas_gl_shader.c \
-        evas_gl_rectangle.c evas_gl_texture.c evas_gl_image.c \
-        evas_gl_font.c evas_gl_polygon.c evas_gl_line.c \
-        evas_gl_filter.c shader/rect_frag.h \
-        shader/rect_frag_bin_s3c6410.h shader/rect_vert.h \
-        shader/rect_vert_bin_s3c6410.h shader/font_frag.h \
-        shader/font_frag_bin_s3c6410.h shader/font_vert.h \
-        shader/font_vert_bin_s3c6410.h shader/img_frag.h \
-        shader/img_frag_bin_s3c6410.h shader/img_vert.h \
-        shader/img_vert_bin_s3c6410.h shader/img_nomul_frag.h \
-        shader/img_nomul_frag_bin_s3c6410.h shader/img_nomul_vert.h \
-        shader/img_nomul_vert_bin_s3c6410.h shader/img_bgra_frag.h \
-        shader/img_bgra_frag_bin_s3c6410.h shader/img_bgra_vert.h \
-        shader/img_bgra_vert_bin_s3c6410.h \
-        shader/img_bgra_nomul_frag.h \
-        shader/img_bgra_nomul_frag_bin_s3c6410.h \
-        shader/img_bgra_nomul_vert.h \
-        shader/img_bgra_nomul_vert_bin_s3c6410.h \
-        shader/img_mask_frag.h shader/img_mask_vert.h \
-        shader/nv12_nomul_vert.h shader/nv12_vert.h \
-        shader/nv12_nomul_frag.h shader/nv12_frag.h shader/yuv_frag.h \
-        shader/yuv_frag_bin_s3c6410.h shader/yuv_vert.h \
-        shader/yuv_vert_bin_s3c6410.h shader/yuv_nomul_frag.h \
-        shader/yuv_nomul_frag_bin_s3c6410.h shader/yuv_nomul_vert.h \
-        shader/yuv_nomul_vert_bin_s3c6410.h shader/tex_frag.h \
-        shader/tex_frag_bin_s3c6410.h shader/tex_vert.h \
-        shader/tex_vert_bin_s3c6410.h shader/tex_nomul_frag.h \
-        shader/tex_nomul_frag_bin_s3c6410.h shader/tex_nomul_vert.h \
-        shader/tex_nomul_vert_bin_s3c6410.h shader/filter_invert.h \
-        shader/filter_invert_nomul.h shader/filter_invert_bgra.h \
-        shader/filter_invert_bgra_nomul.h shader/filter_sepia.h \
-        shader/filter_sepia_nomul.h shader/filter_sepia_bgra.h \
-        shader/filter_sepia_bgra_nomul.h shader/filter_greyscale.h \
-        shader/filter_greyscale_nomul.h shader/filter_greyscale_bgra.h \
-        shader/filter_greyscale_bgra_nomul.h shader/filter_blur.h \
-        shader/filter_blur_nomul.h shader/filter_blur_bgra.h \
-        shader/filter_blur_bgra_nomul.h shader/yuy2_frag.h \
-        shader/yuy2_vert.h shader/yuy2_nomul_frag.h \
-        shader/yuy2_nomul_vert.h
-@BUILD_ENGINE_GL_COMMON_TRUE@am_libevas_engine_gl_common_la_OBJECTS =  \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_context.lo \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_shader.lo \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_rectangle.lo \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_texture.lo \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_image.lo evas_gl_font.lo \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_polygon.lo \
-@BUILD_ENGINE_GL_COMMON_TRUE@   evas_gl_line.lo evas_gl_filter.lo
-libevas_engine_gl_common_la_OBJECTS =  \
-        $(am_libevas_engine_gl_common_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_GL_COMMON_TRUE@am_libevas_engine_gl_common_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_gl_common_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_gl_common_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@EINA_CFLAGS@
-
-@BUILD_ENGINE_GL_COMMON_TRUE@noinst_LTLIBRARIES = libevas_engine_gl_common.la
-@BUILD_ENGINE_GL_COMMON_TRUE@libevas_engine_gl_common_la_SOURCES = \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_private.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_common.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_context.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_shader.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_rectangle.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_texture.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_image.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_font.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_polygon.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_line.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@evas_gl_filter.c \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/rect_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/rect_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/rect_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/rect_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/font_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/font_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/font_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/font_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_nomul_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_nomul_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_nomul_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_nomul_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_nomul_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_nomul_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_nomul_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_bgra_nomul_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_mask_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/img_mask_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/nv12_nomul_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/nv12_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/nv12_nomul_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/nv12_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_nomul_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_nomul_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_nomul_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuv_nomul_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_nomul_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_nomul_frag_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_nomul_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/tex_nomul_vert_bin_s3c6410.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_invert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_invert_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_invert_bgra.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_invert_bgra_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_sepia.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_sepia_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_sepia_bgra.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_sepia_bgra_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_greyscale.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_greyscale_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_greyscale_bgra.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_greyscale_bgra_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_blur.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_blur_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_blur_bgra.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/filter_blur_bgra_nomul.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuy2_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuy2_vert.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuy2_nomul_frag.h \
-@BUILD_ENGINE_GL_COMMON_TRUE@shader/yuy2_nomul_vert.h
-
-@BUILD_ENGINE_GL_COMMON_TRUE@libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ @evas_engine_gl_common_libs@ @dlopen_libs@
-EXTRA_DIST = \
-shader/compile-s3c6410.sh \
-shader/compile-sgx.sh \
-shader/make-c-bin.sh \
-shader/make-c-str.sh \
-shader/rect_frag.shd \
-shader/rect_frag_s3c6410.asm \
-shader/rect_vert.shd \
-shader/font_frag.shd \
-shader/font_frag_s3c6410.asm \
-shader/font_vert.shd \
-shader/img_frag.shd \
-shader/img_frag_s3c6410.asm \
-shader/img_vert.shd \
-shader/img_nomul_frag.shd \
-shader/img_nomul_vert.shd \
-shader/img_bgra_vert.shd \
-shader/img_bgra_frag.shd \
-shader/img_bgra_vert.shd \
-shader/img_bgra_nomul_frag.shd \
-shader/img_bgra_nomul_vert.shd \
-shader/img_mask_frag.h \
-shader/img_mask_vert.h \
-shader/yuv_frag.shd \
-shader/yuv_frag_s3c6410.asm \
-shader/yuv_vert.shd \
-shader/yuv_nomul_frag.shd \
-shader/yuv_nomul_vert.shd \
-shader/tex_frag.shd \
-shader/tex_frag_s3c6410.asm \
-shader/tex_vert.shd \
-shader/tex_nomul_frag.shd \
-shader/tex_nomul_vert.shd \
-shader/filter_invert.shd \
-shader/filter_invert_nomul.shd \
-shader/filter_invert_bgra.shd \
-shader/filter_invert_bgra_nomul.shd \
-shader/filter_greyscale.shd \
-shader/filter_greyscale_nomul.shd \
-shader/filter_greyscale_bgra.shd \
-shader/filter_greyscale_bgra_nomul.shd \
-shader/filter_sepia.shd \
-shader/filter_sepia_nomul.shd \
-shader/filter_sepia_bgra.shd \
-shader/filter_sepia_bgra_nomul.shd \
-shader/filter_blur.shd \
-shader/filter_blur_nomul.shd \
-shader/filter_blur_bgra.shd \
-shader/filter_blur_bgra_nomul.shd \
-shader/nv12_frag.h \
-shader/nv12_frag.shd \
-shader/nv12_nomul_frag.h \
-shader/nv12_nomul_frag.shd \
-shader/nv12_nomul_vert.h \
-shader/nv12_nomul_vert.shd \
-shader/nv12_vert.h \
-shader/nv12_vert.shd \
-shader/yuy2_frag.h \
-shader/yuy2_frag.shd \
-shader/yuy2_nomul_frag.h \
-shader/yuy2_nomul_frag.shd \
-shader/yuy2_nomul_vert.h \
-shader/yuy2_nomul_vert.shd \
-shader/yuy2_vert.h \
-shader/yuy2_vert.shd
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/gl_common/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/gl_common/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_gl_common.la: $(libevas_engine_gl_common_la_OBJECTS) $(libevas_engine_gl_common_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_gl_common_la_rpath) $(libevas_engine_gl_common_la_OBJECTS) $(libevas_engine_gl_common_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_context.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_filter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_font.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_line.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_polygon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_rectangle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_shader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl_texture.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-        distclean-compile distclean-generic distclean-libtool \
-        distclean-tags distdir dvi dvi-am html html-am info info-am \
-        install install-am install-data install-data-am install-dvi \
-        install-dvi-am install-exec install-exec-am install-html \
-        install-html-am install-info install-info-am install-man \
-        install-pdf install-pdf-am install-ps install-ps-am \
-        install-strip installcheck installcheck-am installdirs \
-        maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-        pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h b/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h
deleted file mode 100644
index 051fb3b..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h
+++ /dev/null
@@ -1,659 +0,0 @@
-#ifndef EVAS_GL_COMMON_H
-#define EVAS_GL_COMMON_H
-
-#include "evas_common.h"
-#include "evas_private.h"
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <Eet.h>
-
-#define GL_GLEXT_PROTOTYPES
-
-#ifdef BUILD_ENGINE_GL_COCOA
-# include <OpenGL/gl.h>
-# include <OpenGL/glext.h>
-#else
-# ifdef _EVAS_ENGINE_SDL_H
-#  if defined(GLES_VARIETY_S3C6410) || defined(GLES_VARIETY_SGX)
-#   include <SDL/SDL_opengles.h>
-#  else
-#   include <SDL/SDL_opengl.h>
-#  endif
-# else
-#  if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-#   if defined(GLES_VARIETY_S3C6410)
-#    include <GLES2/gl2.h>
-#   elif defined(GLES_VARIETY_SGX)
-#    include <GLES2/gl2.h>
-#    include <GLES2/gl2ext.h>
-#   endif
-#  else
-#   include <GL/gl.h>
-#   include <GL/glext.h>
-#  endif
-# endif
-#endif
-
-#ifndef GL_TEXTURE_RECTANGLE_NV
-# define GL_TEXTURE_RECTANGLE_NV 0x84F5
-#endif
-#ifndef GL_BGRA
-# define GL_BGRA 0x80E1
-#endif
-
-#ifndef EGL_NO_CONTEXT
-# define EGL_NO_CONTEXT 0
-#endif
-#ifndef EGL_NONE
-# define EGL_NONE 0x3038
-#endif
-#ifndef EGL_TRUE
-# define EGL_TRUE 1
-#endif
-#ifndef EGL_FALSE
-# define EGL_FALSE 0
-#endif
-
-#ifndef EGL_MAP_GL_TEXTURE_2D_SEC
-# define EGL_MAP_GL_TEXTURE_2D_SEC 0x3201
-#endif
-#ifndef  EGL_MAP_GL_TEXTURE_HEIGHT_SEC
-# define EGL_MAP_GL_TEXTURE_HEIGHT_SEC 0x3202
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_WIDTH_SEC
-# define EGL_MAP_GL_TEXTURE_WIDTH_SEC 0x3203
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_FORMAT_SEC
-# define EGL_MAP_GL_TEXTURE_FORMAT_SEC 0x3204
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_RGB_SEC
-# define EGL_MAP_GL_TEXTURE_RGB_SEC 0x3205
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_RGBA_SEC
-# define EGL_MAP_GL_TEXTURE_RGBA_SEC 0x3206
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_BGRA_SEC
-# define EGL_MAP_GL_TEXTURE_BGRA_SEC 0x3207
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_LUMINANCE_SEC
-# define EGL_MAP_GL_TEXTURE_LUMINANCE_SEC 0x3208
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC
-# define EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC 0x3209
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC
-# define EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC 0x320a
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC
-# define EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC 0x320b
-#endif
-#ifndef EGL_MAP_GL_TEXTURE_STRIDE_IN_BYTES_SEC
-# define EGL_MAP_GL_TEXTURE_STRIDE_IN_BYTES_SEC 0x320c
-#endif
-#ifndef GL_PROGRAM_BINARY_LENGTH
-# define GL_PROGRAM_BINARY_LENGTH 0x8741
-#endif
-#ifndef GL_NUM_PROGRAM_BINARY_FORMATS
-# define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE
-#endif
-#ifndef GL_PROGRAM_BINARY_FORMATS
-# define GL_PROGRAM_BINARY_FORMATS 0x87FF
-#endif
-#ifndef GL_PROGRAM_BINARY_RETRIEVABLE_HINT
-# define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
-#endif
-
-#define SHAD_VERTEX 0
-#define SHAD_COLOR  1
-#define SHAD_TEXUV  2
-#define SHAD_TEXUV2 3
-#define SHAD_TEXUV3 4
-#define SHAD_TEXM   5
-
-typedef struct _Evas_GL_Program                      Evas_GL_Program;
-typedef struct _Evas_GL_Program_Source               Evas_GL_Program_Source;
-typedef struct _Evas_GL_Shared                       Evas_GL_Shared;
-typedef struct _Evas_Engine_GL_Context               Evas_Engine_GL_Context;
-typedef struct _Evas_GL_Texture_Pool                 Evas_GL_Texture_Pool;
-typedef struct _Evas_GL_Texture                      Evas_GL_Texture;
-typedef struct _Evas_GL_Image                        Evas_GL_Image;
-typedef struct _Evas_GL_Font_Texture                 Evas_GL_Font_Texture;
-typedef struct _Evas_GL_Polygon                      Evas_GL_Polygon;
-typedef struct _Evas_GL_Polygon_Point                Evas_GL_Polygon_Point;
-
-typedef enum {
-  SHADER_RECT,
-  SHADER_FONT,
-  SHADER_IMG,
-  SHADER_IMG_NOMUL,
-  SHADER_IMG_BGRA,
-  SHADER_IMG_BGRA_NOMUL,
-  SHADER_IMG_MASK,
-  SHADER_YUV,
-  SHADER_YUV_NOMUL,
-  SHADER_YUY2,
-  SHADER_YUY2_NOMUL,
-  SHADER_NV12,
-  SHADER_NV12_NOMUL,
-  SHADER_TEX,
-  SHADER_TEX_NOMUL,
-  SHADER_FILTER_INVERT,
-  SHADER_FILTER_INVERT_NOMUL,
-  SHADER_FILTER_INVERT_BGRA,
-  SHADER_FILTER_INVERT_BGRA_NOMUL,
-  SHADER_FILTER_GREYSCALE,
-  SHADER_FILTER_GREYSCALE_NOMUL,
-  SHADER_FILTER_GREYSCALE_BGRA,
-  SHADER_FILTER_GREYSCALE_BGRA_NOMUL,
-  SHADER_FILTER_SEPIA,
-  SHADER_FILTER_SEPIA_NOMUL,
-  SHADER_FILTER_SEPIA_BGRA,
-  SHADER_FILTER_SEPIA_BGRA_NOMUL,
-  /* SHADER_FILTER_BLUR, */
-  /* SHADER_FILTER_BLUR_NOMUL, */
-  /* SHADER_FILTER_BLUR_BGRA, */
-  /* SHADER_FILTER_BLUR_BGRA_NOMUL, */
-  SHADER_LAST
-} Evas_GL_Shader;
-
-struct _Evas_GL_Program
-{
-   GLuint vert, frag, prog;
-
-   int tex_count;
-};
-
-struct _Evas_GL_Program_Source
-{
-   const char *src;
-   const unsigned int *bin;
-   int bin_size;
-};
-
-struct _Evas_GL_Shared
-{
-   Eina_List          *images;
-
-   int                 images_size;
-
-   struct {
-      GLint max_texture_units;
-      GLint max_texture_size;
-      GLint max_vertex_elements;
-      GLfloat anisotropic;
-      Eina_Bool rgb : 1;
-      Eina_Bool bgra : 1;
-      Eina_Bool tex_npo2 : 1;
-      Eina_Bool tex_rect : 1;
-      Eina_Bool sec_image_map : 1;
-      Eina_Bool bin_program : 1;
-      // tuning params - per gpu/cpu combo?
-#define MAX_CUTOUT             512
-#define DEF_CUTOUT                  512
-
-// FIXME bug with pipes > 1 right now, should default to 32
-#define MAX_PIPES              128
-#define DEF_PIPES                    32
-#define DEF_PIPES_SGX_540            32
-#define DEF_PIPES_TEGRA_2             1
-
-#define MIN_ATLAS_ALLOC         16
-#define MAX_ATLAS_ALLOC       1024
-#define DEF_ATLAS_ALLOC            1024
-
-#define MIN_ATLAS_ALLOC_ALPHA   16
-#define MAX_ATLAS_ALLOC_ALPHA 4096
-#define DEF_ATLAS_ALLOC_ALPHA      4096
-
-#define MAX_ATLAS_W            512
-#define DEF_ATLAS_W                 512
-
-#define MAX_ATLAS_H            512
-#define DEF_ATLAS_H                 512
-
-#define MIN_ATLAS_SLOT          16
-#define MAX_ATLAS_SLOT         512
-#define DEF_ATLAS_SLOT               16
-
-      struct {
-         struct {
-            int max;
-         } cutout;
-         struct {
-            int max;
-         } pipes;
-         struct {
-            int max_alloc_size;
-            int max_alloc_alpha_size;
-            int max_w;
-            int max_h;
-            int slot_size;
-         } atlas;
-      } tune;
-   } info;
-
-   struct {
-      Eina_List       *whole;
-      Eina_List       *atlas[33][3];
-   } tex;
-
-   Eina_Hash          *native_pm_hash;
-   Eina_Hash          *native_tex_hash;
-
-   Evas_GL_Program     shader[SHADER_LAST];
-
-   int references;
-   int w, h;
-   int rot;
-   int mflip;
-   // persp map
-   int foc, z0, px, py;
-   int ax, ay;
-};
-
-#define RTYPE_RECT  1
-#define RTYPE_IMAGE 2
-#define RTYPE_FONT  3
-#define RTYPE_YUV   4
-#define RTYPE_MAP   5 /* need to merge with image */
-#define RTYPE_IMASK 6
-#define RTYPE_YUY2  7
-#define RTYPE_NV12  8
-
-struct _Evas_Engine_GL_Context
-{
-   int                references;
-   int                w, h;
-   int                rot;
-   int                foc, z0, px, py;
-   RGBA_Draw_Context *dc;
-
-   Evas_GL_Shared     *shared;
-
-   int flushnum;
-   struct {
-      int                top_pipe;
-      struct {
-         GLuint          cur_prog;
-         GLuint          cur_tex, cur_texu, cur_texv;
-         GLuint          cur_texm, cur_texmu, cur_texmv;
-         int             render_op;
-         int             cx, cy, cw, ch;
-         int             smooth;
-         int             blend;
-         int             clip;
-      } current;
-   } state;
-
-   struct {
-      struct {
-         int             x, y, w, h;
-         int             type;
-      } region;
-      struct {
-         int             x, y, w, h;
-         Eina_Bool       active : 1;
-      } clip;
-      struct {
-         Evas_GL_Image  *surface;
-         GLuint          cur_prog;
-         GLuint          cur_tex, cur_texu, cur_texv, cur_texm;
-         void           *cur_tex_dyn, *cur_texu_dyn, *cur_texv_dyn;
-         int             render_op;
-         int             cx, cy, cw, ch;
-         int             smooth;
-         int             blend;
-         int             clip;
-      } shader;
-      struct {
-         int num, alloc;
-         GLshort *vertex;
-         GLubyte *color;
-         GLfloat *texuv;
-         GLfloat *texuv2;
-         GLfloat *texuv3;
-         GLfloat *texm;
-         Eina_Bool line: 1;
-         Eina_Bool use_vertex : 1;
-         Eina_Bool use_color : 1;
-         Eina_Bool use_texuv : 1;
-         Eina_Bool use_texuv2 : 1;
-         Eina_Bool use_texuv3 : 1;
-         Eina_Bool use_texm : 1;
-         Evas_GL_Image *im;
-      } array;
-   } pipe[MAX_PIPES];
-
-   struct {
-      Eina_Bool size : 1;
-   } change;
-
-   Eina_Bool havestuff : 1;
-
-   Evas_GL_Image *def_surface;
-
-   /* If this is set: Force drawing with a particular filter */
-   GLuint       filter_prog;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-// FIXME: hack. expose egl display to gl core for egl image sec extn.
-   void *egldisp;
-#endif
-};
-
-struct _Evas_GL_Texture_Pool
-{
-   Evas_Engine_GL_Context *gc;
-   GLuint           texture, fb;
-   GLuint           intformat, format, dataformat;
-   int              w, h;
-   int              references;
-   int              slot, fslot;
-   struct {
-      void         *img;
-      unsigned int *data;
-      int           w, h;
-      int           stride;
-      int           checked_out;
-   } dyn;
-   Eina_List       *allocations;
-   Eina_Bool        whole : 1;
-   Eina_Bool        render : 1;
-   Eina_Bool        native : 1;
-   Eina_Bool        dynamic : 1;
-};
-
-struct _Evas_GL_Texture
-{
-   Evas_Engine_GL_Context *gc;
-   Evas_GL_Image   *im;
-   Evas_GL_Texture_Pool *pt, *ptu, *ptv, *ptuv;
-   int              x, y, w, h;
-   double           sx1, sy1, sx2, sy2;
-   int              references;
-
-   struct
-   {
-      Evas_GL_Texture_Pool *pt[2], *ptuv[2];
-      int              source;
-   } double_buffer;
-
-   Eina_Bool        alpha : 1;
-   Eina_Bool        dyn : 1;
-};
-
-struct _Evas_GL_Image
-{
-   Evas_Engine_GL_Context *gc;
-   RGBA_Image      *im;
-   Evas_GL_Texture *tex;
-   RGBA_Image_Loadopts load_opts;
-   int              references;
-   // if im->im == NULL, it's a render-surface so these here are used
-   int              w, h;
-   struct {
-      int           space;
-      void         *data;
-      unsigned char no_free : 1;
-   } cs;
-
-   struct {
-      void         *data;
-      struct {
-         void     (*bind)   (void *data, void *image);
-         void     (*unbind) (void *data, void *image);
-         void     (*free)   (void *data, void *image);
-         void      *data;
-      } func;
-      int           yinvert;
-      int           target;
-      int           mipmap;
-      unsigned char loose : 1;
-   } native;
-
-   int scale_hint, content_hint;
-   int csize;
-
-   Eina_List       *filtered;
-
-   unsigned char    dirty : 1;
-   unsigned char    cached : 1;
-   unsigned char    alpha : 1;
-   unsigned char    tex_only : 1;
-};
-
-struct _Evas_GL_Font_Texture
-{
-   Evas_GL_Texture *tex;
-};
-
-struct _Evas_GL_Polygon
-{
-   Eina_List *points;
-   Eina_Bool  changed : 1;
-};
-
-struct _Evas_GL_Polygon_Point
-{
-   int x, y;
-};
-
-#if 0
-extern Evas_GL_Program_Source shader_rect_frag_src;
-extern Evas_GL_Program_Source shader_rect_vert_src;
-extern Evas_GL_Program_Source shader_font_frag_src;
-extern Evas_GL_Program_Source shader_font_vert_src;
-
-extern Evas_GL_Program_Source shader_img_frag_src;
-extern Evas_GL_Program_Source shader_img_vert_src;
-extern Evas_GL_Program_Source shader_img_nomul_frag_src;
-extern Evas_GL_Program_Source shader_img_nomul_vert_src;
-extern Evas_GL_Program_Source shader_img_bgra_frag_src;
-extern Evas_GL_Program_Source shader_img_bgra_vert_src;
-extern Evas_GL_Program_Source shader_img_bgra_nomul_frag_src;
-extern Evas_GL_Program_Source shader_img_bgra_nomul_vert_src;
-extern Evas_GL_Program_Source shader_img_mask_frag_src;
-extern Evas_GL_Program_Source shader_img_mask_vert_src;
-
-extern Evas_GL_Program_Source shader_yuv_frag_src;
-extern Evas_GL_Program_Source shader_yuv_vert_src;
-extern Evas_GL_Program_Source shader_yuv_nomul_frag_src;
-extern Evas_GL_Program_Source shader_yuv_nomul_vert_src;
-
-extern Evas_GL_Program_Source shader_yuy2_frag_src;
-extern Evas_GL_Program_Source shader_yuy2_vert_src;
-extern Evas_GL_Program_Source shader_yuy2_nomul_frag_src;
-extern Evas_GL_Program_Source shader_yuy2_nomul_vert_src;
-
-extern Evas_GL_Program_Source shader_tex_frag_src;
-extern Evas_GL_Program_Source shader_tex_vert_src;
-extern Evas_GL_Program_Source shader_tex_nomul_frag_src;
-extern Evas_GL_Program_Source shader_tex_nomul_vert_src;
-
-extern Evas_GL_Program_Source shader_filter_invert_frag_src;
-extern Evas_GL_Program_Source shader_filter_invert_nomul_frag_src;
-extern Evas_GL_Program_Source shader_filter_invert_bgra_frag_src;
-extern Evas_GL_Program_Source shader_filter_invert_bgra_nomul_frag_src;
-extern Evas_GL_Program_Source shader_filter_sepia_frag_src;
-extern Evas_GL_Program_Source shader_filter_sepia_nomul_frag_src;
-extern Evas_GL_Program_Source shader_filter_sepia_bgra_frag_src;
-extern Evas_GL_Program_Source shader_filter_sepia_bgra_nomul_frag_src;
-extern Evas_GL_Program_Source shader_filter_greyscale_frag_src;
-extern Evas_GL_Program_Source shader_filter_greyscale_nomul_frag_src;
-extern Evas_GL_Program_Source shader_filter_greyscale_bgra_frag_src;
-extern Evas_GL_Program_Source shader_filter_greyscale_bgra_nomul_frag_src;
-/* blur (annoyingly) needs (aka is faster with) a vertex shader */
-extern Evas_GL_Program_Source shader_filter_blur_vert_src;
-extern Evas_GL_Program_Source shader_filter_blur_frag_src;
-extern Evas_GL_Program_Source shader_filter_blur_nomul_frag_src;
-extern Evas_GL_Program_Source shader_filter_blur_bgra_frag_src;
-extern Evas_GL_Program_Source shader_filter_blur_bgra_nomul_frag_src;
-#endif
-
-void glerr(int err, const char *file, const char *func, int line, const char *op);
-
-Evas_Engine_GL_Context  *evas_gl_common_context_new(void);
-void              evas_gl_common_context_free(Evas_Engine_GL_Context *gc);
-void              evas_gl_common_context_use(Evas_Engine_GL_Context *gc);
-void              evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc);
-void              evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot);
-void              evas_gl_common_context_target_surface_set(Evas_Engine_GL_Context *gc, Evas_GL_Image *surface);
-
-void              evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
-                                                   int x1, int y1, int x2, int y2,
-                                                   int clip, int cx, int cy, int cw, int ch,
-                                                   int r, int g, int b, int a);
-void              evas_gl_common_context_rectangle_push(Evas_Engine_GL_Context *gc,
-                                                        int x, int y, int w, int h,
-                                                        int r, int g, int b, int a);
-void              evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
-                                                    Evas_GL_Texture *tex,
-                                                    double sx, double sy, double sw, double sh,
-                                                    int x, int y, int w, int h,
-                                                    int r, int g, int b, int a,
-                                                    Eina_Bool smooth, Eina_Bool tex_only);
-void              evas_gl_common_context_image_mask_push(Evas_Engine_GL_Context *gc,
-                                                    Evas_GL_Texture *tex,
-                                                    Evas_GL_Texture *texm,
-                                                    double sx, double sy, double sw, double sh,
-                                                    double sxm, double sym, double swm, double shm,
-                                                    int x, int y, int w, int h,
-                                                    int r, int g, int b, int a,
-                                                    Eina_Bool smooth);
-
-
-void              evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
-                                                   Evas_GL_Texture *tex,
-                                                   double sx, double sy, double sw, double sh,
-                                                   int x, int y, int w, int h,
-                                                   int r, int g, int b, int a);
-void             evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
-                                                 Evas_GL_Texture *tex,
-                                                 double sx, double sy, double sw, double sh,
-                                                 int x, int y, int w, int h,
-                                                 int r, int g, int b, int a,
-                                                 Eina_Bool smooth);
-void             evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
-                                                  Evas_GL_Texture *tex,
-                                                  double sx, double sy, double sw, double sh,
-                                                  int x, int y, int w, int h,
-                                                  int r, int g, int b, int a,
-                                                  Eina_Bool smooth);
-void             evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
-                                                  Evas_GL_Texture *tex,
-                                                  double sx, double sy, double sw, double sh,
-                                                  int x, int y, int w, int h,
-                                                  int r, int g, int b, int a,
-                                                  Eina_Bool smooth);
-void             evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
-                                                       Evas_GL_Texture *tex,
-                                                       int npoints,
-                                                       RGBA_Map_Point *p,
-                                                       int clip, int cx, int cy, int cw, int ch,
-                                                       int r, int g, int b, int a,
-                                                       Eina_Bool smooth,
-                                                       Eina_Bool tex_only,
-                                                       Evas_Colorspace cspace);
-void              evas_gl_common_context_flush(Evas_Engine_GL_Context *gc);
-
-int               evas_gl_common_shader_program_init(Evas_GL_Shared *shared);
-void              evas_gl_common_shader_program_init_done(void);
-void              evas_gl_common_shader_program_shutdown(Evas_GL_Program *p);
-
-void              evas_gl_common_rect_draw(Evas_Engine_GL_Context *gc, int x, int y, int w, int h);
-
-void              evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt);
-Evas_GL_Texture  *evas_gl_common_texture_new(Evas_Engine_GL_Context *gc, RGBA_Image *im);
-Evas_GL_Texture  *evas_gl_common_texture_native_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, Evas_GL_Image *im);
-Evas_GL_Texture  *evas_gl_common_texture_render_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha);
-Evas_GL_Texture  *evas_gl_common_texture_dynamic_new(Evas_Engine_GL_Context *gc, Evas_GL_Image *im);
-void              evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im);
-void              evas_gl_common_texture_free(Evas_GL_Texture *tex);
-Evas_GL_Texture  *evas_gl_common_texture_alpha_new(Evas_Engine_GL_Context *gc, DATA8 *pixels, unsigned int w, unsigned int h, int fh);
-void              evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels, unsigned int w, unsigned int h, int fh);
-Evas_GL_Texture  *evas_gl_common_texture_yuv_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h);
-void              evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned int w, unsigned int h);
-Evas_GL_Texture  *evas_gl_common_texture_yuy2_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h);
-void              evas_gl_common_texture_yuy2_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned int w, unsigned int h);
-Evas_GL_Texture  *evas_gl_common_texture_nv12_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h);
-void              evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **row, unsigned int w, unsigned int h);
-Evas_GL_Texture  *evas_gl_common_texture_nv12tiled_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h);
-void              evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **row, unsigned int w, unsigned int h);
-
-void              evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc);
-
-void              evas_gl_common_image_ref(Evas_GL_Image *im);
-void              evas_gl_common_image_unref(Evas_GL_Image *im);
-Evas_GL_Image    *evas_gl_common_image_load(Evas_Engine_GL_Context *gc, const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error);
-Evas_GL_Image    *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace);
-Evas_GL_Image    *evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace);
-Evas_GL_Image    *evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, int cspace);
-Evas_GL_Image    *evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha);
-void              evas_gl_common_image_native_enable(Evas_GL_Image *im);
-void              evas_gl_common_image_native_disable(Evas_GL_Image *im);
-void              evas_gl_common_image_scale_hint_set(Evas_GL_Image *im, int hint);
-void              evas_gl_common_image_content_hint_set(Evas_GL_Image *im, int hint);
-void              evas_gl_common_image_cache_flush(Evas_Engine_GL_Context *gc);
-void              evas_gl_common_image_free(Evas_GL_Image *im);
-Evas_GL_Image    *evas_gl_common_image_surface_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha);
-void              evas_gl_common_image_dirty(Evas_GL_Image *im, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
-void              evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im);
-void              evas_gl_common_image_map_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, int npoints, RGBA_Map_Point *p, int smooth, int level);
-void              evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int smooth);
-
-void             *evas_gl_font_texture_new(void *gc, RGBA_Font_Glyph *fg);
-void              evas_gl_font_texture_free(void *);
-void              evas_gl_font_texture_draw(void *gc, void *surface, void *dc, RGBA_Font_Glyph *fg, int x, int y);
-
-Evas_GL_Polygon  *evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x, int y);
-Evas_GL_Polygon  *evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly);
-void              evas_gl_common_poly_draw(Evas_Engine_GL_Context *gc, Evas_GL_Polygon *poly, int x, int y);
-
-void              evas_gl_common_line_draw(Evas_Engine_GL_Context *gc, int x1, int y1, int x2, int y2);
-
-#if 0 // filtering disabled
-void              evas_gl_common_filter_draw(Evas_Engine_GL_Context *context, Evas_GL_Image *im, Evas_Filter_Info *filter);
-Filtered_Image   *evas_gl_common_image_filtered_get(Evas_GL_Image *im, uint8_t *key, size_t keylen);
-Filtered_Image   *evas_gl_common_image_filtered_save(Evas_GL_Image *im, Evas_GL_Image *fimage, uint8_t *key, size_t keylen);
-void              evas_gl_common_image_filtered_free(Evas_GL_Image *im, Filtered_Image *);
-#endif
-
-extern void (*glsym_glGenFramebuffers)      (GLsizei a, GLuint *b);
-extern void (*glsym_glBindFramebuffer)      (GLenum a, GLuint b);
-extern void (*glsym_glFramebufferTexture2D) (GLenum a, GLenum b, GLenum c, GLuint d, GLint e);
-extern void (*glsym_glDeleteFramebuffers)   (GLsizei a, const GLuint *b);
-extern void (*glsym_glGetProgramBinary)     (GLuint a, GLsizei b, GLsizei *c, GLenum *d, void *e);
-extern void (*glsym_glProgramBinary)        (GLuint a, GLenum b, const void *c, GLint d);
-extern void (*glsym_glProgramParameteri)    (GLuint a, GLuint b, GLint d);
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-extern void          *(*secsym_eglCreateImage)               (void *a, void *b, GLenum c, void *d, const int *e);
-extern unsigned int   (*secsym_eglDestroyImage)              (void *a, void *b);
-extern void           (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b);
-extern void          *(*secsym_eglMapImageSEC)               (void *a, void *b);
-extern unsigned int   (*secsym_eglUnmapImageSEC)             (void *a, void *b);
-extern unsigned int   (*secsym_eglGetImageAttribSEC)         (void *a, void *b, int c, int *d);
-#endif
-
-//#define GL_ERRORS 1
-
-#ifdef GL_ERRORS
-# define GLERR(fn, fl, ln, op) \
-   { \
-      int __gl_err = glGetError(); \
-      if (__gl_err != GL_NO_ERROR) glerr(__gl_err, fl, fn, ln, op); \
-   }
-#else
-# define GLERR(fn, fl, ln, op)
-#endif
-
-Eina_Bool evas_gl_common_module_open(void);
-void      evas_gl_common_module_close(void);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_context.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_context.c
deleted file mode 100644
index 62e72bd..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_context.c
+++ /dev/null
@@ -1,2723 +0,0 @@
-#include "evas_gl_private.h"
-
-#ifdef HAVE_DLSYM
-# include <dlfcn.h>      /* dlopen,dlclose,etc */
-#else
-# error gl_common should not get compiled if dlsym is not found on the system!
-#endif
-
-#define PRG_INVALID 0xffffffff
-#define GLPIPES 1
-
-static int sym_done = 0;
-int _evas_engine_GL_common_log_dom = -1;
-
-typedef void    (*glsym_func_void) ();
-
-void (*glsym_glGenFramebuffers)      (GLsizei a, GLuint *b) = NULL;
-void (*glsym_glBindFramebuffer)      (GLenum a, GLuint b) = NULL;
-void (*glsym_glFramebufferTexture2D) (GLenum a, GLenum b, GLenum c, GLuint d, GLint e) = NULL;
-void (*glsym_glDeleteFramebuffers)   (GLsizei a, const GLuint *b) = NULL;
-void (*glsym_glGetProgramBinary)     (GLuint a, GLsizei b, GLsizei *c, GLenum *d, void *e) = NULL;
-void (*glsym_glProgramBinary)        (GLuint a, GLenum b, const void *c, GLint d) = NULL;
-void (*glsym_glProgramParameteri)    (GLuint a, GLuint b, GLint d) = NULL;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-// just used for finding symbols :)
-typedef void (*_eng_fn) (void);
-
-typedef _eng_fn       (*secsym_func_eng_fn) ();
-typedef unsigned int  (*secsym_func_uint) ();
-typedef void         *(*secsym_func_void_ptr) ();
-
-static _eng_fn  (*secsym_eglGetProcAddress)          (const char *a) = NULL;
-
-void          *(*secsym_eglCreateImage)               (void *a, void *b, GLenum c, void *d, const int *e) = NULL;
-unsigned int   (*secsym_eglDestroyImage)              (void *a, void *b) = NULL;
-void           (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
-void          *(*secsym_eglMapImageSEC)               (void *a, void *b) = NULL;
-unsigned int   (*secsym_eglUnmapImageSEC)             (void *a, void *b) = NULL;
-unsigned int   (*secsym_eglGetImageAttribSEC)         (void *a, void *b, int c, int *d) = NULL;
-#endif
-
-static int dbgflushnum = -1;
-
-static void
-sym_missing(void)
-{
-   ERR("GL symbols missing!");
-}
-
-static void
-gl_symbols(void)
-{
-   if (sym_done) return;
-   sym_done = 1;
-
-   /* FIXME: If using the SDL engine, we should use SDL_GL_GetProcAddress
-    * instead of dlsym
-    * if (!dst) dst = (typ)SDL_GL_GetProcAddress(sym)
-    */
-#define FINDSYM(dst, sym, typ) if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
-#define FALLBAK(dst, typ) if (!dst) dst = (typ)sym_missing;
-
-   FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", glsym_func_void);
-   FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersEXT", glsym_func_void);
-   FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersARB", glsym_func_void);
-   FALLBAK(glsym_glGenFramebuffers, glsym_func_void);
-
-   FINDSYM(glsym_glBindFramebuffer, "glBindFramebuffer", glsym_func_void);
-   FINDSYM(glsym_glBindFramebuffer, "glBindFramebufferEXT", glsym_func_void);
-   FINDSYM(glsym_glBindFramebuffer, "glBindFramebufferARB", glsym_func_void);
-   FALLBAK(glsym_glBindFramebuffer, glsym_func_void);
-
-   FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2D", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2DEXT", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2DARB", glsym_func_void);
-   FALLBAK(glsym_glFramebufferTexture2D, glsym_func_void);
-
-   FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffers", glsym_func_void);
-   FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffersEXT", glsym_func_void);
-   FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffersARB", glsym_func_void);
-   FALLBAK(glsym_glDeleteFramebuffers, glsym_func_void);
-
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryOES", glsym_func_void);
-
-   FINDSYM(glsym_glProgramBinary, "glProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glProgramBinary, "glProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glProgramBinary, "glProgramBinaryARB", glsym_func_void);
-
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteri", glsym_func_void);
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", glsym_func_void);
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", glsym_func_void);
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-#undef FINDSYM
-#define FINDSYM(dst, sym, typ) \
-   if ((!dst) && (secsym_eglGetProcAddress)) dst = (typ)secsym_eglGetProcAddress(sym); \
-   if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
-// yes - gl core looking for egl stuff. i know it's odd. a reverse-layer thing
-// but it will work as the egl/glx layer calls gl core common stuff and thus
-// these symbols will work. making the glx/egl + x11 layer do this kind-of is
-// wrong as this is not x11 (output) layer specific like the native surface
-// stuff. this is generic zero-copy textures for gl
-
-   FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddress", secsym_func_eng_fn);
-   FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddressEXT", secsym_func_eng_fn);
-   FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddressARB", secsym_func_eng_fn);
-   FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddressKHR", secsym_func_eng_fn);
-
-   FINDSYM(secsym_eglCreateImage, "eglCreateImage", secsym_func_void_ptr);
-   FINDSYM(secsym_eglCreateImage, "eglCreateImageEXT", secsym_func_void_ptr);
-   FINDSYM(secsym_eglCreateImage, "eglCreateImageARB", secsym_func_void_ptr);
-   FINDSYM(secsym_eglCreateImage, "eglCreateImageKHR", secsym_func_void_ptr);
-
-   FINDSYM(secsym_eglDestroyImage, "eglDestroyImage", secsym_func_uint);
-   FINDSYM(secsym_eglDestroyImage, "eglDestroyImageEXT", secsym_func_uint);
-   FINDSYM(secsym_eglDestroyImage, "eglDestroyImageARB", secsym_func_uint);
-   FINDSYM(secsym_eglDestroyImage, "eglDestroyImageKHR", secsym_func_uint);
-
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryOES", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryKHR", glsym_func_void);
-
-   FINDSYM(glsym_glProgramBinary, "glProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glProgramBinary, "glProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glProgramBinary, "glProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glProgramBinary, "glProgramBinaryOES", glsym_func_void);
-   FINDSYM(glsym_glProgramBinary, "glProgramBinaryKHR", glsym_func_void);
-
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteri", glsym_func_void);
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", glsym_func_void);
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", glsym_func_void);
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteriOES", glsym_func_void);
-   FINDSYM(glsym_glProgramParameteri, "glProgramParameteriKHR", glsym_func_void);
-
-   FINDSYM(secsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", glsym_func_void);
-
-   FINDSYM(secsym_eglMapImageSEC, "eglMapImageSEC", secsym_func_void_ptr);
-
-   FINDSYM(secsym_eglUnmapImageSEC, "eglUnmapImageSEC", secsym_func_uint);
-
-   FINDSYM(secsym_eglGetImageAttribSEC, "eglGetImageAttribSEC", secsym_func_uint);
-#endif
-}
-
-static void shader_array_flush(Evas_Engine_GL_Context *gc);
-
-static Evas_Engine_GL_Context *_evas_gl_common_context = NULL;
-static Evas_GL_Shared *shared = NULL;
-
-void
-glerr(int err, const char *file, const char *func, int line, const char *op)
-{
-   const char *errmsg;
-   char buf[32];
-
-   switch (err)
-     {
-     case GL_INVALID_ENUM:
-        errmsg = "GL_INVALID_ENUM";
-        break;
-     case GL_INVALID_VALUE:
-        errmsg = "GL_INVALID_VALUE";
-        break;
-     case GL_INVALID_OPERATION:
-        errmsg = "GL_INVALID_OPERATION";
-        break;
-     case GL_OUT_OF_MEMORY:
-        errmsg = "GL_OUT_OF_MEMORY";
-        break;
-     default:
-        snprintf(buf, sizeof(buf), "%#x", err);
-        errmsg = buf;
-     }
-
-   eina_log_print(_evas_engine_GL_common_log_dom, EINA_LOG_LEVEL_ERR,
-                  file, func, line, "%s: %s", op, errmsg);
-}
-
-static void
-matrix_ortho(GLfloat *m,
-             GLfloat l, GLfloat r,
-             GLfloat t, GLfloat b,
-             GLfloat near, GLfloat far,
-             int rot, int vw, int vh,
-             int foc, GLfloat orth)
-{
-   GLfloat rotf;
-   GLfloat cosv, sinv;
-   GLfloat tx, ty;
-
-   rotf = (((rot / 90) & 0x3) * M_PI) / 2.0;
-
-   tx = -0.5 * (1.0 - orth);
-   ty = -0.5 * (1.0 - orth);
-
-   if (rot == 90)
-     {
-        tx += -(vw * 1.0);
-        ty += -(vh * 0.0);
-     }
-   if (rot == 180)
-     {
-        tx += -(vw * 1.0);
-        ty += -(vh * 1.0);
-     }
-   if (rot == 270)
-     {
-        tx += -(vw * 0.0);
-        ty += -(vh * 1.0);
-     }
-
-   cosv = cos(rotf);
-   sinv = sin(rotf);
-
-   m[0] = (2.0 / (r - l)) * ( cosv);
-   m[1] = (2.0 / (r - l)) * ( sinv);
-   m[2] = 0.0;
-   m[3] = 0.0;
-
-   m[4] = (2.0 / (t - b)) * (-sinv);
-   m[5] = (2.0 / (t - b)) * ( cosv);
-   m[6] = 0.0;
-   m[7] = 0.0;
-
-   m[8] = 0.0;
-   m[9] = 0.0;
-   m[10] = -(2.0 / (far - near));
-   m[11] = 1.0 / (GLfloat)foc;
-
-   m[12] = (m[0] * tx) + (m[4] * ty) - ((r + l) / (r - l));
-   m[13] = (m[1] * tx) + (m[5] * ty) - ((t + b) / (t - b));
-   m[14] = (m[2] * tx) + (m[6] * ty) - ((near + far) / (far - near));
-   m[15] = (m[3] * tx) + (m[7] * ty) + orth;
-}
-
-static int
-_evas_gl_common_version_check()
-{
-   char *version;
-   char *tmp;
-   char *tmp2;
-   int major;
-   int minor;
-
-  /*
-   * glGetString returns a string describing the current GL connection.
-   * GL_VERSION is used to get the version of the connection
-   */
-
-   version = (char *)glGetString(GL_VERSION);
-
-  /*
-   * OpengL ES
-   *
-   * 1.* : The form is:
-   *
-   * OpenGL ES-<profile> <major>.<minor>
-   *
-   * where <profile> is either "CM" or "CL". The minor can be followed by the vendor
-   * specific information
-   *
-   * 2.0 : The form is:
-   *
-   * OpenGL<space>ES<space><version number><space><vendor-specific information>
-   */
-
-   /* OpenGL ES 1.* ? */
-
-   if ((tmp = strstr(version, "OpenGL ES-CM ")) || (tmp = strstr(version, "OpenGL ES-CL ")))
-     {
-        /* Not supported */
-        return 0;
-     }
-
-   /* OpenGL ES 2.* ? */
-
-   if ((tmp = strstr(version, "OpenGL ES ")))
-     {
-        /* Supported */
-        return 1;
-     }
-
-  /*
-   * OpenGL
-   *
-   * The GL_VERSION and GL_SHADING_LANGUAGE_VERSION strings begin with a
-   * version number. The version number uses one of these forms:
-   *
-   * major_number.minor_number
-   * major_number.minor_number.release_number
-   *
-   * Vendor-specific information may follow the version number. Its format
-   * depends on the implementation, but a space always separates the
-   * version number and the vendor-specific information.
-   */
-
-   /* glGetString() returns a static string, and we are going to */
-   /* modify it, so we get a copy first */
-   version = strdup(version);
-   if (!version)
-     return 0;
-
-   tmp = strchr(version, '.');
-   /* the first '.' always exists */
-   *tmp = '\0';
-   major = atoi(version);
-   /* FIXME: maybe we can assume that minor in only a cipher */
-   tmp2 = ++tmp;
-   while ((*tmp != '.') && (*tmp != ' ') && (*tmp != '\0'))
-     tmp++;
-   /* *tmp is '\0' : version is major_number.minor_number */
-   /* *tmp is '.'  : version is major_number.minor_number.release_number */
-   /* *tmp is ' '  : version is major_number.minor_number followed by vendor */
-   *tmp = '\0';
-   minor = atoi(tmp2);
-   free(version);
-
-   if (((major == 1) && (minor >= 4)) || (major >= 2))
-     return 1;
-
-   return 0;
-}
-
-static void
-_evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
-{
-   GLfloat proj[16];
-   unsigned int i;
-   int w = 1, h = 1, m = 1, rot = 1, foc = 0;
-
-   EINA_SAFETY_ON_NULL_RETURN(gc);
-   foc = gc->foc;
-   // surface in pipe 0 will be the same as all pipes
-   if ((gc->pipe[0].shader.surface == gc->def_surface) ||
-       (!gc->pipe[0].shader.surface))
-     {
-        w = gc->w;
-        h = gc->h;
-        rot = gc->rot;
-     }
-   else
-     {
-        w = gc->pipe[0].shader.surface->w;
-        h = gc->pipe[0].shader.surface->h;
-        rot = 0;
-        m = -1;
-     }
-
-   if ((!gc->change.size) ||
-       ((gc->shared->w == w) && (gc->shared->h == h) &&
-           (gc->shared->rot == rot) && (gc->shared->foc == gc->foc) &&
-           (gc->shared->mflip == m)))
-      return;
-
-   gc->shared->w = w;
-   gc->shared->h = h;
-   gc->shared->rot = rot;
-   gc->shared->mflip = m;
-   gc->shared->foc = foc;
-   gc->shared->z0 = gc->z0;
-   gc->shared->px = gc->px;
-   gc->shared->py = gc->py;
-   gc->change.size = 0;
-
-   if (foc == 0)
-     {
-        if ((rot == 0) || (rot == 180))
-           glViewport(0, 0, w, h);
-        else
-           glViewport(0, 0, h, w);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        // std matrix
-        if (m == 1)
-           matrix_ortho(proj,
-                        0, w, 0, h,
-                        -1000000.0, 1000000.0,
-                        rot, w, h,
-                        1, 1.0);
-        // v flipped matrix for render-to-texture
-        else
-           matrix_ortho(proj,
-                        0, w, h, 0,
-                        -1000000.0, 1000000.0,
-                        rot, w, h,
-                        1, 1.0);
-     }
-   else
-     {
-        int px, py, vx, vy, vw = 0, vh = 0, ax = 0, ay = 0, ppx = 0, ppy = 0;
-
-        px = gc->shared->px;
-        py = gc->shared->py;
-
-        if      ((rot == 0  ) || (rot == 90 )) ppx = px;
-        else if ((rot == 180) || (rot == 270)) ppx = w - px;
-        if      ((rot == 0  ) || (rot == 270)) ppy = py;
-        else if ((rot == 90 ) || (rot == 180)) ppy = h - py;
-
-        vx = ((w / 2) - ppx);
-        if (vx >= 0)
-          {
-             vw = w + (2 * vx);
-             if      ((rot == 0  ) || (rot == 90 )) ax = 2 * vx;
-             else if ((rot == 180) || (rot == 270)) ax = 0;
-          }
-        else
-          {
-             vw = w - (2 * vx);
-             if      ((rot == 0  ) || (rot == 90 )) ax = 0;
-             else if ((rot == 180) || (rot == 270)) ax = ppx - px;
-             vx = 0;
-          }
-
-        vy = ((h / 2) - ppy);
-        if (vy < 0)
-          {
-             vh = h - (2 * vy);
-             if      ((rot == 0  ))                                 ay = 0;
-             else if ((rot == 90 ) || (rot == 180) || (rot == 270)) ay = ppy - py;
-             vy = -vy;
-          }
-        else
-          {
-             vh = h + (2 * vy);
-             if      ((rot == 0  ) || (rot == 270)) ay = 2 * vy;
-             else if ((rot == 90 ) || (rot == 180)) ay = 0;
-             vy = 0;
-          }
-
-        if (m == -1) ay = vy * 2;
-
-        if ((rot == 0) || (rot == 180))
-           glViewport(-2 * vx, -2 * vy, vw, vh);
-        else
-           glViewport(-2 * vy, -2 * vx, vh, vw);
-        if (m == 1)
-           matrix_ortho(proj, 0, vw, 0, vh,
-                        -1000000.0, 1000000.0,
-                        rot, vw, vh,
-                        foc, 0.0);
-        else
-           matrix_ortho(proj, 0, vw, vh, 0,
-                        -1000000.0, 1000000.0,
-                        rot, vw, vh,
-                        foc, 0.0);
-        gc->shared->ax = ax;
-        gc->shared->ay = ay;
-     }
-
-   for (i = 0; i < SHADER_LAST; ++i)
-     {
-        glUseProgram(gc->shared->shader[i].prog);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glUniformMatrix4fv(glGetUniformLocation(gc->shared->shader[i].prog, "mvp"), 1, GL_FALSE, proj);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-
-   if (gc->state.current.cur_prog == PRG_INVALID)
-      glUseProgram(gc->shared->shader[0].prog);
-   else glUseProgram(gc->state.current.cur_prog);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-}
-
-Evas_Engine_GL_Context *
-evas_gl_common_context_new(void)
-{
-   Evas_Engine_GL_Context *gc;
-   const char *s;
-   int i;
-
-#if 1
-   if (_evas_gl_common_context)
-     {
-        _evas_gl_common_context->references++;
-        return _evas_gl_common_context;
-     }
-#endif
-   if (!_evas_gl_common_version_check())
-     return NULL;
-   gc = calloc(1, sizeof(Evas_Engine_GL_Context));
-   if (!gc) return NULL;
-
-   gl_symbols();
-
-   gc->references = 1;
-
-   _evas_gl_common_context = gc;
-
-   for (i = 0; i < MAX_PIPES; i++)
-      gc->pipe[i].shader.render_op = EVAS_RENDER_BLEND;
-
-   if (!shared)
-     {
-        const GLubyte *ext;
-
-        shared = calloc(1, sizeof(Evas_GL_Shared));
-        ext = glGetString(GL_EXTENSIONS);
-        if (ext)
-          {
-             if (getenv("EVAS_GL_INFO"))
-                fprintf(stderr, "EXT:\n%s\n", ext);
-             if ((strstr((char *)ext, "GL_ARB_texture_non_power_of_two")) ||
-                 (strstr((char *)ext, "OES_texture_npot")) ||
-                 (strstr((char *)ext, "GL_IMG_texture_npot")))
-               shared->info.tex_npo2 = 1;
-             if ((strstr((char *)ext, "GL_NV_texture_rectangle")) ||
-                 (strstr((char *)ext, "GL_EXT_texture_rectangle")) ||
-                 (strstr((char *)ext, "GL_ARB_texture_rectangle")))
-               shared->info.tex_rect = 1;
-             if ((strstr((char *)ext, "GL_ARB_get_program_binary")) ||
-                 (strstr((char *)ext, "GL_OES_get_program_binary")))
-               shared->info.bin_program = 1;
-#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
-             if ((strstr((char *)ext, "GL_EXT_texture_filter_anisotropic")))
-               glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
-                           &(shared->info.anisotropic));
-#endif
-#ifdef GL_BGRA
-             if ((strstr((char *)ext, "GL_EXT_bgra")) ||
-                 (strstr((char *)ext, "GL_EXT_texture_format_BGRA8888")))
-               shared->info.bgra = 1;
-#endif
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-             // FIXME: there should be an extension name/string to check for
-             // not just symbols in the lib
-             i = 0;
-             s = getenv("EVAS_GL_NO_MAP_IMAGE_SEC");
-             if (s) i = atoi(s);
-             if (!i)
-               {
-                  // test for all needed symbols - be "conservative" and
-                  // need all of it
-                  if ((secsym_eglCreateImage) &&
-                      (secsym_eglDestroyImage) &&
-                      (secsym_glEGLImageTargetTexture2DOES) &&
-                      (secsym_eglMapImageSEC) &&
-                      (secsym_eglUnmapImageSEC) &&
-                      (secsym_eglGetImageAttribSEC))
-                     shared->info.sec_image_map = 1;
-               }
-#endif
-          }
-        glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS,
-                      &(shared->info.max_texture_units));
-        glGetIntegerv(GL_MAX_TEXTURE_SIZE,
-                      &(shared->info.max_texture_size));
-        shared->info.max_vertex_elements = 6 * 100000;
-#ifdef GL_MAX_ELEMENTS_VERTICES
-/* only applies to glDrawRangeElements. don't really need to get it.
-        glGetIntegerv(GL_MAX_ELEMENTS_VERTICES,
-                      &(shared->info.max_vertex_elements));
- */
-#endif
-        s = getenv("EVAS_GL_VERTEX_MAX");
-        if (s) shared->info.max_vertex_elements = atoi(s);
-        if (shared->info.max_vertex_elements < 6)
-           shared->info.max_vertex_elements = 6;
-
-        // magic numbers that are a result of imperical testing and getting
-        // "best case" performance across a range of systems
-        shared->info.tune.cutout.max                 = DEF_CUTOUT;
-        shared->info.tune.pipes.max                  = DEF_PIPES;
-        shared->info.tune.atlas.max_alloc_size       = DEF_ATLAS_ALLOC;
-        shared->info.tune.atlas.max_alloc_alpha_size = DEF_ATLAS_ALLOC_ALPHA;
-        shared->info.tune.atlas.max_w                = DEF_ATLAS_W;
-        shared->info.tune.atlas.max_h                = DEF_ATLAS_H;
-        shared->info.tune.atlas.slot_size            = DEF_ATLAS_SLOT;
-
-        // per gpu hacks. based on impirical measurement of some known gpu's
-        s = (const char *)glGetString(GL_RENDERER);
-        if (s)
-          {
-             if      (strstr(s, "PowerVR SGX 540"))
-                shared->info.tune.pipes.max = DEF_PIPES_SGX_540;
-             else if (strstr(s, "NVIDIA Tegra"))
-                shared->info.tune.pipes.max = DEF_PIPES_TEGRA_2;
-          }
-
-#define GETENVOPT(name, tune_param, min, max) \
-        do { \
-           const char *__v = getenv(name); \
-           if (__v) { \
-              shared->info.tune.tune_param = atoi(__v); \
-              if (shared->info.tune.tune_param > max) \
-                 shared->info.tune.tune_param = max; \
-              else if (shared->info.tune.tune_param < min) \
-                 shared->info.tune.tune_param = min; \
-           } \
-        } while (0)
-
-        GETENVOPT("EVAS_GL_CUTOUT_MAX", cutout.max, -1, 0x7fffffff);
-        GETENVOPT("EVAS_GL_PIPES_MAX", pipes.max, 1, MAX_PIPES);
-        GETENVOPT("EVAS_GL_ATLAS_ALLOC_SIZE", atlas.max_alloc_size, MIN_ATLAS_ALLOC, MAX_ATLAS_ALLOC);
-        GETENVOPT("EVAS_GL_ATLAS_ALLOC_ALPHA_SIZE", atlas.max_alloc_alpha_size, MIN_ATLAS_ALLOC_ALPHA, MAX_ATLAS_ALLOC_ALPHA);
-        GETENVOPT("EVAS_GL_ATLAS_MAX_W", atlas.max_w, 0, MAX_ATLAS_W);
-        GETENVOPT("EVAS_GL_ATLAS_MAX_H", atlas.max_h, 0, MAX_ATLAS_H);
-        GETENVOPT("EVAS_GL_ATLAS_SLOT_SIZE", atlas.slot_size, MIN_ATLAS_SLOT, MAX_ATLAS_SLOT);
-        s = (const char *)getenv("EVAS_GL_GET_PROGRAM_BINARY");
-        if (s)
-          {
-             if (atoi(s) == 0) shared->info.bin_program = 0;
-          }
-
-        if (getenv("EVAS_GL_INFO"))
-           fprintf(stderr,
-                   "max tex size %ix%i\n"
-                   "max units %i\n"
-                   "non-power-2 tex %i\n"
-                   "rect tex %i\n"
-                   "bgra : %i\n"
-                   "max ansiotropic filtering: %3.3f\n"
-                   "egl sec map image: %i\n"
-                   "max vertex count: %i\n"
-                   "\n"
-                   "(can set EVAS_GL_VERTEX_MAX  EVAS_GL_NO_MAP_IMAGE_SEC  EVAS_GL_INFO  EVAS_GL_MEMINFO )\n"
-                   "\n"
-                   "EVAS_GL_GET_PROGRAM_BINARY: %i\n"
-                   "EVAS_GL_CUTOUT_MAX: %i\n"
-                   "EVAS_GL_PIPES_MAX: %i\n"
-                   "EVAS_GL_ATLAS_ALLOC_SIZE: %i\n"
-                   "EVAS_GL_ATLAS_ALLOC_ALPHA_SIZE: %i\n"
-                   "EVAS_GL_ATLAS_MAX_W x EVAS_GL_ATLAS_MAX_H: %i x %i\n"
-                   "EVAS_GL_ATLAS_SLOT_SIZE: %i\n"
-                   ,
-                   (int)shared->info.max_texture_size, (int)shared->info.max_texture_size,
-                   (int)shared->info.max_texture_units,
-                   (int)shared->info.tex_npo2,
-                   (int)shared->info.tex_rect,
-                   (int)shared->info.bgra,
-                   (double)shared->info.anisotropic,
-                   (int)shared->info.sec_image_map,
-                   (int)shared->info.max_vertex_elements,
-
-                   (int)shared->info.bin_program,
-                   (int)shared->info.tune.cutout.max,
-                   (int)shared->info.tune.pipes.max,
-                   (int)shared->info.tune.atlas.max_alloc_size,
-                   (int)shared->info.tune.atlas.max_alloc_alpha_size,
-                   (int)shared->info.tune.atlas.max_w, (int)shared->info.tune.atlas.max_h,
-                   (int)shared->info.tune.atlas.slot_size
-                  );
-
-        glDisable(GL_DEPTH_TEST);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glEnable(GL_DITHER);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glDisable(GL_BLEND);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        // no dest alpha
-//        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha
-//        glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ???
-        glDepthMask(GL_FALSE);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
-        if (shared->info.anisotropic > 0.0)
-          {
-             glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-#endif
-
-        glEnableVertexAttribArray(SHAD_VERTEX);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glEnableVertexAttribArray(SHAD_COLOR);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-        if (!evas_gl_common_shader_program_init(shared)) goto error;
-
-#define SHADER_TEXTURE_ADD(Shared, Shader, Name)                        \
-        glUseProgram(Shared->shader[SHADER_##Shader].prog);             \
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");                    \
-        glUniform1i(glGetUniformLocation(Shared->shader[SHADER_##Shader].prog, #Name), Shared->shader[SHADER_##Shader].tex_count++); \
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-        SHADER_TEXTURE_ADD(shared, YUV, tex);
-        SHADER_TEXTURE_ADD(shared, YUV, texu);
-        SHADER_TEXTURE_ADD(shared, YUV, texv);
-
-        SHADER_TEXTURE_ADD(shared, YUY2, tex);
-        SHADER_TEXTURE_ADD(shared, YUY2, texuv);
-
-        SHADER_TEXTURE_ADD(shared, NV12, tex);
-        SHADER_TEXTURE_ADD(shared, NV12, texuv);
-
-        SHADER_TEXTURE_ADD(shared, YUV_NOMUL, tex);
-        SHADER_TEXTURE_ADD(shared, YUV_NOMUL, texu);
-        SHADER_TEXTURE_ADD(shared, YUV_NOMUL, texv);
-
-        SHADER_TEXTURE_ADD(shared, YUY2_NOMUL, tex);
-        SHADER_TEXTURE_ADD(shared, YUY2_NOMUL, texuv);
-
-        SHADER_TEXTURE_ADD(shared, NV12_NOMUL, tex);
-        SHADER_TEXTURE_ADD(shared, NV12_NOMUL, texuv);
-
-        SHADER_TEXTURE_ADD(shared, IMG_MASK, tex);
-        SHADER_TEXTURE_ADD(shared, IMG_MASK, texm);
-
-        if (gc->state.current.cur_prog == PRG_INVALID)
-           glUseProgram(gc->shared->shader[0].prog);
-        else glUseProgram(gc->state.current.cur_prog);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-        evas_gl_common_shader_program_init_done();
-        // in shader:
-        // uniform sampler2D tex[8];
-        //
-        // in code:
-        // GLuint texes[8];
-        // GLint loc = glGetUniformLocation(prog, "tex");
-        // glUniform1iv(loc, 8, texes);
-
-        shared->native_pm_hash  = eina_hash_int32_new(NULL);
-        shared->native_tex_hash = eina_hash_int32_new(NULL);
-     }
-   gc->shared = shared;
-   gc->shared->references++;
-   _evas_gl_common_viewport_set(gc);
-
-   gc->def_surface = evas_gl_common_image_surface_new(gc, 1, 1, 1);
-
-   return gc;
-   error:
-   evas_gl_common_context_free(gc);
-   return NULL;
-}
-
-void
-evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
-{
-   int i, j;
-   Eina_List *l;
-
-   gc->references--;
-   if (gc->references > 0) return;
-   if (gc->shared) gc->shared->references--;
-
-   if (gc->def_surface) evas_gl_common_image_free(gc->def_surface);
-
-   if (gc->shared)
-     {
-        for (i = 0; i < gc->shared->info.tune.pipes.max; i++)
-          {
-             if (gc->pipe[i].array.vertex) free(gc->pipe[i].array.vertex);
-             if (gc->pipe[i].array.color) free(gc->pipe[i].array.color);
-             if (gc->pipe[i].array.texuv) free(gc->pipe[i].array.texuv);
-             if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm);
-             if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
-             if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
-          }
-     }
-
-   if ((gc->shared) && (gc->shared->references == 0))
-     {
-        Evas_GL_Texture_Pool *pt;
-
-        for (i = 0; i < SHADER_LAST; ++i)
-          evas_gl_common_shader_program_shutdown(&(gc->shared->shader[i]));
-
-        while (gc->shared->images)
-          {
-             evas_gl_common_image_free(gc->shared->images->data);
-          }
-
-        EINA_LIST_FOREACH(gc->shared->tex.whole, l, pt)
-           evas_gl_texture_pool_empty(pt);
-        for (i = 0; i < 33; i++)
-          {
-             for (j = 0; j < 3; j++)
-               {
-                  EINA_LIST_FOREACH(gc->shared->tex.atlas[i][j], l, pt)
-                     evas_gl_texture_pool_empty(pt);
-               }
-          }
-        eina_hash_free(gc->shared->native_pm_hash);
-        eina_hash_free(gc->shared->native_tex_hash);
-        free(gc->shared);
-        shared = NULL;
-     }
-   if (gc == _evas_gl_common_context) _evas_gl_common_context = NULL;
-   free(gc);
-}
-
-void
-evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
-{
-   if (_evas_gl_common_context == gc) return;
-   _evas_gl_common_context = gc;
-   if (gc) _evas_gl_common_viewport_set(gc);
-}
-
-void
-evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
-{
-   int i;
-
-   if (dbgflushnum < 0)
-     {
-        dbgflushnum = 0;
-        if (getenv("EVAS_GL_DBG")) dbgflushnum = 1;
-     }
-   if (dbgflushnum) printf("----prev-flushnum: %i -----------------------------------\n", gc->flushnum);
-
-   gc->flushnum = 0;
-   gc->state.current.cur_prog = 0;
-   gc->state.current.cur_tex = 0;
-   gc->state.current.cur_texu = 0;
-   gc->state.current.cur_texv = 0;
-   gc->state.current.cur_texm = 0;
-   gc->state.current.cur_texmu = 0;
-   gc->state.current.cur_texmv = 0;
-   gc->state.current.render_op = 0;
-   gc->state.current.smooth = 0;
-   gc->state.current.blend = 0;
-   gc->state.current.clip = 0;
-   gc->state.current.cx = 0;
-   gc->state.current.cy = 0;
-   gc->state.current.cw = 0;
-   gc->state.current.ch = 0;
-
-   for (i = 0; i < gc->shared->info.tune.pipes.max; i++)
-     {
-        gc->pipe[i].region.x = 0;
-        gc->pipe[i].region.y = 0;
-        gc->pipe[i].region.w = 0;
-        gc->pipe[i].region.h = 0;
-        gc->pipe[i].region.type = 0;
-        gc->pipe[i].clip.active = 0;
-        gc->pipe[i].clip.x = 0;
-        gc->pipe[i].clip.y = 0;
-        gc->pipe[i].clip.w = 0;
-        gc->pipe[i].clip.h = 0;
-        gc->pipe[i].shader.surface = NULL;
-        gc->pipe[i].shader.cur_prog = 0;
-        gc->pipe[i].shader.cur_tex = 0;
-        gc->pipe[i].shader.cur_texu = 0;
-        gc->pipe[i].shader.cur_texv = 0;
-        gc->pipe[i].shader.cur_texm = 0;
-        gc->pipe[i].shader.render_op = EVAS_RENDER_BLEND;
-        gc->pipe[i].shader.smooth = 0;
-        gc->pipe[i].shader.blend = 0;
-        gc->pipe[i].shader.clip = 0;
-        gc->pipe[i].shader.cx = 0;
-        gc->pipe[i].shader.cy = 0;
-        gc->pipe[i].shader.cw = 0;
-        gc->pipe[i].shader.ch = 0;
-     }
-   gc->change.size = 1;
-
-   glDisable(GL_SCISSOR_TEST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glScissor(0, 0, 0, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glDisable(GL_DEPTH_TEST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glEnable(GL_DITHER);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glDisable(GL_BLEND);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   // no dest alpha
-//   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha
-//   glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ???
-   glDepthMask(GL_FALSE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
-   if (shared->info.anisotropic > 0.0)
-     {
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-#endif
-
-   glEnableVertexAttribArray(SHAD_VERTEX);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glEnableVertexAttribArray(SHAD_COLOR);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (gc->state.current.cur_prog == PRG_INVALID)
-      glUseProgram(gc->shared->shader[0].prog);
-   else glUseProgram(gc->state.current.cur_prog);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glActiveTexture(GL_TEXTURE0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   _evas_gl_common_viewport_set(gc);
-}
-
-void
-evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot)
-{
-   if ((gc->w == w) && (gc->h == h) && (gc->rot == rot)) return;
-   evas_gl_common_context_flush(gc);
-   gc->change.size = 1;
-   gc->rot = rot;
-   gc->w = w;
-   gc->h = h;
-   if (_evas_gl_common_context == gc) _evas_gl_common_viewport_set(gc);
-}
-
-void
-evas_gl_common_context_target_surface_set(Evas_Engine_GL_Context *gc,
-                                          Evas_GL_Image *surface)
-{
-   if (surface == gc->pipe[0].shader.surface) return;
-
-   evas_gl_common_context_flush(gc);
-
-   gc->state.current.cur_prog = PRG_INVALID;
-   gc->state.current.cur_tex = -1;
-   gc->state.current.cur_texu = -1;
-   gc->state.current.cur_texv = -1;
-   gc->state.current.render_op = -1;
-   gc->state.current.smooth = -1;
-   gc->state.current.blend = -1;
-   gc->state.current.clip = -1;
-   gc->state.current.cx = -1;
-   gc->state.current.cy = -1;
-   gc->state.current.cw = -1;
-   gc->state.current.ch = -1;
-
-   gc->pipe[0].shader.surface = surface;
-   gc->change.size = 1;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-# ifndef GL_FRAMEBUFFER
-#  define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
-# endif
-#else
-# ifndef GL_FRAMEBUFFER
-#  define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
-# endif
-#endif
-   if (gc->pipe[0].shader.surface == gc->def_surface)
-     {
-        glsym_glBindFramebuffer(GL_FRAMEBUFFER, 0);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-   else
-     {
-        glsym_glBindFramebuffer(GL_FRAMEBUFFER, surface->tex->pt->fb);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-   _evas_gl_common_viewport_set(gc);
-}
-
-#define PUSH_VERTEX(n, x, y, z) \
-   gc->pipe[n].array.vertex[nv++] = x; \
-   gc->pipe[n].array.vertex[nv++] = y; \
-   gc->pipe[n].array.vertex[nv++] = z
-#define PUSH_COLOR(n, r, g, b, a) \
-   gc->pipe[n].array.color[nc++] = r; \
-   gc->pipe[n].array.color[nc++] = g; \
-   gc->pipe[n].array.color[nc++] = b; \
-   gc->pipe[n].array.color[nc++] = a
-#define PUSH_TEXUV(n, u, v) \
-   gc->pipe[n].array.texuv[nu++] = u; \
-   gc->pipe[n].array.texuv[nu++] = v
-#define PUSH_TEXUV2(n, u, v) \
-   gc->pipe[n].array.texuv2[nu2++] = u; \
-   gc->pipe[n].array.texuv2[nu2++] = v
-#define PUSH_TEXUV3(n, u, v) \
-   gc->pipe[n].array.texuv3[nu3++] = u; \
-   gc->pipe[n].array.texuv3[nu3++] = v
-#define PUSH_TEXM(n, u, v) \
-   gc->pipe[n].array.texm[nm++] = u; \
-   gc->pipe[n].array.texm[nm++] = v
-
-
-static inline void
-array_alloc(Evas_Engine_GL_Context *gc, int n)
-{
-   gc->havestuff = EINA_TRUE;
-   if (gc->pipe[n].array.num <= gc->pipe[n].array.alloc) return;
-   gc->pipe[n].array.alloc += 6 * 1024;
-   if (gc->pipe[n].array.use_vertex)
-     gc->pipe[n].array.vertex = realloc(gc->pipe[n].array.vertex,
-                                gc->pipe[n].array.alloc * sizeof(GLshort) * 3);
-   if (gc->pipe[n].array.use_color)
-     gc->pipe[n].array.color  = realloc(gc->pipe[n].array.color,
-                                gc->pipe[n].array.alloc * sizeof(GLubyte) * 4);
-   if (gc->pipe[n].array.use_texuv)
-     gc->pipe[n].array.texuv  = realloc(gc->pipe[n].array.texuv,
-                                gc->pipe[n].array.alloc * sizeof(GLfloat) * 2);
-   if (gc->pipe[n].array.use_texm)
-     gc->pipe[n].array.texm  = realloc(gc->pipe[n].array.texm,
-                                gc->pipe[n].array.alloc * sizeof(GLfloat) * 2);
-   if (gc->pipe[n].array.use_texuv2)
-     gc->pipe[n].array.texuv2  = realloc(gc->pipe[n].array.texuv2,
-                               gc->pipe[n].array.alloc * sizeof(GLfloat) * 2);
-   if (gc->pipe[n].array.use_texuv3)
-     gc->pipe[n].array.texuv3  = realloc(gc->pipe[n].array.texuv3,
-                                 gc->pipe[n].array.alloc * sizeof(GLfloat) * 2);
-}
-
-#ifdef GLPIPES
-static int
-pipe_region_intersects(Evas_Engine_GL_Context *gc, int n,
-                       int x, int y, int w, int h)
-{
-   int i, rx, ry, rw, rh, ii;
-
-   rx = gc->pipe[n].region.x;
-   ry = gc->pipe[n].region.y;
-   rw = gc->pipe[n].region.w;
-   rh = gc->pipe[n].region.h;
-   if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
-      return 0;
-
-   // a hack for now. map pipes use their whole bounding box for intersects
-   // which at worst case reduces to old pipeline flushes, but cheaper than
-   // full quad region or triangle intersects right now
-   if (gc->pipe[n].region.type == RTYPE_MAP) return 1;
-
-   for (i = 0,
-        ii = 0;
-
-        i < gc->pipe[n].array.num;
-
-        i += (3 * 2),
-        ii += (3 * 3 * 2))
-     {  // tri 1...
-        // 0, 1, 2 < top left
-        // 3, 4, 5 < top right
-        // 6. 7, 8 < bottom left
-        rx = gc->pipe[n].array.vertex[ii + 0];
-        ry = gc->pipe[n].array.vertex[ii + 1];
-        rw = gc->pipe[n].array.vertex[ii + 3] - rx;
-        rh = gc->pipe[n].array.vertex[ii + 7] - ry;
-        if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
-           return 1;
-     }
-   return 0;
-}
-#endif
-
-static void
-pipe_region_expand(Evas_Engine_GL_Context *gc, int n,
-                   int x, int y, int w, int h)
-{
-   int x1, y1, x2, y2;
-
-   if (gc->pipe[n].region.w <= 0)
-     {
-        gc->pipe[n].region.x = x;
-        gc->pipe[n].region.y = y;
-        gc->pipe[n].region.w = w;
-        gc->pipe[n].region.h = h;
-        return;
-     }
-   x1 = gc->pipe[n].region.x;
-   y1 = gc->pipe[n].region.y;
-   x2 = gc->pipe[n].region.x + gc->pipe[n].region.w;
-   y2 = gc->pipe[n].region.y + gc->pipe[n].region.h;
-   if (x < x1) x1 = x;
-   if (y < y1) y1 = y;
-   if ((x + w) > x2) x2 = x + w;
-   if ((y + h) > y2) y2 = y + h;
-   gc->pipe[n].region.x = x1;
-   gc->pipe[n].region.y = y1;
-   gc->pipe[n].region.w = x2 - x1;
-   gc->pipe[n].region.h = y2 - y1;
-}
-
-static Eina_Bool
-vertex_array_size_check(Evas_Engine_GL_Context *gc, int pn, int n)
-{
-   return 1;
-// this fixup breaks for expedite test 32. why?
-   if ((gc->pipe[pn].array.num + n) > gc->shared->info.max_vertex_elements)
-     {
-        shader_array_flush(gc);
-        return 0;
-     }
-   return 1;
-}
-
-static inline Evas_GL_Shader
-evas_gl_common_shader_choice(int npoints __UNUSED__,
-                             RGBA_Map_Point *p,
-                             int r, int g, int b, int a,
-                             Evas_GL_Shader nomul,
-                             Evas_GL_Shader mul)
-{
-  if ((a == 255) && (r == 255) && (g == 255) && (b == 255))
-    {
-       if (!p) return nomul;
-
-       if ((p[0].col == 0xffffffff) && (p[1].col == 0xffffffff) &&
-           (p[2].col == 0xffffffff) && (p[3].col == 0xffffffff))
-         return nomul;
-    }
-  return mul;
-}
-
-static int
-_evas_gl_common_context_push(int rtype,
-                             Evas_Engine_GL_Context *gc,
-                             Evas_GL_Texture *tex,
-                             Evas_GL_Texture *texm,
-                             GLuint prog,
-                             int x, int y, int w, int h,
-                             Eina_Bool blend,
-                             Eina_Bool smooth,
-                             Eina_Bool clip,
-                             int cx, int cy, int cw, int ch)
-{
-   int pn = 0;
-
-#ifdef GLPIPES
- again:
-#endif
-   vertex_array_size_check(gc, gc->state.top_pipe, 6);
-   pn = gc->state.top_pipe;
-#ifdef GLPIPES
-   if (!((pn == 0) && (gc->pipe[pn].array.num == 0)))
-     {
-        int found = 0;
-        int i;
-
-        for (i = pn; i >= 0; i--)
-          {
-             if ((gc->pipe[i].region.type == rtype)
-                 && (!tex || gc->pipe[i].shader.cur_tex == tex->pt->texture)
-                 && (!texm || gc->pipe[i].shader.cur_texm == texm->pt->texture)
-                 && (gc->pipe[i].shader.cur_prog == prog)
-                 && (gc->pipe[i].shader.smooth == smooth)
-                 && (gc->pipe[i].shader.blend == blend)
-                 && (gc->pipe[i].shader.render_op == gc->dc->render_op)
-                 && (gc->pipe[i].shader.clip == clip)
-                 && (!clip || ((gc->pipe[i].shader.cx == cx)
-                               && (gc->pipe[i].shader.cy == cy)
-                               && (gc->pipe[i].shader.cw == cw)
-                               && (gc->pipe[i].shader.ch == ch))))
-               {
-                  found = 1;
-                  pn = i;
-                  break;
-               }
-             if (pipe_region_intersects(gc, i, x, y, w, h)) break;
-          }
-        if (!found)
-          {
-             pn = gc->state.top_pipe + 1;
-             if (pn >= gc->shared->info.tune.pipes.max)
-               {
-                  shader_array_flush(gc);
-                  goto again;
-               }
-             gc->state.top_pipe = pn;
-         }
-     }
-   if ((tex) && (((tex->im) && (tex->im->native.data)) || tex->pt->dyn.img))
-     {
-        if (gc->pipe[pn].array.im != tex->im)
-          {
-             shader_array_flush(gc);
-             pn = gc->state.top_pipe;
-             gc->pipe[pn].array.im = tex->im;
-             goto again;
-          }
-     }
-#else
-   if (!((gc->pipe[pn].region.type == rtype)
-         && (!tex || gc->pipe[pn].shader.cur_tex == tex->pt->texture)
-         && (!texm || gc->pipe[pn].shader.cur_texm == texm->pt->texture)
-         && (gc->pipe[pn].shader.cur_prog == prog)
-         && (gc->pipe[pn].shader.smooth == smooth)
-         && (gc->pipe[pn].shader.blend == blend)
-         && (gc->pipe[pn].shader.render_op == gc->dc->render_op)
-         && (gc->pipe[pn].shader.clip == clip)
-         && (!clip || ((gc->pipe[pn].shader.cx == cx)
-                       && (gc->pipe[pn].shader.cy == cy)
-                       && (gc->pipe[pn].shader.cw == cw)
-                       && (gc->pipe[pn].shader.ch == ch)))))
-     {
-        shader_array_flush(gc);
-     }
-   if ((tex) && (((tex->im) && (tex->im->native.data)) || tex->pt->dyn.img))
-     {
-        if (gc->pipe[pn].array.im != tex->im)
-          {
-             shader_array_flush(gc);
-             gc->pipe[pn].array.im = tex->im;
-          }
-     }
-#endif
-
-   return pn;
-}
-
-void
-evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
-                                 int x1, int y1, int x2, int y2,
-                                 int clip, int cx, int cy, int cw, int ch,
-                                 int r, int g, int b, int a)
-{
-   int pnum, nv, nc, nu, nt, i;
-   Eina_Bool blend = 0;
-   GLuint prog = gc->shared->shader[SHADER_RECT].prog;
-   int pn = 0;
-
-   if (a < 255) blend = 1;
-   if (gc->dc->render_op == EVAS_RENDER_COPY) blend = 0;
-
-   shader_array_flush(gc);
-   vertex_array_size_check(gc, gc->state.top_pipe, 2);
-   pn = gc->state.top_pipe;
-   gc->pipe[pn].shader.cur_tex = 0;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = clip;
-   gc->pipe[pn].shader.cx = cx;
-   gc->pipe[pn].shader.cy = cy;
-   gc->pipe[pn].shader.cw = cw;
-   gc->pipe[pn].shader.ch = ch;
-
-   gc->pipe[pn].array.line = 1;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 0;
-   gc->pipe[pn].array.use_texuv2 = 0;
-   gc->pipe[pn].array.use_texuv3 = 0;
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 2;
-   array_alloc(gc, pn);
-
-   PUSH_VERTEX(pn, x1, y1, 0);
-   PUSH_VERTEX(pn, x2, y2, 0);
-
-   for (i = 0; i < 2; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-
-   shader_array_flush(gc);
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 0;
-   gc->pipe[pn].array.use_color = 0;
-   gc->pipe[pn].array.use_texuv = 0;
-   gc->pipe[pn].array.use_texuv2 = 0;
-   gc->pipe[pn].array.use_texuv3 = 0;
-}
-
-void
-evas_gl_common_context_rectangle_push(Evas_Engine_GL_Context *gc,
-                                      int x, int y, int w, int h,
-                                      int r, int g, int b, int a)
-{
-   int pnum, nv, nc, nu, nt, i;
-   Eina_Bool blend = 0;
-   GLuint prog = gc->shared->shader[SHADER_RECT].prog;
-   int pn = 0;
-
-   if (gc->dc->mask.mask)
-     {
-        RGBA_Draw_Context *dc;
-        dc = gc->dc;
-        Evas_GL_Image *im;
-        im = (void *)dc->mask.mask;
-        evas_gl_common_context_font_push(gc, im->tex,
-                                x - dc->mask.x,y - dc->mask.y,
-                                dc->mask.w,dc->mask.h,
-                                x,y,w,h,r,g,b,a);
-        return;
-     }
-
-   if (a < 255) blend = 1;
-   if (gc->dc->render_op == EVAS_RENDER_COPY) blend = 0;
-
-again:
-   vertex_array_size_check(gc, gc->state.top_pipe, 6);
-   pn = gc->state.top_pipe;
-#ifdef GLPIPES
-   if ((pn == 0) && (gc->pipe[pn].array.num == 0))
-     {
-        gc->pipe[pn].region.type = RTYPE_RECT;
-        gc->pipe[pn].shader.cur_tex = 0;
-        gc->pipe[pn].shader.cur_prog = prog;
-        gc->pipe[pn].shader.blend = blend;
-        gc->pipe[pn].shader.render_op = gc->dc->render_op;
-        gc->pipe[pn].shader.clip = 0;
-        gc->pipe[pn].shader.cx = 0;
-        gc->pipe[pn].shader.cy = 0;
-        gc->pipe[pn].shader.cw = 0;
-        gc->pipe[pn].shader.ch = 0;
-        gc->pipe[pn].array.line = 0;
-        gc->pipe[pn].array.use_vertex = 1;
-        gc->pipe[pn].array.use_color = 1;
-        gc->pipe[pn].array.use_texuv = 0;
-        gc->pipe[pn].array.use_texuv2 = 0;
-        gc->pipe[pn].array.use_texuv3 = 0;
-     }
-   else
-     {
-        int found = 0;
-
-        for (i = pn; i >= 0; i--)
-          {
-             if ((gc->pipe[i].region.type == RTYPE_RECT)
-                 && (gc->pipe[i].shader.cur_tex == 0)
-                 && (gc->pipe[i].shader.cur_prog == prog)
-                 && (gc->pipe[i].shader.blend == blend)
-                 && (gc->pipe[i].shader.render_op == gc->dc->render_op)
-                 && (gc->pipe[i].shader.clip == 0)
-                )
-               {
-                  found = 1;
-                  pn = i;
-                  break;
-               }
-             if (pipe_region_intersects(gc, i, x, y, w, h)) break;
-          }
-        if (!found)
-          {
-             pn = gc->state.top_pipe + 1;
-             if (pn >= gc->shared->info.tune.pipes.max)
-               {
-                  shader_array_flush(gc);
-                  goto again;
-               }
-             gc->state.top_pipe = pn;
-             gc->pipe[pn].region.type = RTYPE_RECT;
-             gc->pipe[pn].shader.cur_tex = 0;
-             gc->pipe[pn].shader.cur_prog = prog;
-             gc->pipe[pn].shader.blend = blend;
-             gc->pipe[pn].shader.render_op = gc->dc->render_op;
-             gc->pipe[pn].shader.clip = 0;
-             gc->pipe[pn].shader.cx = 0;
-             gc->pipe[pn].shader.cy = 0;
-             gc->pipe[pn].shader.cw = 0;
-             gc->pipe[pn].shader.ch = 0;
-             gc->pipe[pn].array.line = 0;
-             gc->pipe[pn].array.use_vertex = 1;
-             gc->pipe[pn].array.use_color = 1;
-             gc->pipe[pn].array.use_texuv = 0;
-             gc->pipe[pn].array.use_texuv2 = 0;
-             gc->pipe[pn].array.use_texuv3 = 0;
-         }
-     }
-#else
-   if ((gc->pipe[pn].shader.cur_tex != 0)
-       || (gc->pipe[pn].shader.cur_prog != prog)
-       || (gc->pipe[pn].shader.blend != blend)
-       || (gc->pipe[pn].shader.render_op != gc->dc->render_op)
-       || (gc->pipe[pn].shader.clip != 0)
-       )
-     {
-        shader_array_flush(gc);
-        pn = gc->state.top_pipe;
-        gc->pipe[pn].shader.cur_tex = 0;
-        gc->pipe[pn].shader.cur_prog = prog;
-        gc->pipe[pn].shader.blend = blend;
-        gc->pipe[pn].shader.render_op = gc->dc->render_op;
-        gc->pipe[pn].shader.clip = 0;
-        gc->pipe[pn].shader.cx = 0;
-        gc->pipe[pn].shader.cy = 0;
-        gc->pipe[pn].shader.cw = 0;
-        gc->pipe[pn].shader.ch = 0;
-     }
-
-   gc->pipe[pn].region.type = RTYPE_RECT;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 0;
-   gc->pipe[pn].array.use_texuv2 = 0;
-   gc->pipe[pn].array.use_texuv3 = 0;
-#endif
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-void
-evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
-                                  Evas_GL_Texture *tex,
-                                  double sx, double sy, double sw, double sh,
-                                  int x, int y, int w, int h,
-                                  int r, int g, int b, int a,
-                                  Eina_Bool smooth, Eina_Bool tex_only)
-{
-   int pnum, nv, nc, nu, nu2, nt, i;
-   GLfloat tx1, tx2, ty1, ty2;
-   Eina_Bool blend = 1;
-   GLuint prog = gc->shared->shader[SHADER_IMG].prog;
-   int pn = 0;
-
-   if (!tex->alpha) blend = 0;
-   if (a < 255) blend = 1;
-
-   if (gc->filter_prog)
-     {
-        prog = gc->filter_prog;
-     }
-   else if (tex_only)
-     {
-        if (tex->pt->dyn.img)
-          {
-             prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                                    SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog;
-          }
-        else
-          {
-             prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                                    SHADER_TEX_NOMUL, SHADER_TEX)].prog;
-          }
-     }
-   else
-     {
-        if (tex->gc->shared->info.bgra)
-          {
-             prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                                    SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog;
-          }
-        else
-          {
-             prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                                    SHADER_IMG_NOMUL, SHADER_IMG)].prog;
-          }
-     }
-
-   pn = _evas_gl_common_context_push(RTYPE_IMAGE,
-                                     gc, tex, NULL,
-                                     prog,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     0, 0, 0, 0, 0);
-
-   gc->pipe[pn].region.type = RTYPE_IMAGE;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = smooth;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = 0;
-   gc->pipe[pn].shader.cx = 0;
-   gc->pipe[pn].shader.cy = 0;
-   gc->pipe[pn].shader.cw = 0;
-   gc->pipe[pn].shader.ch = 0;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   // if nomul... dont need this
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = 0;
-   gc->pipe[pn].array.use_texuv3 = 0;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2;
-   nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   if ((tex->im) && (tex->im->native.data) && (!tex->im->native.yinvert))
-     {
-        tx1 = ((double)(tex->x) + sx) / (double)tex->pt->w;
-        ty1 = 1.0 - ((double)(tex->y) + sy) / (double)tex->pt->h;
-        tx2 = ((double)(tex->x) + sx + sw) / (double)tex->pt->w;
-        ty2 = 1.0 - ((double)(tex->y) + sy + sh) / (double)tex->pt->h;
-     }
-   else
-     {
-        tx1 = ((double)(tex->x) + sx) / (double)tex->pt->w;
-        ty1 = ((double)(tex->y) + sy) / (double)tex->pt->h;
-        tx2 = ((double)(tex->x) + sx + sw) / (double)tex->pt->w;
-        ty2 = ((double)(tex->y) + sy + sh) / (double)tex->pt->h;
-     }
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx1, ty1);
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx2, ty2);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   // if nomul... dont need this
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-void
-evas_gl_common_context_image_mask_push(Evas_Engine_GL_Context *gc,
-                                  Evas_GL_Texture *tex,
-                                  Evas_GL_Texture *texm,
-                                  double sx, double sy, double sw, double sh,
-                                  double sxm, double sym, double swm,double shm,
-                                  int x, int y, int w, int h,
-                                  int r, int g, int b, int a,
-                                  Eina_Bool smooth)
-{
-   int pnum, nv, nc, nu, nm, nt, i;
-   GLfloat tx1, tx2, ty1, ty2;
-   GLfloat txm1, txm2, tym1, tym2;
-   Eina_Bool blend = 1;
-   GLuint prog = gc->shared->shader[SHADER_IMG_MASK].prog;
-   int pn = 0;
-
-#if 0
-   if (tex->gc->shared->info.bgra)
-   {
-      prog = gc->shared->shader[SHADER_IMG_MASK].prog;
-   }
-   else
-   {
-#warning Nash: FIXME: Need two shaders?
-           printf("Not good: Need other texture\n");
-           prog = gc->shared->shader[SHADER_IMG].prog;
-   }
-#endif
-
-   pn = _evas_gl_common_context_push(RTYPE_IMASK,
-                                     gc, tex, texm,
-                                     prog,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     0, 0, 0, 0, 0);
-
-   gc->pipe[pn].region.type = RTYPE_IMASK;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   gc->pipe[pn].shader.cur_texm = texm->pt->texture;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = smooth;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = 0;
-   gc->pipe[pn].shader.cx = 0;
-   gc->pipe[pn].shader.cy = 0;
-   gc->pipe[pn].shader.cw = 0;
-   gc->pipe[pn].shader.ch = 0;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   // if nomul... dont need this
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = 0;
-   gc->pipe[pn].array.use_texuv3 = 0;
-   gc->pipe[pn].array.use_texm = 1;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nm = pnum * 2; nu = pnum * 2;
-   nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   if ((tex->im) && (tex->im->native.data) && (!tex->im->native.yinvert))
-     {
-        tx1 = ((double)(tex->x) + sx) / (double)tex->pt->w;
-        ty1 = ((double)(tex->y) + sy + sh) / (double)tex->pt->h;
-        tx2 = ((double)(tex->x) + sx + sw) / (double)tex->pt->w;
-        ty2 = ((double)(tex->y) + sy) / (double)tex->pt->h;
-
-        txm1 = ((double)(texm->x) + sxm) / (double)texm->pt->w;
-        tym1 = ((double)(texm->y) + sym + shm) / (double)texm->pt->h;
-        txm2 = ((double)(texm->x) + sxm + swm) / (double)texm->pt->w;
-        tym2 = ((double)(texm->y) + sym) / (double)texm->pt->h;
-     }
-   else
-     {
-        tx1 = ((double)(tex->x) + sx) / (double)tex->pt->w;
-        ty1 = ((double)(tex->y) + sy) / (double)tex->pt->h;
-        tx2 = ((double)(tex->x) + sx + sw) / (double)tex->pt->w;
-        ty2 = ((double)(tex->y) + sy + sh) / (double)tex->pt->h;
-
-        txm1 = (texm->x + sxm) / (double)texm->pt->w;
-        tym1 = (texm->y + sym) / (double)texm->pt->h;
-        txm2 = (texm->x + sxm + swm) / (double)texm->pt->w;
-        tym2 = (texm->y + sym + shm) / (double)texm->pt->h;
-     }
- // printf(" %3.6lf %3.6lf %3.6lf %3.6lf\n",sx,sy,sw,sh);
- //  printf("m%3.6lf %3.6lf %3.6lf %3.6lf\n",sxm,sym,swm,shm);
- // printf(" %3f %3f %3f %3f\n",tx1,ty1,tx2,ty2);
- // printf("m%3f %3f %3f %3f\n",txm1,tym1,txm2,tym2);
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx1, ty1);
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXM(pn, txm1, tym1);
-   PUSH_TEXM(pn, txm2, tym1);
-   PUSH_TEXM(pn, txm1, tym2);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx2, ty2);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXM(pn, txm2, tym1);
-   PUSH_TEXM(pn, txm2, tym2);
-   PUSH_TEXM(pn, txm1, tym2);
-
-   // if nomul... dont need this
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-
-void
-evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
-                                 Evas_GL_Texture *tex,
-                                 double sx, double sy, double sw, double sh,
-                                 int x, int y, int w, int h,
-                                 int r, int g, int b, int a)
-{
-   int pnum, nv, nc, nu, nt, i;
-   GLfloat tx1, tx2, ty1, ty2;
-   GLuint prog = gc->shared->shader[SHADER_FONT].prog;
-   int pn = 0;
-
-   pn = _evas_gl_common_context_push(RTYPE_FONT,
-                                     gc, tex, NULL,
-                                     prog,
-                                     x, y, w, h,
-                                     1,
-                                     0,
-                                     0, 0, 0, 0, 0);
-
-   gc->pipe[pn].region.type = RTYPE_FONT;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = 0;
-   gc->pipe[pn].shader.blend = 1;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = 0;
-   gc->pipe[pn].shader.cx = 0;
-   gc->pipe[pn].shader.cy = 0;
-   gc->pipe[pn].shader.cw = 0;
-   gc->pipe[pn].shader.ch = 0;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = 0;
-   gc->pipe[pn].array.use_texuv3 = 0;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   if (sw == 0.0)
-     {
-        tx1 = tex->sx1;
-        ty1 = tex->sy1;
-        tx2 = tex->sx2;
-        ty2 = tex->sy2;
-     }
-   else
-     {
-        tx1 = ((double)(tex->x) + sx) / (double)tex->pt->w;
-        ty1 = ((double)(tex->y) + sy) / (double)tex->pt->h;
-        tx2 = ((double)(tex->x) + sx + sw) / (double)tex->pt->w;
-        ty2 = ((double)(tex->y) + sy + sh) / (double)tex->pt->h;
-     }
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx1, ty1);
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx2, ty2);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-void
-evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
-                                Evas_GL_Texture *tex,
-                                double sx, double sy, double sw, double sh,
-                                int x, int y, int w, int h,
-                                int r, int g, int b, int a,
-                                Eina_Bool smooth)
-{
-   int pnum, nv, nc, nu, nu2, nu3, nt, i;
-   GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
-   Eina_Bool blend = 0;
-   GLuint prog;
-   int pn = 0;
-
-   if (a < 255) blend = 1;
-
-   prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                          SHADER_YUV_NOMUL, SHADER_YUV)].prog;
-
-   pn = _evas_gl_common_context_push(RTYPE_YUV,
-                                     gc, tex, NULL,
-                                     prog,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     0, 0, 0, 0, 0);
-
-   gc->pipe[pn].region.type = RTYPE_YUV;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   gc->pipe[pn].shader.cur_texu = tex->ptu->texture;
-   gc->pipe[pn].shader.cur_texv = tex->ptv->texture;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = smooth;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = 0;
-   gc->pipe[pn].shader.cx = 0;
-   gc->pipe[pn].shader.cy = 0;
-   gc->pipe[pn].shader.cw = 0;
-   gc->pipe[pn].shader.ch = 0;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = 1;
-   gc->pipe[pn].array.use_texuv3 = 1;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
-   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   tx1 = (sx) / (double)tex->pt->w;
-   ty1 = (sy) / (double)tex->pt->h;
-   tx2 = (sx + sw) / (double)tex->pt->w;
-   ty2 = (sy + sh) / (double)tex->pt->h;
-
-   t2x1 = ((sx) / 2) / (double)tex->ptu->w;
-   t2y1 = ((sy) / 2) / (double)tex->ptu->h;
-   t2x2 = ((sx + sw) / 2) / (double)tex->ptu->w;
-   t2y2 = ((sy + sh) / 2) / (double)tex->ptu->h;
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx1, ty1);
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXUV2(pn, t2x1, t2y1);
-   PUSH_TEXUV2(pn, t2x2, t2y1);
-   PUSH_TEXUV2(pn, t2x1, t2y2);
-
-   PUSH_TEXUV3(pn, t2x1, t2y1);
-   PUSH_TEXUV3(pn, t2x2, t2y1);
-   PUSH_TEXUV3(pn, t2x1, t2y2);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx2, ty2);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXUV2(pn, t2x2, t2y1);
-   PUSH_TEXUV2(pn, t2x2, t2y2);
-   PUSH_TEXUV2(pn, t2x1, t2y2);
-
-   PUSH_TEXUV3(pn, t2x2, t2y1);
-   PUSH_TEXUV3(pn, t2x2, t2y2);
-   PUSH_TEXUV3(pn, t2x1, t2y2);
-
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-void
-evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
-                                 Evas_GL_Texture *tex,
-                                 double sx, double sy, double sw, double sh,
-                                 int x, int y, int w, int h,
-                                 int r, int g, int b, int a,
-                                 Eina_Bool smooth)
-{
-   int pnum, nv, nc, nu, nu2, nu3, nt, i;
-   GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
-   Eina_Bool blend = 0;
-   GLuint prog;
-   int pn = 0;
-
-   if (a < 255) blend = 1;
-
-   prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                          SHADER_YUY2_NOMUL, SHADER_YUY2)].prog;
-
-   pn = _evas_gl_common_context_push(RTYPE_YUY2,
-                                     gc, tex, NULL,
-                                     prog,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     0, 0, 0, 0, 0);
-
-   gc->pipe[pn].region.type = RTYPE_YUY2;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   gc->pipe[pn].shader.cur_texu = tex->ptuv->texture;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = smooth;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = 0;
-   gc->pipe[pn].shader.cx = 0;
-   gc->pipe[pn].shader.cy = 0;
-   gc->pipe[pn].shader.cw = 0;
-   gc->pipe[pn].shader.ch = 0;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = 1;
-   gc->pipe[pn].array.use_texuv3 = 0;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
-   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   tx1 = (sx) / (double)tex->pt->w;
-   ty1 = (sy) / (double)tex->pt->h;
-   tx2 = (sx + sw) / (double)tex->pt->w;
-   ty2 = (sy + sh) / (double)tex->pt->h;
-
-   t2x1 = sx / (double)tex->ptuv->w;
-   t2y1 = sy / (double)tex->ptuv->h;
-   t2x2 = (sx + sw) / (double)tex->ptuv->w;
-   t2y2 = (sy + sh) / (double)tex->ptuv->h;
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx1, ty1);
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXUV2(pn, t2x1, t2y1);
-   PUSH_TEXUV2(pn, t2x2, t2y1);
-   PUSH_TEXUV2(pn, t2x1, t2y2);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx2, ty2);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXUV2(pn, t2x2, t2y1);
-   PUSH_TEXUV2(pn, t2x2, t2y2);
-   PUSH_TEXUV2(pn, t2x1, t2y2);
-
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-void
-evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
-                                 Evas_GL_Texture *tex,
-                                 double sx, double sy, double sw, double sh,
-                                 int x, int y, int w, int h,
-                                 int r, int g, int b, int a,
-                                 Eina_Bool smooth)
-{
-   int pnum, nv, nc, nu, nu2, nu3, nt, i;
-   GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
-   Eina_Bool blend = 0;
-   GLuint prog;
-   int pn = 0;
-
-   if (a < 255) blend = 1;
-
-   prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a,
-                                                          SHADER_NV12_NOMUL, SHADER_NV12)].prog;
-
-   pn = _evas_gl_common_context_push(RTYPE_NV12,
-                                     gc, tex, NULL,
-                                     prog,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     0, 0, 0, 0, 0);
-
-   gc->pipe[pn].region.type = RTYPE_NV12;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   gc->pipe[pn].shader.cur_tex_dyn = tex->pt->dyn.img;
-   gc->pipe[pn].shader.cur_texu = tex->ptuv->texture;
-   gc->pipe[pn].shader.cur_texu_dyn = tex->ptuv->dyn.img;
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = smooth;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = 0;
-   gc->pipe[pn].shader.cx = 0;
-   gc->pipe[pn].shader.cy = 0;
-   gc->pipe[pn].shader.cw = 0;
-   gc->pipe[pn].shader.ch = 0;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = 1;
-   gc->pipe[pn].array.use_texuv3 = 0;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
-   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   tx1 = (sx) / (double)tex->pt->w;
-   ty1 = (sy) / (double)tex->pt->h;
-   tx2 = (sx + sw) / (double)tex->pt->w;
-   ty2 = (sy + sh) / (double)tex->pt->h;
-
-   t2x1 = sx / (double)tex->ptuv->w;
-   t2y1 = sy / (double)tex->ptuv->h;
-   t2x2 = (sx + sw) / (double)tex->ptuv->w;
-   t2y2 = (sy + sh) / (double)tex->ptuv->h;
-
-   PUSH_VERTEX(pn, x    , y    , 0);
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx1, ty1);
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXUV2(pn, t2x1, t2y1);
-   PUSH_TEXUV2(pn, t2x2, t2y1);
-   PUSH_TEXUV2(pn, t2x1, t2y2);
-
-   PUSH_VERTEX(pn, x + w, y    , 0);
-   PUSH_VERTEX(pn, x + w, y + h, 0);
-   PUSH_VERTEX(pn, x    , y + h, 0);
-
-   PUSH_TEXUV(pn, tx2, ty1);
-   PUSH_TEXUV(pn, tx2, ty2);
-   PUSH_TEXUV(pn, tx1, ty2);
-
-   PUSH_TEXUV2(pn, t2x2, t2y1);
-   PUSH_TEXUV2(pn, t2x2, t2y2);
-   PUSH_TEXUV2(pn, t2x1, t2y2);
-
-   for (i = 0; i < 6; i++)
-     {
-        PUSH_COLOR(pn, r, g, b, a);
-     }
-}
-
-void
-evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
-                                      Evas_GL_Texture *tex,
-                                      int npoints,
-                                      RGBA_Map_Point *p,
-                                      int clip, int cx, int cy, int cw, int ch,
-                                      int r, int g, int b, int a,
-                                      Eina_Bool smooth, Eina_Bool tex_only,
-                                      Evas_Colorspace cspace)
-{
-   int pnum, nv, nc, nu, nu2, nu3, nt, i;
-   const int points[6] = { 0, 1, 2, 0, 2, 3 };
-   int x = 0, y = 0, w = 0, h = 0, px = 0, py = 0;
-   GLfloat tx[4], ty[4], t2x[4], t2y[4];
-   Eina_Bool blend = 1;
-   DATA32 cmul;
-   GLuint prog = gc->shared->shader[SHADER_IMG].prog;
-   Eina_Bool utexture = EINA_FALSE;
-   Eina_Bool uvtexture = EINA_FALSE;
-   int pn = 0;
-   int flat = 0;
-
-   if (!tex->alpha) blend = 0;
-   if (a < 255) blend = 1;
-   if (npoints != 4)
-     {
-        // FIXME: nash - you didn't fix this for n points. its still all
-        // 4 point stuff!!! grrrr.
-        abort();
-     }
-   if ((A_VAL(&(p[0].col)) < 0xff) || (A_VAL(&(p[1].col)) < 0xff) ||
-       (A_VAL(&(p[2].col)) < 0xff) || (A_VAL(&(p[3].col)) < 0xff))
-     blend = 1;
-
-   if ((p[0].z == p[1].z) && (p[1].z == p[2].z) && (p[2].z == p[3].z))
-      flat = 1;
-
-   if (!clip) cx = cy = cw = ch = 0;
-
-   if (!flat)
-     {
-        if (p[0].foc <= 0) flat = 1;
-     }
-
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-         prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                SHADER_YUV_NOMUL, SHADER_YUV)].prog;
-         utexture = EINA_TRUE;
-         break;
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-         prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                SHADER_YUY2_NOMUL, SHADER_YUY2)].prog;
-         uvtexture = EINA_TRUE;
-         break;
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                SHADER_NV12_NOMUL, SHADER_NV12)].prog;
-         uvtexture = EINA_TRUE;
-         break;
-
-      default:
-         if (tex_only)
-           {
-              if (tex->pt->dyn.img)
-                {
-                   prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                          SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog;
-                }
-              else
-                {
-                   prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                          SHADER_TEX_NOMUL, SHADER_TEX)].prog;
-                }
-           }
-         else
-           {
-              if (tex->gc->shared->info.bgra)
-                {
-                   prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                          SHADER_IMG_BGRA_NOMUL,
-                                                                          SHADER_IMG_BGRA)].prog;
-                }
-             else
-               {
-                  prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a,
-                                                                         SHADER_IMG_NOMUL,
-                                                                         SHADER_IMG)].prog;
-               }
-           }
-     }
-
-   x = w = (p[0].x >> FP);
-   y = h = (p[0].y >> FP);
-   for (i = 0; i < 4; i++)
-     {
-        tx[i] = ((double)(tex->x) + (((double)p[i].u) / FP1)) /
-          (double)tex->pt->w;
-        ty[i] = ((double)(tex->y) + (((double)p[i].v) / FP1)) /
-          (double)tex->pt->h;
-        px = (p[i].x >> FP);
-        if      (px < x) x = px;
-        else if (px > w) w = px;
-        py = (p[i].y >> FP);
-        if      (py < y) y = py;
-        else if (py > h) h = py;
-        if (utexture)
-          {
-             t2x[i] = ((((double)p[i].u / 2) / FP1)) / (double)tex->ptu->w;
-             t2y[i] = ((((double)p[i].v / 2) / FP1)) / (double)tex->ptu->h;
-          }
-        else if (uvtexture)
-          {
-             t2x[i] = ((((double)p[i].u / 2) / FP1)) / (double)tex->ptuv->w;
-             t2y[i] = ((((double)p[i].v / 2) / FP1)) / (double)tex->ptuv->h;
-          }
-     }
-   w = w - x;
-   h = h - y;
-
-   if (clip)
-     {
-        int nx = x, ny = y, nw = w, nh = h;
-
-        RECTS_CLIP_TO_RECT(nx, ny, nw, nh, cx, cy, cw, ch);
-        if ((nx == x) && (ny == y) && (nw == w) && (nh == h))
-          {
-             clip = 0; cx = 0; cy = 0; cw = 0; ch = 0;
-          }
-        x = nx; y = nw; w = nw; h = nh;
-     }
-
-   if (!flat)
-     {
-        shader_array_flush(gc);
-        gc->foc = p[0].foc >> FP;
-        gc->z0 = p[0].z0 >> FP;
-        gc->px = p[0].px >> FP;
-        gc->py = p[0].py >> FP;
-        gc->change.size = 1;
-        _evas_gl_common_viewport_set(gc);
-     }
-
-   pn = _evas_gl_common_context_push(RTYPE_MAP,
-                                     gc, tex, NULL,
-                                     prog,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     clip, cx, cy, cw, ch);
-   gc->pipe[pn].region.type = RTYPE_MAP;
-   gc->pipe[pn].shader.cur_tex = tex->pt->texture;
-   if (utexture)
-     {
-       gc->pipe[pn].shader.cur_texu = tex->ptu->texture;
-       gc->pipe[pn].shader.cur_texu_dyn = tex->ptu->dyn.img;
-       gc->pipe[pn].shader.cur_texv = tex->ptv->texture;
-       gc->pipe[pn].shader.cur_texv_dyn = tex->ptv->dyn.img;
-     }
-   else if (uvtexture)
-     {
-       gc->pipe[pn].shader.cur_texu = tex->ptuv->texture;
-       gc->pipe[pn].shader.cur_texu_dyn = tex->ptuv->dyn.img;
-     }
-   gc->pipe[pn].shader.cur_prog = prog;
-   gc->pipe[pn].shader.smooth = smooth;
-   gc->pipe[pn].shader.blend = blend;
-   gc->pipe[pn].shader.render_op = gc->dc->render_op;
-   gc->pipe[pn].shader.clip = clip;
-   gc->pipe[pn].shader.cx = cx;
-   gc->pipe[pn].shader.cy = cy;
-   gc->pipe[pn].shader.cw = cw;
-   gc->pipe[pn].shader.ch = ch;
-   gc->pipe[pn].array.line = 0;
-   gc->pipe[pn].array.use_vertex = 1;
-   gc->pipe[pn].array.use_color = 1;
-   gc->pipe[pn].array.use_texuv = 1;
-   gc->pipe[pn].array.use_texuv2 = (utexture || uvtexture) ? 1 : 0;
-   gc->pipe[pn].array.use_texuv3 = (utexture) ? 1 : 0;
-
-   pipe_region_expand(gc, pn, x, y, w, h);
-
-   pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2;
-   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
-   gc->pipe[pn].array.num += 6;
-   array_alloc(gc, pn);
-
-   if ((tex->im) && (tex->im->native.data) && (!tex->im->native.yinvert))
-     {
-        for (i = 0; i < 4; i++)
-          {
-             ty[i] = 1.0 - ty[i];
-             if (utexture || uvtexture)
-                t2y[i] = 1.0 - t2y[i];
-          }
-     }
-
-   cmul = ARGB_JOIN(a, r, g, b);
-   for (i = 0; i < 6; i++)
-     {
-        DATA32 cl = MUL4_SYM(cmul, p[points[i]].col);
-        if (flat)
-          {
-             PUSH_VERTEX(pn,
-                         (p[points[i]].x >> FP),
-                         (p[points[i]].y >> FP),
-                         0);
-          }
-        else
-          {
-             PUSH_VERTEX(pn,
-                         (p[points[i]].fx) + gc->shared->ax,
-                         (p[points[i]].fy) + gc->shared->ay,
-                         (p[points[i]].fz)
-                         + (gc->shared->foc - gc->shared->z0));
-          }
-        PUSH_TEXUV(pn,
-                   tx[points[i]],
-                   ty[points[i]]);
-        if (utexture)
-          {
-             PUSH_TEXUV2(pn,
-                         t2x[points[i]],
-                         t2y[points[i]]);
-             PUSH_TEXUV3(pn,
-                         t2x[points[i]],
-                         t2y[points[i]]);
-          }
-        else if (uvtexture)
-          {
-             PUSH_TEXUV2(pn,
-                         t2x[points[i]],
-                         t2y[points[i]]);
-          }
-
-        PUSH_COLOR(pn,
-                   R_VAL(&cl),
-                   G_VAL(&cl),
-                   B_VAL(&cl),
-                   A_VAL(&cl));
-     }
-   if (!flat)
-     {
-        shader_array_flush(gc);
-        gc->foc = 0;
-        gc->z0 = 0;
-        gc->px = 0;
-        gc->py = 0;
-        gc->change.size = 1;
-        _evas_gl_common_viewport_set(gc);
-     }
-}
-
-void
-evas_gl_common_context_flush(Evas_Engine_GL_Context *gc)
-{
-   shader_array_flush(gc);
-}
-
-static void
-scissor_rot(Evas_Engine_GL_Context *gc __UNUSED__,
-            int rot, int gw, int gh, int cx, int cy, int cw, int ch)
-{
-   switch (rot)
-     {
-      case 0: // UP this way: ^
-        glScissor(cx, cy, cw, ch);
-        break;
-      case 90: // UP this way: <
-        glScissor(gh - (cy + ch), cx, ch, cw);
-        break;
-      case 180: // UP this way: v
-        glScissor(gw - (cx + cw), gh - (cy + ch), cw, ch);
-        break;
-      case 270: // UP this way: >
-        glScissor(cy, gw - (cx + cw), ch, cw);
-        break;
-      default: // assume up is up
-        glScissor(cx, cy, cw, ch);
-        break;
-     }
-}
-
-static void
-shader_array_flush(Evas_Engine_GL_Context *gc)
-{
-   int i, gw, gh, setclip, cy, fbo = 0, done = 0;
-
-   if (!gc->havestuff) return;
-   gw = gc->w;
-   gh = gc->h;
-   if (!((gc->pipe[0].shader.surface == gc->def_surface) ||
-         (!gc->pipe[0].shader.surface)))
-     {
-        gw = gc->pipe[0].shader.surface->w;
-        gh = gc->pipe[0].shader.surface->h;
-        fbo = 1;
-     }
-   for (i = 0; i < gc->shared->info.tune.pipes.max; i++)
-     {
-        if (gc->pipe[i].array.num <= 0) break;
-        setclip = 0;
-        done++;
-        gc->flushnum++;
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "<flush err>");
-        if (gc->pipe[i].shader.cur_prog != gc->state.current.cur_prog)
-          {
-             glUseProgram(gc->pipe[i].shader.cur_prog);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-
-        if (gc->pipe[i].shader.cur_tex != gc->state.current.cur_tex)
-          {
-#if 0
-             if (gc->pipe[i].shader.cur_tex)
-               {
-                  glEnable(GL_TEXTURE_2D);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             else
-               {
-                  glDisable(GL_TEXTURE_2D);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-#endif
-             glActiveTexture(GL_TEXTURE0);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_tex);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-        if (gc->pipe[i].array.im)
-          {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-             if (gc->pipe[i].array.im->tex->pt->dyn.img)
-               {
-                  secsym_glEGLImageTargetTexture2DOES
-                     (GL_TEXTURE_2D, gc->pipe[i].array.im->tex->pt->dyn.img);
-               }
-             else
-#endif
-               {
-                  if (!gc->pipe[i].array.im->native.loose)
-                    {
-                       if (gc->pipe[i].array.im->native.func.bind)
-                          gc->pipe[i].array.im->native.func.bind(gc->pipe[i].array.im->native.func.data,
-                                                                 gc->pipe[i].array.im);
-                    }
-               }
-          }
-        if (gc->pipe[i].shader.render_op != gc->state.current.render_op)
-          {
-             switch (gc->pipe[i].shader.render_op)
-               {
-               case EVAS_RENDER_BLEND: /**< default op: d = d*(1-sa) + s */
-                  glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  break;
-               case EVAS_RENDER_COPY: /**< d = s */
-                  gc->pipe[i].shader.blend = 0;
-                  glBlendFunc(GL_ONE, GL_ONE);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  break;
-                  // FIXME: fix blend funcs below!
-               case EVAS_RENDER_BLEND_REL: /**< d = d*(1 - sa) + s*da */
-               case EVAS_RENDER_COPY_REL: /**< d = s*da */
-               case EVAS_RENDER_ADD: /**< d = d + s */
-               case EVAS_RENDER_ADD_REL: /**< d = d + s*da */
-               case EVAS_RENDER_SUB: /**< d = d - s */
-               case EVAS_RENDER_SUB_REL: /**< d = d - s*da */
-               case EVAS_RENDER_TINT: /**< d = d*s + d*(1 - sa) + s*(1 - da) */
-               case EVAS_RENDER_TINT_REL: /**< d = d*(1 - sa + s) */
-               case EVAS_RENDER_MASK: /**< d = d*sa */
-               case EVAS_RENDER_MUL: /**< d = d*s */
-               default:
-                  glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  break;
-               }
-          }
-        if (gc->pipe[i].shader.blend != gc->state.current.blend)
-          {
-             if (gc->pipe[i].shader.blend)
-               {
-                  glEnable(GL_BLEND);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             else
-               {
-                  glDisable(GL_BLEND);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-          }
-        if ((gc->pipe[i].shader.smooth != gc->state.current.smooth) ||
-            (gc->pipe[i].shader.cur_tex != gc->state.current.cur_tex))
-          {
-             if (gc->pipe[i].shader.smooth)
-               {
-#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
-                  if (shared->info.anisotropic > 0.0)
-                    {
-                       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
-                       GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                    }
-#endif
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             else
-               {
-#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
-                  if (shared->info.anisotropic > 0.0)
-                    {
-                       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
-                       GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                    }
-#endif
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-          }
-        if (gc->pipe[i].shader.clip != gc->state.current.clip)
-          {
-
-             if (gc->pipe[i].shader.clip)
-               {
-                  cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
-                  if (fbo) cy = gc->pipe[i].shader.cy;
-                  glEnable(GL_SCISSOR_TEST);
-                  if (!fbo)
-                     scissor_rot(gc, gc->rot, gw, gh,
-                                 gc->pipe[i].shader.cx,
-                                 cy,
-                                 gc->pipe[i].shader.cw,
-                                 gc->pipe[i].shader.ch);
-                  else
-                     glScissor(gc->pipe[i].shader.cx, cy,
-                               gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
-                  setclip = 1;
-               }
-             else
-               {
-                  glDisable(GL_SCISSOR_TEST);
-                  glScissor(0, 0, 0, 0);
-               }
-          }
-        if ((gc->pipe[i].shader.clip) && (!setclip))
-          {
-             if ((gc->pipe[i].shader.cx != gc->state.current.cx) ||
-                 (gc->pipe[i].shader.cy != gc->state.current.cy) ||
-                 (gc->pipe[i].shader.cw != gc->state.current.cw) ||
-                 (gc->pipe[i].shader.ch != gc->state.current.ch))
-               {
-                  cy = gh - gc->pipe[i].shader.cy - gc->pipe[i].shader.ch;
-                  if (fbo) cy = gc->pipe[i].shader.cy;
-                  if (!fbo)
-                     scissor_rot(gc, gc->rot, gw, gh,
-                                 gc->pipe[i].shader.cx,
-                                 cy,
-                                 gc->pipe[i].shader.cw,
-                                 gc->pipe[i].shader.ch);
-                  else
-                     glScissor(gc->pipe[i].shader.cx, cy,
-                               gc->pipe[i].shader.cw, gc->pipe[i].shader.ch);
-               }
-          }
-
-        glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, gc->pipe[i].array.vertex);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glVertexAttribPointer(SHAD_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, gc->pipe[i].array.color);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        if (gc->pipe[i].array.use_texuv)
-          {
-             glEnableVertexAttribArray(SHAD_TEXUV);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             glVertexAttribPointer(SHAD_TEXUV, 2, GL_FLOAT, GL_FALSE, 0, gc->pipe[i].array.texuv);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-        else
-          {
-             glDisableVertexAttribArray(SHAD_TEXUV);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-
-        if (gc->pipe[i].array.line)
-          {
-             glDisableVertexAttribArray(SHAD_TEXUV);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             glDisableVertexAttribArray(SHAD_TEXUV2);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             glDisableVertexAttribArray(SHAD_TEXUV3);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             glDrawArrays(GL_LINES, 0, gc->pipe[i].array.num);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-        else
-          {
-             if (gc->pipe[i].array.use_texm)
-               {
-                  glEnableVertexAttribArray(SHAD_TEXM);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glVertexAttribPointer(SHAD_TEXM, 2, GL_FLOAT, GL_FALSE, 0, gc->pipe[i].array.texm);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glActiveTexture(GL_TEXTURE1);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texm);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glActiveTexture(GL_TEXTURE0);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             else
-               {
-                  glDisableVertexAttribArray(SHAD_TEXM);
-               }
-             if ((gc->pipe[i].array.use_texuv2) && (gc->pipe[i].array.use_texuv3))
-               {
-                  glEnableVertexAttribArray(SHAD_TEXUV2);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glEnableVertexAttribArray(SHAD_TEXUV3);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glVertexAttribPointer(SHAD_TEXUV2, 2, GL_FLOAT, GL_FALSE, 0, gc->pipe[i].array.texuv2);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glVertexAttribPointer(SHAD_TEXUV3, 2, GL_FLOAT, GL_FALSE, 0, gc->pipe[i].array.texuv3);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-                  glActiveTexture(GL_TEXTURE1);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-                  if (gc->pipe[i].shader.cur_texu_dyn)
-                    secsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu_dyn);
-#endif
-                  
-                  glActiveTexture(GL_TEXTURE2);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texv);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-                  if (gc->pipe[i].shader.cur_texv_dyn)
-                    secsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texv_dyn);
-#endif
-                  glActiveTexture(GL_TEXTURE0);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             else if (gc->pipe[i].array.use_texuv2)
-               {
-                  glEnableVertexAttribArray(SHAD_TEXUV2);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glVertexAttribPointer(SHAD_TEXUV2, 2, GL_FLOAT, GL_FALSE, 0, gc->pipe[i].array.texuv2);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-                  glActiveTexture(GL_TEXTURE1);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-                  if (gc->pipe[i].shader.cur_texu_dyn)
-                    secsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu_dyn);
-#endif
-                  glActiveTexture(GL_TEXTURE0);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             else
-               {
-                  glDisableVertexAttribArray(SHAD_TEXUV2);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                  glDisableVertexAttribArray(SHAD_TEXUV3);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-               }
-             if (dbgflushnum)
-               {
-                  const char *types[6] =
-                    {"----", "RECT", "IMAG", "FONT", "YUV-", "MAP"};
-                  printf("  DRAW#%3i %4i -> %p[%4ix%4i] @ %4ix%4i -{ tex %4i type %s }-\n",
-                         i,
-                         gc->pipe[i].array.num / 6,
-                         gc->pipe[0].shader.surface,
-                         gc->pipe[0].shader.surface->w,
-                         gc->pipe[0].shader.surface->h,
-                         gw, gh,
-                         gc->pipe[i].shader.cur_tex,
-                         types[gc->pipe[i].region.type]
-                        );
-               }
-             glDrawArrays(GL_TRIANGLES, 0, gc->pipe[i].array.num);
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-          }
-        if (gc->pipe[i].array.im)
-          {
-             if (!gc->pipe[i].array.im->native.loose)
-               {
-                  if (gc->pipe[i].array.im->native.func.unbind)
-                     gc->pipe[i].array.im->native.func.unbind(gc->pipe[i].array.im->native.func.data,
-                                                              gc->pipe[i].array.im);
-               }
-             gc->pipe[i].array.im = NULL;
-          }
-
-        gc->state.current.cur_prog  = gc->pipe[i].shader.cur_prog;
-        gc->state.current.cur_tex   = gc->pipe[i].shader.cur_tex;
-        gc->state.current.render_op = gc->pipe[i].shader.render_op;
-        gc->state.current.cx        = gc->pipe[i].shader.cx;
-        gc->state.current.cy        = gc->pipe[i].shader.cy;
-        gc->state.current.cw        = gc->pipe[i].shader.cw;
-        gc->state.current.ch        = gc->pipe[i].shader.ch;
-        gc->state.current.smooth    = gc->pipe[i].shader.smooth;
-        gc->state.current.blend     = gc->pipe[i].shader.blend;
-        gc->state.current.clip      = gc->pipe[i].shader.clip;
-
-        if (gc->pipe[i].array.vertex) free(gc->pipe[i].array.vertex);
-        if (gc->pipe[i].array.color) free(gc->pipe[i].array.color);
-        if (gc->pipe[i].array.texuv) free(gc->pipe[i].array.texuv);
-        if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm);
-        if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
-        if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
-
-        gc->pipe[i].array.vertex = NULL;
-        gc->pipe[i].array.color = NULL;
-        gc->pipe[i].array.texuv = NULL;
-        gc->pipe[i].array.texm = NULL;
-        gc->pipe[i].array.texuv2 = NULL;
-        gc->pipe[i].array.texuv3 = NULL;
-
-        gc->pipe[i].array.num = 0;
-        gc->pipe[i].array.alloc = 0;
-
-        gc->pipe[i].region.x = 0;
-        gc->pipe[i].region.y = 0;
-        gc->pipe[i].region.w = 0;
-        gc->pipe[i].region.h = 0;
-        gc->pipe[i].region.type = 0;
-     }
-   gc->state.top_pipe = 0;
-   if (dbgflushnum)
-     {
-        if (done > 0) printf("DONE (pipes): %i\n", done);
-     }
-   gc->havestuff = EINA_FALSE;
-}
-
-Eina_Bool
-evas_gl_common_module_open(void)
-{
-   if (_evas_engine_GL_common_log_dom < 0)
-     _evas_engine_GL_common_log_dom = eina_log_domain_register
-       ("evas-gl_common", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_GL_common_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return EINA_FALSE;
-     }
-   return EINA_TRUE;
-}
-
-void
-evas_gl_common_module_close(void)
-{
-   if (_evas_engine_GL_common_log_dom < 0) return;
-   eina_log_domain_unregister(_evas_engine_GL_common_log_dom);
-   _evas_engine_GL_common_log_dom = -1;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_filter.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_filter.c
deleted file mode 100644
index a9d18d8..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_filter.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "evas_gl_private.h"
-
-#if 0 // filtering disabled
-void
-evas_gl_common_filter_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, Evas_Filter_Info *filter)
-{
-   RGBA_Draw_Context *dc;
-   GLuint prog;
-   int r,g,b,a;
-   int nomul, bgra;
-
-   dc = gc->dc;
-
-   if (dc->mul.use)
-     {
-        a = (dc->mul.col >> 24) & 0xff;
-        r = (dc->mul.col >> 16) & 0xff;
-        g = (dc->mul.col >> 8 ) & 0xff;
-        b = (dc->mul.col      ) & 0xff;
-     }
-   else
-     {
-        r = g = b = a = 255;
-     }
-
-   nomul = (a == 255 && r == 255 && g == 255 && b == 255) ? 1 : 0;
-   bgra = (gc->shared->info.bgra) ? 1 : 0;
-
-   /* FIXME: This should so be a table */
-#if 0
-   if (filter->filter == EVAS_FILTER_BLUR)
-     {
-         if (bgra)
-          {
-             if (nomul)
-                prog = gc->shared->shader.filter_blur_bgra_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_blur_bgra.prog;
-          }
-        else
-          {
-             if (a == 255 && r == 255 && g == 255 && b == 255)
-                prog = gc->shared->shader.filter_blur_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_blur.prog;
-          }
-     }
-   else
-#endif
-     if (filter->filter == EVAS_FILTER_INVERT)
-     {
-        if (bgra)
-          {
-             if (nomul)
-                prog = gc->shared->shader.filter_invert_bgra_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_invert_bgra.prog;
-          }
-        else
-          {
-             if (a == 255 && r == 255 && g == 255 && b == 255)
-                prog = gc->shared->shader.filter_invert_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_invert.prog;
-          }
-     }
-   else if (filter->filter == EVAS_FILTER_SEPIA)
-     {
-        if (bgra)
-          {
-             if (nomul)
-                prog = gc->shared->shader.filter_sepia_bgra_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_sepia_bgra.prog;
-          }
-        else
-          {
-             if (nomul)
-                prog = gc->shared->shader.filter_sepia_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_sepia.prog;
-          }
-
-     }
-   else /*if (filter->filter == EVAS_FILTER_GREYSCALE)*/
-     {
-        printf("BGRA: %s  Nomul: %s\n",bgra?"true":"false",nomul?"nomul":"mul");
-        if (bgra)
-          {
-             if (nomul)
-                prog = gc->shared->shader.filter_greyscale_bgra_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_greyscale_bgra.prog;
-          }
-        else
-          {
-             if (nomul)
-                prog = gc->shared->shader.filter_greyscale_nomul.prog;
-             else
-                prog = gc->shared->shader.filter_greyscale.prog;
-          }
-
-     }
-
-   printf("Prog: %d %d %d\n",prog,im->w,im->h);
-   gc->filter_prog = prog;
-   evas_gl_common_image_update(gc, im);
-   evas_gl_common_context_image_push(gc, im->tex, 0, 0, im->w, im->h,
-                                      0, 0, im->w, im->h,
-                                      r,g,b,a,
-                                      1, im->tex_only);
-   gc->filter_prog = 0;
-}
-
-
-Filtered_Image *
-evas_gl_common_image_filtered_get(Evas_GL_Image *im, uint8_t *key, size_t len)
-{
-   Filtered_Image *fi;
-   Eina_List *l;
-
-   for (l = im->filtered ; l ; l = l->next)
-     {
-         fi = l->data;
-         if (fi->keylen != len) continue;
-         if (memcmp(key, fi->key, len) != 0) continue;
-         fi->ref ++;
-         return fi;
-     }
-
-   return NULL;
-}
-
-Filtered_Image *
-evas_gl_common_image_filtered_save(Evas_GL_Image *im, Evas_GL_Image *fimage,
-                                   uint8_t *key, size_t keylen)
-{
-   Filtered_Image *fi;
-   Eina_List *l;
-
-   for (l = im->filtered ; l ; l = l->next)
-     {
-        fi = l->data;
-        if (fi->keylen != keylen) continue;
-        if (memcmp(key, fi->key, keylen) != 0) continue;
-
-        fi->image = (void *)fimage;
-        fi->ref ++;
-        return fi;
-     }
-
-   fi = calloc(1,sizeof(Filtered_Image));
-   if (!fi) return NULL;
-
-   fi->keylen = keylen;
-   fi->key = malloc(keylen);
-   memcpy(fi->key, key, keylen);
-   fi->image = (void *)fimage;
-   fi->ref = 1;
-
-   im->filtered = eina_list_prepend(im->filtered, fi);
-
-   return fi;
-}
-
-void
-evas_gl_common_image_filtered_free(Evas_GL_Image *image, Filtered_Image *fi)
-{
-   fi->ref --;
-   if (fi->ref) return;
-
-   free(fi->key);
-   evas_gl_common_image_free((void *)fi->image);
-   fi->image = NULL;
-
-   image->filtered = eina_list_remove(image->filtered, fi);
-}
-#endif
-
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_font.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_font.c
deleted file mode 100644
index e5f3a4a..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_font.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "evas_gl_private.h"
-
-void *
-evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
-{
-   Evas_Engine_GL_Context *gc = context;
-   Evas_GL_Texture *tex;
-   DATA8 *data;
-   int w, h, j, nw;
-   DATA8 *ndata;
-   int fh;
-
-   if (fg->ext_dat) return fg->ext_dat; // FIXME: one engine at a time can do this :(
-
-   w = fg->glyph_out->bitmap.width;
-   h = fg->glyph_out->bitmap.rows;
-   if ((w == 0) || (h == 0)) return NULL;
-
-   data = fg->glyph_out->bitmap.buffer;
-   j = fg->glyph_out->bitmap.pitch;
-   if (j < w) j = w;
-
-   nw = ((w + 3) / 4) * 4;
-   ndata = alloca(nw *h);
-   if (!ndata) return NULL;
-   if (fg->glyph_out->bitmap.num_grays == 256)
-     {
-        int x, y;
-        DATA8 *p1, *p2;
-
-        for (y = 0; y < h; y++)
-          {
-             p1 = data + (j * y);
-             p2 = ndata + (nw * y);
-             for (x = 0; x < w; x++)
-               {
-                  *p2 = *p1;
-                  p1++;
-                  p2++;
-               }
-          }
-     }
-   else if (fg->glyph_out->bitmap.num_grays == 0)
-     {
-        DATA8 *tmpbuf = NULL, *dp, *tp, bits;
-        int bi, bj, end;
-        const DATA8 bitrepl[2] = {0x0, 0xff};
-
-        tmpbuf = alloca(w);
-        if (tmpbuf)
-          {
-             int x, y;
-             DATA8 *p1, *p2;
-
-             for (y = 0; y < h; y++)
-               {
-                  p1 = tmpbuf;
-                  p2 = ndata + (nw * y);
-                  tp = tmpbuf;
-                  dp = data + (y * fg->glyph_out->bitmap.pitch);
-                  for (bi = 0; bi < w; bi += 8)
-                    {
-                       bits = *dp;
-                       if ((w - bi) < 8) end = w - bi;
-                       else end = 8;
-                       for (bj = 0; bj < end; bj++)
-                         {
-                            *tp = bitrepl[(bits >> (7 - bj)) & 0x1];
-                            tp++;
-                         }
-                       dp++;
-                    }
-                  for (x = 0; x < w; x++)
-                    {
-                       *p2 = *p1;
-                       p1++;
-                       p2++;
-                    }
-               }
-          }
-     }
-//   fh = h;
-   fh = fg->fi->max_h;
-   tex = evas_gl_common_texture_alpha_new(gc, ndata, w, h, fh);
-   tex->sx1 = ((double)(tex->x)) / (double)tex->pt->w;
-   tex->sy1 = ((double)(tex->y)) / (double)tex->pt->h;
-   tex->sx2 = ((double)(tex->x + tex->w)) / (double)tex->pt->w;
-   tex->sy2 = ((double)(tex->y + tex->h)) / (double)tex->pt->h;
-   return tex;
-}
-
-void
-evas_gl_font_texture_free(void *tex)
-{
-   if (!tex) return;
-   evas_gl_common_texture_free(tex);
-}
-
-void
-evas_gl_font_texture_draw(void *context, void *surface __UNUSED__, void *draw_context, RGBA_Font_Glyph *fg, int x, int y)
-{
-   Evas_Engine_GL_Context *gc = context;
-   RGBA_Draw_Context *dc = draw_context;
-   Evas_GL_Texture *tex;
-   Cutout_Rects *rects;
-   Cutout_Rect  *rct;
-   int r, g, b, a;
-   double ssx, ssy, ssw, ssh;
-   int c, cx, cy, cw, ch;
-   int i;
-   int sx, sy, sw, sh;
-
-   if (dc != gc->dc) return;
-   tex = fg->ext_dat;
-   if (!tex) return;
-   a = (dc->col.col >> 24) & 0xff;
-   if (a == 0) return;
-   r = (dc->col.col >> 16) & 0xff;
-   g = (dc->col.col >> 8 ) & 0xff;
-   b = (dc->col.col      ) & 0xff;
-   sx = 0; sy = 0; sw = tex->w, sh = tex->h;
-   if ((!gc->dc->cutout.rects) ||
-       ((gc->shared->info.tune.cutout.max > 0) &&
-           (gc->dc->cutout.active > gc->shared->info.tune.cutout.max)))
-     {
-        if (gc->dc->clip.use)
-          {
-             int nx, ny, nw, nh;
-
-             nx = x; ny = y; nw = tex->w; nh = tex->h;
-             RECTS_CLIP_TO_RECT(nx, ny, nw, nh,
-                                gc->dc->clip.x, gc->dc->clip.y,
-                                gc->dc->clip.w, gc->dc->clip.h);
-             if ((nw < 1) || (nh < 1)) return;
-             if ((nx == x) && (ny == y) && (nw == tex->w) && (nh == tex->h))
-               {
-                  evas_gl_common_context_font_push(gc, tex,
-                                                   0.0, 0.0, 0.0, 0.0,
-//                                                   sx, sy, sw, sh,
-                                                   x, y, tex->w, tex->h,
-                                                   r, g, b, a);
-                  return;
-               }
-             ssx = (double)sx + ((double)(sw * (nx - x)) / (double)(tex->w));
-             ssy = (double)sy + ((double)(sh * (ny - y)) / (double)(tex->h));
-             ssw = ((double)sw * (double)(nw)) / (double)(tex->w);
-             ssh = ((double)sh * (double)(nh)) / (double)(tex->h);
-             evas_gl_common_context_font_push(gc, tex,
-                                              ssx, ssy, ssw, ssh,
-                                              nx, ny, nw, nh,
-                                              r, g, b, a);
-          }
-        else
-          {
-             evas_gl_common_context_font_push(gc, tex,
-                                              0.0, 0.0, 0.0, 0.0,
-//                                              sx, sy, sw, sh,
-                                              x, y, tex->w, tex->h,
-                                              r, g, b, a);
-          }
-        return;
-     }
-   /* save out clip info */
-   c = gc->dc->clip.use; cx = gc->dc->clip.x; cy = gc->dc->clip.y; cw = gc->dc->clip.w; ch = gc->dc->clip.h;
-   evas_common_draw_context_clip_clip(gc->dc, 0, 0, gc->w, gc->h);
-   evas_common_draw_context_clip_clip(gc->dc, x, y, tex->w, tex->h);
-   /* our clip is 0 size.. abort */
-   if ((gc->dc->clip.w <= 0) || (gc->dc->clip.h <= 0))
-     {
-        gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch;
-        return;
-     }
-   rects = evas_common_draw_context_apply_cutouts(dc);
-   for (i = 0; i < rects->active; ++i)
-     {
-        int nx, ny, nw, nh;
-
-        rct = rects->rects + i;
-        nx = x; ny = y; nw = tex->w; nh = tex->h;
-        RECTS_CLIP_TO_RECT(nx, ny, nw, nh, rct->x, rct->y, rct->w, rct->h);
-        if ((nw < 1) || (nh < 1)) continue;
-        if ((nx == x) && (ny == y) && (nw == tex->w) && (nh == tex->h))
-          {
-             evas_gl_common_context_font_push(gc, tex,
-                                              0.0, 0.0, 0.0, 0.0,
-//                                              sx, sy, sw, sh,
-                                              x, y, tex->w, tex->h,
-                                              r, g, b, a);
-             continue;
-          }
-        ssx = (double)sx + ((double)(sw * (nx - x)) / (double)(tex->w));
-        ssy = (double)sy + ((double)(sh * (ny - y)) / (double)(tex->h));
-        ssw = ((double)sw * (double)(nw)) / (double)(tex->w);
-        ssh = ((double)sh * (double)(nh)) / (double)(tex->h);
-        evas_gl_common_context_font_push(gc, tex,
-                                         ssx, ssy, ssw, ssh,
-                                         nx, ny, nw, nh,
-                                         r, g, b, a);
-     }
-   evas_common_draw_context_apply_clear_cutouts(rects);
-   /* restore clip info */
-   gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_image.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_image.c
deleted file mode 100644
index 1d4b1f8..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_image.c
+++ /dev/null
@@ -1,968 +0,0 @@
-#include "evas_gl_private.h"
-
-void
-evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc)
-{
-   Eina_List *l;
-   Evas_GL_Image *im;
-
-   EINA_LIST_FOREACH(gc->shared->images, l, im)
-     {
-        if (im->im) evas_cache_image_unload_data(&im->im->cache_entry);
-        if (im->tex)
-          {
-             if (!im->tex->pt->dyn.img)
-               {
-                  evas_gl_common_texture_free(im->tex);
-                  im->tex = NULL;
-               }
-          }
-     }
-}
-
-static void
-_evas_gl_image_cache_trim(Evas_Engine_GL_Context *gc)
-{
-   int size = evas_common_image_get_cache();
-
-   while (gc->shared->images_size > size)
-     {
-        Evas_GL_Image *im2;
-        Eina_List *l = NULL;
-
-        EINA_LIST_REVERSE_FOREACH(gc->shared->images, l, im2)
-          {
-             if (im2->references == 0)
-               {
-                  im2->cached = 0;
-                  im2->gc->shared->images =
-                     eina_list_remove_list(im2->gc->shared->images, l);
-                  im2->gc->shared->images_size -= (im2->csize);
-                  evas_gl_common_image_free(im2);
-                  l = NULL;
-                  break;
-               }
-          }
-        if ((gc->shared->images_size > size) && (l))
-          {
-//             printf("EEK %i > %i, no 0 ref imgs\n",
-//                    gc->shared->images_size, size);
-             break;
-          }
-        if (!gc->shared->images)
-          {
-//             printf("EEK %i > %i, no imgs\n",
-//                    gc->shared->images_size, size);
-             break;
-          }
-     }
-}
-
-static Eina_Bool
-_evas_gl_image_cache_add(Evas_GL_Image *im)
-{
-   if (im->references == 0)
-     {
-        im->csize = im->w * im->h * 4;
-        im->gc->shared->images_size += im->csize;
-        _evas_gl_image_cache_trim(im->gc);
-        return EINA_TRUE;
-     }
-   else
-     {
-        im->gc->shared->images = eina_list_remove(im->gc->shared->images, im);
-        im->cached = 0;
-     }
-   return EINA_FALSE;
-}
-
-void
-evas_gl_common_image_ref(Evas_GL_Image *im)
-{
-   if (im->references == 0)
-     {
-        im->gc->shared->images_size -= (im->csize);
-     }
-   im->references++;
-}
-
-void
-evas_gl_common_image_unref(Evas_GL_Image *im)
-{
-   im->references--;
-   if (im->references == 0)
-     {
-        _evas_gl_image_cache_add(im);
-     }
-}
-
-Evas_GL_Image *
-evas_gl_common_image_load(Evas_Engine_GL_Context *gc, const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error)
-{
-   Evas_GL_Image        *im;
-   RGBA_Image           *im_im;
-   Eina_List            *l;
-
-   im_im = evas_common_load_image_from_file(file, key, lo, error);
-   if (!im_im) return NULL;
-
-   /* i'd LOVe to do this, but we can't because we load to load header
-    * to get image size to know if its too big or not! so this disallows
-    * us to know that - photocam thus suffers
-   if (((int)im_im->cache_entry.w > gc->shared->info.max_texture_size) ||
-       ((int)im_im->cache_entry.h > gc->shared->info.max_texture_size))
-     {
-        evas_cache_image_drop(&(im_im->cache_entry));
-        *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-        return NULL;
-     }
-    */
-   
-   // FIXME: keep unreffed shared images around
-   EINA_LIST_FOREACH(gc->shared->images, l, im)
-     {
-        if (im->im == im_im)
-          {
-// why did i put this here? i think to free the rgba pixel data once a texture
-// exists.
-//             evas_cache_image_drop(&(im_im->cache_entry));
-             gc->shared->images = eina_list_remove_list(gc->shared->images, l);
-             gc->shared->images = eina_list_prepend(gc->shared->images, im);
-             evas_gl_common_image_ref(im);
-             *error = EVAS_LOAD_ERROR_NONE;
-             return im;
-          }
-     }
-
-   im = calloc(1, sizeof(Evas_GL_Image));
-   if (!im)
-     {
-        evas_cache_image_drop(&(im_im->cache_entry));
-        *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-        return NULL;
-     }
-   im->references = 1;
-   im->im = im_im;
-   im->gc = gc;
-   im->cached = 1;
-   im->cs.space = EVAS_COLORSPACE_ARGB8888;
-   im->alpha = im->im->cache_entry.flags.alpha;
-   im->w = im->im->cache_entry.w;
-   im->h = im->im->cache_entry.h;
-   if (lo) im->load_opts = *lo;
-   gc->shared->images = eina_list_prepend(gc->shared->images, im);
-   return im;
-}
-
-Evas_GL_Image *
-evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace)
-{
-   Evas_GL_Image *im;
-   Eina_List *l;
-
-   if (((int)w > gc->shared->info.max_texture_size) ||
-       ((int)h > gc->shared->info.max_texture_size))
-     return NULL;
-     
-   if (data)
-     {
-        EINA_LIST_FOREACH(gc->shared->images, l, im)
-          {
-             if (((void *)(im->im->image.data) == (void *)data) &&
-                 (im->im->cache_entry.w == w) &&
-                 (im->im->cache_entry.h == h))
-               {
-                  gc->shared->images = eina_list_remove_list(gc->shared->images, l);
-                  gc->shared->images = eina_list_prepend(gc->shared->images, im);
-                  evas_gl_common_image_ref(im);
-                  return im;
-               }
-          }
-     }
-   im = calloc(1, sizeof(Evas_GL_Image));
-   if (!im) return NULL;
-   im->references = 1;
-   im->im = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
-                                                 w, h, data, alpha, cspace);
-   if (!im->im)
-     {
-        free(im);
-        return NULL;
-     }
-   im->gc = gc;
-   im->cs.space = cspace;
-   im->alpha = im->im->cache_entry.flags.alpha;
-   im->w = im->im->cache_entry.w;
-   im->h = im->im->cache_entry.h;
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-        if (im->tex) evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        im->cs.data = data;
-        im->cs.no_free = 1;
-        break;
-      default:
-        abort();
-        break;
-     }
-   return im;
-}
-
-Evas_GL_Image *
-evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, int cspace)
-{
-   Evas_GL_Image *im;
-
-   if (((int)w > gc->shared->info.max_texture_size) ||
-       ((int)h > gc->shared->info.max_texture_size))
-     return NULL;
-   
-   im = calloc(1, sizeof(Evas_GL_Image));
-   if (!im) return NULL;
-   im->references = 1;
-   im->im = (RGBA_Image *) evas_cache_image_copied_data(evas_common_image_cache_get(),
-                                                        w, h, data, alpha, cspace);
-   if (!im->im)
-     {
-        free(im);
-        return NULL;
-     }
-   im->gc = gc;
-   im->cs.space = cspace;
-   im->alpha = im->im->cache_entry.flags.alpha;
-   im->w = im->im->cache_entry.w;
-   im->h = im->im->cache_entry.h;
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-        if (im->tex) evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        im->cs.no_free = 0;
-        if (im->im->cache_entry.h > 0)
-          im->cs.data = calloc(1, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-        if ((data) && (im->cs.data))
-          memcpy(im->cs.data, data, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-        break;
-      default:
-        abort();
-        break;
-     }
-   return im;
-}
-
-Evas_GL_Image *
-evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, int cspace)
-{
-   Evas_GL_Image *im;
-
-   if (((int)w > gc->shared->info.max_texture_size) ||
-       ((int)h > gc->shared->info.max_texture_size))
-     return NULL;
-   
-   im = calloc(1, sizeof(Evas_GL_Image));
-   if (!im) return NULL;
-   im->references = 1;
-   im->im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-   if (!im->im)
-     {
-        free(im);
-        return NULL;
-     }
-   im->gc = gc;
-   im->im->cache_entry.flags.alpha = alpha ? 1 : 0;
-   im->cs.space = cspace;
-   im->alpha = im->im->cache_entry.flags.alpha;
-   im->im->cache_entry.w = w;
-   im->im->cache_entry.h = h;
-   im->w = im->im->cache_entry.w;
-   im->h = im->im->cache_entry.h;
-   evas_cache_image_colorspace(&im->im->cache_entry, cspace);
-   im->im = (RGBA_Image *)evas_cache_image_size_set(&im->im->cache_entry, w, h);
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-//        if (im->tex) evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        im->cs.no_free = 0;
-        if (im->im->cache_entry.h > 0)
-          im->cs.data = calloc(1, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-        break;
-      default:
-        abort();
-        break;
-     }
-   return im;
-}
-
-Evas_GL_Image *
-evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha)
-{
-   if (!im) return NULL;
-   if (im->alpha == alpha) return im;
-   im->alpha = alpha;
-   if (!im->im) return im;
-   im->im->cache_entry.flags.alpha = alpha ? 1 : 0;
-   if (im->tex)
-     {
-        evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-     }
-   if (!im->tex)
-     im->tex = evas_gl_common_texture_new(im->gc, im->im);
-   return im;
-}
-
-void
-evas_gl_common_image_native_enable(Evas_GL_Image *im)
-{
-   if (im->cs.data)
-     {
-        if (!im->cs.no_free) free(im->cs.data);
-        im->cs.data = NULL;
-     }
-   im->cs.no_free = 0;
-   if (im->cached)
-     {
-        if (im->references == 0)
-           im->gc->shared->images_size -= (im->csize);
-        im->gc->shared->images = eina_list_remove(im->gc->shared->images, im);
-        im->cached = 0;
-     }
-   if (im->im)
-     {
-        evas_cache_image_drop(&im->im->cache_entry);
-        im->im = NULL;
-     }
-   if (im->tex)
-     {
-        evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-     }
-
-   im->cs.space = EVAS_COLORSPACE_ARGB8888;
-   im->tex = evas_gl_common_texture_native_new(im->gc, im->w, im->h, im->alpha, im);
-   im->tex_only = 1;
-}
-
-void
-evas_gl_common_image_native_disable(Evas_GL_Image *im)
-{
-   if (im->im)
-     {
-        evas_cache_image_drop(&im->im->cache_entry);
-        im->im = NULL;
-     }
-   if (im->tex)
-     {
-        evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-     }
-   im->tex_only = 0;
-
-   im->im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-   im->im->cache_entry.flags.alpha = im->alpha;
-   im->cs.space = EVAS_COLORSPACE_ARGB8888;
-   evas_cache_image_colorspace(&im->im->cache_entry, im->cs.space);
-   im->im = (RGBA_Image *)evas_cache_image_size_set(&im->im->cache_entry, im->w, im->h);
-   if (!im->tex)
-     im->tex = evas_gl_common_texture_new(im->gc, im->im);
-}
-
-void
-evas_gl_common_image_scale_hint_set(Evas_GL_Image *im, int hint)
-{
-   im->scale_hint = hint;
-   // FIXME: take advantage of this even in gl (eg if image is
-   // 1600x1200 but we always use it at 800x600 or even less - drop
-   // the texture res down for "non dynamic" stuff to save memory)
-}
-
-void
-evas_gl_common_image_content_hint_set(Evas_GL_Image *im, int hint)
-{
-   if (im->content_hint == hint) return;
-   im->content_hint = hint;
-   if (!im->gc) return;
-   if (!im->gc->shared->info.sec_image_map) return;
-   if (!im->gc->shared->info.bgra) return;
-   // does not handle yuv yet.
-   if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return;
-   if (im->content_hint == EVAS_IMAGE_CONTENT_HINT_DYNAMIC)
-     {
-        if (im->cs.data)
-          {
-             if (!im->cs.no_free) free(im->cs.data);
-             im->cs.data = NULL;
-          }
-        im->cs.no_free = 0;
-        if (im->cached)
-          {
-             if (im->references == 0)
-                im->gc->shared->images_size -= im->csize;
-             im->gc->shared->images = eina_list_remove(im->gc->shared->images, im);
-             im->cached = 0;
-          }
-        if (im->im)
-          {
-             evas_cache_image_drop(&im->im->cache_entry);
-             im->im = NULL;
-          }
-        if (im->tex)
-          {
-             evas_gl_common_texture_free(im->tex);
-             im->tex = NULL;
-          }
-        im->tex = evas_gl_common_texture_dynamic_new(im->gc, im);
-        im->tex_only = 1;
-     }
-   else
-     {
-        if (im->im)
-          {
-             evas_cache_image_drop(&im->im->cache_entry);
-             im->im = NULL;
-          }
-        if (im->tex)
-          {
-             evas_gl_common_texture_free(im->tex);
-             im->tex = NULL;
-          }
-        im->tex_only = 0;
-
-        im->im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        im->im->cache_entry.flags.alpha = im->alpha;
-        im->cs.space = EVAS_COLORSPACE_ARGB8888;
-        evas_cache_image_colorspace(&im->im->cache_entry, im->cs.space);
-        im->im = (RGBA_Image *)evas_cache_image_size_set(&im->im->cache_entry, im->w, im->h);
-        if (!im->tex)
-           im->tex = evas_gl_common_texture_new(im->gc, im->im);
-     }
-}
-
-void
-evas_gl_common_image_cache_flush(Evas_Engine_GL_Context *gc)
-{
-   _evas_gl_image_cache_trim(gc);
-}
-
-void
-evas_gl_common_image_free(Evas_GL_Image *im)
-{
-#if 0 // filtering disabled
-   Filtered_Image *fi;
-#endif
-
-   evas_gl_common_context_flush(im->gc);
-   im->references--;
-   if (im->references > 0) return;
-
-   if (im->native.func.free)
-     im->native.func.free(im->native.func.data, im);
-
-   if (im->cs.data)
-     {
-        if (!im->cs.no_free) free(im->cs.data);
-     }
-   if (im->cached)
-     {
-        if (_evas_gl_image_cache_add(im)) return;
-     }
-   if (im->im) evas_cache_image_drop(&im->im->cache_entry);
-   if (im->tex) evas_gl_common_texture_free(im->tex);
-
-#if 0 // filtering disabled
-   EINA_LIST_FREE(im->filtered, fi)
-     {
-        free(fi->key);
-        evas_gl_common_image_free((Evas_GL_Image *)fi->image);
-        free(fi);
-     }
-#endif
-
-   free(im);
-}
-
-Evas_GL_Image *
-evas_gl_common_image_surface_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha)
-{
-   Evas_GL_Image *im;
-
-   if (((int)w > gc->shared->info.max_texture_size) ||
-       ((int)h > gc->shared->info.max_texture_size))
-     return NULL;
-   
-   im = calloc(1, sizeof(Evas_GL_Image));
-   if (!im) return NULL;
-   im->references = 1;
-   im->gc = gc;
-   im->cs.space = EVAS_COLORSPACE_ARGB8888;
-   im->alpha = alpha;
-   im->w = w;
-   im->h = h;
-   im->tex = evas_gl_common_texture_render_new(gc, w, h, alpha);
-   im->tex_only = 1;
-   return im;
-}
-
-void
-evas_gl_common_image_dirty(Evas_GL_Image *im, unsigned int x, unsigned int y, unsigned int w, unsigned int h)
-{
-   if ((w == 0) && (h == 0) && (x == 0) && (y == 0))
-     {
-        w = im->w;
-        h = im->h;
-     }
-   if (im->im)
-     {
-        im->im = (RGBA_Image *)evas_cache_image_dirty(&im->im->cache_entry, x, y, w, h);
-     }
-   im->dirty = 1;
-}
-
-void
-evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
-{
-   Image_Entry *ie;
-   if (!im->im) return;
-   ie = (Image_Entry *)(im->im);
-/*
-   if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
-       (im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
-     {
-        // SOFTWARE convert. do multi texture later
-        if ((im->cs.data) && (*((unsigned char **)im->cs.data)))
-          {
-             if (im->dirty || !im->im->image.data)
-               {
-                  free(im->im->image.data);
-                  im->im->image.data = malloc(im->im->cache_entry.w * im->im->cache_entry.h * sizeof(DATA32));
-                  if (im->im->image.data)
-                    evas_common_convert_yuv_420p_601_rgba(im->cs.data,
-                                                          (void *)im->im->image.data,
-                                                          im->im->cache_entry.w, im->im->cache_entry.h);
-               }
-          }
-        space = EVAS_COLORSPACE_ARGB8888;
-     }
-   else
- */
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if ((im->tex) &&
-             ((im->dirty) || (ie->flags.animated)))
-          {
-             evas_cache_image_load_data(&im->im->cache_entry);
-             evas_gl_common_texture_update(im->tex, im->im);
-             evas_cache_image_unload_data(&im->im->cache_entry);
-          }
-        if (!im->tex)
-          {
-             evas_cache_image_load_data(&im->im->cache_entry);
-             im->tex = evas_gl_common_texture_new(gc, im->im);
-             evas_cache_image_unload_data(&im->im->cache_entry);
-          }
-        im->dirty = 0;
-        if (!im->tex) return;
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-        if ((im->tex) && (im->dirty))
-          {
-             evas_gl_common_texture_yuv_update(im->tex, im->cs.data,
-                                               im->im->cache_entry.w,
-                                               im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if ((!im->tex) && (im->cs.data) && (*((unsigned char **)im->cs.data)))
-          {
-             im->tex = evas_gl_common_texture_yuv_new(gc, im->cs.data,
-                                                      im->im->cache_entry.w,
-                                                      im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if (!im->tex) return;
-        break;
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-        if ((im->tex) && (im->dirty))
-          {
-             evas_gl_common_texture_yuy2_update(im->tex, im->cs.data,
-                                                im->im->cache_entry.w,
-                                                im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if ((!im->tex) && (im->cs.data) && (*((unsigned char **)im->cs.data)))
-          {
-             im->tex = evas_gl_common_texture_yuy2_new(gc, im->cs.data,
-                                                       im->im->cache_entry.w,
-                                                       im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if (!im->tex) return;
-        break;
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-        if ((im->tex) && (im->dirty))
-          {
-             evas_gl_common_texture_nv12_update(im->tex, im->cs.data,
-                                                im->im->cache_entry.w,
-                                                im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if ((!im->tex) && (im->cs.data) && (*((unsigned char **)im->cs.data)))
-          {
-             im->tex = evas_gl_common_texture_nv12_new(gc, im->cs.data,
-                                                       im->im->cache_entry.w,
-                                                       im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if (!im->tex) return;
-        break;
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-        if ((im->tex) && (im->dirty))
-          {
-             evas_gl_common_texture_nv12tiled_update(im->tex, im->cs.data,
-                                                     im->im->cache_entry.w,
-                                                     im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if ((!im->tex) && (im->cs.data) && (*((unsigned char **)im->cs.data)))
-          {
-             im->tex = evas_gl_common_texture_nv12tiled_new(gc, im->cs.data,
-                                                            im->im->cache_entry.w,
-                                                            im->im->cache_entry.h);
-             im->dirty = 0;
-          }
-        if (!im->tex) return;
-        break;
-      default:
-        ERR("unhandled img format colorspace=%d", im->cs.space);
-        break;
-    }
-}
-
-void
-evas_gl_common_image_map_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im,
-                              int npoints, RGBA_Map_Point *p, int smooth, int level __UNUSED__)
-{
-   RGBA_Draw_Context *dc;
-   int r, g, b, a;
-   int c, cx, cy, cw, ch;
-
-   dc = gc->dc;
-   if (dc->mul.use)
-     {
-        a = (dc->mul.col >> 24) & 0xff;
-        r = (dc->mul.col >> 16) & 0xff;
-        g = (dc->mul.col >> 8 ) & 0xff;
-        b = (dc->mul.col      ) & 0xff;
-     }
-   else
-     {
-        r = g = b = a = 255;
-     }
-
-   evas_gl_common_image_update(gc, im);
-
-   c = gc->dc->clip.use;
-   cx = gc->dc->clip.x; cy = gc->dc->clip.y;
-   cw = gc->dc->clip.w; ch = gc->dc->clip.h;
-   im->tex->im = im;
-
-   evas_gl_common_context_image_map_push(gc, im->tex, npoints, p,
-                                         c, cx, cy, cw, ch,
-                                         r, g, b, a, smooth, im->tex_only,
-                                         im->cs.space);
-}
-
-void
-evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int smooth)
-{
-   RGBA_Draw_Context *dc;
-   Evas_GL_Image *imm;
-   int r, g, b, a;
-   double ssx, ssy, ssw, ssh;
-   double mssx, mssy, mssw, mssh;
-   Cutout_Rects *rects;
-   Cutout_Rect  *rct;
-   int c, cx, cy, cw, ch;
-   int i;
-   int yuv = 0;
-   int yuy2 = 0;
-   int nv12 = 0;
-
-   if (sw < 1) sw = 1;
-   if (sh < 1) sh = 1;
-   dc = gc->dc;
-   imm = (Evas_GL_Image *)dc->mask.mask;
-   if (dc->mul.use)
-     {
-        a = (dc->mul.col >> 24) & 0xff;
-        r = (dc->mul.col >> 16) & 0xff;
-        g = (dc->mul.col >> 8 ) & 0xff;
-        b = (dc->mul.col      ) & 0xff;
-     }
-   else
-     {
-        r = g = b = a = 255;
-     }
-
-   evas_gl_common_image_update(gc, im);
-   if (!im->tex)
-     {
-        evas_gl_common_rect_draw(gc, dx, dy, dw, dh);
-        return;
-     }
-   if (imm)
-     {
-        evas_gl_common_image_update(gc, imm);
-        if (!imm->tex) imm = NULL; /* Turn of mask on error */
-     }
-
-   if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
-       (im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
-     yuv = 1;
-   if (im->cs.space == EVAS_COLORSPACE_YCBCR422601_PL)
-     yuy2 = 1;
-   if ((im->cs.space == EVAS_COLORSPACE_YCBCR420NV12601_PL) ||
-       (im->cs.space == EVAS_COLORSPACE_YCBCR420TM12601_PL))
-     nv12 = 1;
-
-   im->tex->im = im;
-   if (imm) imm->tex->im = imm;
-   if ((!gc->dc->cutout.rects) ||
-       ((gc->shared->info.tune.cutout.max > 0) &&
-           (gc->dc->cutout.active > gc->shared->info.tune.cutout.max)))
-     {
-        if (gc->dc->clip.use)
-          {
-             int nx, ny, nw, nh;
-             double scalex,scaley;
-
-             nx = dx; ny = dy; nw = dw; nh = dh;
-             RECTS_CLIP_TO_RECT(nx, ny, nw, nh,
-                                gc->dc->clip.x, gc->dc->clip.y,
-                                gc->dc->clip.w, gc->dc->clip.h);
-             if ((nw < 1) || (nh < 1)) return;
-             if ((!imm) && (nx == dx) && (ny == dy) && (nw == dw) && (nh == dh))
-               {
-                  if (yuv)
-                    evas_gl_common_context_yuv_push(gc,
-                                                    im->tex,
-                                                    sx, sy, sw, sh,
-                                                    dx, dy, dw, dh,
-                                                    r, g, b, a,
-                                                    smooth);
-                  else if (yuy2)
-                    evas_gl_common_context_yuy2_push(gc,
-                                                     im->tex,
-                                                     sx, sy, sw, sh,
-                                                     dx, dy, dw, dh,
-                                                     r, g, b, a,
-                                                     smooth);
-                  else if (nv12)
-                    evas_gl_common_context_nv12_push(gc,
-                                                     im->tex,
-                                                     sx, sy, sw, sh,
-                                                     dx, dy, dw, dh,
-                                                     r, g, b, a,
-                                                     smooth);
-                  else
-
-                    evas_gl_common_context_image_push(gc,
-                                                      im->tex,
-                                                      sx, sy, sw, sh,
-                                                      dx, dy, dw, dh,
-                                                      r, g, b, a,
-                                                      smooth, im->tex_only);
-                  return;
-               }
-
-             ssx = (double)sx + ((double)(sw * (nx - dx)) / (double)(dw));
-             ssy = (double)sy + ((double)(sh * (ny - dy)) / (double)(dh));
-             ssw = ((double)sw * (double)(nw)) / (double)(dw);
-             ssh = ((double)sh * (double)(nh)) / (double)(dh);
-             if (imm)
-               {
-                  /* Correct ones here */
-                  scalex = imm->w / (double)dc->mask.w;
-                  scaley = imm->h / (double)dc->mask.h;
-                  mssx = scalex * (nx - dc->mask.x);
-                  mssy = scaley * (ny - dc->mask.y);
-                  mssw = scalex * nw;
-                  mssh = scaley * nh;
-
-                  /* No yuv + imm I'm afraid */
-                  evas_gl_common_context_image_mask_push(gc,
-                                               im->tex,
-                                               imm->tex,
-                                               ssx, ssy, ssw, ssh,
-                                               mssx, mssy, mssw, mssh,
-                                               //dc->mask.x, dc->mask.y, dc->mask.w, dc->mask.h,
-                                               nx, ny, nw, nh,
-                                               r, g, b, a,
-                                               smooth);
-               }
-             else if (yuv)
-               evas_gl_common_context_yuv_push(gc,
-                                               im->tex,
-                                               ssx, ssy, ssw, ssh,
-                                               nx, ny, nw, nh,
-                                               r, g, b, a,
-                                               smooth);
-             else if (yuy2)
-               evas_gl_common_context_yuy2_push(gc,
-                                                im->tex,
-                                                ssx, ssy, ssw, ssh,
-                                                nx, ny, nw, nh,
-                                                r, g, b, a,
-                                                smooth);
-             else if (nv12)
-               evas_gl_common_context_nv12_push(gc,
-                                                im->tex,
-                                                ssx, ssy, ssw, ssh,
-                                                nx, ny, nw, nh,
-                                                r, g, b, a,
-                                                smooth);
-             else
-               evas_gl_common_context_image_push(gc,
-                                                 im->tex,
-                                                 ssx, ssy, ssw, ssh,
-                                                 nx, ny, nw, nh,
-                                                 r, g, b, a,
-                                                 smooth, im->tex_only);
-          }
-        else
-          {
-             if (yuv)
-               evas_gl_common_context_yuv_push(gc,
-                                               im->tex,
-                                               sx, sy, sw, sh,
-                                               dx, dy, dw, dh,
-                                               r, g, b, a,
-                                               smooth);
-             else if (yuy2)
-               evas_gl_common_context_yuy2_push(gc,
-                                                im->tex,
-                                                sx, sy, sw, sh,
-                                                dx, dy, dw, dh,
-                                                r, g, b, a,
-                                                smooth);
-             else if (nv12)
-               evas_gl_common_context_nv12_push(gc,
-                                                im->tex,
-                                                sx, sy, sw, sh,
-                                                dx, dy, dw, dh,
-                                                r, g, b, a,
-                                                smooth);
-             else
-               evas_gl_common_context_image_push(gc,
-                                                 im->tex,
-                                                 sx, sy, sw, sh,
-                                                 dx, dy, dw, dh,
-                                                 r, g, b, a,
-                                                 smooth, im->tex_only);
-          }
-        return;
-     }
-
-   /* save out clip info */
-   c = gc->dc->clip.use; cx = gc->dc->clip.x; cy = gc->dc->clip.y; cw = gc->dc->clip.w; ch = gc->dc->clip.h;
-   evas_common_draw_context_clip_clip(gc->dc, 0, 0, gc->w, gc->h);
-   evas_common_draw_context_clip_clip(gc->dc, dx, dy, dw, dh);
-   /* our clip is 0 size.. abort */
-   if ((gc->dc->clip.w <= 0) || (gc->dc->clip.h <= 0))
-     {
-        gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch;
-        return;
-     }
-   rects = evas_common_draw_context_apply_cutouts(dc);
-   for (i = 0; i < rects->active; ++i)
-     {
-        int nx, ny, nw, nh;
-
-        rct = rects->rects + i;
-        nx = dx; ny = dy; nw = dw; nh = dh;
-        RECTS_CLIP_TO_RECT(nx, ny, nw, nh, rct->x, rct->y, rct->w, rct->h);
-        if ((nw < 1) || (nh < 1)) continue;
-        if ((nx == dx) && (ny == dy) && (nw == dw) && (nh == dh))
-          {
-             if (yuv)
-               evas_gl_common_context_yuv_push(gc,
-                                               im->tex,
-                                               sx, sy, sw, sh,
-                                               dx, dy, dw, dh,
-                                               r, g, b, a,
-                                               smooth);
-             else if (yuy2)
-               evas_gl_common_context_yuy2_push(gc,
-                                                im->tex,
-                                                sx, sy, sw, sh,
-                                                dx, dy, dw, dh,
-                                                r, g, b, a,
-                                                smooth);
-             else if (nv12)
-               evas_gl_common_context_nv12_push(gc,
-                                                im->tex,
-                                                sx, sy, sw, sh,
-                                                dx, dy, dw, dh,
-                                                r, g, b, a,
-                                                smooth);
-             else
-               evas_gl_common_context_image_push(gc,
-                                                 im->tex,
-                                                 sx, sy, sw, sh,
-                                                 dx, dy, dw, dh,
-                                                 r, g, b, a,
-                                                 smooth, im->tex_only);
-             continue;
-          }
-        ssx = (double)sx + ((double)(sw * (nx - dx)) / (double)(dw));
-        ssy = (double)sy + ((double)(sh * (ny - dy)) / (double)(dh));
-        ssw = ((double)sw * (double)(nw)) / (double)(dw);
-        ssh = ((double)sh * (double)(nh)) / (double)(dh);
-        if (yuv)
-          evas_gl_common_context_yuv_push(gc,
-                                          im->tex,
-                                          ssx, ssy, ssw, ssh,
-                                          nx, ny, nw, nh,
-                                          r, g, b, a,
-                                          smooth);
-        else if (yuy2)
-          evas_gl_common_context_yuy2_push(gc,
-                                           im->tex,
-                                           ssx, ssy, ssw, ssh,
-                                           nx, ny, nw, nh,
-                                           r, g, b, a,
-                                           smooth);
-        else if (nv12)
-          evas_gl_common_context_nv12_push(gc,
-                                           im->tex,
-                                           ssx, ssy, ssw, ssh,
-                                           nx, ny, nw, nh,
-                                           r, g, b, a,
-                                           smooth);
-        else
-          evas_gl_common_context_image_push(gc,
-                                            im->tex,
-                                            ssx, ssy, ssw, ssh,
-                                            nx, ny, nw, nh,
-                                            r, g, b, a,
-                                            smooth, im->tex_only);
-     }
-   evas_common_draw_context_apply_clear_cutouts(rects);
-   /* restore clip info */
-   gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c
deleted file mode 100644
index f8ace2e..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "evas_gl_private.h"
-
-void
-evas_gl_common_line_draw(Evas_Engine_GL_Context *gc, int x1, int y1, int x2, int y2)
-{
-   RGBA_Draw_Context *dc;
-   int r, g, b, a;
-   int c, cx, cy, cw, ch;
-
-   dc = gc->dc;
-   if (dc->mul.use)
-     {
-        a = (dc->mul.col >> 24) & 0xff;
-        r = (dc->mul.col >> 16) & 0xff;
-        g = (dc->mul.col >> 8 ) & 0xff;
-        b = (dc->mul.col      ) & 0xff;
-     }
-   else
-     {
-        a = (dc->col.col >> 24) & 0xff;
-        r = (dc->col.col >> 16) & 0xff;
-        g = (dc->col.col >> 8 ) & 0xff;
-        b = (dc->col.col      ) & 0xff;
-     }
-
-   glFlush();
-
-   c = gc->dc->clip.use;
-   cx = gc->dc->clip.x; cy = gc->dc->clip.y;
-   cw = gc->dc->clip.w; ch = gc->dc->clip.h;
-
-   evas_gl_common_context_line_push(gc, x1, y1, x2, y2,
-                                    c, cx, cy, cw, ch,
-                                    r, g, b, a);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_polygon.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_polygon.c
deleted file mode 100644
index 06647cd..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_polygon.c
+++ /dev/null
@@ -1,307 +0,0 @@
-#include "evas_gl_private.h"
-
-// FIXME: this is a verbatim copy of the software poly renderer. it just
-// use gl to draw 1 pixel high spans like software does. this is to make
-// sure rendering correctness matches the software engine but also to save
-// time in coming up with a good triangulation algorithm. if you want to
-// feel free to turn this into a real triangulation system and use gl to its
-// fullest, but as such polygons are used so little, it's not worth it.
-
-typedef struct _RGBA_Span RGBA_Span;
-typedef struct _RGBA_Edge RGBA_Edge;
-typedef struct _RGBA_Vertex RGBA_Vertex;
-
-struct _RGBA_Span
-{
-   EINA_INLIST;
-   int x, y, w;
-};
-
-struct _RGBA_Edge
-{
-   double x, dx;
-   int i;
-};
-
-struct _RGBA_Vertex
-{
-   double x, y;
-   int i;
-};
-
-#define POLY_EDGE_DEL(_i)                                               \
-   {                                                                       \
-      int _j;                                                              \
-      \
-      for (_j = 0; (_j < num_active_edges) && (edges[_j].i != _i); _j++);  \
-      if (_j < num_active_edges)                                           \
-        {                                                                  \
-           num_active_edges--;                                             \
-           memmove(&(edges[_j]), &(edges[_j + 1]),                         \
-                      (num_active_edges - _j) * sizeof(RGBA_Edge));           \
-        }                                                                  \
-   }
-
-#define POLY_EDGE_ADD(_i, _y)                                           \
-   {                                                                       \
-      int _j;                                                              \
-      float _dx;                                                           \
-      RGBA_Vertex *_p, *_q;                                                \
-      if (_i < (n - 1)) _j = _i + 1;                                       \
-      else _j = 0;                                                         \
-      if (point[_i].y < point[_j].y)                                       \
-        {                                                                  \
-           _p = &(point[_i]);                                              \
-           _q = &(point[_j]);                                              \
-        }                                                                  \
-      else                                                                 \
-        {                                                                  \
-           _p = &(point[_j]);                                              \
-           _q = &(point[_i]);                                              \
-        }                                                                  \
-      edges[num_active_edges].dx = _dx = (_q->x - _p->x) / (_q->y - _p->y); \
-      edges[num_active_edges].x = (_dx * ((float)_y + 0.5 - _p->y)) + _p->x; \
-      edges[num_active_edges].i = _i;                                      \
-      num_active_edges++;                                                  \
-   }
-
-Evas_GL_Polygon *
-evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x, int y)
-{
-   Evas_GL_Polygon_Point *pt;
-
-   if (!poly) poly = calloc(1, sizeof(Evas_GL_Polygon));
-   if (!poly) return NULL;
-   pt = calloc(1, sizeof(Evas_GL_Polygon_Point));
-   if (!pt) return NULL;
-   pt->x = x;
-   pt->y = y;
-   poly->points = eina_list_append(poly->points, pt);
-   poly->changed = 1;
-   return poly;
-}
-
-Evas_GL_Polygon *
-evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly)
-{
-   if (!poly) return NULL;
-   while (poly->points)
-     {
-        Evas_GL_Polygon_Point *pt;
-
-        pt = poly->points->data;
-        poly->points = eina_list_remove(poly->points, pt);
-        free(pt);
-     }
-   free(poly);
-   return NULL;
-}
-
-static int
-polygon_point_sorter(const void *a, const void *b)
-{
-   RGBA_Vertex *p, *q;
-
-   p = (RGBA_Vertex *)a;
-   q = (RGBA_Vertex *)b;
-   if (p->y <= q->y) return -1;
-   return 1;
-}
-
-static int
-polygon_edge_sorter(const void *a, const void *b)
-{
-   RGBA_Edge *p, *q;
-
-   p = (RGBA_Edge *)a;
-   q = (RGBA_Edge *)b;
-   if (p->x <= q->x) return -1;
-   return 1;
-}
-
-void
-evas_gl_common_poly_draw(Evas_Engine_GL_Context *gc, Evas_GL_Polygon *poly, int dx, int dy)
-{
-   Cutout_Rects *rects;
-   Cutout_Rect  *r;
-   int c, cx, cy, cw, ch, cr, cg, cb, ca, i;
-   int x = 0, y = 0, w = 0, h = 0;
-
-   Eina_List *l;
-   int n, k, num_active_edges, y0, y1, *sorted_index, j;
-   RGBA_Edge *edges;
-   RGBA_Vertex *point;
-   Evas_GL_Polygon_Point *pt;
-   Eina_Inlist *spans;
-
-   /* save out clip info */
-   c = gc->dc->clip.use; cx = gc->dc->clip.x; cy = gc->dc->clip.y; cw = gc->dc->clip.w; ch = gc->dc->clip.h;
-
-   ca = (gc->dc->col.col >> 24) & 0xff;
-   if (ca <= 0) return;
-   cr = (gc->dc->col.col >> 16) & 0xff;
-   cg = (gc->dc->col.col >> 8 ) & 0xff;
-   cb = (gc->dc->col.col      ) & 0xff;
-
-   n = eina_list_count(poly->points);
-   if (n < 3) return;
-   edges = malloc(sizeof(RGBA_Edge) * n);
-   if (!edges) return;
-   point = malloc(sizeof(RGBA_Vertex) * n);
-   if (!point)
-     {
-        free(edges);
-        return;
-     }
-   sorted_index = malloc(sizeof(int) * n);
-   if (!sorted_index)
-     {
-        free(edges);
-        free(point);
-        return;
-     }
-
-   k = 0;
-   EINA_LIST_FOREACH(poly->points, l, pt)
-     {
-        point[k].x = pt->x + dx;
-        point[k].y = pt->y + dy;
-        point[k].i = k;
-        k++;
-     }
-   qsort(point, n, sizeof(RGBA_Vertex), polygon_point_sorter);
-   for (k = 0; k < n; k++) sorted_index[k] = point[k].i;
-   k = 0;
-
-   EINA_LIST_FOREACH(poly->points, l, pt)
-     {
-        point[k].x = pt->x + dx;
-        point[k].y = pt->y + dy;
-        point[k].i = k;
-        k++;
-     }
-
-   y0 = MAX(cy, ceil(point[sorted_index[0]].y - 0.5));
-   y1 = MIN(cy + ch - 1, floor(point[sorted_index[n - 1]].y - 0.5));
-
-   k = 0;
-   num_active_edges = 0;
-   spans = NULL;
-
-   for (y = y0; y <= y1; y++)
-     {
-        for (; (k < n) && (point[sorted_index[k]].y <= ((double)y + 0.5)); k++)
-          {
-             i = sorted_index[k];
-
-             if (i > 0) j = i - 1;
-             else j = n - 1;
-             if (point[j].y <= ((double)y - 0.5))
-               {
-                  POLY_EDGE_DEL(j)
-               }
-             else if (point[j].y > ((double)y + 0.5))
-               {
-                  POLY_EDGE_ADD(j, y)
-               }
-             if (i < (n - 1)) j = i + 1;
-             else j = 0;
-             if (point[j].y <= ((double)y - 0.5))
-               {
-                  POLY_EDGE_DEL(i)
-               }
-             else if (point[j].y > ((double)y + 0.5))
-               {
-                  POLY_EDGE_ADD(i, y)
-               }
-          }
-
-        qsort(edges, num_active_edges, sizeof(RGBA_Edge), polygon_edge_sorter);
-
-        for (j = 0; j < num_active_edges; j += 2)
-          {
-             int x0, x1;
-
-             x0 = ceil(edges[j].x - 0.5);
-             if (j < (num_active_edges - 1))
-               x1 = floor(edges[j + 1].x - 0.5);
-             else
-               x1 = x0;
-             if ((x1 >= cx) && (x0 < (cx + cw)) && (x0 <= x1))
-               {
-                  RGBA_Span *span;
-
-                  if (x0 < cx) x0 = cx;
-                  if (x1 >= (cx + cw)) x1 = cx + cw - 1;
-                  span = malloc(sizeof(RGBA_Span));
-                  spans = eina_inlist_append(spans, EINA_INLIST_GET(span));
-                  span->y = y;
-                  span->x = x0;
-                  span->w = (x1 - x0) + 1;
-               }
-             edges[j].x += edges[j].dx;
-             edges[j + 1].x += edges[j + 1].dx;
-          }
-     }
-
-   free(edges);
-   free(point);
-   free(sorted_index);
-
-   evas_common_draw_context_clip_clip(gc->dc, 0, 0, gc->w, gc->h);
-
-   if (spans)
-     {
-        RGBA_Span *span;
-
-        /* no cutouts - cut right to the chase */
-        if (!gc->dc->cutout.rects)
-          {
-             EINA_INLIST_FOREACH(spans, span)
-               {
-                  x = span->x;
-                  y = span->y;
-                  w = span->w;
-                  h = 1;
-                  evas_gl_common_context_rectangle_push(gc, x, y, w, h, cr, cg, cb, ca);
-               }
-          }
-        else
-          {
-             evas_common_draw_context_clip_clip(gc->dc, x, y, w, h);
-             /* our clip is 0 size.. abort */
-             if ((gc->dc->clip.w > 0) && (gc->dc->clip.h > 0))
-               {
-                  rects = evas_common_draw_context_apply_cutouts(gc->dc);
-                  for (i = 0; i < rects->active; ++i)
-                    {
-                       r = rects->rects + i;
-                       if ((r->w > 0) && (r->h > 0))
-                         {
-                            EINA_INLIST_FOREACH(spans, span)
-                              {
-                                 x = span->x;
-                                 y = span->y;
-                                 w = span->w;
-                                 h = 1;
-                                 RECTS_CLIP_TO_RECT(x, y, w, h, r->x, r->y, r->w, r->h);
-                                 if ((w > 0) && (h > 0))
-                                   evas_gl_common_context_rectangle_push(gc, x, y, w, h, cr, cg, cb, ca);
-                              }
-                         }
-                    }
-                  evas_common_draw_context_apply_clear_cutouts(rects);
-               }
-          }
-        while (spans)
-          {
-             span = (RGBA_Span *)spans;
-             spans = eina_inlist_remove(spans, spans);
-             free(span);
-          }
-     }
-
-   /* restore clip info */
-   gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch;
-
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_private.h b/libraries/evas/src/modules/engines/gl_common/evas_gl_private.h
deleted file mode 100644
index a178823..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_private.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _EVAS_GL_PRIVATE_H
-#define _EVAS_GL_PRIVATE_H
-#include "evas_gl_common.h"
-
-extern int _evas_engine_GL_common_log_dom;
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_GL_common_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_GL_common_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_GL_common_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_common_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_common_log_dom, __VA_ARGS__)
-
-#endif
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_rectangle.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_rectangle.c
deleted file mode 100644
index 1903314..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_rectangle.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "evas_gl_private.h"
-
-void
-evas_gl_common_rect_draw(Evas_Engine_GL_Context *gc, int x, int y, int w, int h)
-{
-   Cutout_Rects *rects;
-   Cutout_Rect  *r;
-   int          c, cx, cy, cw, ch, cr, cg, cb, ca, i;
-
-   if ((w <= 0) || (h <= 0)) return;
-   if (!(RECTS_INTERSECT(x, y, w, h, 0, 0, gc->w, gc->h))) return;
-   /* save out clip info */
-   c = gc->dc->clip.use; cx = gc->dc->clip.x; cy = gc->dc->clip.y; cw = gc->dc->clip.w; ch = gc->dc->clip.h;
-
-   ca = (gc->dc->col.col >> 24) & 0xff;
-   if ((gc->dc->render_op != EVAS_RENDER_COPY) && (ca <= 0)) return;
-   cr = (gc->dc->col.col >> 16) & 0xff;
-   cg = (gc->dc->col.col >> 8 ) & 0xff;
-   cb = (gc->dc->col.col      ) & 0xff;
-   evas_common_draw_context_clip_clip(gc->dc, 0, 0, gc->w, gc->h);
-   /* no cutouts - cut right to the chase */
-   if ((gc->dc) && (gc->dc->clip.use))
-     {
-        RECTS_CLIP_TO_RECT(x, y, w, h,
-                           gc->dc->clip.x, gc->dc->clip.y,
-                           gc->dc->clip.w, gc->dc->clip.h);
-     }
-
-   if (!gc->dc->cutout.rects)
-     {
-        evas_gl_common_context_rectangle_push(gc, x, y, w, h, cr, cg, cb, ca);
-     }
-   else
-     {
-        evas_common_draw_context_clip_clip(gc->dc, x, y, w, h);
-        /* our clip is 0 size.. abort */
-        if ((gc->dc->clip.w > 0) && (gc->dc->clip.h > 0))
-          {
-             rects = evas_common_draw_context_apply_cutouts(gc->dc);
-             for (i = 0; i < rects->active; ++i)
-               {
-                  r = rects->rects + i;
-                  if ((r->w > 0) && (r->h > 0))
-                    {
-                       evas_gl_common_context_rectangle_push(gc, r->x, r->y, r->w, r->h, cr, cg, cb, ca);
-                    }
-               }
-             evas_common_draw_context_apply_clear_cutouts(rects);
-          }
-     }
-   /* restore clip info */
-   gc->dc->clip.use = c; gc->dc->clip.x = cx; gc->dc->clip.y = cy; gc->dc->clip.w = cw; gc->dc->clip.h = ch;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_shader.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_shader.c
deleted file mode 100644
index 6666ac5..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_shader.c
+++ /dev/null
@@ -1,1262 +0,0 @@
-#include "evas_gl_private.h"
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int rect_frag_bin[] =
-{
-# include "shader/rect_frag_bin_s3c6410.h"
-};
-#endif
-
-const char rect_frag_glsl[] =
-#include "shader/rect_frag.h"
-  ;
-Evas_GL_Program_Source shader_rect_frag_src =
-{
-   rect_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     rect_frag_bin, sizeof(rect_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int rect_vert_bin[] =
-{
-# include "shader/rect_vert_bin_s3c6410.h"
-};
-#endif
-const char rect_vert_glsl[] =
-#include "shader/rect_vert.h"
-  ;
-Evas_GL_Program_Source shader_rect_vert_src =
-{
-   rect_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     rect_vert_bin, sizeof(rect_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int font_frag_bin[] =
-{
-# include "shader/font_frag_bin_s3c6410.h"
-};
-#endif
-
-const char font_frag_glsl[] =
-#include "shader/font_frag.h"
-  ;
-Evas_GL_Program_Source shader_font_frag_src =
-{
-   font_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     font_frag_bin, sizeof(font_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int font_vert_bin[] =
-{
-# include "shader/font_vert_bin_s3c6410.h"
-};
-#endif
-const char font_vert_glsl[] =
-#include "shader/font_vert.h"
-  ;
-Evas_GL_Program_Source shader_font_vert_src =
-{
-   font_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     font_vert_bin, sizeof(font_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuv_frag_bin[] =
-{
-# include "shader/yuv_frag_bin_s3c6410.h"
-};
-#endif
-
-const char yuv_frag_glsl[] =
-#include "shader/yuv_frag.h"
-  ;
-Evas_GL_Program_Source shader_yuv_frag_src =
-{
-   yuv_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuv_frag_bin, sizeof(yuv_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuv_vert_bin[] =
-{
-# include "shader/yuv_vert_bin_s3c6410.h"
-};
-#endif
-const char yuv_vert_glsl[] =
-#include "shader/yuv_vert.h"
-  ;
-Evas_GL_Program_Source shader_yuv_vert_src =
-{
-   yuv_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuv_vert_bin, sizeof(yuv_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuy2_frag_bin[] =
-{
-# include "shader/yuy2_frag_bin_s3c6410.h"
-};
-#endif
-
-const char yuy2_frag_glsl[] =
-#include "shader/yuy2_frag.h"
-  ;
-Evas_GL_Program_Source shader_yuy2_frag_src =
-{
-   yuy2_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuy2_frag_bin, sizeof(yuy2_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuy2_vert_bin[] =
-{
-# include "shader/yuy2_vert_bin_s3c6410.h"
-};
-#endif
-const char yuy2_vert_glsl[] =
-#include "shader/yuy2_vert.h"
-  ;
-Evas_GL_Program_Source shader_yuy2_vert_src =
-{
-   yuy2_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuy2_vert_bin, sizeof(yuy2_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuy2_nomul_frag_bin[] =
-{
-# include "shader/yuy2_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char yuy2_nomul_frag_glsl[] =
-#include "shader/yuy2_nomul_frag.h"
-  ;
-Evas_GL_Program_Source shader_yuy2_nomul_frag_src =
-{
-   yuy2_nomul_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuy2_nomul_frag_bin, sizeof(yuy2_nomul_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuy2_nomul_vert_bin[] =
-{
-# include "shader/yuy2_nomul_vert_bin_s3c6410.h"
-};
-#endif
-const char yuy2_nomul_vert_glsl[] =
-#include "shader/yuy2_nomul_vert.h"
-  ;
-Evas_GL_Program_Source shader_yuy2_nomul_vert_src =
-{
-   yuy2_nomul_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuy2_nomul_vert_bin, sizeof(yuy2_nomul_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int nv12_nomul_vert_bin[] =
-{
-# include "shader/nv12_nomul_vert_bin_s3c6410.h"
-};
-#endif
-const char nv12_nomul_vert_glsl[] =
-#include "shader/nv12_nomul_vert.h"
-  ;
-Evas_GL_Program_Source shader_nv12_nomul_vert_src =
-{
-   nv12_nomul_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     nv12_nomul_vert_bin, sizeof(nv12_nomul_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int nv12_vert_bin[] =
-{
-# include "shader/nv12_vert_bin_s3c6410.h"
-};
-#endif
-const char nv12_vert_glsl[] =
-#include "shader/nv12_vert.h"
-  ;
-Evas_GL_Program_Source shader_nv12_vert_src =
-{
-   nv12_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     nv12_vert_bin, sizeof(nv12_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int nv12_nomul_frag_bin[] =
-{
-# include "shader/nv12_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char nv12_frag_glsl[] =
-#include "shader/nv12_frag.h"
-  ;
-Evas_GL_Program_Source shader_nv12_frag_src =
-{
-   nv12_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     nv12_frag_bin, sizeof(nv12_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int nv12_nomul_frag_bin[] =
-{
-# include "shader/nv12_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char nv12_nomul_frag_glsl[] =
-#include "shader/nv12_nomul_frag.h"
-  ;
-Evas_GL_Program_Source shader_nv12_nomul_frag_src =
-{
-   nv12_nomul_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     nv12_nomul_frag_bin, sizeof(nv12_nomul_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuv_nomul_frag_bin[] =
-{
-# include "shader/yuv_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char yuv_nomul_frag_glsl[] =
-#include "shader/yuv_nomul_frag.h"
-  ;
-Evas_GL_Program_Source shader_yuv_nomul_frag_src =
-{
-   yuv_nomul_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuv_nomul_frag_bin, sizeof(yuv_nomul_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int yuv_nomul_vert_bin[] =
-{
-# include "shader/yuv_nomul_vert_bin_s3c6410.h"
-};
-#endif
-const char yuv_nomul_vert_glsl[] =
-#include "shader/yuv_nomul_vert.h"
-  ;
-Evas_GL_Program_Source shader_yuv_nomul_vert_src =
-{
-   yuv_nomul_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     yuv_nomul_vert_bin, sizeof(yuv_nomul_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int tex_frag_bin[] =
-{
-# include "shader/tex_frag_bin_s3c6410.h"
-};
-#endif
-
-const char tex_frag_glsl[] =
-#include "shader/tex_frag.h"
-  ;
-Evas_GL_Program_Source shader_tex_frag_src =
-{
-   tex_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     tex_frag_bin, sizeof(tex_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int tex_vert_bin[] =
-{
-# include "shader/tex_vert_bin_s3c6410.h"
-};
-#endif
-const char tex_vert_glsl[] =
-#include "shader/tex_vert.h"
-  ;
-Evas_GL_Program_Source shader_tex_vert_src =
-{
-   tex_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     tex_vert_bin, sizeof(tex_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int tex_nomul_frag_bin[] =
-{
-# include "shader/tex_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char tex_nomul_frag_glsl[] =
-#include "shader/tex_nomul_frag.h"
-  ;
-Evas_GL_Program_Source shader_tex_nomul_frag_src =
-{
-   tex_nomul_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     tex_nomul_frag_bin, sizeof(tex_nomul_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int tex_nomul_vert_bin[] =
-{
-# include "shader/tex_nomul_vert_bin_s3c6410.h"
-};
-#endif
-const char tex_nomul_vert_glsl[] =
-#include "shader/tex_nomul_vert.h"
-  ;
-Evas_GL_Program_Source shader_tex_nomul_vert_src =
-{
-   tex_nomul_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     tex_nomul_vert_bin, sizeof(tex_nomul_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_frag_bin[] =
-{
-# include "shader/img_frag_bin_s3c6410.h"
-};
-#endif
-
-const char img_frag_glsl[] =
-#include "shader/img_frag.h"
-  ;
-Evas_GL_Program_Source shader_img_frag_src =
-{
-   img_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_frag_bin, sizeof(img_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_vert_bin[] =
-{
-# include "shader/img_vert_bin_s3c6410.h"
-};
-#endif
-const char img_vert_glsl[] =
-#include "shader/img_vert.h"
-  ;
-Evas_GL_Program_Source shader_img_vert_src =
-{
-   img_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_vert_bin, sizeof(img_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_nomul_frag_bin[] =
-{
-# include "shader/img_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char img_nomul_frag_glsl[] =
-#include "shader/img_nomul_frag.h"
-  ;
-Evas_GL_Program_Source shader_img_nomul_frag_src =
-{
-   img_nomul_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_nomul_frag_bin, sizeof(img_nomul_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_nomul_vert_bin[] =
-{
-# include "shader/img_nomul_vert_bin_s3c6410.h"
-};
-#endif
-const char img_nomul_vert_glsl[] =
-#include "shader/img_nomul_vert.h"
-  ;
-Evas_GL_Program_Source shader_img_nomul_vert_src =
-{
-   img_nomul_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_nomul_vert_bin, sizeof(img_nomul_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_bgra_frag_bin[] =
-{
-# include "shader/img_bgra_frag_bin_s3c6410.h"
-};
-#endif
-
-const char img_bgra_frag_glsl[] =
-#include "shader/img_bgra_frag.h"
-  ;
-Evas_GL_Program_Source shader_img_bgra_frag_src =
-{
-   img_bgra_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_bgra_frag_bin, sizeof(img_bgra_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_bgra_vert_bin[] =
-{
-# include "shader/img_bgra_vert_bin_s3c6410.h"
-};
-#endif
-const char img_bgra_vert_glsl[] =
-#include "shader/img_bgra_vert.h"
-  ;
-Evas_GL_Program_Source shader_img_bgra_vert_src =
-{
-   img_bgra_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_bgra_vert_bin, sizeof(img_bgra_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_mask_frag_bin[] =
-{
-# include "shader/img_mask_frag_bin_s3c6410.h"
-};
-#endif
-
-const char img_mask_frag_glsl[] =
-#include "shader/img_mask_frag.h"
-  ;
-Evas_GL_Program_Source shader_img_mask_frag_src =
-{
-   img_mask_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_mask_frag_bin, sizeof(img_mask_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_mask_vert_bin[] =
-{
-# include "shader/img_mask_vert_bin_s3c6410.h"
-};
-#endif
-const char img_mask_vert_glsl[] =
-#include "shader/img_mask_vert.h"
-  ;
-Evas_GL_Program_Source shader_img_mask_vert_src =
-{
-   img_mask_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_mask_vert_bin, sizeof(img_mask_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-
-/////////////////////////////////////////////
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_bgra_nomul_frag_bin[] =
-{
-# include "shader/img_bgra_nomul_frag_bin_s3c6410.h"
-};
-#endif
-
-const char img_bgra_nomul_frag_glsl[] =
-#include "shader/img_bgra_nomul_frag.h"
-  ;
-Evas_GL_Program_Source shader_img_bgra_nomul_frag_src =
-{
-   img_bgra_nomul_frag_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_bgra_nomul_frag_bin, sizeof(img_bgra_nomul_frag_bin)
-#else
-     NULL, 0
-#endif
-};
-
-#if defined (GLES_VARIETY_S3C6410)
-const unsigned int img_bgra_nomul_vert_bin[] =
-{
-# include "shader/img_bgra_nomul_vert_bin_s3c6410.h"
-};
-#endif
-const char img_bgra_nomul_vert_glsl[] =
-#include "shader/img_bgra_nomul_vert.h"
-  ;
-Evas_GL_Program_Source shader_img_bgra_nomul_vert_src =
-{
-   img_bgra_nomul_vert_glsl,
-#if defined (GLES_VARIETY_S3C6410)
-     img_bgra_nomul_vert_bin, sizeof(img_bgra_nomul_vert_bin)
-#else
-     NULL, 0
-#endif
-};
-
-/////////////////////////////////////////////
-const char filter_invert_frag_glsl[] =
-#include "shader/filter_invert.h"
-  ;
-Evas_GL_Program_Source shader_filter_invert_frag_src =
-{
-   filter_invert_frag_glsl,
-   NULL, 0
-};
-
-const char filter_invert_nomul_frag_glsl[] =
-#include "shader/filter_invert_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_invert_nomul_frag_src =
-{
-   filter_invert_nomul_frag_glsl,
-   NULL, 0
-};
-
-const char filter_invert_bgra_frag_glsl[] =
-#include "shader/filter_invert_bgra.h"
-  ;
-Evas_GL_Program_Source shader_filter_invert_bgra_frag_src =
-{
-   filter_invert_bgra_frag_glsl,
-   NULL, 0
-};
-const char filter_invert_bgra_nomul_frag_glsl[] =
-#include "shader/filter_invert_bgra_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_invert_bgra_nomul_frag_src =
-{
-   filter_invert_bgra_nomul_frag_glsl,
-   NULL, 0
-};
-
-/////////////////////////////////////////////
-const char filter_greyscale_frag_glsl[] =
-#include "shader/filter_greyscale.h"
-  ;
-Evas_GL_Program_Source shader_filter_greyscale_frag_src =
-{
-   filter_greyscale_frag_glsl,
-   NULL, 0
-};
-
-const char filter_greyscale_nomul_frag_glsl[] =
-#include "shader/filter_greyscale_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_greyscale_nomul_frag_src =
-{
-   filter_greyscale_nomul_frag_glsl,
-   NULL, 0
-};
-
-const char filter_greyscale_bgra_frag_glsl[] =
-#include "shader/filter_greyscale_bgra.h"
-  ;
-Evas_GL_Program_Source shader_filter_greyscale_bgra_frag_src =
-{
-   filter_greyscale_bgra_frag_glsl,
-   NULL, 0
-};
-const char filter_greyscale_bgra_nomul_frag_glsl[] =
-#include "shader/filter_greyscale_bgra_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_greyscale_bgra_nomul_frag_src =
-{
-   filter_greyscale_bgra_nomul_frag_glsl,
-   NULL, 0
-};
-
-/////////////////////////////////////////////
-const char filter_sepia_frag_glsl[] =
-#include "shader/filter_sepia.h"
-  ;
-Evas_GL_Program_Source shader_filter_sepia_frag_src =
-{
-   filter_sepia_frag_glsl,
-   NULL, 0
-};
-
-const char filter_sepia_nomul_frag_glsl[] =
-#include "shader/filter_sepia_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_sepia_nomul_frag_src =
-{
-   filter_sepia_nomul_frag_glsl,
-   NULL, 0
-};
-
-const char filter_sepia_bgra_frag_glsl[] =
-#include "shader/filter_sepia_bgra.h"
-  ;
-Evas_GL_Program_Source shader_filter_sepia_bgra_frag_src =
-{
-   filter_sepia_bgra_frag_glsl,
-   NULL, 0
-};
-const char filter_sepia_bgra_nomul_frag_glsl[] =
-#include "shader/filter_sepia_bgra_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_sepia_bgra_nomul_frag_src =
-{
-   filter_sepia_bgra_nomul_frag_glsl,
-   NULL, 0
-};
-
-/////////////////////////////////////////////
-#if 0
-        Blur is a work in progress currently.
-        Mostly because GPUs are so hopeless.
-const char filter_blur_vert_glsl[] =
-#include "shader/filter_blur_vert.h"
-  ;
-
-Evas_GL_Program_Source shader_filter_blur_vert_src =
-{
-   filter_blur_vert_glsl,
-   NULL, 0
-};
-
-const char filter_blur_frag_glsl[] =
-#include "shader/filter_blur.h"
-  ;
-Evas_GL_Program_Source shader_filter_blur_frag_src =
-{
-   filter_blur_frag_glsl,
-   NULL, 0
-};
-
-const char filter_blur_nomul_frag_glsl[] =
-#include "shader/filter_blur_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_blur_nomul_frag_src =
-{
-   filter_blur_nomul_frag_glsl,
-   NULL, 0
-};
-
-const char filter_blur_bgra_frag_glsl[] =
-#include "shader/filter_blur_bgra.h"
-  ;
-Evas_GL_Program_Source shader_filter_blur_bgra_frag_src =
-{
-   filter_blur_bgra_frag_glsl,
-   NULL, 0
-};
-const char filter_blur_bgra_nomul_frag_glsl[] =
-#include "shader/filter_blur_bgra_nomul.h"
-  ;
-Evas_GL_Program_Source shader_filter_blur_bgra_nomul_frag_src =
-{
-   filter_blur_bgra_nomul_frag_glsl,
-   NULL, 0
-};
-
-#endif
-
-
-
-/////////////////////////////////////////////
-static void
-gl_compile_link_error(GLuint target, const char *action)
-{
-   int loglen = 0, chars = 0;
-   char *logtxt;
-
-   /* Shader info log */
-   glGetShaderiv(target, GL_INFO_LOG_LENGTH, &loglen);
-   if (loglen > 0)
-     {
-        logtxt = calloc(loglen, sizeof(char));
-        if (logtxt)
-          {
-             glGetShaderInfoLog(target, loglen, &chars, logtxt);
-             ERR("Failed to %s: %s", action, logtxt);
-             free(logtxt);
-          }
-     }
-
-   /* Program info log */
-   glGetProgramiv(target, GL_INFO_LOG_LENGTH, &loglen);
-   if (loglen > 0)
-     {
-        logtxt = calloc(loglen, sizeof(char));
-        if (logtxt)
-          {
-             glGetProgramInfoLog(target, loglen, &chars, logtxt);
-             ERR("Failed to %s: %s", action, logtxt);
-             free(logtxt);
-          }
-     }
-}
-
-static mode_t default_mode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
-
-static Eina_Bool
-_evas_gl_shader_file_is_dir(const char *file)
-{
-   struct stat st;
-
-   if (stat(file, &st) < 0) return EINA_FALSE;
-   if (S_ISDIR(st.st_mode)) return EINA_TRUE;
-   return EINA_FALSE;
-}
-
-static Eina_Bool
-_evas_gl_shader_file_mkdir(const char *dir)
-{
-   /* evas gl shader only call this function when the dir is not exist */
-   if (mkdir(dir, default_mode) < 0) return EINA_FALSE;
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-_evas_gl_shader_file_exists(const char *file)
-{
-   struct stat st;
-   if (!file) return EINA_FALSE;
-   if (stat(file, &st) < 0) return EINA_FALSE;
-   return EINA_TRUE;
-}
-
-static inline Eina_Bool
-_evas_gl_shader_file_mkpath_if_not_exists(const char *path)
-{
-   struct stat st;
-
-   if (stat(path, &st) < 0)
-     return _evas_gl_shader_file_mkdir(path);
-   else if (!S_ISDIR(st.st_mode))
-     return EINA_FALSE;
-   else
-     return EINA_TRUE;
-}
-
-static Eina_Bool
-_evas_gl_shader_file_mkpath(const char *path)
-{
-   char ss[PATH_MAX];
-   unsigned int i;
-
-   if (_evas_gl_shader_file_is_dir(path)) return EINA_TRUE;
-
-   for (i = 0; path[i]; ss[i] = path[i], i++)
-     {
-        if (i == sizeof(ss) - 1) return EINA_FALSE;
-        if ((path[i] == '/') && (i > 0))
-          {
-             ss[i] = 0;
-             if (!_evas_gl_shader_file_mkpath_if_not_exists(ss))
-               return EINA_FALSE;
-          }
-     }
-   ss[i] = 0;
-   return _evas_gl_shader_file_mkpath_if_not_exists(ss);
-}
-
-static int
-_evas_gl_shader_dir_check(char *bin_shader_dir, int num)
-{
-   char *home = NULL;
-   char *subdir = ".cache/evas_gl_common_shaders";
-
-   home = getenv("HOME");
-   if ((!home) || (!home[0])) return 0;
-
-   snprintf(bin_shader_dir, num, "%s/%s", home, subdir);
-   return _evas_gl_shader_file_exists(bin_shader_dir);
-}
-
-static int
-_evas_gl_shader_file_check(const char *bin_shader_dir, char *bin_shader_file, int dir_num)
-{
-   char before_name[PATH_MAX];
-   char after_name[PATH_MAX];
-   int new_path_len = 0;
-   int i = 0, j = 0;
-
-   char *vendor = NULL;
-   char *driver = NULL;
-   char *version = NULL;
-
-   vendor = (char *)glGetString(GL_VENDOR);
-   driver = (char *)glGetString(GL_RENDERER);
-   version = (char *)glGetString(GL_VERSION);
-
-   new_path_len = snprintf(before_name, sizeof(before_name), "%s::%s::%s::%s::binary_shader.eet", vendor, version, driver, MODULE_ARCH);
-
-   /* remove '/' from file name */
-   for (i = 0; i < new_path_len; i++)
-     {
-        if (before_name[i] != '/')
-          {
-             after_name[j] = before_name[i];
-             j++;
-          }
-     }
-   after_name[j] = 0;
-
-   snprintf(bin_shader_file, dir_num, "%s/%s", bin_shader_dir, after_name);
-
-   return _evas_gl_shader_file_exists(bin_shader_file);
-}
-
-static int
-_evas_gl_common_shader_program_binary_init(Evas_GL_Program *p,
-                                           const char *pname,
-                                           Eet_File *ef)
-{
-   int res = 0, num = 0, length = 0;
-   int *formats = NULL;
-   void *data = NULL;
-   GLint ok = 0;
-
-   if (!ef) return res;
-
-   data = eet_read(ef, pname, &length);
-   if ((!data) || (length <= 0)) goto finish;
-
-   glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &num);
-   if (num <= 0) goto finish;
-
-   formats = calloc(num, sizeof(int));
-   if (!formats) goto finish;
-
-   glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, formats);
-   if (!formats[0]) goto finish;
-
-   p->prog = glCreateProgram();
-
-   glsym_glProgramBinary(p->prog, formats[0], data, length);
-
-   glBindAttribLocation(p->prog, SHAD_VERTEX, "vertex");
-   glBindAttribLocation(p->prog, SHAD_COLOR,  "color");
-   glBindAttribLocation(p->prog, SHAD_TEXUV,  "tex_coord");
-   glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2");
-   glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3");
-   glBindAttribLocation(p->prog, SHAD_TEXM,   "tex_coordm");
-
-   glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (!ok)
-     {
-        gl_compile_link_error(p->prog, "load a program object");
-        ERR("Abort load of program (%s)", pname);
-        goto finish;
-     }
-
-   res = 1;
-
-finish:
-   if (formats) free(formats);
-   if (data) free(data);
-   if ((!res) && (p->prog))
-     {
-        glDeleteProgram(p->prog);
-        p->prog = 0;
-     }
-   return res;
-}
-
-static int
-_evas_gl_common_shader_program_binary_save(Evas_GL_Program *p,
-                                           const char *pname,
-                                           Eet_File *ef)
-{
-   void* data = NULL;
-   GLenum format;
-   int length = 0, size = 0;
-
-   if (!glsym_glGetProgramBinary) return 0;
-
-   glGetProgramiv(p->prog, GL_PROGRAM_BINARY_LENGTH, &length);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (length <= 0) return 0;
-
-   data = malloc(length);
-   if (!data) return 0;
-
-   glsym_glGetProgramBinary(p->prog, length, &size, &format, data);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   if (length != size)
-     {
-        free(data);
-        return 0;
-     }
-
-   if (eet_write(ef, pname, data, length, 0) < 0)
-     {
-        if (data) free(data);
-        return 0;
-     }
-   if (data) free(data);
-   return 1;
-}
-
-static int
-_evas_gl_common_shader_program_source_init(Evas_GL_Program *p,
-                                           Evas_GL_Program_Source *vert,
-                                           Evas_GL_Program_Source *frag,
-                                           const char *name)
-{
-   GLint ok;
-
-   p->vert = glCreateShader(GL_VERTEX_SHADER);
-   p->frag = glCreateShader(GL_FRAGMENT_SHADER);
-#if defined (GLES_VARIETY_S3C6410)
-   glShaderBinary(1, &(p->vert), 0, vert->bin, vert->bin_size);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glShaderBinary(1, &(p->frag), 0, frag->bin, frag->bin_size);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#else
-   glShaderSource(p->vert, 1,
-                  (const char **)&(vert->src), NULL);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glCompileShader(p->vert);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   ok = 0;
-   glGetShaderiv(p->vert, GL_COMPILE_STATUS, &ok);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (!ok)
-     {
-        gl_compile_link_error(p->vert, "compile vertex shader");
-        ERR("Abort compile of shader vert (%s): %s", name, vert->src);
-        return 0;
-     }
-   glShaderSource(p->frag, 1,
-                  (const char **)&(frag->src), NULL);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glCompileShader(p->frag);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   ok = 0;
-   glGetShaderiv(p->frag, GL_COMPILE_STATUS, &ok);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (!ok)
-     {
-        gl_compile_link_error(p->frag, "compile fragment shader");
-        ERR("Abort compile of shader frag (%s): %s", name, frag->src);
-        return 0;
-     }
-#endif
-   p->prog = glCreateProgram();
-#if defined(GLES_VARIETY_S3C6410) || defined(GLES_VARIETY_SGX)
-#else
-   if ((glsym_glGetProgramBinary) && (glsym_glProgramParameteri))
-      glsym_glProgramParameteri(p->prog, GL_PROGRAM_BINARY_RETRIEVABLE_HINT,
-                                GL_TRUE);
-#endif
-   glAttachShader(p->prog, p->vert);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glAttachShader(p->prog, p->frag);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glBindAttribLocation(p->prog, SHAD_VERTEX, "vertex");
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindAttribLocation(p->prog, SHAD_COLOR,  "color");
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindAttribLocation(p->prog, SHAD_TEXUV,  "tex_coord");
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2");
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3");
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glLinkProgram(p->prog);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   ok = 0;
-   glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (!ok)
-     {
-        gl_compile_link_error(p->prog, "link fragment and vertex shaders");
-        ERR("Abort compile of shader frag (%s): %s", name, frag->src);
-        ERR("Abort compile of shader vert (%s): %s", name, vert->src);
-        return 0;
-     }
-   return 1;
-}
-
-#define SHADER_SOURCE_LINE(Big, Small) \
-  { SHADER_##Big, &(shader_##Small##_vert_src), &(shader_##Small##_frag_src), #Small }
-
-#define SHADER_SOURCE_FILTER_LINE(Big, Small) \
-  { SHADER_##Big, &(shader_img_vert_src), &(shader_##Small##_frag_src), #Small }
-
-static const struct {
-  Evas_GL_Shader id;
-  Evas_GL_Program_Source *vert;
-  Evas_GL_Program_Source *frag;
-  const char *name;
-} _shaders_source[] = {
-  SHADER_SOURCE_LINE(RECT, rect),
-  SHADER_SOURCE_LINE(FONT, font),
-  SHADER_SOURCE_LINE(IMG, img),
-  SHADER_SOURCE_LINE(IMG_NOMUL, img_nomul),
-  SHADER_SOURCE_LINE(IMG_BGRA, img_bgra),
-  SHADER_SOURCE_LINE(IMG_BGRA_NOMUL, img_bgra_nomul),
-  SHADER_SOURCE_LINE(IMG_MASK, img_mask),
-  SHADER_SOURCE_LINE(YUV, yuv),
-  SHADER_SOURCE_LINE(YUV_NOMUL, yuv_nomul),
-  SHADER_SOURCE_LINE(YUY2, yuy2),
-  SHADER_SOURCE_LINE(YUY2_NOMUL, yuy2_nomul),
-  SHADER_SOURCE_LINE(NV12, nv12),
-  SHADER_SOURCE_LINE(NV12_NOMUL, nv12_nomul),
-  SHADER_SOURCE_LINE(TEX, tex),
-  SHADER_SOURCE_LINE(TEX_NOMUL, tex_nomul),
-   /* Most of the filters use the image fragment shader */
-  SHADER_SOURCE_FILTER_LINE(FILTER_INVERT, filter_invert),
-  SHADER_SOURCE_FILTER_LINE(FILTER_INVERT_NOMUL, filter_invert_nomul),
-  SHADER_SOURCE_FILTER_LINE(FILTER_INVERT_BGRA, filter_invert_bgra),
-  SHADER_SOURCE_FILTER_LINE(FILTER_INVERT_BGRA_NOMUL, filter_invert_bgra_nomul),
-  SHADER_SOURCE_FILTER_LINE(FILTER_GREYSCALE, filter_greyscale),
-  SHADER_SOURCE_FILTER_LINE(FILTER_GREYSCALE_NOMUL, filter_greyscale_nomul),
-  SHADER_SOURCE_FILTER_LINE(FILTER_GREYSCALE_BGRA, filter_greyscale_bgra),
-  SHADER_SOURCE_FILTER_LINE(FILTER_GREYSCALE_BGRA_NOMUL, filter_greyscale_bgra_nomul),
-  SHADER_SOURCE_FILTER_LINE(FILTER_SEPIA, filter_sepia),
-  SHADER_SOURCE_FILTER_LINE(FILTER_SEPIA_NOMUL, filter_sepia_nomul),
-  SHADER_SOURCE_FILTER_LINE(FILTER_SEPIA_BGRA, filter_sepia_bgra),
-  SHADER_SOURCE_FILTER_LINE(FILTER_SEPIA_BGRA_NOMUL, filter_sepia_bgra_nomul)/* , */
-  /* SHADER_SOURCE_LINE(FILTER_BLUR, filter_blur), */
-  /* SHADER_SOURCE_LINE(FILTER_BLUR_NOMUL, filter_blur_nomul), */
-  /* SHADER_SOURCE_LINE(FILTER_BLUR_BGRA, filter_blur_bgra), */
-  /* SHADER_SOURCE_LINE(FILTER_BLUR_BGRA_NOMUL, filter_blur_bgra_nomul) */
-};
-
-static int
-_evas_gl_common_shader_source_init(Evas_GL_Shared *shared)
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof (_shaders_source) / sizeof (_shaders_source[0]); ++i)
-    if (!_evas_gl_common_shader_program_source_init(&(shared->shader[_shaders_source[i].id]),
-                                                    _shaders_source[i].vert,
-                                                    _shaders_source[i].frag,
-                                                    _shaders_source[i].name))
-        return 0;
-
-   return 1;
-}
-
-static int
-_evas_gl_common_shader_binary_init(Evas_GL_Shared *shared)
-{
-   /* check eet */
-   Eet_File *et = NULL;
-   char bin_dir_path[PATH_MAX];
-   char bin_file_path[PATH_MAX];
-   unsigned int i;
-
-   if (!_evas_gl_shader_dir_check(bin_dir_path, sizeof(bin_dir_path)))
-      return 0;
-
-   if (!_evas_gl_shader_file_check(bin_dir_path, bin_file_path,
-                                   sizeof(bin_dir_path)))
-      return 0;
-
-   /* use eet */
-   if (!eet_init()) return 0;
-   et = eet_open(bin_file_path, EET_FILE_MODE_READ);
-   if (!et) goto error;
-
-   for (i = 0; i < sizeof (_shaders_source) / sizeof (_shaders_source[0]); ++i)
-     if (!_evas_gl_common_shader_program_binary_init(&(shared->shader[_shaders_source[i].id]),
-                                                     _shaders_source[i].name,
-                                                     et))
-       goto error;
-
-   if (et) eet_close(et);
-   eet_shutdown();
-   return 1;
-
-error:
-   if (et) eet_close(et);
-   eet_shutdown();
-   return 0;
-}
-
-static int
-_evas_gl_common_shader_binary_save(Evas_GL_Shared *shared)
-{
-   /* check eet */
-   Eet_File *et = NULL; //check eet file
-   int tmpfd;
-   int res = 0;
-   char bin_dir_path[PATH_MAX];
-   char bin_file_path[PATH_MAX];
-   char tmp_file[PATH_MAX];
-   unsigned int i;
-
-   if (!_evas_gl_shader_dir_check(bin_dir_path, sizeof(bin_dir_path)))
-      res = _evas_gl_shader_file_mkpath(bin_dir_path);
-   if (!res) return 0; /* we can't make directory */
-
-   _evas_gl_shader_file_check(bin_dir_path, bin_file_path,
-                              sizeof(bin_dir_path));
-
-   /* use mkstemp for writing */
-   snprintf(tmp_file, sizeof(tmp_file), "%s.XXXXXX", bin_file_path);
-   tmpfd = mkstemp(tmp_file);
-   if (tmpfd < 0) goto error;
-   close(tmpfd);
-
-   /* use eet */
-   if (!eet_init()) goto error;
-
-   et = eet_open(tmp_file, EET_FILE_MODE_WRITE);
-   if (!et) goto error;
-
-   for (i = 0; i < sizeof (_shaders_source) / sizeof (_shaders_source[0]); ++i)
-     if (!_evas_gl_common_shader_program_binary_save(&(shared->shader[_shaders_source[i].id]),
-                                                     _shaders_source[i].name,
-                                                     et))
-       goto error;
-
-   if (eet_close(et) != EET_ERROR_NONE) goto error;
-   if (rename(tmp_file,bin_file_path) < 0) goto error;
-   eet_shutdown();
-   return 1;
-
-error:
-   if (et) eet_close(et);
-   if (_evas_gl_shader_file_exists(tmp_file)) unlink(tmp_file);
-   eet_shutdown();
-   return 0;
-}
-
-int
-evas_gl_common_shader_program_init(Evas_GL_Shared *shared)
-{
-   // gl support binary shader and get env of binary shader path
-   if (shared->info.bin_program &&
-       _evas_gl_common_shader_binary_init(shared)) return 1;
-   /* compile all shader.*/
-   if (!_evas_gl_common_shader_source_init(shared)) return 0;
-   /* success compile all shader. if gl support binary shader, we need to save */
-   if (shared->info.bin_program) _evas_gl_common_shader_binary_save(shared);
-   return 1;
-}
-
-void
-evas_gl_common_shader_program_init_done(void)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glReleaseShaderCompiler();
-#endif
-}
-
-void
-evas_gl_common_shader_program_shutdown(Evas_GL_Program *p)
-{
-   if (p->vert) glDeleteShader(p->vert);
-   if (p->frag) glDeleteShader(p->frag);
-   if (p->prog) glDeleteProgram(p->prog);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c
deleted file mode 100644
index 8162cd1..0000000
--- a/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c
+++ /dev/null
@@ -1,1669 +0,0 @@
-#include "evas_gl_private.h"
-
-static const GLenum rgba_fmt   = GL_RGBA;
-static const GLenum rgba_ifmt  = GL_RGBA;
-//#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-//static const GLenum rgb_fmt    = GL_RGBA;
-//static const GLenum rgb_ifmt   = GL_RGBA;
-//#else
-static const GLenum rgb_fmt    = GL_RGBA;
-static const GLenum rgb_ifmt   = GL_RGB;
-//#endif
-#ifdef GL_BGRA
-# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-static const GLenum bgra_fmt   = GL_BGRA;
-static const GLenum bgra_ifmt  = GL_BGRA;
-static const GLenum bgr_fmt    = GL_BGRA;
-static const GLenum bgr_ifmt   = GL_BGRA;
-# else
-static const GLenum bgra_fmt   = GL_BGRA;
-static const GLenum bgra_ifmt  = GL_RGBA;
-static const GLenum bgr_fmt    = GL_BGRA;
-static const GLenum bgr_ifmt   = GL_RGB;
-# endif
-#endif
-static const GLenum alpha_fmt      = GL_ALPHA;
-static const GLenum alpha_ifmt     = GL_ALPHA;
-static const GLenum lum_fmt        = GL_LUMINANCE;
-static const GLenum lum_ifmt       = GL_LUMINANCE;
-static const GLenum lum_alpha_fmt  = GL_LUMINANCE_ALPHA;
-static const GLenum lum_alpha_ifmt = GL_LUMINANCE_ALPHA;
-static const GLenum rgba8_ifmt     = GL_RGBA;
-static const GLenum rgba8_fmt      = GL_BGRA;
-
-static struct {
-   struct {
-      int num, pix;
-   } c, a, v, r, n, d;
-} texinfo = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
-
-static void
-_print_tex_count(void)
-{
-   if (getenv("EVAS_GL_MEMINFO"))
-     {
-        fprintf(stderr,
-                "T: c:%i/%ik | a:%i/%ik | v:%i/%ik | r:%i/%ik | n:%i/%ik | d:%i/%ik\n",
-                texinfo.c.num, (texinfo.c.pix * 4) / 1024,
-                texinfo.a.num, (texinfo.a.pix    ) / 1024,
-                texinfo.v.num, (texinfo.v.pix    ) / 1024,
-                texinfo.r.num, (texinfo.r.pix * 4) / 1024,
-                texinfo.n.num, (texinfo.n.pix * 4) / 1024,
-                texinfo.d.num, (texinfo.d.pix * 4) / 1024
-               );
-     }
-}
-
-static int
-_nearest_pow2(int num)
-{
-   unsigned int n = num - 1;
-   n |= n >> 1;
-   n |= n >> 2;
-   n |= n >> 4;
-   n |= n >> 8;
-   n |= n >> 16;
-   return n + 1;
-}
-
-static void
-_tex_adjust(Evas_Engine_GL_Context *gc, int *w, int *h)
-{
-   if (gc->shared->info.tex_npo2) return;
-   /*if (gc->shared->info.tex_rect) return;*/
-   *w = _nearest_pow2(*w);
-   *h = _nearest_pow2(*h);
-}
-
-static int
-_tex_round_slot(Evas_Engine_GL_Context *gc, int h)
-{
-   if (!gc->shared->info.tex_npo2)
-     h = _nearest_pow2(h);
-   return (h + gc->shared->info.tune.atlas.slot_size - 1) /
-      gc->shared->info.tune.atlas.slot_size;
-}
-
-static int
-_tex_format_index(GLuint format)
-{
-   switch (format)
-     {
-     case GL_RGBA:
-#ifdef GL_BGRA
-     case GL_BGRA:
-#endif
-        return 0;
-     case GL_RGB:
-        return 1;
-     case GL_ALPHA:
-        return 2;
-     case GL_LUMINANCE: // never used in atlas
-        return 3;
-     default:
-        return 0;
-     }
-   return 0;
-}
-
-static void
-_tex_2d(int intfmt, int w, int h, int fmt, int type)
-{
-#ifdef GL_TEXTURE_INTERNAL_FORMAT
-   int intfmtret = -1;
-#endif   
-   glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_TEXTURE_INTERNAL_FORMAT
-// this is not in opengles!!! hrrrm   
-   glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, 
-                            GL_TEXTURE_INTERNAL_FORMAT, &intfmtret);
-   if (intfmtret != intfmt)
-     {
-        ERR("Fail tex alloc %ix%i", w, h);
-//        XXX send async err to evas
-     }
-#endif   
-}
-
-static void
-_tex_sub_2d(int x, int y, int w, int h, int fmt, int type, const void *pix)
-{
-   glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-}
-
-static Evas_GL_Texture_Pool *
-_pool_tex_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, GLenum format)
-{
-   Evas_GL_Texture_Pool *pt;
-
-   pt = calloc(1, sizeof(Evas_GL_Texture_Pool));
-   if (!pt) return NULL;
-   h = _tex_round_slot(gc, h) * gc->shared->info.tune.atlas.slot_size;
-   _tex_adjust(gc, &w, &h);
-   pt->gc = gc;
-   pt->w = w;
-   pt->h = h;
-   pt->intformat = intformat;
-   pt->format = format;
-   pt->dataformat = GL_UNSIGNED_BYTE;
-   pt->references = 0;
-
-   if (format == alpha_fmt)
-      {
-         texinfo.a.num++;
-         texinfo.a.pix += pt->w * pt->h;
-      }
-   else if (format == lum_fmt)
-      {
-         texinfo.v.num++;
-         texinfo.v.pix += pt->w * pt->h;
-      }
-   else
-      {
-         texinfo.c.num++;
-         texinfo.c.pix += pt->w * pt->h;
-      }
-
-   _print_tex_count();
-
-   glGenTextures(1, &(pt->texture));
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(pt->intformat, w, h, pt->format, pt->dataformat);
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   return pt;
-}
-
-static int
-_pool_tex_alloc(Evas_GL_Texture_Pool *pt, int w, int h __UNUSED__, int *u, int *v, Eina_List **l_after)
-{
-   Eina_List *l;
-   Evas_GL_Texture *tex, *tex2;
-   int nx, d, b;
-
-   if (pt->allocations)
-     {
-        tex = pt->allocations->data;
-        // if firest tex is not at left edge...
-        if (tex->x > (0 + 1))
-          {
-             if ((tex->x - 1) >= w)
-               {
-                  *u = 0;
-                  *v = 0;
-                  *l_after = NULL;
-                  return 1;
-               }
-          }
-     }
-   EINA_LIST_FOREACH(pt->allocations, l, tex)
-     {
-        b = tex->x + tex->w + 2;
-        if (l->next)
-          {
-             tex2 = l->next->data;
-             nx = tex2->x - 1;
-          }
-        else
-          nx = pt->w - 1;
-        d = nx - b;
-        if (d >= w)
-          {
-             *u = b;
-             *v = 0;
-             *l_after = l;
-             return 1;
-          }
-     }
-   *l_after = NULL;
-   return 0;
-}
-
-static Evas_GL_Texture_Pool *
-_pool_tex_find(Evas_Engine_GL_Context *gc, int w, int h,
-               int intformat, int format, int *u, int *v,
-               Eina_List **l_after, int atlas_w)
-{
-   Evas_GL_Texture_Pool *pt = NULL;
-   Eina_List *l;
-   int th, th2;
-
-   if (atlas_w > gc->shared->info.max_texture_size)
-      atlas_w = gc->shared->info.max_texture_size;
-   if ((w > gc->shared->info.tune.atlas.max_w) ||
-       (h > gc->shared->info.tune.atlas.max_h))
-     {
-        pt = _pool_tex_new(gc, w, h, intformat, format);
-        gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, pt);
-        pt->slot = -1;
-        pt->fslot = -1;
-        pt->whole = 1;
-        *u = 0;
-        *v = 0;
-        *l_after = NULL;
-        return pt;
-     }
-
-   th = _tex_round_slot(gc, h);
-   th2 = _tex_format_index(intformat);
-   EINA_LIST_FOREACH(gc->shared->tex.atlas[th][th2], l, pt)
-     {
-        if (_pool_tex_alloc(pt, w, h, u, v, l_after))
-          {
-             gc->shared->tex.atlas[th][th2] =
-               eina_list_remove_list(gc->shared->tex.atlas[th][th2], l);
-             gc->shared->tex.atlas[th][th2] =
-               eina_list_prepend(gc->shared->tex.atlas[th][th2], pt);
-             return pt;
-          }
-     }
-   pt = _pool_tex_new(gc, atlas_w, h, intformat, format);
-   gc->shared->tex.atlas[th][th2] =
-     eina_list_prepend(gc->shared->tex.atlas[th][th2], pt);
-   pt->slot = th;
-   pt->fslot = th2;
-   *u = 0;
-   *v = 0;
-   *l_after = NULL;
-   return pt;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_new(Evas_Engine_GL_Context *gc, RGBA_Image *im)
-{
-   Evas_GL_Texture *tex;
-   Eina_List *l_after = NULL;
-   int u = 0, v = 0;
-
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex) return NULL;
-
-   tex->gc = gc;
-   tex->references = 1;
-
-   if (im->cache_entry.flags.alpha)
-     {
-        if (gc->shared->info.bgra)
-           tex->pt = _pool_tex_find(gc, im->cache_entry.w + 2,
-                                    im->cache_entry.h + 1, bgra_ifmt, bgra_fmt,
-                                    &u, &v, &l_after,
-                                    gc->shared->info.tune.atlas.max_alloc_size);
-        else
-           tex->pt = _pool_tex_find(gc, im->cache_entry.w + 2,
-                                    im->cache_entry.h + 1, rgba_ifmt, rgba_fmt,
-                                    &u, &v, &l_after,
-                                    gc->shared->info.tune.atlas.max_alloc_size);
-        tex->alpha = 1;
-     }
-   else
-     {
-        if (gc->shared->info.bgra)
-           tex->pt = _pool_tex_find(gc, im->cache_entry.w + 3,
-                                    im->cache_entry.h + 1, bgr_ifmt, bgr_fmt,
-                                    &u, &v, &l_after,
-                                    gc->shared->info.tune.atlas.max_alloc_size);
-        else
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-           tex->pt = _pool_tex_find(gc, im->cache_entry.w + 3,
-                                    im->cache_entry.h + 1, rgba_ifmt, rgba_fmt,
-                                    &u, &v, &l_after,
-                                    gc->shared->info.tune.atlas.max_alloc_size);
-#else
-           tex->pt = _pool_tex_find(gc, im->cache_entry.w + 3,
-                                    im->cache_entry.h + 1, rgb_ifmt, rgb_fmt,
-                                    &u, &v, &l_after,
-                                    gc->shared->info.tune.atlas.max_alloc_size);
-#endif
-     }
-   if (!tex->pt)
-     {
-        free(tex);
-        return NULL;
-     }
-   tex->x = u + 1;
-   tex->y = v;
-   tex->w = im->cache_entry.w;
-   tex->h = im->cache_entry.h;
-   if (l_after)
-     tex->pt->allocations =
-     eina_list_append_relative_list(tex->pt->allocations, tex, l_after);
-   else
-     tex->pt->allocations =
-     eina_list_prepend(tex->pt->allocations, tex);
-   tex->pt->references++;
-   evas_gl_common_texture_update(tex, im);
-   return tex;
-}
-
-static Evas_GL_Texture_Pool *
-_pool_tex_render_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, int format)
-{
-   Evas_GL_Texture_Pool *pt;
-
-   pt = calloc(1, sizeof(Evas_GL_Texture_Pool));
-   if (!pt) return NULL;
-   h = _tex_round_slot(gc, h) * gc->shared->info.tune.atlas.slot_size;
-   _tex_adjust(gc, &w, &h);
-   pt->gc = gc;
-   pt->w = w;
-   pt->h = h;
-   pt->intformat = intformat;
-   pt->format = format;
-   pt->dataformat = GL_UNSIGNED_BYTE;
-   pt->render = 1;
-   pt->references = 0;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-# ifndef GL_FRAMEBUFFER
-#  define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
-# endif
-# ifndef GL_COLOR_ATTACHMENT0
-#  define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_OES
-# endif
-#else
-# ifndef GL_FRAMEBUFFER
-#  define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
-# endif
-# ifndef GL_COLOR_ATTACHMENT0
-#  define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
-# endif
-#endif
-   texinfo.r.num++;
-   texinfo.r.pix += pt->w * pt->h;
-
-   _print_tex_count();
-
-   glGenTextures(1, &(pt->texture));
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(pt->intformat, w, h, pt->format, pt->dataformat);
-
-   glsym_glGenFramebuffers(1, &(pt->fb));
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glsym_glBindFramebuffer(GL_FRAMEBUFFER, pt->fb);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glsym_glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pt->texture, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glsym_glBindFramebuffer(GL_FRAMEBUFFER, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   return pt;
-}
-
-static Evas_GL_Texture_Pool *
-_pool_tex_native_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, int format, Evas_GL_Image *im)
-{
-   Evas_GL_Texture_Pool *pt;
-
-   pt = calloc(1, sizeof(Evas_GL_Texture_Pool));
-   if (!pt) return NULL;
-   pt->gc = gc;
-#ifdef GL_TEXTURE_RECTANGLE_ARB
-   if (im->native.target == GL_TEXTURE_RECTANGLE_ARB)
-     {
-        printf("REEEEEEEEECT\n");
-        pt->w = w;
-        pt->h = h;
-     }
-   else
-#endif
-     {
-        // FIXME: handle po2 only textures
-        pt->w = w;
-        pt->h = h;
-     }
-   pt->intformat = intformat;
-   pt->format = format;
-   pt->dataformat = GL_UNSIGNED_BYTE;
-   pt->references = 0;
-   pt->native = 1;
-   texinfo.n.num++;
-   texinfo.n.pix += pt->w * pt->h;
-
-   _print_tex_count();
-
-   glGenTextures(1, &(pt->texture));
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(im->native.target, pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-#else
-   if (im->native.loose)
-     {
-        if (im->native.func.bind)
-          im->native.func.bind(im->native.func.data, im);
-     }
-#endif
-
-   glTexParameteri(im->native.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(im->native.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(im->native.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(im->native.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(im->native.target, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(im->native.target, gc->pipe[0].shader.cur_tex);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   return pt;
-}
-
-static Evas_GL_Texture_Pool *
-_pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, int format)
-{
-   Evas_GL_Texture_Pool *pt = NULL;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   int fmt; // EGL_MAP_GL_TEXTURE_RGBA_SEC or EGL_MAP_GL_TEXTURE_RGB_SEC or bust
-   int pixtype; // EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC or bust
-   int attr[] =
-     {
-        EGL_MAP_GL_TEXTURE_WIDTH_SEC, 32,
-        EGL_MAP_GL_TEXTURE_HEIGHT_SEC, 32,
-        EGL_MAP_GL_TEXTURE_FORMAT_SEC, EGL_MAP_GL_TEXTURE_RGBA_SEC,
-        EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC, EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC,
-        EGL_NONE
-     };
-   void *egldisplay;
-
-   if (intformat != format) return NULL;
-
-   switch (intformat)
-     {
-#ifdef EGL_MAP_GL_TEXTURE_LUMINANCE_SEC
-     case GL_LUMINANCE: attr[5] = EGL_MAP_GL_TEXTURE_LUMINANCE_SEC; break;
-#endif
-#ifdef EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC
-     case GL_LUMINANCE_ALPHA: attr[5] = EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC; break;
-#endif
-     case GL_RGBA: attr[5] = EGL_MAP_GL_TEXTURE_RGBA_SEC; break;
-     case GL_BGRA: attr[5] = EGL_MAP_GL_TEXTURE_BGRA_SEC; break;
-     default: fprintf(stderr, "unknown format\n"); return NULL;
-     }
-
-   pt = calloc(1, sizeof(Evas_GL_Texture_Pool));
-   if (!pt) return NULL;
-   h = _tex_round_slot(gc, h) * gc->shared->info.tune.atlas.slot_size;
-   _tex_adjust(gc, &w, &h);
-   pt->gc = gc;
-   pt->w = w;
-   pt->h = h;
-   pt->intformat = intformat;
-   pt->format = format;
-   pt->dataformat = GL_UNSIGNED_BYTE;
-   pt->render = 1;
-   pt->references = 0;
-   texinfo.d.num++;
-   texinfo.d.pix += pt->w * pt->h;
-
-   _print_tex_count();
-
-   glGenTextures(1, &(pt->texture));
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   egldisplay = pt->gc->egldisp;
-
-   attr[1] = pt->w;
-   attr[3] = pt->h;
-
-   // FIXME: seems a bit slower than i'd like - maybe too many flushes?
-   // FIXME: YCbCr no support as yet
-   pt->dyn.img = secsym_eglCreateImage(egldisplay,
-                                       EGL_NO_CONTEXT,
-                                       EGL_MAP_GL_TEXTURE_2D_SEC,
-                                       0, attr);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (!pt->dyn.img)
-     {
-        glBindTexture(GL_TEXTURE_2D, 0);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        glDeleteTextures(1, &(pt->texture));
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        free(pt);
-        return NULL;
-     }
-   if (secsym_eglGetImageAttribSEC(egldisplay,
-                                   pt->dyn.img,
-                                   EGL_MAP_GL_TEXTURE_WIDTH_SEC,
-                                   &(pt->dyn.w)) != EGL_TRUE) goto error;
-   if (secsym_eglGetImageAttribSEC(egldisplay,
-                                   pt->dyn.img,
-                                   EGL_MAP_GL_TEXTURE_HEIGHT_SEC,
-                                   &(pt->dyn.h)) != EGL_TRUE) goto error;
-   if (secsym_eglGetImageAttribSEC(egldisplay,
-                                   pt->dyn.img,
-                                   EGL_MAP_GL_TEXTURE_STRIDE_IN_BYTES_SEC,
-                                   &(pt->dyn.stride)) != EGL_TRUE) goto error;
-   if (secsym_eglGetImageAttribSEC(egldisplay,
-                                   pt->dyn.img,
-                                   EGL_MAP_GL_TEXTURE_FORMAT_SEC,
-                                   &(fmt)) != EGL_TRUE) goto error;
-
-   if (secsym_eglGetImageAttribSEC(egldisplay,
-                                   pt->dyn.img,
-                                   EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC,
-                                   &(pixtype)) != EGL_TRUE) goto error;
-
-   if (pixtype != EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC) goto error;
-
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#else
-   gc = NULL;
-   w = 0;
-   h = 0;
-   intformat = 0;
-   format = 0;
-#endif
-   return pt;
-
-/* ERROR HANDLING */
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-error:
-  secsym_eglDestroyImage(egldisplay, pt->dyn.img);
-  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-  pt->dyn.img = NULL;
-  glBindTexture(GL_TEXTURE_2D, 0);
-  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-  glDeleteTextures(1, &(pt->texture));
-  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-  free(pt);
-  return NULL;
-#endif   
-}
-
-void
-evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt)
-{
-   if (!pt->gc) return;
-
-   if (pt->format == alpha_fmt)
-      {
-         texinfo.a.num--;
-         texinfo.a.pix -= pt->w * pt->h;
-      }
-   else if (pt->format == lum_fmt)
-      {
-         texinfo.v.num--;
-         texinfo.v.pix -= pt->w * pt->h;
-      }
-   else if (pt->dyn.img)
-      {
-         texinfo.d.num--;
-         texinfo.d.pix -= pt->w * pt->h;
-      }
-   else if (pt->render)
-      {
-         texinfo.r.num--;
-         texinfo.r.pix -= pt->w * pt->h;
-      }
-   else if (pt->native)
-      {
-         texinfo.n.num--;
-         texinfo.n.pix -= pt->w * pt->h;
-      }
-   else
-      {
-         texinfo.c.num--;
-         texinfo.c.pix -= pt->w * pt->h;
-      }
-
-   _print_tex_count();
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   if (pt->dyn.img)
-     {
-        if (pt->dyn.checked_out > 0)
-          secsym_eglUnmapImageSEC(pt->gc->egldisp, pt->dyn.img);
-        secsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img);
-        pt->dyn.img = NULL;
-        pt->dyn.data = NULL;
-        pt->dyn.w = 0;
-        pt->dyn.h = 0;
-        pt->dyn.stride = 0;
-        pt->dyn.checked_out = 0;
-     }
-#endif
-
-   glDeleteTextures(1, &(pt->texture));
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   if (pt->fb)
-     {
-        glsym_glDeleteFramebuffers(1, &(pt->fb));
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        pt->fb = 0;
-     }
-   while (pt->allocations)
-      pt->allocations =
-      eina_list_remove_list(pt->allocations, pt->allocations);
-   pt->texture = 0;
-   pt->gc = NULL;
-   pt->w = 0;
-   pt->h = 0;
-}
-
-static void
-pt_unref(Evas_GL_Texture_Pool *pt)
-{
-   if (!pt) return;
-   if (!pt->gc) return;
-   pt->references--;
-   if (pt->references != 0) return;
-
-   if (!((pt->render) || (pt->native)))
-     {
-        if (pt->whole)
-           pt->gc->shared->tex.whole =
-           eina_list_remove(pt->gc->shared->tex.whole, pt);
-        else
-           pt->gc->shared->tex.atlas [pt->slot][pt->fslot] =
-           eina_list_remove(pt->gc->shared->tex.atlas[pt->slot][pt->fslot], pt);
-     }
-   evas_gl_texture_pool_empty(pt);
-   free(pt);
-}
-
-static void
-pt_link(Evas_Engine_GL_Context *gc, Evas_GL_Texture *tex, Evas_GL_Texture_Pool *pt)
-{
-   gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, pt);
-   pt->slot = -1;
-   pt->fslot = -1;
-   pt->whole = 1;
-   pt->allocations = eina_list_prepend(pt->allocations, tex);
-   pt->references++;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_native_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha, Evas_GL_Image *im)
-{
-   Evas_GL_Texture *tex;
-
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex) return NULL;
-
-   tex->gc = gc;
-   tex->references = 1;
-   tex->alpha = alpha;
-   if (alpha)
-     {
-        if (gc->shared->info.bgra)
-          tex->pt = _pool_tex_native_new(gc, w, h, rgba_ifmt, rgba_fmt, im);
-        else
-          tex->pt = _pool_tex_native_new(gc, w, h, rgba_ifmt, rgba_fmt, im);
-     }
-   else
-     {
-        if (gc->shared->info.bgra)
-          tex->pt = _pool_tex_native_new(gc, w, h, rgb_ifmt, rgb_fmt, im);
-        else
-          tex->pt = _pool_tex_native_new(gc, w, h, rgb_ifmt, rgb_fmt, im);
-     }
-   if (!tex->pt)
-     {
-        free(tex);
-        return NULL;
-     }
-   tex->x = 0;
-   tex->y = 0;
-   tex->w = w;
-   tex->h = h;
-   tex->pt->references++;
-   return tex;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_render_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, int alpha)
-{
-   Evas_GL_Texture *tex;
-
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex) return NULL;
-
-   tex->gc = gc;
-   tex->references = 1;
-   tex->alpha = alpha;
-   if (alpha)
-     {
-        if (gc->shared->info.bgra)
-          tex->pt = _pool_tex_render_new(gc, w, h, rgba_ifmt, rgba_fmt);
-        else
-          tex->pt = _pool_tex_render_new(gc, w, h, rgba_ifmt, rgba_fmt);
-     }
-   else
-     {
-        if (gc->shared->info.bgra)
-          tex->pt = _pool_tex_render_new(gc, w, h, rgb_ifmt, rgb_fmt);
-        else
-          tex->pt = _pool_tex_render_new(gc, w, h, rgb_ifmt, rgb_fmt);
-     }
-   if (!tex->pt)
-     {
-        free(tex);
-        return NULL;
-     }
-   tex->x = 0;
-   tex->y = 0;
-   tex->w = w;
-   tex->h = h;
-   tex->pt->references++;
-   return tex;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_dynamic_new(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
-{
-   Evas_GL_Texture *tex;
-
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex) return NULL;
-
-   tex->gc = gc;
-   tex->references = 1;
-   tex->alpha = im->alpha;
-   tex->x = 0;
-   tex->y = 0;
-   tex->w = im->w;
-   tex->h = im->h;
-   if (tex->alpha)
-     {
-        if (gc->shared->info.bgra)
-          tex->pt = _pool_tex_dynamic_new(gc, tex->w, tex->h, bgra_ifmt, bgra_fmt);
-        else
-          tex->pt = _pool_tex_dynamic_new(gc, tex->w, tex->h, bgra_ifmt, bgra_fmt);
-     }
-   else
-     {
-        if (gc->shared->info.bgra)
-          tex->pt = _pool_tex_dynamic_new(gc, tex->w, tex->h, bgra_ifmt, bgra_fmt);
-        else
-          tex->pt = _pool_tex_dynamic_new(gc, tex->w, tex->h, bgra_ifmt, bgra_fmt);
-     }
-   if (!tex->pt)
-     {
-        free(tex);
-        return NULL;
-     }
-   tex->pt->references++;
-   return tex;
-}
-
-void
-evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
-{
-   GLuint fmt;
-
-   if (tex->alpha != im->cache_entry.flags.alpha)
-     {
-        tex->pt->allocations = eina_list_remove(tex->pt->allocations, tex);
-        pt_unref(tex->pt);
-        tex->alpha = im->cache_entry.flags.alpha;
-        if (tex->alpha)
-          {
-             if (tex->gc->shared->info.bgra)
-               tex->pt = _pool_tex_render_new(tex->gc, tex->w, tex->h, bgra_ifmt, bgra_fmt);
-             else
-               tex->pt = _pool_tex_render_new(tex->gc, tex->w, tex->h, rgba_ifmt, rgba_fmt);
-          }
-        else
-          {
-             if (tex->gc->shared->info.bgra)
-               tex->pt = _pool_tex_render_new(tex->gc, tex->w, tex->h, bgr_ifmt, bgr_fmt);
-             else
-               tex->pt = _pool_tex_render_new(tex->gc, tex->w, tex->h, rgb_ifmt, rgb_fmt);
-          }
-     }
-   if (!tex->pt) return;
-   if (!im->image.data) return;
-
-   fmt = tex->pt->format;
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#endif
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-//   printf("tex upload %ix%i\n", im->cache_entry.w, im->cache_entry.h);
-   //  +-+
-   //  +-+
-   //
-   _tex_sub_2d(tex->x, tex->y,
-               im->cache_entry.w, im->cache_entry.h,
-               fmt, tex->pt->dataformat,
-               im->image.data);
-   //  xxx
-   //  xxx
-   //  ---
-   _tex_sub_2d(tex->x, tex->y + im->cache_entry.h,
-               im->cache_entry.w, 1,
-               fmt, tex->pt->dataformat,
-               im->image.data + ((im->cache_entry.h - 1) * im->cache_entry.w));
-   //  xxx
-   //  xxx
-   // o
-   _tex_sub_2d(tex->x - 1, tex->y + im->cache_entry.h,
-               1, 1,
-               fmt, tex->pt->dataformat,
-               im->image.data + ((im->cache_entry.h - 1) * im->cache_entry.w));
-   //  xxx
-   //  xxx
-   //     o
-   _tex_sub_2d(tex->x + im->cache_entry.w, tex->y + im->cache_entry.h,
-               1, 1,
-               fmt, tex->pt->dataformat,
-               im->image.data + ((im->cache_entry.h - 1) * im->cache_entry.w) + (im->cache_entry.w - 1));
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, im->cache_entry.w);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   // |xxx
-   // |xxx
-   //
-   _tex_sub_2d(tex->x - 1, tex->y,
-               1, im->cache_entry.h,
-               fmt, tex->pt->dataformat,
-               im->image.data);
-   //  xxx|
-   //  xxx|
-   //
-   _tex_sub_2d(tex->x + im->cache_entry.w, tex->y,
-               1, im->cache_entry.h,
-               fmt, tex->pt->dataformat,
-               im->image.data + (im->cache_entry.w - 1));
-#else
-     {
-        DATA32 *tpix, *ps, *pd;
-        int i;
-        
-        tpix = alloca(im->cache_entry.h * sizeof(DATA32));
-        pd = tpix;
-        ps = im->image.data;
-        for (i = 0; i < (int)im->cache_entry.h; i++)
-          {
-             *pd = *ps;
-             pd++;
-             ps += im->cache_entry.w;
-          }
-        // |xxx
-        // |xxx
-        //
-        _tex_sub_2d(tex->x - 1, tex->y,
-                    1, im->cache_entry.h,
-                    fmt, tex->pt->dataformat,
-                    tpix);
-        pd = tpix;
-        ps = im->image.data + (im->cache_entry.w - 1);
-        for (i = 0; i < (int)im->cache_entry.h; i++)
-          {
-             *pd = *ps;
-             pd++;
-             ps += im->cache_entry.w;
-          }
-        //  xxx|
-        //  xxx|
-        //
-        _tex_sub_2d(tex->x + im->cache_entry.w, tex->y,
-                    1, im->cache_entry.h,
-                    fmt, tex->pt->dataformat,
-                    tpix);
-     }
-#endif
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
-     {
-        glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-}
-
-void
-evas_gl_common_texture_free(Evas_GL_Texture *tex)
-{
-   if (!tex) return;
-   tex->references--;
-   if (tex->references != 0) return;
-   if (tex->double_buffer.pt[0])
-     {
-        tex->double_buffer.pt[0]->allocations = eina_list_remove(tex->double_buffer.pt[0]->allocations, tex);
-        tex->double_buffer.pt[1]->allocations = eina_list_remove(tex->double_buffer.pt[1]->allocations, tex);
-        tex->double_buffer.ptuv[0]->allocations = eina_list_remove(tex->double_buffer.ptuv[0]->allocations, tex);
-        tex->double_buffer.ptuv[1]->allocations = eina_list_remove(tex->double_buffer.ptuv[1]->allocations, tex);
-     }
-   else
-     {
-        if (tex->pt)
-          {
-             tex->pt->allocations = eina_list_remove(tex->pt->allocations, tex);
-             pt_unref(tex->pt);
-          }
-        if (tex->ptu)
-          {
-             tex->ptu->allocations = eina_list_remove(tex->ptu->allocations, tex);
-             pt_unref(tex->ptu);
-          }
-        if (tex->ptv)
-          {
-             tex->ptv->allocations = eina_list_remove(tex->ptv->allocations, tex);
-             pt_unref(tex->ptv);
-          }
-        if (tex->ptuv)
-          {
-             tex->ptuv->allocations = eina_list_remove(tex->ptuv->allocations, tex);
-             pt_unref(tex->ptuv);
-          }
-     }
-   free(tex);
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_alpha_new(Evas_Engine_GL_Context *gc, DATA8 *pixels,
-                                 unsigned int w, unsigned int h, int fh)
-{
-   Evas_GL_Texture *tex;
-   Eina_List *l_after = NULL;
-   int u = 0, v = 0;
-
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex) return NULL;
-
-   tex->gc = gc;
-   tex->references = 1;
-   tex->pt = _pool_tex_find(gc, w + 3, fh, alpha_ifmt, alpha_fmt, &u, &v,
-                            &l_after,
-                            gc->shared->info.tune.atlas.max_alloc_alpha_size);
-   if (!tex->pt)
-     {
-        free(tex);
-        return NULL;
-     }
-   tex->x = u + 1;
-   tex->y = v;
-   tex->w = w;
-   tex->h = h;
-   if (l_after)
-     tex->pt->allocations =
-     eina_list_append_relative_list(tex->pt->allocations, tex, l_after);
-   else
-     tex->pt->allocations = eina_list_prepend(tex->pt->allocations, tex);
-   tex->pt->references++;
-   evas_gl_common_texture_alpha_update(tex, pixels, w, h, fh);
-   return tex;
-}
-
-void
-evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels,
-                                    unsigned int w, unsigned int h, int fh __UNUSED__)
-{
-   if (!tex->pt) return;
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-#endif
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_sub_2d(tex->x, tex->y, w, h, tex->pt->format, tex->pt->dataformat,
-               pixels);
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
-     {
-        glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_yuv_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   Evas_GL_Texture *tex;
-
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex) return NULL;
-
-   tex->gc = gc;
-   tex->references = 1;
-   tex->ptu = _pool_tex_new(gc, w / 2 + 1, h / 2 + 1, lum_ifmt, lum_fmt);
-   if (!tex->ptu)
-     {
-        free(tex);
-        return NULL;
-     }
-   gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, tex->ptu);
-   tex->ptu->slot = -1;
-   tex->ptu->fslot = -1;
-   tex->ptu->whole = 1;
-   tex->ptv = _pool_tex_new(gc,  tex->ptu->w, tex->ptu->h, lum_ifmt, lum_fmt);
-   if (!tex->ptv)
-     {
-        pt_unref(tex->pt);
-        pt_unref(tex->ptu);
-        free(tex);
-        return NULL;
-     }
-   gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, tex->ptv);
-   tex->ptv->slot = -1;
-   tex->ptv->fslot = -1;
-   tex->ptv->whole = 1;
-   tex->pt = _pool_tex_new(gc, tex->ptu->w * 2, tex->ptu->h * 2, lum_ifmt, lum_fmt);
-   if (!tex->pt)
-     {
-        free(tex);
-        return NULL;
-     }
-   gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, tex->pt);
-   tex->pt->slot = -1;
-   tex->pt->fslot = -1;
-   tex->pt->whole = 1;
-   tex->x = 0;
-   tex->y = 0;
-   tex->w = w;
-   tex->h = h;
-   tex->pt->allocations = eina_list_prepend(tex->pt->allocations, tex);
-   tex->ptu->allocations = eina_list_prepend(tex->ptu->allocations, tex);
-   tex->ptv->allocations = eina_list_prepend(tex->ptv->allocations, tex);
-   tex->pt->references++;
-   tex->ptu->references++;
-   tex->ptv->references++;
-   evas_gl_common_texture_yuv_update(tex, rows, w, h);
-   return tex;
-}
-
-void
-evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   if (!tex->pt) return;
-   // FIXME: works on lowest size 4 pixel high buffers. must also be multiple of 2
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat);
-   _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
-   glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + (h / 2) + 1] - rows[h + (h / 2)]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat);
-   _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
-#else
-   unsigned int y;
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   if ((rows[1] - rows[0]) == (int)w)
-     _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   else
-     {
-        for (y = 0; y < h; y++)
-          _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
-     }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat);
-   if ((rows[h + 1] - rows[h]) == (int)(w / 2))
-     _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
-   else
-     {
-        for (y = 0; y < (h / 2); y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptu->format, tex->ptu->dataformat, rows[h + y]);
-     }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat);
-   if ((rows[h + (h / 2) + 1] - rows[h + (h / 2)]) == (int)(w / 2))
-     _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
-   else
-     {
-        for (y = 0; y < (h / 2); y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2) + y]);
-     }
-#endif
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
-     {
-        glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-}
-
-static Evas_GL_Texture *
-_evas_gl_common_texture_y2uv_new(Evas_Engine_GL_Context *gc,
-                                 unsigned int yw, unsigned int yh,
-                                 Eina_Bool uv2w, Eina_Bool uv2h,
-                                 GLenum y_ifmt, GLenum y_fmt,
-                                 GLenum uv_ifmt, GLenum uv_fmt,
-                                 Eina_Bool dynamic)
-{
-   Evas_GL_Texture_Pool *pt[2] = { NULL, NULL };
-   Evas_GL_Texture_Pool *ptuv[2] = { NULL, NULL };
-   Evas_GL_Texture *tex;
-   unsigned int uvw, uvh;
-
-   uvw = uv2w ? yw / 2 + 1 : yw + 1;
-   uvh = uv2h ? yh / 2 + 1 : yh + 1;
-
-   if (!dynamic)
-     {
-        ptuv[0] = _pool_tex_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
-        ptuv[1] = _pool_tex_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
-
-        if (ptuv[0] && ptuv[1])
-          {
-             pt[0] = _pool_tex_new(gc,
-                                   ptuv[0]->w * (uv2w ? 2 : 1),
-                                   ptuv[0]->h * (uv2h ? 2 : 1),
-                                   y_ifmt, y_fmt);
-             pt[1] = _pool_tex_new(gc,
-                                   ptuv[1]->w * (uv2w ? 2 : 1),
-                                   ptuv[1]->h * (uv2h ? 2 : 1),
-                                   y_ifmt, y_fmt);
-          }
-     }
-   else
-     {
-        ptuv[0] = _pool_tex_dynamic_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
-        ptuv[1] = _pool_tex_dynamic_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
-
-        if (ptuv[0] && ptuv[1])
-          {
-             pt[0] = _pool_tex_dynamic_new(gc,
-                                           ptuv[0]->w * (uv2w ? 2 : 1),
-                                           ptuv[0]->h * (uv2h ? 2 : 1),
-                                           y_ifmt, y_fmt);
-             pt[1] = _pool_tex_dynamic_new(gc,
-                                           ptuv[1]->w * (uv2w ? 2 : 1),
-                                           ptuv[1]->h * (uv2h ? 2 : 1),
-                                           y_ifmt, y_fmt);
-          }
-     }
-
-   if (!pt[0] || !pt[1] || !ptuv[0] || !ptuv[1])
-     goto on_error;
-
-   INF("YUV [%i, %i] => Y[%i, %i], UV[%i, %i]",
-       yw, yh,
-       pt[0]->w, pt[0]->h,
-       ptuv[0]->w, ptuv[0]->h);
-   tex = calloc(1, sizeof(Evas_GL_Texture));
-   if (!tex)
-     goto on_error;
-
-   tex->gc = gc;
-   tex->references = 1;
-   tex->pt = pt[0];
-   tex->ptuv = ptuv[0];
-   tex->dyn = dynamic;
-
-   pt_link(gc, tex, pt[0]);
-   pt_link(gc, tex, pt[1]);
-   pt_link(gc, tex, ptuv[0]);
-   pt_link(gc, tex, ptuv[1]);
-
-   tex->x = 0;
-   tex->y = 0;
-   tex->w = yw;
-   tex->h = yh;
-   tex->double_buffer.source = 0;
-   memcpy(tex->double_buffer.pt, pt, sizeof (Evas_GL_Texture_Pool *) * 2);
-   memcpy(tex->double_buffer.ptuv, ptuv, sizeof (Evas_GL_Texture_Pool *) * 2);
-
-   return tex;
-
- on_error:
-   pt_unref(pt[0]);
-   pt_unref(pt[1]);
-   pt_unref(ptuv[0]);
-   pt_unref(ptuv[1]);
-   return NULL;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_yuy2_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   Evas_GL_Texture *tex;
-
-   tex = _evas_gl_common_texture_y2uv_new(gc, w, h, EINA_TRUE, EINA_FALSE, lum_alpha_ifmt, lum_alpha_fmt, rgba8_ifmt, rgba8_fmt, 0);
-   evas_gl_common_texture_yuy2_update(tex, rows, w, h);
-   return tex;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_nv12_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   Evas_GL_Texture *tex;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   tex = _evas_gl_common_texture_y2uv_new(gc, w, h, EINA_TRUE, EINA_TRUE, lum_ifmt, lum_fmt, lum_alpha_ifmt, lum_alpha_fmt, 1);
-   if (!tex)
-#endif
-     tex = _evas_gl_common_texture_y2uv_new(gc, w, h, EINA_TRUE, EINA_TRUE, lum_ifmt, lum_fmt, lum_alpha_ifmt, lum_alpha_fmt, 0);
-
-   evas_gl_common_texture_nv12_update(tex, rows, w, h);
-   return tex;
-}
-
-Evas_GL_Texture *
-evas_gl_common_texture_nv12tiled_new(Evas_Engine_GL_Context *gc, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   Evas_GL_Texture *tex = NULL;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   tex = _evas_gl_common_texture_y2uv_new(gc, w, h, EINA_TRUE, EINA_TRUE, lum_ifmt, lum_fmt, lum_alpha_ifmt, lum_alpha_fmt, 1);
-   if (!tex)
-#endif
-     tex = _evas_gl_common_texture_y2uv_new(gc, w, h, EINA_TRUE, EINA_TRUE, lum_ifmt, lum_fmt, lum_alpha_ifmt, lum_alpha_fmt, 0);
-
-   evas_gl_common_texture_nv12tiled_update(tex, rows, w, h);
-   return tex;
-}
-
-void
-evas_gl_common_texture_yuy2_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   if (!tex->pt) return;
-   // FIXME: works on lowest size 4 pixel high buffers. must also be multiple of 2
-   unsigned int y;
-
-   tex->double_buffer.source = 1 - tex->double_buffer.source;
-   tex->pt = tex->double_buffer.pt[tex->double_buffer.source];
-   tex->ptuv = tex->double_buffer.ptuv[tex->double_buffer.source];
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   if ((rows[1] - rows[0]) == (int)w * 4)
-     _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   else
-     {
-        for (y = 0; y < h; y++)
-          _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
-     }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptuv->intformat, w / 2, h, tex->ptuv->format, tex->ptuv->dataformat);
-#if 0
-   /*
-     FIXME: this piece of code doesn't work anymore since texture width
-     is not anymore exactly w / 2. I don't understand why.
-   */
-   if ((rows[1] - rows[0]) == (int)(w * 2))
-     _tex_sub_2d(0, 0, w / 2, h, tex->ptuv->format, tex->ptuv->dataformat, rows[0]);
-   else
-#endif
-     {
-        for (y = 0; y < h; y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptuv->format, tex->ptuv->dataformat, rows[y]);
-     }
-
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
-     {
-        glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-}
-
-void
-evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   if (!tex->pt) return;
-
-   tex->double_buffer.source = 1 - tex->double_buffer.source;
-   tex->pt = tex->double_buffer.pt[tex->double_buffer.source];
-   tex->ptuv = tex->double_buffer.ptuv[tex->double_buffer.source];
-
-   // FIXME: works on lowest size 4 pixel high buffers. must also be multiple of 2
-#ifdef GL_UNPACK_ROW_LENGTH
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat);
-   _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
-#else
-   unsigned int y;
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-   if ((rows[1] - rows[0]) == (int)w)
-     _tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
-   else
-     {
-        for (y = 0; y < h; y++)
-          _tex_sub_2d(0, y, w, 1, tex->pt->format, tex->pt->dataformat, rows[y]);
-     }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-   _tex_2d(tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat);
-   if ((rows[h + 1] - rows[h]) == (int)(w / 2))
-     _tex_sub_2d(0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
-   else
-     {
-        for (y = 0; y < (h / 2); y++)
-          _tex_sub_2d(0, y, w / 2, 1, tex->ptuv->format, tex->ptuv->dataformat, rows[h + y]);
-     }
-#endif
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
-     {
-        glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
-        GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-     }
-}
-
-void
-evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned int w, unsigned int h)
-{
-   unsigned int mb_x, mb_y, mb_w, mb_h;
-   unsigned int base_h;
-
-   if (!tex->pt) return;
-
-   tex->double_buffer.source = 1 - tex->double_buffer.source;
-   tex->pt = tex->double_buffer.pt[tex->double_buffer.source];
-   tex->ptuv = tex->double_buffer.ptuv[tex->double_buffer.source];
-
-   mb_w = w / 64 + (w % 64 ? 1 : 0);
-   mb_h = h / 32 + (h % 32 ? 1 : 0);
-
-#if ( defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) )
-   if (tex->dyn)
-     {
-        char *texture_addr;
-        char *tmp;
-
-        texture_addr = secsym_eglMapImageSEC(tex->gc->egldisp, tex->pt->dyn.img);
-
-        /* Iterate each Y macroblock like we do in evas_convert_yuv.c */
-        for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
-          {
-             int step = 2;
-             int offset = 0;
-             int x = 0;
-             int rmb_x = 0;
-             int ry[2];
-
-             ry[0] = mb_y * 2 * 32 * tex->pt->dyn.stride;
-             ry[1] = ry[0] + 32 * tex->pt->dyn.stride;
-
-             for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32)
-               {
-                  unsigned int i;
-
-                  tmp = texture_addr + x + ry[offset];
-
-                  for (i = 0; i < 32 * 64; i += 64, tmp += tex->pt->dyn.stride)
-                    memcpy(tmp, rows[mb_y] + rmb_x + i, 64);
-
-                  step++;
-                  if ((step & 0x3) == 0)
-                    {
-                       offset = 1 - offset;
-                       x -= 64;
-                    }
-                  else
-                    {
-                       x += 64;
-                    }
-               }
-          }
-
-        if (mb_h & 0x1)
-          {
-             int rmb_x = 0;
-             int x = 0;
-             int ry;
-
-             ry = mb_y * 2 * 32 * tex->pt->dyn.stride;
-
-             for (mb_x = 0; mb_x < mb_w; mb_x++, x += 64, rmb_x += 64 * 32)
-               {
-                  unsigned int i;
-
-                  tmp = texture_addr + x + ry;
-
-                  for (i = 0; i < 32 * 64; i += 64, tmp += tex->pt->dyn.stride)
-                    memcpy(tmp, rows[mb_y] + rmb_x + i, 64);
-               }
-          }
-
-        secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->pt->dyn.img);
-
-        texture_addr = secsym_eglMapImageSEC(tex->gc->egldisp, tex->ptuv->dyn.img);
-
-        /* Iterate each UV macroblock like we do in evas_convert_yuv.c */
-        base_h = (mb_h >> 1) + (mb_h & 0x1);
-
-        /* h is always a multiple of 32 */
-        mb_h = h / 2;
-        mb_h = (mb_h / 32 + (mb_h % 32 ? 1 : 0));
-
-        mb_w = w / 2;
-        mb_w = (mb_w / 32 + (mb_w % 32 ? 1 : 0));
-
-        for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
-          {
-             int step = 2;
-             int offset = 0;
-             int x = 0;
-             int rmb_x = 0;
-             int ry[2];
-
-             ry[0] = mb_y * 2 * 32 * tex->ptuv->dyn.stride;
-             ry[1] = ry[0] + 32 * tex->ptuv->dyn.stride;
-
-             for (mb_x = 0; mb_x < mb_w * 4; mb_x++, rmb_x += 64 * 32)
-               {
-                  unsigned int i = 0;
-
-                  tmp = texture_addr + x + ry[offset];
-
-                  for (i = 0; i < 32 * 64; i += 64, tmp += tex->ptuv->dyn.stride)
-                    memcpy(tmp, rows[mb_y + base_h] + rmb_x + i, 64);
-
-                  step++;
-                  if ((step & 0x3) == 0)
-                    {
-                       offset = 1 - offset;
-                       x -= 64;
-                    }
-                  else
-                    {
-                       x += 64;
-                    }
-               }
-          }
-
-        if (mb_h & 0x1)
-          {
-             int rmb_x = 0;
-             int x = 0;
-             int ry;
-
-             ry = mb_y * 2 * 32 * tex->ptuv->dyn.stride;
-
-             for (mb_x = 0; mb_x < mb_w * 2; mb_x++, x += 64, rmb_x += 64 * 32)
-               {
-                  unsigned int i;
-
-                  tmp = texture_addr + x + ry;
-
-                  /* It has horizontaly half the pixels, but they are double the size*/
-                  for (i = 0; i < 32 * 64; i += 64, tmp += tex->ptuv->dyn.stride)
-                    memcpy(tmp, rows[mb_y + base_h] + rmb_x + i, 64);
-               }
-          }
-
-        secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->ptuv->dyn.img);
-        return ;
-     }
-#endif
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   // We are telling the driver to not swizzle back the buffer as we are going to replace all pixel
-   _tex_2d(tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat);
-
-   /* Iterate each Y macroblock like we do in evas_convert_yuv.c */
-   for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
-     {
-        int step = 2;
-        int offset = 0;
-        int x = 0;
-        int rmb_x = 0;
-        int ry[2];
-
-        ry[0] = mb_y * 2 * 32;
-        ry[1] = ry[0] + 32;
-
-        for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32)
-          {
-             _tex_sub_2d(x, ry[offset], 64, 32, tex->pt->format, tex->pt->dataformat, rows[mb_y] + rmb_x);
-
-             step++;
-             if ((step & 0x3) == 0)
-               {
-                  offset = 1 - offset;
-                  x -= 64;
-               }
-             else
-               {
-                  x += 64;
-               }
-          }
-     }
-
-   if (mb_h & 0x1)
-     {
-        int rmb_x = 0;
-        int x = 0;
-        int ry;
-
-        ry = mb_y * 2 * 32;
-
-        for (mb_x = 0; mb_x < mb_w; mb_x++, x += 64, rmb_x += 64 * 32)
-          _tex_sub_2d(x, ry, 64, 32, tex->pt->format, tex->pt->dataformat, rows[mb_y] + rmb_x);
-     }
-
-   glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
-   GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
-   _tex_2d(tex->ptuv->intformat, w, h, tex->ptuv->format, tex->ptuv->dataformat);
-
-   /* Iterate each UV macroblock like we do in evas_convert_yuv.c */
-   base_h = (mb_h >> 1) + (mb_h & 0x1);
-
-   /* h is always a multiple of 32 */
-   mb_h = h / 2;
-   mb_h = (mb_h / 32 + (mb_h % 32 ? 1 : 0));
-
-   mb_w = w / 2;
-   mb_w = (mb_w / 32 + (mb_w % 32 ? 1 : 0));
-
-   for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
-     {
-        int step = 2;
-        int offset = 0;
-        int x = 0;
-        int rmb_x = 0;
-        int ry[2];
-
-        ry[0] = mb_y * 2 * 32;
-        ry[1] = ry[0] + 32;
-
-        for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32)
-          {
-             _tex_sub_2d(x, ry[offset], 32, 32,
-                         tex->ptuv->format, tex->ptuv->dataformat,
-                         rows[mb_y + base_h] + rmb_x);
-             step++;
-             if ((step & 0x3) == 0)
-               {
-                  offset = 1 - offset;
-                  x -= 32;
-               }
-             else
-               {
-                  x += 32;
-               }
-          }
-     }
-
-   if (mb_h & 0x1)
-     {
-        int rmb_x = 0;
-        int x = 0;
-        int ry;
-
-        ry = mb_y * 2 * 32;
-
-        for (mb_x = 0; mb_x < mb_w; mb_x++, x += 32, rmb_x += 64 * 32)
-          _tex_sub_2d(x, ry, 64, 32, tex->ptuv->format, tex->ptuv->dataformat, rows[mb_y + base_h] + rmb_x);
-     }
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/compile-s3c6410.sh b/libraries/evas/src/modules/engines/gl_common/shader/compile-s3c6410.sh
deleted file mode 100755
index 450e5de..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/compile-s3c6410.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-ORIONEXE=/home/raster/Data/orion/orion.exe
-OPTS="-O --nolodcalc -lp"
-
-function compile()
-{
-  F=$1
-
-  make-c-str.sh $F"_frag.shd" > $F"_frag.h"
-  if test -f $F"_frag_s3c6410.asm"; then
-    wine $ORIONEXE -a $OPTS -f $F"_frag_s3c6410.asm"
-    make-c-bin.sh $F"_frag_s3c6410.bin" > $F"_frag_bin_s3c6410.h"
-    rm -f   $F"_frag_s3c6410.bin"   $F"_frag_s3c6410.h"
-  else
-    wine $ORIONEXE $OPTS -f $F"_frag.shd"
-    make-c-bin.sh $F"_frag.shd.bin" > $F"_frag_bin_s3c6410.h"
-    rm -f   $F"_frag.shd.bin"   $F"_frag.shd.asm"   $F"_frag.shd.h"
-  fi
-
-  make-c-str.sh $F"_vert.shd" > $F"_vert.h"
-  if test -f $F"_vert_s3c6410.asm"; then
-    wine $ORIONEXE -a $OPTS -v $F"_vert_s3c6410.asm"
-    make-c-bin.sh $F"_vert_s3c6410.bin" > $F"_vert_bin_s3c6410.h"
-    rm -f   $F"_vert_s3c6410.bin"   $F"_vert_s3c6410.h"
-  else
-    wine $ORIONEXE $OPTS -v $F"_vert.shd"
-    make-c-bin.sh $F"_vert.shd.bin" > $F"_vert_bin_s3c6410.h"
-    rm -f   $F"_vert.shd.bin"   $F"_vert.shd.asm"   $F"_vert.shd.h"
-  fi
-}
-
-compile rect
-compile font
-compile img
-compile img_nomul
-compile img_bgra
-compile img_bgra_nomul
-compile img_mask
-compile yuv
-compile yuv_nomul
-compile tex
-compile tex_nomul
-compile nv12
-compile nv12_nomul
-compile yuy2
-compile yuy2_nomul
-## FIXME: compile filter_*
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/compile-sgx.sh b/libraries/evas/src/modules/engines/gl_common/shader/compile-sgx.sh
deleted file mode 100755
index a96b58c..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/compile-sgx.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-function compile()
-{
-  F=$1
-
-  if [ -f $F".shd" ]; then
-    make-c-str.sh $F".shd" > $F".h"
-  fi
-  if [ -f $F"_frag.shd" ]; then
-    make-c-str.sh $F"_frag.shd" > $F"_frag.h"
-  fi
-  if [ -f $F"_vert.shd" ]; then
-    make-c-str.sh $F"_vert.shd" > $F"_vert.h"
-  fi
-}
-
-compile rect
-compile font
-compile img
-compile img_nomul
-compile img_bgra
-compile img_bgra_nomul
-compile img_mask
-compile yuv
-compile yuv_nomul
-compile tex
-compile tex_nomul
-compile filter_blur_bgra
-compile filter_blur_bgra_nomul
-compile filter_blur
-compile filter_blur_nomul
-compile filter_greyscale_bgra
-compile filter_greyscale_bgra_nomul
-compile filter_greyscale
-compile filter_greyscale_nomul
-compile filter_invert_bgra
-compile filter_invert_bgra_nomul
-compile filter_invert
-compile filter_invert_nomul
-compile filter_sepia_bgra
-compile filter_sepia_bgra_nomul
-compile filter_sepia
-compile filter_sepia_nomul
-compile nv12
-compile nv12_nomul
-compile yuy2
-compile yuy2_nomul
-
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur.h
deleted file mode 100644
index 7c3a369..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur.h
+++ /dev/null
@@ -1,24 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"uniform sampler1D gaussian;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"varying weight;\n"
-"uniform radius;\n"
-"void main()\n"
-"{\n"
-"       int i;\n"
-"       vec4 fc = vec4(0,0,0,0);\n"
-"       \n"
-"       for (i = 0 ; i < radius ; i ++){\n"
-"               fc += texture2D(tex, tex_c.xy).rgba *\n"
-"                       texture1D(gaussian,i/radius).aaaa;\n"
-"       }\n"
-"       gl_FragColor = fc / 4 * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur.shd
deleted file mode 100644
index 5f13a47..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur.shd
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-uniform sampler1D gaussian;
-varying vec4 col;
-varying vec2 tex_c;
-varying weight;
-uniform radius;
-void main()
-{
-        int i;
-        vec4 fc = vec4(0,0,0,0);
-        
-        for (i = 0 ; i < radius ; i ++){
-                fc += texture2D(tex, tex_c.xy).rgba *
-                        texture1D(gaussian,i/radius).aaaa;
-        }
-        gl_FragColor = fc / 4 * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h
deleted file mode 100644
index 0862e4f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h
+++ /dev/null
@@ -1,24 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"uniform sampler1D gaussian;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"varying weight;\n"
-"uniform radius;\n"
-"void main()\n"
-"{\n"
-"       int i;\n"
-"       vec4 fc = vec4(0,0,0,0);\n"
-"       \n"
-"       for (i = 0 ; i < radius ; i ++){\n"
-"               fc += texture2D(tex, tex_c.xy).rgba *\n"
-"                       texture1D(gaussian,i/radius).aaaa;\n"
-"       }\n"
-"       gl_FragColor = fc / 4;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd
deleted file mode 100644
index a9134df..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-uniform sampler1D gaussian;
-varying vec4 col;
-varying vec2 tex_c;
-varying weight;
-uniform radius;
-void main()
-{
-        int i;
-        vec4 fc = vec4(0,0,0,0);
-        
-        for (i = 0 ; i < radius ; i ++){
-                fc += texture2D(tex, tex_c.xy).rgba *
-                        texture1D(gaussian,i/radius).aaaa;
-        }
-        gl_FragColor = fc / 4;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h
deleted file mode 100644
index 0862e4f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h
+++ /dev/null
@@ -1,24 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"uniform sampler1D gaussian;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"varying weight;\n"
-"uniform radius;\n"
-"void main()\n"
-"{\n"
-"       int i;\n"
-"       vec4 fc = vec4(0,0,0,0);\n"
-"       \n"
-"       for (i = 0 ; i < radius ; i ++){\n"
-"               fc += texture2D(tex, tex_c.xy).rgba *\n"
-"                       texture1D(gaussian,i/radius).aaaa;\n"
-"       }\n"
-"       gl_FragColor = fc / 4;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd
deleted file mode 100644
index a9134df..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-uniform sampler1D gaussian;
-varying vec4 col;
-varying vec2 tex_c;
-varying weight;
-uniform radius;
-void main()
-{
-        int i;
-        vec4 fc = vec4(0,0,0,0);
-        
-        for (i = 0 ; i < radius ; i ++){
-                fc += texture2D(tex, tex_c.xy).rgba *
-                        texture1D(gaussian,i/radius).aaaa;
-        }
-        gl_FragColor = fc / 4;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h
deleted file mode 100644
index 0862e4f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h
+++ /dev/null
@@ -1,24 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"uniform sampler1D gaussian;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"varying weight;\n"
-"uniform radius;\n"
-"void main()\n"
-"{\n"
-"       int i;\n"
-"       vec4 fc = vec4(0,0,0,0);\n"
-"       \n"
-"       for (i = 0 ; i < radius ; i ++){\n"
-"               fc += texture2D(tex, tex_c.xy).rgba *\n"
-"                       texture1D(gaussian,i/radius).aaaa;\n"
-"       }\n"
-"       gl_FragColor = fc / 4;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd
deleted file mode 100644
index a9134df..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-uniform sampler1D gaussian;
-varying vec4 col;
-varying vec2 tex_c;
-varying weight;
-uniform radius;
-void main()
-{
-        int i;
-        vec4 fc = vec4(0,0,0,0);
-        
-        for (i = 0 ; i < radius ; i ++){
-                fc += texture2D(tex, tex_c.xy).rgba *
-                        texture1D(gaussian,i/radius).aaaa;
-        }
-        gl_FragColor = fc / 4;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale.h
deleted file mode 100644
index 850538a..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   float inten = dot(texture2D(tex,tex_c.xy).agb,vec3(.3, .59, .11));\n"
-"   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).r) * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd
deleted file mode 100644
index 78ecf08..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   float inten = dot(texture2D(tex,tex_c.xy).agb,vec3(.3, .59, .11));
-   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).r) * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h
deleted file mode 100644
index 3caef35..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   float inten = dot(texture2D(tex,tex_c.xy).rgb,vec3(.3, .59, .11));\n"
-"   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).a) * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd
deleted file mode 100644
index 5dca381..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   float inten = dot(texture2D(tex,tex_c.xy).rgb,vec3(.3, .59, .11));
-   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).a) * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
deleted file mode 100644
index 4cb36a8..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   float inten = dot(texture2D(tex,tex_c.xy).rgb,vec3(.3, .59, .11));\n"
-"   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).a);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd
deleted file mode 100644
index a077eea..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec2 tex_c;
-void main()
-{
-   float inten = dot(texture2D(tex,tex_c.xy).rgb,vec3(.3, .59, .11));
-   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).a);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h
deleted file mode 100644
index f501a02..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   float inten = dot(texture2D(tex,tex_c.xy).abg,vec3(.3, .59, .11));\n"
-"   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).r);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd
deleted file mode 100644
index b5b8ec6..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec2 tex_c;
-void main()
-{
-   float inten = dot(texture2D(tex,tex_c.xy).abg,vec3(.3, .59, .11));
-   gl_FragColor = vec4(inten, inten, inten, texture2D(tex,tex_c.xy).r);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert.h
deleted file mode 100644
index 46373e0..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = (vec4(0, 1.0, 1.0, 1.0) - texture2D(tex, tex_c.xy).bgra)*col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert.shd
deleted file mode 100644
index a75b058..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = (vec4(0, 1.0, 1.0, 1.0) - texture2D(tex, tex_c.xy).bgra)*col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h
deleted file mode 100644
index 3e3011d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = (vec4(1.0, 1.0, 1.0, 1.0) - texture2D(tex, tex_c.xy))*col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd
deleted file mode 100644
index 8d7df2d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = (vec4(1.0, 1.0, 1.0, 1.0) - texture2D(tex, tex_c.xy))*col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h
deleted file mode 100644
index b9f1e25..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   vec3 inv = vec3(1.0, 1.0, 1.0) - texture2D(tex,tex_c.xy).rgb;\n"
-"   gl_FragColor = vec4(inv.r, inv.g, inv.b, 1.0);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd
deleted file mode 100644
index 682acb2..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   vec3 inv = vec3(1.0, 1.0, 1.0) - texture2D(tex,tex_c.xy).rgb;
-   gl_FragColor = vec4(inv.r, inv.g, inv.b, 1.0);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h
deleted file mode 100644
index 46373e0..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = (vec4(0, 1.0, 1.0, 1.0) - texture2D(tex, tex_c.xy).bgra)*col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd
deleted file mode 100644
index a75b058..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = (vec4(0, 1.0, 1.0, 1.0) - texture2D(tex, tex_c.xy).bgra)*col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia.h
deleted file mode 100644
index 50fbf12..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia.h
+++ /dev/null
@@ -1,20 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"       vec3 inp = texture2D(tex,tex_c.xy).abg;\n"
-"       vec4 sep;\n"
-"       sep.r = dot(inp, vec3(.393, .769, .189));\n"
-"       sep.g = dot(inp, vec3(.349, .686, .168));\n"
-"       sep.b = dot(inp, vec3(.272, .534, .131));\n"
-"       sep.a = texture2D(tex,tex_c.xy).r;\n"
-"       gl_FragColor = sep * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia.shd
deleted file mode 100644
index 027ecfb..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia.shd
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-        vec3 inp = texture2D(tex,tex_c.xy).abg;
-        vec4 sep;
-        sep.r = dot(inp, vec3(.393, .769, .189));
-        sep.g = dot(inp, vec3(.349, .686, .168));
-        sep.b = dot(inp, vec3(.272, .534, .131));
-        sep.a = texture2D(tex,tex_c.xy).r;
-        gl_FragColor = sep * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h
deleted file mode 100644
index 41e4283..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h
+++ /dev/null
@@ -1,20 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"       vec3 inp = texture2D(tex,tex_c.xy).rgb;\n"
-"       vec4 sep;\n"
-"       sep.r = dot(inp, vec3(.393, .769, .189));\n"
-"       sep.g = dot(inp, vec3(.349, .686, .168));\n"
-"       sep.b = dot(inp, vec3(.272, .534, .131));\n"
-"       sep.a = texture2D(tex,tex_c.xy).a;\n"
-"       gl_FragColor = sep * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd
deleted file mode 100644
index caed378..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-        vec3 inp = texture2D(tex,tex_c.xy).rgb;
-        vec4 sep;
-        sep.r = dot(inp, vec3(.393, .769, .189));
-        sep.g = dot(inp, vec3(.349, .686, .168));
-        sep.b = dot(inp, vec3(.272, .534, .131));
-        sep.a = texture2D(tex,tex_c.xy).a;
-        gl_FragColor = sep * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h
deleted file mode 100644
index 0c4fe1b..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h
+++ /dev/null
@@ -1,18 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"       vec3 inp = texture2D(tex,tex_c.xy).rgb;\n"
-"       gl_FragColor.r = dot(inp, vec3(.393, .769, .189));\n"
-"       gl_FragColor.g = dot(inp, vec3(.349, .686, .168));\n"
-"       gl_FragColor.b = dot(inp, vec3(.272, .534, .131));\n"
-"       gl_FragColor.a = texture2D(tex,tex_c.xy).a;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd
deleted file mode 100644
index 9c6c1d4..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-        vec3 inp = texture2D(tex,tex_c.xy).rgb;
-        gl_FragColor.r = dot(inp, vec3(.393, .769, .189));
-        gl_FragColor.g = dot(inp, vec3(.349, .686, .168));
-        gl_FragColor.b = dot(inp, vec3(.272, .534, .131));
-        gl_FragColor.a = texture2D(tex,tex_c.xy).a;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h
deleted file mode 100644
index 23af9ec..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h
+++ /dev/null
@@ -1,18 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"       vec3 inp = texture2D(tex,tex_c.xy).abg;\n"
-"       gl_FragColor.r = dot(inp, vec3(.393, .769, .189));\n"
-"       gl_FragColor.g = dot(inp, vec3(.349, .686, .168));\n"
-"       gl_FragColor.b = dot(inp, vec3(.272, .534, .131));\n"
-"       gl_FragColor.a = texture2D(tex,tex_c.xy).r;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd b/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd
deleted file mode 100644
index f9871bd..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-        vec3 inp = texture2D(tex,tex_c.xy).abg;
-        gl_FragColor.r = dot(inp, vec3(.393, .769, .189));
-        gl_FragColor.g = dot(inp, vec3(.349, .686, .168));
-        gl_FragColor.b = dot(inp, vec3(.272, .534, .131));
-        gl_FragColor.a = texture2D(tex,tex_c.xy).r;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/font_frag.h
deleted file mode 100644
index f27dcdc..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_frag.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy).aaaa * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/font_frag.shd
deleted file mode 100644
index a8eb9b7..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_frag.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy).aaaa * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/font_frag_bin_s3c6410.h
deleted file mode 100644
index daca692..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,9 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000003, 0x00000000, 
-0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000000, 
-0x00000000, 0x0000e407, 0x307820e4, 0x00000000, 0x01000000, 0x0100e400, 
-0x237a10ff, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000004, 0x00000003, 0x00000009, 0x00000000, 0x00000004, 0x00000008, 
-0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 
-0x0000000f, 0x00030005, 0x00000000, 0x00786574, 0x006c6f63, 0x5f786574, 
-0x00000063, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_frag_s3c6410.asm b/libraries/evas/src/modules/engines/gl_common/shader/font_frag_s3c6410.asm
deleted file mode 100644
index 4ed116f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_frag_s3c6410.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-#-------------------------------------------------
-# ORION - OpenGL ES 2.0 Shading Language Compiler
-# SAMSUNG INDIA SOFTWARE OPERATIONS PVT. LTD.
-# Compiler Version      : v04.00.09
-# Release Date          : 19.01.2009
-# FIMG VERSION      : FIMGv1.5
-# Optimizer Options :  -O --nolodcalc
-#-------------------------------------------------
-
-# hand optimised - removed useless ops
-
-ps_3_0
-
-fimg_version    0x01020000
-
-dcl_s2_tex      s0
-dcl_f4_col      v1.x
-dcl_f2_tex_c    v0.x
-
-label start
-label main_
-texld r0.xyzw, v0.xyzw, s0      # tex=s0
-mul_sat oColor.xyzw, r0.wwww, v1.xyzw   # gl_FragColor=oColor.xyzw, col=v1.xyzw
-label main_end
-ret
-# 4 instructions, 4 C regs, 1 R regs
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/font_vert.h
deleted file mode 100644
index 8921d9d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_vert.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/font_vert.shd
deleted file mode 100644
index 606c297..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_vert.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/font_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/font_vert_bin_s3c6410.h
deleted file mode 100644
index 1402448..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/font_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,20 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000007, 0x00000006, 
-0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20f801e4, 0x00000000, 0x00000000, 0x00020000, 0x20980254, 0x00000000, 
-0x00000000, 0x00000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000c, 0x00000006, 
-0x00000009, 0x00000000, 0x00000000, 0x00000013, 0x00000005, 0x00000009, 
-0x00000000, 0x00000004, 0x00000019, 0x00000009, 0x00000003, 0x00000000, 
-0x00000008, 0x00000000, 0x0000000b, 0x00000009, 0x00010004, 0x00000000, 
-0x00000027, 0x00000003, 0x00000009, 0x00010004, 0x00000004, 0x0000002b, 
-0x00000005, 0x00000003, 0x00010004, 0x00000008, 0x00000023, 0x00000003, 
-0x0000000e, 0x00020001, 0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 
-0x74726576, 0x63007865, 0x726f6c6f, 0x78657400, 0x6f6f635f, 0x6d006472, 
-0x63007076, 0x74006c6f, 0x635f7865, 0x00000000, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h
deleted file mode 100644
index 1ced5e0..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy) * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd
deleted file mode 100644
index 2bc8d79..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy) * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag_bin_s3c6410.h
deleted file mode 100644
index feb5bf5..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,11 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000004, 0x00000003, 
-0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000000, 
-0x00000000, 0x02025400, 0x23782050, 0x00000000, 0x00000000, 0x0100e407, 
-0x307820e4, 0x00000000, 0x01000000, 0x0100e400, 0x237a10e4, 0x00000000, 
-0x00000000, 0x00000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 
-0x00000009, 0x00000000, 0x00000004, 0x00000008, 0x00000005, 0x00000003, 
-0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x0000000f, 0x00030005, 
-0x00000000, 0x00786574, 0x006c6f63, 0x5f786574, 0x00000063, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h
deleted file mode 100644
index 459611f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd
deleted file mode 100644
index 877df62..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag_bin_s3c6410.h
deleted file mode 100644
index b89eeb1..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,10 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000003, 0x00000003, 
-0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000a, 0x00000000, 
-0x00000000, 0x02025400, 0x23782050, 0x00000000, 0x00000000, 0x0100e407, 
-0x307a10e4, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000004, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 
-0x00000003, 0x0000000f, 0x00030005, 0x00000000, 0x00786574, 0x5f786574, 
-0x00000063, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h
deleted file mode 100644
index 13d5edd..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h
+++ /dev/null
@@ -1,12 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd
deleted file mode 100644
index 74f3207..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert_bin_s3c6410.h
deleted file mode 100644
index 314b5f3..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,17 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000006, 0x00000006, 
-0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20980154, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x0000000c, 0x00000006, 0x00000009, 0x00000000, 0x00000000, 0x00000013, 
-0x00000009, 0x00000003, 0x00000000, 0x00000004, 0x00000000, 0x0000000b, 
-0x00000009, 0x00010004, 0x00000000, 0x00000021, 0x00000005, 0x00000003, 
-0x00010004, 0x00000004, 0x0000001d, 0x00000003, 0x0000000e, 0x00020001, 
-0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 0x74726576, 0x74007865, 
-0x635f7865, 0x64726f6f, 0x70766d00, 0x78657400, 0x0000635f, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h
deleted file mode 100644
index 8921d9d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd
deleted file mode 100644
index 606c297..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert_bin_s3c6410.h
deleted file mode 100644
index 1402448..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_bgra_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,20 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000007, 0x00000006, 
-0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20f801e4, 0x00000000, 0x00000000, 0x00020000, 0x20980254, 0x00000000, 
-0x00000000, 0x00000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000c, 0x00000006, 
-0x00000009, 0x00000000, 0x00000000, 0x00000013, 0x00000005, 0x00000009, 
-0x00000000, 0x00000004, 0x00000019, 0x00000009, 0x00000003, 0x00000000, 
-0x00000008, 0x00000000, 0x0000000b, 0x00000009, 0x00010004, 0x00000000, 
-0x00000027, 0x00000003, 0x00000009, 0x00010004, 0x00000004, 0x0000002b, 
-0x00000005, 0x00000003, 0x00010004, 0x00000008, 0x00000023, 0x00000003, 
-0x0000000e, 0x00020001, 0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 
-0x74726576, 0x63007865, 0x726f6c6f, 0x78657400, 0x6f6f635f, 0x6d006472, 
-0x63007076, 0x74006c6f, 0x635f7865, 0x00000000, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/img_frag.h
deleted file mode 100644
index 0a95502..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_frag.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy).bgra * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_frag.shd
deleted file mode 100644
index 9faa414..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_frag.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy).bgra * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_frag_bin_s3c6410.h
deleted file mode 100644
index 3518e8d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,9 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000003, 0x00000000, 
-0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000000, 
-0x00000000, 0x0000e407, 0x307820e4, 0x00000000, 0x01000000, 0x0100e400, 
-0x237a10c6, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000004, 0x00000003, 0x00000009, 0x00000000, 0x00000004, 0x00000008, 
-0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 
-0x0000000f, 0x00030005, 0x00000000, 0x00786574, 0x006c6f63, 0x5f786574, 
-0x00000063, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_frag_s3c6410.asm b/libraries/evas/src/modules/engines/gl_common/shader/img_frag_s3c6410.asm
deleted file mode 100644
index 3716bce..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_frag_s3c6410.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#-------------------------------------------------
-# ORION - OpenGL ES 2.0 Shading Language Compiler
-# SAMSUNG INDIA SOFTWARE OPERATIONS PVT. LTD.
-# Compiler Version      : v04.00.09
-# Release Date          : 19.01.2009
-# FIMG VERSION      : FIMGv1.5
-# Optimizer Options :  -O --nolodcalc
-#-------------------------------------------------
-
-# hand optimised - removed useless ops
-
-ps_3_0
-
-fimg_version    0x01020000
-
-dcl_s2_tex      s0
-dcl_f4_col      v1.x
-dcl_f2_tex_c    v0.x
-
-label start
-label main_
-texld r0.xyzw, v0.xyzw, s0      # tex=s0
-mul_sat oColor.xyzw, r0.zyxw, v1.xyzw   # gl_FragColor=oColor.xyzw, col=v1.xyzw
-label main_end
-ret
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_mask_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/img_mask_frag.h
deleted file mode 100644
index 1b28128..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_mask_frag.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texm;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_cm;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(texm, tex_cm.xy).aaaa * texture2D(tex, tex_c.xy).rgba * col;\n"
-"}\n"
-"\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_mask_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/img_mask_vert.h
deleted file mode 100644
index 7508c98..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_mask_vert.h
+++ /dev/null
@@ -1,16 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord, tex_coordm;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_cm;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cm = tex_coordm;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h
deleted file mode 100644
index 0343b34..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy).bgra;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd
deleted file mode 100644
index 222d635..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy).bgra;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag_bin_s3c6410.h
deleted file mode 100644
index 61662c8..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,10 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000003, 0x00000003, 
-0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000a, 0x00000000, 
-0x00000000, 0x02025400, 0x23782050, 0x00000000, 0x00000000, 0x0100e407, 
-0x307a10c6, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000004, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 
-0x00000003, 0x0000000f, 0x00030005, 0x00000000, 0x00786574, 0x5f786574, 
-0x00000063, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h
deleted file mode 100644
index 13d5edd..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h
+++ /dev/null
@@ -1,12 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd
deleted file mode 100644
index 74f3207..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert_bin_s3c6410.h
deleted file mode 100644
index 314b5f3..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_nomul_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,17 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000006, 0x00000006, 
-0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20980154, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x0000000c, 0x00000006, 0x00000009, 0x00000000, 0x00000000, 0x00000013, 
-0x00000009, 0x00000003, 0x00000000, 0x00000004, 0x00000000, 0x0000000b, 
-0x00000009, 0x00010004, 0x00000000, 0x00000021, 0x00000005, 0x00000003, 
-0x00010004, 0x00000004, 0x0000001d, 0x00000003, 0x0000000e, 0x00020001, 
-0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 0x74726576, 0x74007865, 
-0x635f7865, 0x64726f6f, 0x70766d00, 0x78657400, 0x0000635f, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/img_vert.h
deleted file mode 100644
index 8921d9d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_vert.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/img_vert.shd
deleted file mode 100644
index 606c297..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_vert.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/img_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/img_vert_bin_s3c6410.h
deleted file mode 100644
index 1402448..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/img_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,20 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000007, 0x00000006, 
-0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20f801e4, 0x00000000, 0x00000000, 0x00020000, 0x20980254, 0x00000000, 
-0x00000000, 0x00000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000c, 0x00000006, 
-0x00000009, 0x00000000, 0x00000000, 0x00000013, 0x00000005, 0x00000009, 
-0x00000000, 0x00000004, 0x00000019, 0x00000009, 0x00000003, 0x00000000, 
-0x00000008, 0x00000000, 0x0000000b, 0x00000009, 0x00010004, 0x00000000, 
-0x00000027, 0x00000003, 0x00000009, 0x00010004, 0x00000004, 0x0000002b, 
-0x00000005, 0x00000003, 0x00010004, 0x00000008, 0x00000023, 0x00000003, 
-0x0000000e, 0x00020001, 0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 
-0x74726576, 0x63007865, 0x726f6c6f, 0x78657400, 0x6f6f635f, 0x6d006472, 
-0x63007076, 0x74006c6f, 0x635f7865, 0x00000000, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/make-c-bin.sh b/libraries/evas/src/modules/engines/gl_common/shader/make-c-bin.sh
deleted file mode 100755
index 2902df6..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/make-c-bin.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-od --width=4 -t x4 -v $1 | \
-awk '{ if (NF > 1) printf("0x%s, ", $2); L = L + 1; if (L > 5) { L = 0; printf("\n");}}'
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/make-c-str.sh b/libraries/evas/src/modules/engines/gl_common/shader/make-c-str.sh
deleted file mode 100755
index fe7e80a..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/make-c-str.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-awk '{printf("\"%s\\n\"\n", $0);}' $1
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/nv12_frag.h
deleted file mode 100644
index fec4b23..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_frag.h
+++ /dev/null
@@ -1,31 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texuv;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"  float y,u,v,vmu,r,g,b;\n"
-"  y=texture2D(tex,tex_c).g;\n"
-"  u=texture2D(texuv,tex_cuv).g;\n"
-"  v=texture2D(texuv,tex_cuv).a;\n"
-"\n"
-"  u=u-0.5;\n"
-"  v=v-0.5;\n"
-"  vmu=v*0.813+u*0.391;\n"
-"  u=u*2.018;\n"
-"  v=v*1.596;\n"
-"  y=(y-0.062)*1.164;\n"
-"\n"
-"  r=y+v;\n"
-"  g=y-vmu;\n"
-"  b=y+u;\n"
-"\n"
-"  gl_FragColor=vec4(r,g,b,1.0) * col;\n"
-"}\n"
-"\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/nv12_frag.shd
deleted file mode 100644
index 34748fc..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_frag.shd
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex, texuv;
-varying vec4 col;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-  float y,u,v,vmu,r,g,b;
-  y=texture2D(tex,tex_c).g;
-  u=texture2D(texuv,tex_cuv).g;
-  v=texture2D(texuv,tex_cuv).a;
-
-  u=u-0.5;
-  v=v-0.5;
-  vmu=v*0.813+u*0.391;
-  u=u*2.018;
-  v=v*1.596;
-  y=(y-0.062)*1.164;
-
-  r=y+v;
-  g=y-vmu;
-  b=y+u;
-
-  gl_FragColor=vec4(r,g,b,1.0) * col;
-}
-
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h
deleted file mode 100644
index df52d19..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h
+++ /dev/null
@@ -1,31 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texuv;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"  float y,u,v,vmu,r,g,b;\n"
-"  y=texture2D(tex,tex_c).g;\n"
-"  u=texture2D(texuv,tex_cuv).g;\n"
-"  v=texture2D(texuv,tex_cuv).a;\n"
-"\n"
-"  u=u-0.5;\n"
-"  v=v-0.5;\n"
-"  vmu=v*0.813+u*0.391;\n"
-"  u=u*2.018;\n"
-"  v=v*1.596;\n"
-"  y=(y-0.062)*1.164;\n"
-"\n"
-"  r=y+v;\n"
-"  g=y-vmu;\n"
-"  b=y+u;\n"
-"\n"
-"  gl_FragColor=vec4(r,g,b,1.0);\n"
-"}\n"
-"\n"
-"\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd
deleted file mode 100644
index 6910933..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex, texuv;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-  float y,u,v,vmu,r,g,b;
-  y=texture2D(tex,tex_c).g;
-  u=texture2D(texuv,tex_cuv).g;
-  v=texture2D(texuv,tex_cuv).a;
-
-  u=u-0.5;
-  v=v-0.5;
-  vmu=v*0.813+u*0.391;
-  u=u*2.018;
-  v=v*1.596;
-  y=(y-0.062)*1.164;
-
-  r=y+v;
-  g=y-vmu;
-  b=y+u;
-
-  gl_FragColor=vec4(r,g,b,1.0);
-}
-
-
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
deleted file mode 100644
index 6ff1040..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord, tex_coord2;\n"
-"uniform mat4 mvp;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cuv = tex_coord2 * 0.25;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd
deleted file mode 100644
index 994f5e6..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord, tex_coord2;
-uniform mat4 mvp;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-   gl_Position = mvp * vertex;
-   tex_c = tex_coord;
-   tex_cuv = tex_coord2 * 0.25;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/nv12_vert.h
deleted file mode 100644
index 38d6d9e..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_vert.h
+++ /dev/null
@@ -1,16 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord, tex_coord2;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cuv = tex_coord2 * 0.25;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/nv12_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/nv12_vert.shd
deleted file mode 100644
index eb7cc36..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/nv12_vert.shd
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord, tex_coord2;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-   tex_cuv = tex_coord2 * 0.25;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/rect_frag.h
deleted file mode 100644
index 4a102a4..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/rect_frag.shd
deleted file mode 100644
index 02251ee..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag.shd
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-void main()
-{
-   gl_FragColor = col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/rect_frag_bin_s3c6410.h
deleted file mode 100644
index ee94467..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,6 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000002, 0x00000000, 
-0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 
-0x00000000, 0x00000000, 0x20fa10e4, 0x00000000, 0x00000000, 0x00000000, 
-0x1e000000, 0x00000000, 0x00000000, 0x00000003, 0x00000009, 0x00000000, 
-0x00000000, 0x006c6f63, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag_s3c6410.asm b/libraries/evas/src/modules/engines/gl_common/shader/rect_frag_s3c6410.asm
deleted file mode 100644
index 24c47ac..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_frag_s3c6410.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#-------------------------------------------------
-# ORION - OpenGL ES 2.0 Shading Language Compiler
-# SAMSUNG INDIA SOFTWARE OPERATIONS PVT. LTD.
-# Compiler Version      : v04.00.09
-# Release Date          : 19.01.2009
-# FIMG VERSION      : FIMGv1.5
-# Optimizer Options :  -O --nolodcalc
-#-------------------------------------------------
-
-# hand optimised - removed useless ops
-
-ps_3_0
-
-fimg_version    0x01020000
-
-dcl_f4_col      v0.x
-
-label start
-label main_
-label main_end
-mov_sat oColor.xyzw, v0.xyzw
-ret
-
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/rect_vert.h
deleted file mode 100644
index 51d41aa..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_vert.h
+++ /dev/null
@@ -1,12 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/rect_vert.shd
deleted file mode 100644
index 63fea5d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_vert.shd
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-uniform mat4 mvp;
-varying vec4 col;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/rect_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/rect_vert_bin_s3c6410.h
deleted file mode 100644
index 3130684..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/rect_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,17 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000006, 0x00000006, 
-0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000021, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20f801e4, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x0000000c, 0x00000006, 0x00000009, 0x00000000, 0x00000000, 0x00000013, 
-0x00000005, 0x00000009, 0x00000000, 0x00000004, 0x00000000, 0x0000000b, 
-0x00000009, 0x00010004, 0x00000000, 0x0000001d, 0x00000003, 0x00000009, 
-0x00010004, 0x00000004, 0x00000019, 0x00000003, 0x0000000e, 0x00020001, 
-0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 0x74726576, 0x63007865, 
-0x726f6c6f, 0x70766d00, 0x6c6f6300, 0x00000000, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_frag.h
deleted file mode 100644
index 1ced5e0..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy) * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/tex_frag.shd
deleted file mode 100644
index 2bc8d79..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy) * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_frag_bin_s3c6410.h
deleted file mode 100644
index 24af537..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,9 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000003, 0x00000000, 
-0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000000, 
-0x00000000, 0x0000e407, 0x307820e4, 0x00000000, 0x01000000, 0x0100e400, 
-0x237a10e4, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000004, 0x00000003, 0x00000009, 0x00000000, 0x00000004, 0x00000008, 
-0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 
-0x0000000f, 0x00030005, 0x00000000, 0x00786574, 0x006c6f63, 0x5f786574, 
-0x00000063, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag_s3c6410.asm b/libraries/evas/src/modules/engines/gl_common/shader/tex_frag_s3c6410.asm
deleted file mode 100644
index 14bbfa1..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_frag_s3c6410.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#-------------------------------------------------
-# ORION - OpenGL ES 2.0 Shading Language Compiler
-# SAMSUNG INDIA SOFTWARE OPERATIONS PVT. LTD.
-# Compiler Version      : v04.00.09
-# Release Date          : 19.01.2009
-# FIMG VERSION      : FIMGv1.5
-# Optimizer Options :  -O --nolodcalc
-#-------------------------------------------------
-
-# hand optimised - removed useless ops
-
-ps_3_0
-
-fimg_version    0x01020000
-
-dcl_s2_tex      s0
-dcl_f4_col      v1.x
-dcl_f2_tex_c    v0.x
-
-label start
-label main_
-texld r0.xyzw, v0.xyzw, s0      # tex=s0
-mul_sat oColor.xyzw, r0.xyzw, v1.xyzw   # gl_FragColor=oColor.xyzw, col=v1.xyzw
-label main_end
-ret
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h
deleted file mode 100644
index 459611f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_FragColor = texture2D(tex, tex_c.xy);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd
deleted file mode 100644
index 877df62..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex;
-varying vec2 tex_c;
-void main()
-{
-   gl_FragColor = texture2D(tex, tex_c.xy);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag_bin_s3c6410.h
deleted file mode 100644
index b89eeb1..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,10 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x00000003, 0x00000003, 
-0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000a, 0x00000000, 
-0x00000000, 0x02025400, 0x23782050, 0x00000000, 0x00000000, 0x0100e407, 
-0x307a10e4, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000004, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 
-0x00000003, 0x0000000f, 0x00030005, 0x00000000, 0x00786574, 0x5f786574, 
-0x00000063, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h
deleted file mode 100644
index 13d5edd..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h
+++ /dev/null
@@ -1,12 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd
deleted file mode 100644
index 74f3207..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert_bin_s3c6410.h
deleted file mode 100644
index 314b5f3..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_nomul_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,17 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000006, 0x00000006, 
-0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20980154, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x0000000c, 0x00000006, 0x00000009, 0x00000000, 0x00000000, 0x00000013, 
-0x00000009, 0x00000003, 0x00000000, 0x00000004, 0x00000000, 0x0000000b, 
-0x00000009, 0x00010004, 0x00000000, 0x00000021, 0x00000005, 0x00000003, 
-0x00010004, 0x00000004, 0x0000001d, 0x00000003, 0x0000000e, 0x00020001, 
-0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 0x74726576, 0x74007865, 
-0x635f7865, 0x64726f6f, 0x70766d00, 0x78657400, 0x0000635f, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_vert.h
deleted file mode 100644
index 8921d9d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_vert.h
+++ /dev/null
@@ -1,15 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/tex_vert.shd
deleted file mode 100644
index 606c297..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_vert.shd
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/tex_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/tex_vert_bin_s3c6410.h
deleted file mode 100644
index 1402448..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/tex_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,20 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000007, 0x00000006, 
-0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20f801e4, 0x00000000, 0x00000000, 0x00020000, 0x20980254, 0x00000000, 
-0x00000000, 0x00000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000c, 0x00000006, 
-0x00000009, 0x00000000, 0x00000000, 0x00000013, 0x00000005, 0x00000009, 
-0x00000000, 0x00000004, 0x00000019, 0x00000009, 0x00000003, 0x00000000, 
-0x00000008, 0x00000000, 0x0000000b, 0x00000009, 0x00010004, 0x00000000, 
-0x00000027, 0x00000003, 0x00000009, 0x00010004, 0x00000004, 0x0000002b, 
-0x00000005, 0x00000003, 0x00010004, 0x00000008, 0x00000023, 0x00000003, 
-0x0000000e, 0x00020001, 0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 
-0x74726576, 0x63007865, 0x726f6c6f, 0x78657400, 0x6f6f635f, 0x6d006472, 
-0x63007076, 0x74006c6f, 0x635f7865, 0x00000000, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h
deleted file mode 100644
index 87f4095..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h
+++ /dev/null
@@ -1,24 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texu, texv;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_c2, tex_c3;\n"
-"void main()\n"
-"{\n"
-"   float r, g, b, y, u, v;\n"
-"   y = texture2D(tex, tex_c.xy).r;\n"
-"   u = texture2D(texu, tex_c2.xy).r;\n"
-"   v = texture2D(texv, tex_c3.xy).r;\n"
-"   y = (y - 0.0625) * 1.164;\n"
-"   u = u - 0.5;\n"
-"   v = v - 0.5;\n"
-"   r = y + (1.402   * v);\n"
-"   g = y - (0.34414 * u) - (0.71414 * v);\n"
-"   b = y + (1.772   * u);\n"
-"   gl_FragColor = vec4(r, g, b, 1.0) * col;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd
deleted file mode 100644
index 367fb55..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex, texu, texv;
-varying vec4 col;
-varying vec2 tex_c, tex_c2, tex_c3;
-void main()
-{
-   float r, g, b, y, u, v;
-   y = texture2D(tex, tex_c.xy).r;
-   u = texture2D(texu, tex_c2.xy).r;
-   v = texture2D(texv, tex_c3.xy).r;
-   y = (y - 0.0625) * 1.164;
-   u = u - 0.5;
-   v = v - 0.5;
-   r = y + (1.402   * v);
-   g = y - (0.34414 * u) - (0.71414 * v);
-   b = y + (1.772   * u);
-   gl_FragColor = vec4(r, g, b, 1.0) * col;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag_bin_s3c6410.h
deleted file mode 100644
index cd301dc..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,24 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x0000000d, 0x00000007, 
-0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000003, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000026, 0x00000000, 
-0x00000000, 0x02065400, 0x23782050, 0x00000000, 0x00000000, 0x0100e407, 
-0x307820e4, 0x00000000, 0x01000000, 0x02065400, 0x23782150, 0x00000000, 
-0x01000000, 0x0101e407, 0x307821e4, 0x00000000, 0x02000000, 0x02065400, 
-0x23782250, 0x00000000, 0x02000000, 0x0102e407, 0x307822e4, 0x00000000, 
-0x00000000, 0x02020001, 0x237823e4, 0x00000000, 0x01e40103, 0x02030001, 
-0x2ef823e4, 0x00000000, 0x02e40103, 0x02040001, 0x2ef823e4, 0x00000000, 
-0x00000000, 0x02050000, 0x20f824e4, 0x00000000, 0x06e40103, 0x01040002, 
-0x2ef823e4, 0x00000000, 0x03000000, 0x0103e400, 0x237a10e4, 0x00000000, 
-0x00000000, 0x00000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x3f94fdf4, 0x3f94fdf4, 0x3f94fdf4, 0x00000000, 0x00000000, 0xbeb02de0, 
-0x3fe2d0e5, 0x00000000, 0x3fb374bc, 0xbf36cf42, 0x00000000, 0x00000000, 
-0xbf4617c2, 0x3ee9a027, 0xbf7573eb, 0x3f800000, 0x3f800000, 0x00000000, 
-0x00000000, 0x00000000, 0x0000000e, 0x00000003, 0x00000009, 0x00000000, 
-0x0000000c, 0x00000012, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 
-0x00000018, 0x00000006, 0x00000003, 0x00000000, 0x00000004, 0x0000001f, 
-0x00000006, 0x00000003, 0x00000000, 0x00000008, 0x00000000, 0x00000003, 
-0x0000000f, 0x00030005, 0x00000000, 0x00000004, 0x00000004, 0x0000000f, 
-0x00030005, 0x00000004, 0x00000009, 0x00000004, 0x0000000f, 0x00030005, 
-0x00000008, 0x00786574, 0x75786574, 0x78657400, 0x6f630076, 0x6574006c, 
-0x00635f78, 0x5f786574, 0x74003263, 0x635f7865, 0x00000033, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag_s3c6410.asm b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag_s3c6410.asm
deleted file mode 100644
index 9a10bf0..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag_s3c6410.asm
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#-------------------------------------------------
-# ORION - OpenGL ES 2.0 Shading Language Compiler
-# SAMSUNG INDIA SOFTWARE OPERATIONS PVT. LTD.
-# Compiler Version      : v04.00.09
-# Release Date          : 19.01.2009
-# FIMG VERSION      : FIMGv1.5
-# Optimizer Options :  -O --nolodcalc
-#-------------------------------------------------
-
-# hand optimised - removed useless ops
-
-ps_3_0
-
-fimg_version    0x01020000
-
-dcl_s2_tex      s0
-dcl_s2_texu     s1
-dcl_s2_texv     s2
-dcl_f4_col      v3.x
-dcl_f2_tex_c    v0.x
-dcl_f2_tex_c2   v1.x
-dcl_f2_tex_c3   v2.x
-
-def c2, 1.164000, 1.164000, 1.164000, 0.000000
-def c3, 0.000000, -0.344100, 1.772000, 0.000000
-def c4, 1.402000, -0.714100, 0.000000, 0.000000
-def c5, -0.773800, 0.456300, -0.958800, 1.000000
-def c6, 1.000000, 0.000000, 0.000000, 0.000000
-
-label start
-label main_
-mul r0.xyzw, c6.xxyy, v0.xyyy   # tex_c=v0.xyyy
-texld r0.xyzw, r0.xyzw, s0      # tex=s0
-mul r1.xyzw, c6.xxyy, v1.xyyy   # tex_c2=v1.xyyy
-texld r1.xyzw, r1.xyzw, s1      # texu=s1
-mul r2.xyzw, c6.xxyy, v2.xyyy   # tex_c3=v2.xyyy
-texld r2.xyzw, r2.xyzw, s2      # texv=s2
-mul r3.xyzw, c2.xyzw, r0.xxxx   # yuv=r0.xxxx
-mad r3.xyzw, c3.xyzw, r1.xxxx, r3.xyzw  # yuv=r1.xxxx
-mad r3.xyzw, c4.xyzw, r2.xxxx, r3.xyzw  # yuv=r2.xxxx
-mov r4.xyzw, c5.xyzw
-mad r3.xyzw, r4.xyzw, c6.xxxx, r3.xyzw  # yuv=c6.xxxx
-mul_sat oColor.xyzw, r3.xyzw, v3.xyzw   # gl_FragColor=oColor.xyzw, col=v3.xyzw
-label main_end
-ret
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h
deleted file mode 100644
index 0df4b97..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h
+++ /dev/null
@@ -1,23 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texu, texv;\n"
-"varying vec2 tex_c, tex_c2, tex_c3;\n"
-"void main()\n"
-"{\n"
-"   float r, g, b, y, u, v;\n"
-"   y = texture2D(tex, tex_c.xy).r;\n"
-"   u = texture2D(texu, tex_c2.xy).r;\n"
-"   v = texture2D(texv, tex_c3.xy).r;\n"
-"   y = (y - 0.0625) * 1.164;\n"
-"   u = u - 0.5;\n"
-"   v = v - 0.5;\n"
-"   r = y + (1.402   * v);\n"
-"   g = y - (0.34414 * u) - (0.71414 * v);\n"
-"   b = y + (1.772   * u);\n"
-"   gl_FragColor = vec4(r, g, b, 1.0);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd
deleted file mode 100644
index ce24622..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex, texu, texv;
-varying vec2 tex_c, tex_c2, tex_c3;
-void main()
-{
-   float r, g, b, y, u, v;
-   y = texture2D(tex, tex_c.xy).r;
-   u = texture2D(texu, tex_c2.xy).r;
-   v = texture2D(texv, tex_c3.xy).r;
-   y = (y - 0.0625) * 1.164;
-   u = u - 0.5;
-   v = v - 0.5;
-   r = y + (1.402   * v);
-   g = y - (0.34414 * u) - (0.71414 * v);
-   b = y + (1.772   * u);
-   gl_FragColor = vec4(r, g, b, 1.0);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag_bin_s3c6410.h
deleted file mode 100644
index 45aa66d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag_bin_s3c6410.h
+++ /dev/null
@@ -1,23 +0,0 @@
-0x20205350, 0xffff0008, 0x00000048, 0x01020000, 0x0000000c, 0x00000007, 
-0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000022, 0x00000000, 
-0x00000000, 0x02065400, 0x23782050, 0x00000000, 0x00000000, 0x0100e407, 
-0x307820e4, 0x00000000, 0x01000000, 0x02065400, 0x23782150, 0x00000000, 
-0x01000000, 0x0101e407, 0x307821e4, 0x00000000, 0x02000000, 0x02065400, 
-0x23782250, 0x00000000, 0x02000000, 0x0102e407, 0x307822e4, 0x00000000, 
-0x00000000, 0x02020001, 0x237823e4, 0x00000000, 0x01e40103, 0x02030001, 
-0x2ef823e4, 0x00000000, 0x02e40103, 0x02040001, 0x2ef823e4, 0x00000000, 
-0x00000000, 0x02050000, 0x20f824e4, 0x00000000, 0x06e40103, 0x01040002, 
-0x2efa10e4, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x3f94fdf4, 0x3f94fdf4, 0x3f94fdf4, 0x00000000, 
-0x00000000, 0xbeb02de0, 0x3fe2d0e5, 0x00000000, 0x3fb374bc, 0xbf36cf42, 
-0x00000000, 0x00000000, 0xbf4617c2, 0x3ee9a027, 0xbf7573eb, 0x3f800000, 
-0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000005, 
-0x00000003, 0x00000000, 0x00000000, 0x00000014, 0x00000006, 0x00000003, 
-0x00000000, 0x00000004, 0x0000001b, 0x00000006, 0x00000003, 0x00000000, 
-0x00000008, 0x00000000, 0x00000003, 0x0000000f, 0x00030005, 0x00000000, 
-0x00000004, 0x00000004, 0x0000000f, 0x00030005, 0x00000004, 0x00000009, 
-0x00000004, 0x0000000f, 0x00030005, 0x00000008, 0x00786574, 0x75786574, 
-0x78657400, 0x65740076, 0x00635f78, 0x5f786574, 0x74003263, 0x635f7865, 
-0x00000033, 
\ No newline at end of file
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h
deleted file mode 100644
index c3f585f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h
+++ /dev/null
@@ -1,14 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec2 tex_coord, tex_coord2, tex_coord3;\n"
-"uniform mat4 mvp;\n"
-"varying vec2 tex_c, tex_c2, tex_c3;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"   tex_c2 = tex_coord2;\n"
-"   tex_c3 = tex_coord3;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd
deleted file mode 100644
index a83d505..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec2 tex_coord, tex_coord2, tex_coord3;
-uniform mat4 mvp;
-varying vec2 tex_c, tex_c2, tex_c3;
-void main()
-{
-   gl_Position = mvp * vertex;
-   tex_c = tex_coord;
-   tex_c2 = tex_coord2;
-   tex_c3 = tex_coord3;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert_bin_s3c6410.h
deleted file mode 100644
index 5942b4b..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,23 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000008, 0x00000006, 
-0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004b, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20980154, 0x00000000, 0x00000000, 0x00020000, 0x20980254, 0x00000000, 
-0x00000000, 0x00030000, 0x20980354, 0x00000000, 0x00000000, 0x00000000, 
-0x1e000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x0000000c, 0x00000006, 0x00000009, 0x00000000, 
-0x00000000, 0x00000013, 0x00000009, 0x00000003, 0x00000000, 0x00000004, 
-0x0000001d, 0x0000000a, 0x00000003, 0x00000000, 0x00000008, 0x00000028, 
-0x0000000a, 0x00000003, 0x00000000, 0x0000000c, 0x00000000, 0x0000000b, 
-0x00000009, 0x00010004, 0x00000000, 0x00000037, 0x00000005, 0x00000003, 
-0x00010004, 0x00000004, 0x0000003d, 0x00000006, 0x00000003, 0x00010004, 
-0x00000008, 0x00000044, 0x00000006, 0x00000003, 0x00010004, 0x0000000c, 
-0x00000033, 0x00000003, 0x0000000e, 0x00020001, 0x00000008, 0x505f6c67, 
-0x7469736f, 0x006e6f69, 0x74726576, 0x74007865, 0x635f7865, 0x64726f6f, 
-0x78657400, 0x6f6f635f, 0x00326472, 0x5f786574, 0x726f6f63, 0x6d003364, 
-0x74007076, 0x635f7865, 0x78657400, 0x0032635f, 0x5f786574, 0x00003363, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert.h
deleted file mode 100644
index 6ccf06d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert.h
+++ /dev/null
@@ -1,17 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord, tex_coord2, tex_coord3;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_c2, tex_c3;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"   tex_c2 = tex_coord2;\n"
-"   tex_c3 = tex_coord3;\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert.shd
deleted file mode 100644
index 0ea0b2f..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert.shd
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord, tex_coord2, tex_coord3;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c, tex_c2, tex_c3;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-   tex_c2 = tex_coord2;
-   tex_c3 = tex_coord3;
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert_bin_s3c6410.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert_bin_s3c6410.h
deleted file mode 100644
index e757b6d..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_vert_bin_s3c6410.h
+++ /dev/null
@@ -1,26 +0,0 @@
-0x20205356, 0xffff0008, 0x00000048, 0x01020000, 0x00000009, 0x00000006, 
-0x00000000, 0x00000000, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000055, 0x00000000, 
-0x00000000, 0x02020000, 0x237820e4, 0x00000000, 0x00e40100, 0x02035500, 
-0x2ef820e4, 0x00000000, 0x00e40100, 0x0204aa00, 0x2ef820e4, 0x00000000, 
-0x00e40100, 0x0205ff00, 0x2ef800e4, 0x00000000, 0x00000000, 0x00010000, 
-0x20f801e4, 0x00000000, 0x00000000, 0x00020000, 0x20980254, 0x00000000, 
-0x00000000, 0x00030000, 0x20980354, 0x00000000, 0x00000000, 0x00040000, 
-0x20980454, 0x00000000, 0x00000000, 0x00000000, 0x1e000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 
-0x3f800000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 
-0x0000000c, 0x00000006, 0x00000009, 0x00000000, 0x00000000, 0x00000013, 
-0x00000005, 0x00000009, 0x00000000, 0x00000004, 0x00000019, 0x00000009, 
-0x00000003, 0x00000000, 0x00000008, 0x00000023, 0x0000000a, 0x00000003, 
-0x00000000, 0x0000000c, 0x0000002e, 0x0000000a, 0x00000003, 0x00000000, 
-0x00000010, 0x00000000, 0x0000000b, 0x00000009, 0x00010004, 0x00000000, 
-0x0000003d, 0x00000003, 0x00000009, 0x00010004, 0x00000004, 0x00000041, 
-0x00000005, 0x00000003, 0x00010004, 0x00000008, 0x00000047, 0x00000006, 
-0x00000003, 0x00010004, 0x0000000c, 0x0000004e, 0x00000006, 0x00000003, 
-0x00010004, 0x00000010, 0x00000039, 0x00000003, 0x0000000e, 0x00020001, 
-0x00000008, 0x505f6c67, 0x7469736f, 0x006e6f69, 0x74726576, 0x63007865, 
-0x726f6c6f, 0x78657400, 0x6f6f635f, 0x74006472, 0x635f7865, 0x64726f6f, 
-0x65740032, 0x6f635f78, 0x3364726f, 0x70766d00, 0x6c6f6300, 0x78657400, 
-0x7400635f, 0x635f7865, 0x65740032, 0x33635f78, 0x00000000, 
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_frag.h
deleted file mode 100644
index abe4b03..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_frag.h
+++ /dev/null
@@ -1,30 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texuv;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"  float y,u,v,vmu,r,g,b;\n"
-"  y=texture2D(tex,tex_c).r;\n"
-"  u=texture2D(texuv,tex_cuv).g;\n"
-"  v=texture2D(texuv,tex_cuv).a;\n"
-"\n"
-"  u=u-0.5;\n"
-"  v=v-0.5;\n"
-"  vmu=v*0.813+u*0.391;\n"
-"  u=u*2.018;\n"
-"  v=v*1.596;\n"
-"\n"
-"  r=y+v;\n"
-"  g=y-vmu;\n"
-"  b=y+u;\n"
-"\n"
-"  gl_FragColor=vec4(r,g,b,1.0) * col;\n"
-"}\n"
-"\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd
deleted file mode 100644
index 98dd91b..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex, texuv;
-varying vec4 col;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-  float y,u,v,vmu,r,g,b;
-  y=texture2D(tex,tex_c).r;
-  u=texture2D(texuv,tex_cuv).g;
-  v=texture2D(texuv,tex_cuv).a;
-
-  u=u-0.5;
-  v=v-0.5;
-  vmu=v*0.813+u*0.391;
-  u=u*2.018;
-  v=v*1.596;
-
-  r=y+v;
-  g=y-vmu;
-  b=y+u;
-
-  gl_FragColor=vec4(r,g,b,1.0) * col;
-}
-
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h
deleted file mode 100644
index 618fa50..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h
+++ /dev/null
@@ -1,30 +0,0 @@
-"#ifdef GL_ES\n"
-"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-"precision highp float;\n"
-"#else\n"
-"precision mediump float;\n"
-"#endif\n"
-"#endif\n"
-"uniform sampler2D tex, texuv;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"  float y,u,v,vmu,r,g,b;\n"
-"  y=texture2D(tex,tex_c).r;\n"
-"  u=texture2D(texuv,tex_cuv).g;\n"
-"  v=texture2D(texuv,tex_cuv).a;\n"
-"\n"
-"  u=u-0.5;\n"
-"  v=v-0.5;\n"
-"  vmu=v*0.813+u*0.391;\n"
-"  u=u*2.018;\n"
-"  v=v*1.596;\n"
-"  y=(y-0.062)*1.164;\n"
-"\n"
-"  r=y+v;\n"
-"  g=y-vmu;\n"
-"  b=y+u;\n"
-"\n"
-"  gl_FragColor=vec4(r,g,b,1.0);\n"
-"}\n"
-"\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd
deleted file mode 100644
index fd82e2a..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-uniform sampler2D tex, texuv;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-  float y,u,v,vmu,r,g,b;
-  y=texture2D(tex,tex_c).r;
-  u=texture2D(texuv,tex_cuv).g;
-  v=texture2D(texuv,tex_cuv).a;
-
-  u=u-0.5;
-  v=v-0.5;
-  vmu=v*0.813+u*0.391;
-  u=u*2.018;
-  v=v*1.596;
-  y=(y-0.062)*1.164;
-
-  r=y+v;
-  g=y-vmu;
-  b=y+u;
-
-  gl_FragColor=vec4(r,g,b,1.0);
-}
-
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h
deleted file mode 100644
index 4620b66..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h
+++ /dev/null
@@ -1,13 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec2 tex_coord, tex_coord2;\n"
-"uniform mat4 mvp;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cuv = vec2(tex_coord2.x * 0.5, tex_coord2.y);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.shd
deleted file mode 100644
index 05acc9c..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.shd
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec2 tex_coord, tex_coord2;
-uniform mat4 mvp;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-   gl_Position = mvp * vertex;
-   tex_c = tex_coord;
-   tex_cuv = vec2(tex_coord2.x * 0.5, tex_coord2.y);
-}
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_vert.h b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_vert.h
deleted file mode 100644
index 1e49018..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_vert.h
+++ /dev/null
@@ -1,16 +0,0 @@
-"#ifdef GL_ES\n"
-"precision highp float;\n"
-"#endif\n"
-"attribute vec4 vertex;\n"
-"attribute vec4 color;\n"
-"attribute vec2 tex_coord, tex_coord2;\n"
-"uniform mat4 mvp;\n"
-"varying vec4 col;\n"
-"varying vec2 tex_c, tex_cuv;\n"
-"void main()\n"
-"{\n"
-"   gl_Position = mvp * vertex;\n"
-"   col = color;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cuv = vec2(tex_coord2.x * 0.5, tex_coord2.y);\n"
-"}\n"
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_vert.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuy2_vert.shd
deleted file mode 100644
index 54efb1e..0000000
--- a/libraries/evas/src/modules/engines/gl_common/shader/yuy2_vert.shd
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-attribute vec4 vertex;
-attribute vec4 color;
-attribute vec2 tex_coord, tex_coord2;
-uniform mat4 mvp;
-varying vec4 col;
-varying vec2 tex_c, tex_cuv;
-void main()
-{
-   gl_Position = mvp * vertex;
-   col = color;
-   tex_c = tex_coord;
-   tex_cuv = vec2(tex_coord2.x * 0.5, tex_coord2.y);
-}
diff --git a/libraries/evas/src/modules/engines/gl_sdl/Evas_Engine_GL_SDL.h b/libraries/evas/src/modules/engines/gl_sdl/Evas_Engine_GL_SDL.h
deleted file mode 100644
index 3804aa0..0000000
--- a/libraries/evas/src/modules/engines/gl_sdl/Evas_Engine_GL_SDL.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _EVAS_ENGINE_GL_SDL_H
-#define _EVAS_ENGINE_GL_SDL_H
-
-#include <SDL/SDL.h>
-
-typedef struct _Evas_Engine_Info_GL_SDL              Evas_Engine_Info_GL_SDL;
-
-struct _Evas_Engine_Info_GL_SDL
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   struct {
-     int rotation;
-     int fullscreen : 1;
-     int noframe : 1;
-   } flags;
-   
-};
-#endif
-
-
diff --git a/libraries/evas/src/modules/engines/gl_sdl/Makefile.am b/libraries/evas/src/modules/engines/gl_sdl/Makefile.am
deleted file mode 100644
index abdeaf0..0000000
--- a/libraries/evas/src/modules/engines/gl_sdl/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@evas_engine_gl_sdl_cflags@
-
-if BUILD_ENGINE_GL_SDL
-
-GL_SDL_SOURCES = \
-evas_engine.c
-
-GL_SDL_LIBADD = @evas_engine_gl_sdl_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la 
-
-
-includes_HEADERS = Evas_Engine_GL_SDL.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_GL_SDL
-
-pkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(GL_SDL_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(GL_SDL_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_gl_sdl.la
-
-libevas_engine_gl_sdl_la_SOURCES = $(GL_SDL_SOURCES)
-libevas_engine_gl_sdl_la_LIBADD = $(GL_SDL_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/gl_sdl/Makefile.in b/libraries/evas/src/modules/engines/gl_sdl/Makefile.in
deleted file mode 100644
index 4bc9d59..0000000
--- a/libraries/evas/src/modules/engines/gl_sdl/Makefile.in
+++ /dev/null
@@ -1,800 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/gl_sdl
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-@BUILD_ENGINE_GL_SDL_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_TRUE@libevas_engine_gl_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_gl_sdl_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_GL_SDL_TRUE@am__objects_1 = evas_engine.lo
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_TRUE@am_libevas_engine_gl_sdl_la_OBJECTS = $(am__objects_1)
-libevas_engine_gl_sdl_la_OBJECTS =  \
-        $(am_libevas_engine_gl_sdl_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_TRUE@am_libevas_engine_gl_sdl_la_rpath =
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@      $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_GL_SDL_TRUE@am__objects_2 = module_la-evas_engine.lo
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_gl_sdl_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_gl_sdl_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_GL_SDL.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@evas_engine_gl_sdl_cflags@
-
-@BUILD_ENGINE_GL_SDL_TRUE@GL_SDL_SOURCES = \
-@BUILD_ENGINE_GL_SDL_TRUE@evas_engine.c
-
-@BUILD_ENGINE_GL_SDL_TRUE@GL_SDL_LIBADD = @evas_engine_gl_sdl_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la 
-@BUILD_ENGINE_GL_SDL_TRUE@includes_HEADERS = Evas_Engine_GL_SDL.h
-@BUILD_ENGINE_GL_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@module_la_SOURCES = $(GL_SDL_SOURCES)
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@module_la_LIBADD = @EINA_LIBS@ $(GL_SDL_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@module_la_LDFLAGS = -module -avoid-version
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_gl_sdl.la
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_TRUE@libevas_engine_gl_sdl_la_SOURCES = $(GL_SDL_SOURCES)
-@BUILD_ENGINE_GL_SDL_TRUE@@EVAS_STATIC_BUILD_GL_SDL_TRUE@libevas_engine_gl_sdl_la_LIBADD = $(GL_SDL_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/gl_sdl/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/gl_sdl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_gl_sdl.la: $(libevas_engine_gl_sdl_la_OBJECTS) $(libevas_engine_gl_sdl_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_gl_sdl_la_rpath) $(libevas_engine_gl_sdl_la_OBJECTS) $(libevas_engine_gl_sdl_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/gl_sdl/evas_engine.c b/libraries/evas/src/modules/engines/gl_sdl/evas_engine.c
deleted file mode 100644
index 46588d9..0000000
--- a/libraries/evas/src/modules/engines/gl_sdl/evas_engine.c
+++ /dev/null
@@ -1,1081 +0,0 @@
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_engine.h"
-
-static void*                     _sdl_output_setup      (int w, int h, int fullscreen, int noframe);
-                
-int _evas_engine_GL_SDL_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_GL_SDL *info;
-
-   info = calloc(1, sizeof(Evas_Engine_Info_GL_SDL));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_GL_SDL *in;
-   in = (Evas_Engine_Info_GL_SDL *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_GL_SDL *info;
-
-   info = (Evas_Engine_Info_GL_SDL *)in;
-
-   SDL_Init(SDL_INIT_NOPARACHUTE);
-
-   if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
-     {
-        ERR("SDL_Init failed with %s", SDL_GetError());
-        SDL_Quit();
-        return 0;
-     }
-
-   re = _sdl_output_setup(e->output.w, e->output.h,
-                             info->flags.fullscreen,
-                             info->flags.noframe);
-   re->info = info;
-   e->engine.data.output = re;
-   if (!e->engine.data.output)
-     return 0;
-
-   e->engine.func = &func;
-   e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-   
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_free(re->gl_context);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-
-   SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine        *re;
-   SDL_Surface          *surface;
-
-   re = (Render_Engine *)data;
-   re->w = w;
-   re->h = h;
-
-   if(SDL_GetVideoSurface()->flags & SDL_RESIZABLE)
-     {
-        surface = SDL_SetVideoMode(w, h, 32, EVAS_SDL_GL_FLAG
-                      | (re->info->flags.fullscreen ? SDL_FULLSCREEN : 0)
-                      | (re->info->flags.noframe ? SDL_NOFRAME : 0));
-        if (!surface)
-          {
-             ERR("Unable to change the resolution to : %ix%i", w, h);
-             SDL_Quit();
-             exit(-1);
-          }
-     }
-
-   evas_gl_common_context_resize(re->gl_context, w, h, re->gl_context->rot);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w __UNUSED__, int h __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_resize(re->gl_context, re->w, re->h, re->gl_context->rot);
-   /* smple bounding box */
-   if (!re->draw.redraw)
-     {
-#if 0
-        re->draw.x1 = x;
-        re->draw.y1 = y;
-        re->draw.x2 = x + w - 1;
-        re->draw.y2 = y + h - 1;
-#else
-        re->draw.x1 = 0;
-        re->draw.y1 = 0;
-        re->draw.x2 = re->w - 1;
-        re->draw.y2 = re->h - 1;
-#endif
-     }
-   else
-     {
-        if (x < re->draw.x1) re->draw.x1 = x;
-        if (y < re->draw.y1) re->draw.y1 = y;
-        if ((x + w - 1) > re->draw.x2) re->draw.x2 = x + w - 1;
-        if ((y + h - 1) > re->draw.y2) re->draw.y2 = y + h - 1;
-     }
-   re->draw.redraw = 1;
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->draw.redraw = 0;
-//   INF("GL: finish update cycle!");
-}
-
-/* at least the nvidia drivers are so abysmal that copying from the backbuffer
- * to the front using glCopyPixels() that you literally can WATCH it draw the
- * pixels slowly across the screen with a window update taking multiple
- * seconds - so workaround by doing a full buffer render as frankly GL isn't
- * up to doing anything that isn't done by quake (etc.)
- */
-#define SLOW_GL_COPY_RECT 1
-/* vsync games - not for now though */
-//#define VSYNC_TO_SCREEN 1
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_flush(re->gl_context);
-   evas_gl_common_context_newframe(re->gl_context);
-   /* get the upate rect surface - return engine data as dummy */
-   if (!re->draw.redraw)
-     {
-//      printf("GL: NO updates!\n");
-        return NULL;
-     }
-//   printf("GL: update....!\n");
-#ifdef SLOW_GL_COPY_RECT
-   /* if any update - just return the whole canvas - works with swap
-    * buffers then */
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = re->w;
-   if (h) *h = re->h;
-   if (cx) *cx = 0;
-   if (cy) *cy = 0;
-   if (cw) *cw = re->w;
-   if (ch) *ch = re->h;
-#else
-   /* 1 update - INCREDIBLY SLOW if combined with swap_rect in flush. a gl
-    * problem where there just is no hardware path for somethnig that
-    * obviously SHOULD be there */
-   /* only 1 update to minimise gl context games and rendering multiple update
-    * regions as evas does with other engines
-    */
-   if (x) *x = re->draw.x1;
-   if (y) *y = re->draw.y1;
-   if (w) *w = re->draw.x2 - re->draw.x1 + 1;
-   if (h) *h = re->draw.y2 - re->draw.y1 + 1;
-   if (cx) *cx = re->draw.x1;
-   if (cy) *cy = re->draw.y1;
-   if (cw) *cw = re->draw.x2 - re->draw.x1 + 1;
-   if (ch) *ch = re->draw.y2 - re->draw.y1 + 1;
-#endif
-// clear buffer. only needed for dest alpha
-//   glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-//   glClear(GL_COLOR_BUFFER_BIT);
-//x//   printf("frame -> new\n");
-   return re->gl_context->def_surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   /* put back update surface.. in this case just unflag redraw */
-   re->draw.redraw = 0;
-   re->draw.drew = 1;
-   evas_gl_common_context_flush(re->gl_context);
-//x//   printf("frame -> push\n");
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!re->draw.drew) return;
-//x//   printf("frame -> flush\n");
-   re->draw.drew = 0;
-
-#if 0
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-//   glFlush();
-   eglSwapBuffers(re->egl_disp, re->egl_surface[0]);
-#else
-   glXSwapBuffers(re->win->disp, re->win);
-#endif   
-#else
-   SDL_GL_SwapBuffers();
-#endif
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-}
-
-static void
-eng_output_dump(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_image_image_all_unload();
-   evas_common_font_font_all_unload();
-   evas_gl_common_image_all_unload(re->gl_context);
-}
-
-static void
-eng_context_cutout_add(void *data, void *context, int x, int y, int w, int h)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-//   re->gl_context->dc = context;
-   evas_common_draw_context_add_cutout(context, x, y, w, h);
-}
-
-static void
-eng_context_cutout_clear(void *data, void *context)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-//   re->gl_context->dc = context;
-   evas_common_draw_context_clear_cutouts(context);
-}
-
-static void
-eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_target_surface_set(re->gl_context, surface);
-   re->gl_context->dc = context;
-   evas_gl_common_rect_draw(re->gl_context, x, y, w, h);
-}
-
-static void
-eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_target_surface_set(re->gl_context, surface);
-   re->gl_context->dc = context;
-   evas_gl_common_line_draw(re->gl_context, x1, y1, x2, y2);
-}
-
-static void *
-eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_point_add(polygon, x, y);
-}
-
-static void *
-eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_points_clear(polygon);
-}
-
-static void
-eng_polygon_draw(void *data, void *context, void *surface, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_target_surface_set(re->gl_context, surface);
-   re->gl_context->dc = context;
-   evas_gl_common_poly_draw(re->gl_context, polygon, x, y);
-}
-
-static int
-eng_image_alpha_get(void *data, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return 1;
-   im = image;
-   return im->alpha;
-}
-
-static int
-eng_image_colorspace_get(void *data, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return EVAS_COLORSPACE_ARGB8888;
-   im = image;
-   return im->cs.space;
-}
-
-static void *
-eng_image_alpha_set(void *data, void *image, int has_alpha)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->native.data)
-     {
-        im->alpha = has_alpha;
-        return image;
-     }
-   /* FIXME: can move to gl_common */
-   if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
-   if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image;
-   else if ((!has_alpha) && (!im->im->cache_entry.flags.alpha)) return image;
-   if (im->references > 1)
-     {
-        Evas_GL_Image *im_new;
-        
-        im_new = evas_gl_common_image_new_from_copied_data(im->gc, im->im->cache_entry.w, im->im->cache_entry.h, im->im->image.data,
-                                                           eng_image_alpha_get(data, image),
-                                                           eng_image_colorspace_get(data, image));
-        if (!im_new) return im;
-        evas_gl_common_image_free(im);
-        im = im_new;
-     }
-   else
-     evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-   im->im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
-   return image;
-}
-
-static void *
-eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-   return image;
-}
-
-static void
-eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-}
-
-static char *
-eng_image_comment_get(void *data, void *image, char *key __UNUSED__)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (!im->im) return NULL;
-   return im->im->info.comment;
-}
-
-static char *
-eng_image_format_get(void *data, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   im = image;
-   return NULL;
-}
-
-static void
-eng_image_colorspace_set(void *data, void *image, int cspace)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   im = image;
-   if (im->native.data) return;
-   /* FIXME: can move to gl_common */
-   if (im->cs.space == cspace) return;
-   evas_cache_image_colorspace(&im->im->cache_entry, cspace);
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (im->cs.data)
-          {
-             if (!im->cs.no_free) free(im->cs.data);
-             im->cs.data = NULL;
-             im->cs.no_free = 0;
-          }
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-        if (im->tex) evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        if (im->cs.data)
-          {
-             if (!im->cs.no_free) free(im->cs.data);
-          }
-        im->cs.data = calloc(1, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-        im->cs.no_free = 0;
-        break;
-      default:
-        abort();
-        break;
-     }
-   im->cs.space = cspace;
-}
-
-/////////////////////////////////////////////////////////////////////////
-//
-//
-typedef struct _Native Native;
-
-struct _Native
-{
-   Evas_Native_Surface ns;
-   
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   EGLSurface  egl_surface;
-#endif
-};
-
-static void
-_native_bind_cb(void *data, void *image)
-{
-}
-
-static void
-_native_unbind_cb(void *data, void *image)
-{
-}
-
-static void
-_native_free_cb(void *data, void *image)
-{
-}
-
-static void *
-eng_image_native_set(void *data, void *image, void *native)
-{
-   return NULL;
-}
-
-static void *
-eng_image_native_get(void *data, void *image)
-{
-   return NULL;
-}
-
-//
-//
-/////////////////////////////////////////////////////////////////////////
-
-static void *
-eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   *error = EVAS_LOAD_ERROR_NONE;
-   return evas_gl_common_image_load(re->gl_context, file, key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_image_new_from_data(re->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_image_new_from_copied_data(re->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void
-eng_image_free(void *data, void *image)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   evas_gl_common_image_free(image);
-}
-
-static void
-eng_image_size_get(void *data, void *image, int *w, int *h)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-   if (!image)
-     {
-        *w = 0;
-        *h = 0;
-        return;
-     }
-   if (w) *w = ((Evas_GL_Image *)image)->w;
-   if (h) *h = ((Evas_GL_Image *)image)->h;
-}
-
-static void *
-eng_image_size_set(void *data, void *image, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-   Evas_GL_Image *im_old;
-   
-   re = (Render_Engine *)data;
-   if (!im) return NULL;
-   if (im->native.data)
-     {
-        im->w = w;
-        im->h = h;
-        return image;
-     }
-   im_old = image;
-
-   switch (eng_image_colorspace_get(data, image))
-     {
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         w &= ~0x1;
-         break;
-     }
-
-   if ((im_old) && (im_old->im->cache_entry.w == w) && (im_old->im->cache_entry.h == h))
-     return image;
-   if (im_old)
-     {
-        im = evas_gl_common_image_new(re->gl_context, w, h,
-                                      eng_image_alpha_get(data, image),
-                                      eng_image_colorspace_get(data, image));
-/*
-        evas_common_load_image_data_from_file(im_old->im);
-        if (im_old->im->image->data)
-          {
-             evas_common_blit_rectangle(im_old->im, im->im, 0, 0, w, h, 0, 0);
-             evas_common_cpu_end_opt();
-          }
- */
-        evas_gl_common_image_free(im_old);
-     }
-   else
-     im = evas_gl_common_image_new(re->gl_context, w, h, 1, EVAS_COLORSPACE_ARGB8888);
-   return im;
-}
-
-static void *
-eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   if (im->native.data) return image;
-   evas_gl_common_image_dirty(image, x, y, w, h);
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-   int error;
-   
-   re = (Render_Engine *)data;
-   if (!image)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_GENERIC;
-        return NULL;
-     }
-   im = image;
-   if (im->native.data)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-   error = evas_cache_image_load_data(&im->im->cache_entry);
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (to_write)
-          {
-             if (im->references > 1)
-               {
-                  Evas_GL_Image *im_new;
-
-                  im_new = evas_gl_common_image_new_from_copied_data(im->gc, im->im->cache_entry.w, im->im->cache_entry.h, im->im->image.data,
-                                                                     eng_image_alpha_get(data, image),
-                                                                     eng_image_colorspace_get(data, image));
-                  if (!im_new)
-                    {
-                       *image_data = NULL;
-                       if (err) *err = error;
-                       return im;
-                    }
-                  evas_gl_common_image_free(im);
-                  im = im_new;
-               }
-             else
-               evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-          }
-        *image_data = im->im->image.data;
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-        *image_data = im->cs.data;
-        break;
-      default:
-        abort();
-        break;
-     }
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data, void *image, DATA32 *image_data)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im, *im2;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->native.data) return image;
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (image_data != im->im->image.data)
-          {
-             int w, h;
-
-             w = im->im->cache_entry.w;
-             h = im->im->cache_entry.h;
-             im2 = eng_image_new_from_data(data, w, h, image_data,
-                                           eng_image_alpha_get(data, image),
-                                           eng_image_colorspace_get(data, image));
-             if (!im2) return im;
-             evas_gl_common_image_free(im);
-             im = im2;
-          }
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-        if (image_data != im->cs.data)
-          {
-             if (im->cs.data)
-               {
-                  if (!im->cs.no_free) free(im->cs.data);
-               }
-             im->cs.data = image_data;
-          }
-        break;
-      default:
-        abort();
-        break;
-     }
-   /* hmmm - but if we wrote... why bother? */
-   evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-   return im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   evas_gl_common_context_target_surface_set(re->gl_context, surface);
-   re->gl_context->dc = context;
-   evas_gl_common_image_draw(re->gl_context, image,
-                             src_x, src_y, src_w, src_h,
-                             dst_x, dst_y, dst_w, dst_h,
-                             smooth);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-}
-
-static void
-eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   Render_Engine *re;
-   
-   re = (Render_Engine *)data;
-   evas_gl_common_context_target_surface_set(re->gl_context, surface);
-   re->gl_context->dc = context;
-   evas_gl_common_image_map_draw(re->gl_context, image, npoints, p, smooth, level);
-}
-
-static void *
-eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
-{
-   Render_Engine *re;
-   
-   re = (Render_Engine *)data;
-   return evas_gl_common_image_surface_new(re->gl_context, w, h, alpha);
-}
-
-static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_gl_common_image_free(surface);
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-}
-
-static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_gl_common_context_target_surface_set(re->gl_context, surface);
-   re->gl_context->dc = context;
-     {
-        // FIXME: put im into context so we can free it
-        static RGBA_Image *im = NULL;
-        
-        if (!im)
-          im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.w = re->w;
-        im->cache_entry.h = re->h;
-        evas_common_draw_context_font_ext_set(context,
-                                              re->gl_context,
-                                              evas_gl_font_texture_new,
-                                              evas_gl_font_texture_free,
-                                              evas_gl_font_texture_draw);
-        evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
-              intl_props);
-        evas_common_draw_context_font_ext_set(context,
-                                              NULL,
-                                              NULL,
-                                              NULL,
-                                              NULL);
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__)
-{
-   // FIXME: support ARGB gl targets!!!
-   return EINA_FALSE;
-}
-
-static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-   
-   if (!image) return EVAS_LOAD_ERROR_NONE;
-   im = image;
-   return im->im->cache_entry.load_error;
-}
-
-
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   if (!evas_gl_common_module_open()) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   if (_evas_engine_GL_SDL_log_dom < 0)
-     _evas_engine_GL_SDL_log_dom = eina_log_domain_register
-       ("evas-gl_sdl", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_GL_SDL_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-   #define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(context_cutout_add);
-   ORD(context_cutout_clear);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(output_dump);
-   ORD(rectangle_draw);
-   ORD(line_draw);
-   ORD(polygon_point_add);
-   ORD(polygon_points_clear);
-   ORD(polygon_draw);
-
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_free);
-   ORD(image_size_get);
-   ORD(image_size_set);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_native_set);
-   ORD(image_native_get);
-#if 0 // filtering disabled
-//   ORD(image_draw_filtered);
-//   ORD(image_filtered_get);
-//   ORD(image_filtered_save);
-//   ORD(image_filtered_free);
-#endif
-   ORD(font_draw);
-   
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-   
-   ORD(image_map_draw);
-   ORD(image_map_surface_new);
-   ORD(image_map_surface_free);
-
-//   ORD(image_content_hint_set);
-//   ORD(image_content_hint_get);
-   
-//   ORD(image_cache_flush);
-//   ORD(image_cache_set);
-//   ORD(image_cache_get);
-   
-//   ORD(gl_surface_create);
-//   ORD(gl_surface_destroy);
-//   ORD(gl_context_create);
-//   ORD(gl_context_destroy);
-//   ORD(gl_make_current);
-//   ORD(gl_proc_address_get);
-//   ORD(gl_native_surface_get);
-   
-//   ORD(gl_api_get);
-   
-   ORD(image_load_error_get);
-   
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-    eina_log_domain_unregister(_evas_engine_GL_SDL_log_dom);
-    evas_gl_common_module_close();
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "gl_sdl",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_sdl);
-
-#ifndef EVAS_STATIC_BUILD_GL_SDL
-EVAS_EINA_MODULE_DEFINE(engine, gl_sdl);
-#endif
-
-static void*
-_sdl_output_setup               (int w, int h, int fullscreen, int noframe)
-{
-   Render_Engine                *re = calloc(1, sizeof(Render_Engine));
-   SDL_Surface                  *surface;
-   int                          context_attrs[3];
-   int                          config_attrs[20];
-   int                          major_version, minor_version;
-   int                          num_config;
-
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   if (w <= 0) w = 640;
-   if (h <= 0) h = 480;
-   
-   /* GL Initialization */
-#ifdef HAVE_SDL_GL_CONTEXT_VERSION
-   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
-   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
-#endif
-   SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-   SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-   SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-   SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-   SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 0);
-
-   surface = SDL_SetVideoMode(w, h, 32, EVAS_SDL_GL_FLAG
-                           | (fullscreen ? SDL_FULLSCREEN : 0)
-                           | (noframe ? SDL_NOFRAME : 0));
-
-   if (!surface)
-     {
-        CRIT("SDL_SetVideoMode [ %i x %i x 32 ] failed. %s", w, h, SDL_GetError());
-        SDL_Quit();
-        exit(-1);
-     }
-
-   INF("Screen Depth: %d, Vendor: '%s', Renderer: '%s', Version: '%s'", SDL_GetVideoSurface()->format->BitsPerPixel, glGetString(GL_VENDOR), glGetString(GL_RENDERER), glGetString(GL_VERSION));
-
-   re->gl_context = evas_gl_common_context_new();
-   if (!re->gl_context)
-     {
-        free(re);
-        return NULL;
-     }
-   evas_gl_common_context_use(re->gl_context);
-   evas_gl_common_context_resize(re->gl_context, w, h, re->gl_context->rot);
-
-   /* End GL Initialization */
-   re->w = w;
-   re->h = h;
-   return re;
-}
-
diff --git a/libraries/evas/src/modules/engines/gl_sdl/evas_engine.h b/libraries/evas/src/modules/engines/gl_sdl/evas_engine.h
deleted file mode 100644
index 7d46720..0000000
--- a/libraries/evas/src/modules/engines/gl_sdl/evas_engine.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-#define _EVAS_ENGINE_SDL_H
-
-#include "config.h"
-#include <SDL/SDL.h>
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-# include <EGL/egl.h>
-# include <SDL/SDL_opengles.h>
-# ifdef HAVE_SDL_FLAG_OPENGLES
-#  define EVAS_SDL_GL_FLAG SDL_OPENGLES
-# else
-#  define EVAS_SDL_GL_FLAG SDL_OPENGL /* This probably won't work? */
-# endif
-#else
-# include <SDL/SDL_opengl.h>
-# define EVAS_SDL_GL_FLAG SDL_OPENGL
-#endif
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_gl_common.h"
-#include "Evas.h"
-#include "Evas_Engine_GL_SDL.h"
-
-extern int _evas_engine_GL_SDL_log_dom ;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
-
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine
-{
-   Evas_Engine_Info_GL_SDL      *info;
-   int                  w, h;
-
-   Evas_Engine_GL_Context *gl_context;
-   struct {
-      int              redraw : 1;
-      int              drew : 1;
-      int              x1, y1, x2, y2;
-   } draw;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   EGLContext       egl_context[1];
-   EGLSurface       egl_surface[1];
-   EGLConfig        egl_config;
-   EGLDisplay       egl_disp;
-#endif
-
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/gl_x11/Evas_Engine_GL_X11.h b/libraries/evas/src/modules/engines/gl_x11/Evas_Engine_GL_X11.h
deleted file mode 100644
index fb2c81c..0000000
--- a/libraries/evas/src/modules/engines/gl_x11/Evas_Engine_GL_X11.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _EVAS_ENGINE_GL_X11_H
-#define _EVAS_ENGINE_GL_X11_H
-
-#include <X11/Xlib.h>
-
-typedef struct _Evas_Engine_Info_GL_X11              Evas_Engine_Info_GL_X11;
-
-struct _Evas_Engine_Info_GL_X11
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   struct {
-      Display     *display;
-      Drawable     drawable;
-      Visual      *visual;
-      Colormap     colormap;
-      int          depth;
-      int          screen;
-      int          rotation;
-      unsigned int destination_alpha  : 1;
-   } info;
-   /* engine specific function calls to query stuff about the destination */
-   /* engine (what visual & colormap & depth to use, performance info etc. */
-   struct {
-      Visual *  (*best_visual_get)   (Evas_Engine_Info_GL_X11 *einfo);
-      Colormap  (*best_colormap_get) (Evas_Engine_Info_GL_X11 *einfo);
-      int       (*best_depth_get)    (Evas_Engine_Info_GL_X11 *einfo);
-   } func;
-
-   struct {
-      void      (*pre_swap)          (void *data, Evas *e);
-      void      (*post_swap)         (void *data, Evas *e);
-
-      void       *data; // data for callback calls
-   } callback;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-
-   unsigned char vsync : 1; // does nothing right now
-   unsigned char indirect : 1; // use indirect rendering
-};
-#endif
diff --git a/libraries/evas/src/modules/engines/gl_x11/Makefile.am b/libraries/evas/src/modules/engines/gl_x11/Makefile.am
deleted file mode 100644
index 8b0e622..0000000
--- a/libraries/evas/src/modules/engines/gl_x11/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@evas_engine_gl_xlib_cflags@
-
-if BUILD_ENGINE_GL_X11
-
-GL_X11_SOURCES = \
-evas_engine.c \
-evas_x_main.c
-
-GL_X11_LIBADD = @evas_engine_gl_xlib_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la 
-
-
-includes_HEADERS = Evas_Engine_GL_X11.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_GL_X11
-
-pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(GL_X11_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ $(GL_X11_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_gl_x11.la
-
-libevas_engine_gl_x11_la_SOURCES = $(GL_X11_SOURCES)
-libevas_engine_gl_x11_la_LIBADD = $(GL_X11_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/gl_x11/Makefile.in b/libraries/evas/src/modules/engines/gl_x11/Makefile.in
deleted file mode 100644
index 3ac8dff..0000000
--- a/libraries/evas/src/modules/engines/gl_x11/Makefile.in
+++ /dev/null
@@ -1,814 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/gl_x11
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-@BUILD_ENGINE_GL_X11_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_TRUE@libevas_engine_gl_x11_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_gl_x11_la_SOURCES_DIST = evas_engine.c \
-        evas_x_main.c
-@BUILD_ENGINE_GL_X11_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_GL_X11_TRUE@      evas_x_main.lo
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_TRUE@am_libevas_engine_gl_x11_la_OBJECTS = $(am__objects_1)
-libevas_engine_gl_x11_la_OBJECTS =  \
-        $(am_libevas_engine_gl_x11_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_TRUE@am_libevas_engine_gl_x11_la_rpath =
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@      $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_x_main.c
-@BUILD_ENGINE_GL_X11_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_GL_X11_TRUE@      module_la-evas_x_main.lo
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_gl_x11_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_gl_x11_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_GL_X11.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@evas_engine_gl_xlib_cflags@
-
-@BUILD_ENGINE_GL_X11_TRUE@GL_X11_SOURCES = \
-@BUILD_ENGINE_GL_X11_TRUE@evas_engine.c \
-@BUILD_ENGINE_GL_X11_TRUE@evas_x_main.c
-
-@BUILD_ENGINE_GL_X11_TRUE@GL_X11_LIBADD = @evas_engine_gl_xlib_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la 
-@BUILD_ENGINE_GL_X11_TRUE@includes_HEADERS = Evas_Engine_GL_X11.h
-@BUILD_ENGINE_GL_X11_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@module_la_SOURCES = $(GL_X11_SOURCES)
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@module_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ $(GL_X11_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@module_la_LDFLAGS = -module -avoid-version
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_TRUE@noinst_LTLIBRARIES = libevas_engine_gl_x11.la
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_TRUE@libevas_engine_gl_x11_la_SOURCES = $(GL_X11_SOURCES)
-@BUILD_ENGINE_GL_X11_TRUE@@EVAS_STATIC_BUILD_GL_X11_TRUE@libevas_engine_gl_x11_la_LIBADD = $(GL_X11_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/gl_x11/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/gl_x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_gl_x11.la: $(libevas_engine_gl_x11_la_OBJECTS) $(libevas_engine_gl_x11_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_gl_x11_la_rpath) $(libevas_engine_gl_x11_la_OBJECTS) $(libevas_engine_gl_x11_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_x_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_x_main.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_x_main.lo: evas_x_main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_x_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_x_main.Tpo -c -o module_la-evas_x_main.lo `test -f 'evas_x_main.c' || echo '$(srcdir)/'`evas_x_main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_x_main.Tpo $(DEPDIR)/module_la-evas_x_main.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_x_main.c' object='module_la-evas_x_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_x_main.lo `test -f 'evas_x_main.c' || echo '$(srcdir)/'`evas_x_main.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/gl_x11/evas_engine.c b/libraries/evas/src/modules/engines/gl_x11/evas_engine.c
deleted file mode 100644
index 06348b4..0000000
--- a/libraries/evas/src/modules/engines/gl_x11/evas_engine.c
+++ /dev/null
@@ -1,4416 +0,0 @@
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_engine.h"
-
-#ifdef HAVE_DLSYM
-# include <dlfcn.h>      /* dlopen,dlclose,etc */
-#else
-# error gl_x11 should not get compiled if dlsym is not found on the system!
-#endif
-
-#define EVAS_GL_NO_GL_H_CHECK 1
-#include "Evas_GL.h"
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-// EGL / GLES
-# if defined(GLES_VARIETY_S3C6410)
-# elif defined(GLES_VARIETY_SGX)
-# endif
-#else
-// GLX
-#endif
-
-typedef struct _Render_Engine               Render_Engine;
-typedef struct _Render_Engine_GL_Surface    Render_Engine_GL_Surface;
-typedef struct _Render_Engine_GL_Context    Render_Engine_GL_Context;
-typedef struct _Render_Engine_GL_Resource   Render_Engine_GL_Resource;
-typedef struct _Extension_Entry             Extension_Entry;
-
-struct _Render_Engine
-{
-   Evas_GL_X11_Window      *win;
-   Evas_Engine_Info_GL_X11 *info;
-   Evas                    *evas;
-   Tilebuf                 *tb;
-   int                      end;
-/*
-   XrmDatabase   xrdb; // xres - dpi
-   struct { // xres - dpi
-      int        dpi; // xres - dpi
-   } xr; // xres - dpi
- */
-   int w, h;
-   int vsync;
-
-   // Shader used for Evas_GL_Direct Optimization
-   GLuint   df_program;
-   GLuint   df_vtx_shader;
-   GLuint   df_fgmt_shader;   
-   GLuint   df_col_attrib;
-   GLuint   df_pos_attrib;
-
-   GLfloat  df_clear_color[4];
-   GLfloat  df_depth_value;
-
-   int      df_initialized;
-};
-
-struct _Render_Engine_GL_Surface
-{
-   int      initialized;
-   int      fbo_attached;
-   int      w, h;
-   int      depth_bits;
-   int      stencil_bits;
-
-   int      direct_fb_opt;
-
-   // Render target texture/buffers
-   GLuint   rt_tex;
-   GLint    rt_internal_fmt;
-   GLenum   rt_fmt;
-   GLuint   rb_depth;
-   GLenum   rb_depth_fmt;
-   GLuint   rb_stencil;
-   GLenum   rb_stencil_fmt;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   EGLSurface  direct_sfc;
-#else
-   Window      direct_sfc;
-#endif
-
-   Render_Engine_GL_Context   *current_ctx;
-};
-
-struct _Render_Engine_GL_Context
-{
-   int         initialized;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   EGLContext  context;
-#else
-   GLXContext  context;
-#endif
-   GLuint      context_fbo;
-   GLuint      current_fbo;
-
-
-   int         scissor_enabled;
-   int         scissor_upated;
-
-   Render_Engine_GL_Surface   *current_sfc;
-};
-
-// Resources used per thread
-struct _Render_Engine_GL_Resource
-{
-   // Resource context/surface per Thread in TLS for evasgl use 
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   EGLContext context;
-   EGLSurface surface;
-#else
-   GLXContext context;
-#endif
-};
-
-// Extension Handling
-struct _Extension_Entry
-{
-   const char *name;
-   const char *real_name;
-   int supported;
-};
-
-static int initted = 0;
-static int gl_wins = 0;
-static int gl_direct_override = 0;
-static int gl_direct_enabled = 0;
-static Render_Engine_GL_Context *current_evgl_ctx = NULL;
-static Render_Engine *current_engine = NULL;
-static Evas_Object *gl_direct_img_obj = NULL;
-
-static char _gl_ext_string[1024];
-static char _evasgl_ext_string[1024];
-
-// Resource context/surface per Thread in TLS for evasgl use 
-static Eina_TLS   resource_key;
-static Eina_List *resource_list;
-LK(resource_lock);
-
-typedef void            (*_eng_fn) (void);
-typedef _eng_fn         (*glsym_func_eng_fn) ();
-typedef void            (*glsym_func_void) ();
-typedef void           *(*glsym_func_void_ptr) ();
-typedef int             (*glsym_func_int) ();
-typedef unsigned int    (*glsym_func_uint) ();
-typedef unsigned char   (*glsym_func_uchar) ();
-typedef unsigned char  *(*glsym_func_uchar_ptr) ();
-typedef const char     *(*glsym_func_const_char_ptr) ();
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-
-#ifndef EGL_NATIVE_PIXMAP_KHR
-# define EGL_NATIVE_PIXMAP_KHR 0x30b0
-#endif
-_eng_fn  (*glsym_eglGetProcAddress)            (const char *a) = NULL;
-void     (*glsym_eglBindTexImage)              (EGLDisplay a, EGLSurface b, int c) = NULL;
-void     (*glsym_eglReleaseTexImage)           (EGLDisplay a, EGLSurface b, int c) = NULL;
-void    *(*glsym_eglCreateImage)               (EGLDisplay a, EGLContext b, EGLenum c, EGLClientBuffer d, const int *e) = NULL;
-void     (*glsym_eglDestroyImage)              (EGLDisplay a, void *b) = NULL;
-void     (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b)  = NULL;
-void     (*glsym_glEGLImageTargetRenderbufferStorageOES) (int a, void *b)  = NULL;
-void          *(*glsym_eglMapImageSEC)         (void *a, void *b) = NULL;
-unsigned int   (*glsym_eglUnmapImageSEC)       (void *a, void *b) = NULL;
-const char    *(*glsym_eglQueryString)         (EGLDisplay a, int name) = NULL;
-
-unsigned int   (*glsym_eglLockSurface)          (EGLDisplay a, EGLSurface b, const int *attrib_list) = NULL;
-unsigned int   (*glsym_eglUnlockSurface)        (EGLDisplay a, EGLSurface b) = NULL;
-
-#else
-typedef XID     (*glsym_func_xid) ();
-
-_eng_fn  (*glsym_glXGetProcAddress)  (const char *a) = NULL;
-void     (*glsym_glXBindTexImage)    (Display *a, GLXDrawable b, int c, int *d) = NULL;
-void     (*glsym_glXReleaseTexImage) (Display *a, GLXDrawable b, int c) = NULL;
-int      (*glsym_glXGetVideoSync)    (unsigned int *a) = NULL;
-int      (*glsym_glXWaitVideoSync)   (int a, int b, unsigned int *c) = NULL;
-XID      (*glsym_glXCreatePixmap)    (Display *a, void *b, Pixmap c, const int *d) = NULL;
-void     (*glsym_glXDestroyPixmap)   (Display *a, XID b) = NULL;
-void     (*glsym_glXQueryDrawable)   (Display *a, XID b, int c, unsigned int *d) = NULL;
-int      (*glsym_glXSwapIntervalSGI) (int a) = NULL;
-void     (*glsym_glXSwapIntervalEXT) (Display *s, GLXDrawable b, int c) = NULL;
-
-const char *(*glsym_glXQueryExtensionsString) (Display *a, int screen) = NULL;
-#endif
-
-// GLES2 Extensions
-void    (*glsym_glGetProgramBinaryOES) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary) = NULL;
-void    (*glsym_glProgramBinaryOES) (GLuint program, GLenum binaryFormat, const void *binary, GLint length) = NULL;
-void*   (*glsym_glMapBufferOES) (GLenum target, GLenum access) = NULL;
-unsigned char   (*glsym_glUnmapBufferOES) (GLenum target) = NULL;
-void    (*glsym_glGetBufferPointervOES) (GLenum target, GLenum pname, void** params) = NULL;
-void    (*glsym_glTexImage3DOES) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels) = NULL;
-void    (*glsym_glTexSubImage3DOES) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels) = NULL;
-void    (*glsym_glCopyTexSubImage3DOES) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
-void    (*glsym_glCompressedTexImage3DOES) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data) = NULL;
-void    (*glsym_glCompressedTexSubImage3DOES) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data) = NULL;
-void    (*glsym_glFramebufferTexture3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) = NULL;
-void    (*glsym_glGetPerfMonitorGroupsAMD) (GLint* numGroups, GLsizei groupsSize, GLuint* groups) = NULL;
-void    (*glsym_glGetPerfMonitorCountersAMD) (GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters) = NULL;
-void    (*glsym_glGetPerfMonitorGroupStringAMD) (GLuint group, GLsizei bufSize, GLsizei* length, char* groupString) = NULL;
-void    (*glsym_glGetPerfMonitorCounterStringAMD) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, char* counterString) = NULL;
-void    (*glsym_glGetPerfMonitorCounterInfoAMD) (GLuint group, GLuint counter, GLenum pname, void* data) = NULL;
-void    (*glsym_glGenPerfMonitorsAMD) (GLsizei n, GLuint* monitors) = NULL;
-void    (*glsym_glDeletePerfMonitorsAMD) (GLsizei n, GLuint* monitors) = NULL;
-void    (*glsym_glSelectPerfMonitorCountersAMD) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* countersList) = NULL;
-void    (*glsym_glBeginPerfMonitorAMD) (GLuint monitor) = NULL;
-void    (*glsym_glEndPerfMonitorAMD) (GLuint monitor) = NULL;
-void    (*glsym_glGetPerfMonitorCounterDataAMD) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint* bytesWritten) = NULL;
-void    (*glsym_glDiscardFramebufferEXT) (GLenum target, GLsizei numAttachments, const GLenum* attachments) = NULL;
-void    (*glsym_glMultiDrawArraysEXT) (GLenum mode, GLint* first, GLsizei* count, GLsizei primcount) = NULL;
-void    (*glsym_glMultiDrawElementsEXT) (GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount) = NULL;
-void    (*glsym_glDeleteFencesNV) (GLsizei n, const GLuint* fences) = NULL;
-void    (*glsym_glGenFencesNV) (GLsizei n, GLuint* fences) = NULL;
-unsigned char   (*glsym_glIsFenceNV) (GLuint fence) = NULL;
-unsigned char   (*glsym_glTestFenceNV) (GLuint fence) = NULL;
-void    (*glsym_glGetFenceivNV) (GLuint fence, GLenum pname, GLint* params) = NULL;
-void    (*glsym_glFinishFenceNV) (GLuint fence) = NULL;
-void    (*glsym_glSetFenceNV) (GLuint, GLenum) = NULL;
-void    (*glsym_glGetDriverControlsQCOM) (GLint* num, GLsizei size, GLuint* driverControls) = NULL;
-void    (*glsym_glGetDriverControlStringQCOM) (GLuint driverControl, GLsizei bufSize, GLsizei* length, char* driverControlString) = NULL;
-void    (*glsym_glEnableDriverControlQCOM) (GLuint driverControl) = NULL;
-void    (*glsym_glDisableDriverControlQCOM) (GLuint driverControl) = NULL;
-void    (*glsym_glExtGetTexturesQCOM) (GLuint* textures, GLint maxTextures, GLint* numTextures) = NULL;
-void    (*glsym_glExtGetBuffersQCOM) (GLuint* buffers, GLint maxBuffers, GLint* numBuffers) = NULL;
-void    (*glsym_glExtGetRenderbuffersQCOM) (GLuint* renderbuffers, GLint maxRenderbuffers, GLint* numRenderbuffers) = NULL;
-void    (*glsym_glExtGetFramebuffersQCOM) (GLuint* framebuffers, GLint maxFramebuffers, GLint* numFramebuffers) = NULL;
-void    (*glsym_glExtGetTexLevelParameterivQCOM) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint* params) = NULL;
-void    (*glsym_glExtTexObjectStateOverrideiQCOM) (GLenum target, GLenum pname, GLint param) = NULL;
-void    (*glsym_glExtGetTexSubImageQCOM) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void* texels) = NULL;
-void    (*glsym_glExtGetBufferPointervQCOM) (GLenum target, void** params) = NULL;
-void    (*glsym_glExtGetShadersQCOM) (GLuint* shaders, GLint maxShaders, GLint* numShaders) = NULL;
-void    (*glsym_glExtGetProgramsQCOM) (GLuint* programs, GLint maxPrograms, GLint* numPrograms) = NULL;
-unsigned char   (*glsym_glExtIsProgramBinaryQCOM) (GLuint program) = NULL;
-void    (*glsym_glExtGetProgramBinarySourceQCOM) (GLuint program, GLenum shadertype, char* source, GLint* length) = NULL;
-
-
-//------ GLES 2.0 Extensions supported in EvasGL -----//
-static Extension_Entry _gl_ext_entries[] = {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-       //--- Function Extensions ---//
-       { "GL_OES_get_program_binary", "get_program_binary", 0 },
-       { "GL_OES_mapbuffer", "mapbuffer", 0 },
-       { "GL_OES_texture_3D", "texture_3D", 0 },
-       { "AMD_performance_monitor", "AMD_performance_monitor", 0 },
-       { "GL_EXT_discard_framebuffer", "discard_framebuffer", 0 },
-       { "GL_EXT_multi_draw_arrays", "multi_draw_arrays", 0 },
-       { "GL_NV_fence", "NV_fence", 0 },
-       { "GL_QCOM_driver_control", "QCOM_driver_control", 0 },
-       { "GL_QCOM_extended_get", "QCOM_extended_get", 0 },
-       { "GL_QCOM_extended_get2", "QCOM_extended_get2", 0 },
-
-       //--- Define Extensions ---//
-       { "GL_OES_compressed_ETC1_RGB8_texture", "compressed_ETC1_RGB8_texture", 0 },
-       { "GL_OES_compressed_paletted_texture", "compressed_paletted_texture", 0 },
-       { "GL_OES_depth24", "depth24", 0 },
-       { "GL_OES_depth32", "depth32", 0 },
-       { "GL_OES_EvasGL_image", "EGL_image", 0 },
-       { "GL_OES_packed_depth_stencil", "packed_depth_stencil", 0 },
-       { "GL_OES_rgb8_rgba8", "rgb8_rgba8", 0 },
-       { "GL_OES_standard_derivatives", "standard_derivatives", 0 },
-       { "GL_OES_stencil1", "stencil1", 0 },
-       { "GL_OES_stencil4", "stencil4", 0 },
-       { "GL_OES_texture_float", "texture_float", 0 },
-       { "GL_OES_texture_half_float", "texture_half_float", 0 },
-       { "GL_OES_texture_half_float_linear", "texture_half_float_linear", 0 },
-       { "GL_OES_texture_npot", "texture_npot", 0 },
-       { "GL_OES_vertex_half_float", "vertex_half_float", 0 },
-       { "GL_OES_vertex_type_10_10_10_2", "vertex_type_10_10_10_2", 0 },
-       { "GL_AMD_compressed_3DC_texture", "compressed_3DC_texture", 0 },
-       { "GL_AMD_compressed_ATC_texture", "compressed_ATC_texture", 0 },
-       { "GL_AMD_program_binary_Z400", "program_binary_Z400", 0 },
-       { "GL_EXT_blend_minmax", "blend_minmax", 0 },
-       { "GL_EXT_read_format_bgra", "read_format_bgra", 0 },
-       { "GL_EXT_texture_filter_anisotropic", "texture_filter_anisotrophic", 0 },
-       { "GL_EXT_texture_format_BGRA8888", "texture_format_BGRA8888", 0 },
-       { "GL_EXT_texture_type_2_10_10_10_REV", "texture_type_2_10_10_10_rev", 0 },
-       { "GL_IMG_program_binary", "IMG_program_binary", 0 },
-       { "GL_IMG_read_format", "IMG_read_format", 0 },
-       { "GL_IMG_shader_binary", "IMG_shader_binary", 0 },
-       { "GL_IMG_texture_compression_pvrtc", "IMG_texture_compression_pvrtc", 0 },
-       { "GL_QCOM_perfmon_global_mode", "QCOM_perfmon_global_mode", 0 },
-       { "GL_QCOM_writeonly_rendering", "QCOM_writeonly_rendering", 0 },
-#else
-       //--- Function Extensions ---//
-       { "GL_OES_get_program_binary", "get_program_binary", 0 },
-       { "GL_OES_mapbuffer", "mapbuffer", 0 },
-       { "GL_OES_texture_3D", "texture_3D", 0 },
-       { "AMD_performance_monitor", "AMD_performance_monitor", 0 },
-       { "GL_EXT_discard_framebuffer", "discard_framebuffer", 0 },
-       { "GL_EXT_multi_draw_arrays", "multi_draw_arrays", 0 },
-       { "GL_NV_fence", "NV_fence", 0 },
-       { "GL_QCOM_driver_control", "QCOM_driver_control", 0 },
-       { "GL_QCOM_extended_get", "QCOM_extended_get", 0 },
-       { "GL_QCOM_extended_get2", "QCOM_extended_get2", 0 },
-
-       //--- Define Extensions ---//
-       { "GL_OES_compressed_ETC1_RGB8_texture", "compressed_ETC1_RGB8_texture", 0 },
-       { "GL_OES_compressed_paletted_texture", "compressed_paletted_texture", 0 },
-       { "GL_OES_depth24", "depth24", 0 },
-       { "GL_OES_depth32", "depth32", 0 },
-       { "GL_OES_EvasGL_image", "EGL_image", 0 },
-       { "GL_OES_packed_depth_stencil", "packed_depth_stencil", 0 },
-       { "GL_OES_rgb8_rgba8", "rgb8_rgba8", 0 },
-       { "GL_OES_standard_derivatives", "standard_derivatives", 0 },
-       { "GL_OES_stencil1", "stencil1", 0 },
-       { "GL_OES_stencil4", "stencil4", 0 },
-       { "GL_OES_texture_float", "texture_float", 0 },
-       { "GL_OES_texture_half_float", "texture_half_float", 0 },
-       { "GL_OES_texture_half_float_linear", "texture_half_float_linear", 0 },
-       { "GL_OES_texture_npot", "texture_non_power_of_two", 0 },     // Desktop differs
-       { "GL_OES_vertex_half_float", "half_float_vertex", 0 }, // Desktop differs
-       { "GL_OES_vertex_type_10_10_10_2", "vertex_type_10_10_10_2", 0 },
-       { "GL_AMD_compressed_3DC_texture", "compressed_3DC_texture", 0 },
-       { "GL_AMD_compressed_ATC_texture", "compressed_ATC_texture", 0 },
-       { "GL_AMD_program_binary_Z400", "program_binary_Z400", 0 },
-       { "GL_EXT_blend_minmax", "blend_minmax", 0 },
-       { "GL_EXT_read_format_bgra", "bgra", 0 }, // Desktop differs
-       { "GL_EXT_texture_filter_anisotropic", "texture_filter_anisotrophic", 0 },
-       { "GL_EXT_texture_format_BGRA8888", "bgra", 0 }, // Desktop differs
-       { "GL_EXT_texture_type_2_10_10_10_REV", "vertex_type_2_10_10_10_rev", 0 },  // Desktop differs ???
-       { "GL_IMG_program_binary", "IMG_program_binary", 0 },
-       { "GL_IMG_read_format", "IMG_read_format", 0 },
-       { "GL_IMG_shader_binary", "IMG_shader_binary", 0 },
-       { "GL_IMG_texture_compression_pvrtc", "IMG_texture_compression_pvrtc", 0 },
-       { "GL_QCOM_perfmon_global_mode", "QCOM_perfmon_global_mode", 0 },
-       { "GL_QCOM_writeonly_rendering", "QCOM_writeonly_rendering", 0 },
-
-#endif
-       { NULL, NULL, 0}
-};
-
-//------ Extensions supported in EvasGL -----//
-static Extension_Entry _evasgl_ext_entries[] = {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-       { "EvasGL_KHR_image", "EGL_KHR_image", 0 },
-       { "EvasGL_KHR_vg_parent_image", "EGL_KHR_vg_parent_image", 0 },
-       { "EvasGL_KHR_gl_texture_2D_image", "EGL_KHR_gl_texture_2D_image", 0 },
-       { "EvasGL_KHR_gl_texture_cubemap_image", "EGL_KHR_gl_texture_cubemap_image", 0 },
-       { "EvasGL_KHR_gl_texture_3D_image", "EGL_KHR_gl_texture_3D_image", 0 },
-       { "EvasGL_KHR_gl_renderbuffer_image", "EGL_KHR_gl_renderbuffer_image", 0 },
-#else
-#endif
-       { NULL, NULL, 0 }
-};
-
-static void
-_sym_init(void)
-{
-   static int done = 0;
-
-   if (done) return;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-#define FINDSYM(dst, sym, typ) \
-   if ((!dst) && (glsym_eglGetProcAddress)) dst = (typ)glsym_eglGetProcAddress(sym); \
-   if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
-
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB", glsym_func_eng_fn);
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressKHR", glsym_func_eng_fn);
-
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImage", glsym_func_void);
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImageEXT", glsym_func_void);
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImageARB", glsym_func_void);
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImageKHR", glsym_func_void);
-
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImage", glsym_func_void);
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImageEXT", glsym_func_void);
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImageARB", glsym_func_void);
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImageKHR", glsym_func_void);
-
-   FINDSYM(glsym_eglCreateImage, "eglCreateImage", glsym_func_void_ptr);
-   FINDSYM(glsym_eglCreateImage, "eglCreateImageEXT", glsym_func_void_ptr);
-   FINDSYM(glsym_eglCreateImage, "eglCreateImageARB", glsym_func_void_ptr);
-   FINDSYM(glsym_eglCreateImage, "eglCreateImageKHR", glsym_func_void_ptr);
-
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImage", glsym_func_void);
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImageEXT", glsym_func_void);
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImageARB", glsym_func_void);
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImageKHR", glsym_func_void);
-
-   FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", glsym_func_void);
-
-   FINDSYM(glsym_glEGLImageTargetRenderbufferStorageOES, "glEGLImageTargetRenderbufferStorageOES", glsym_func_void);
-
-   FINDSYM(glsym_eglMapImageSEC, "eglMapImageSEC", glsym_func_void_ptr);
-   FINDSYM(glsym_eglUnmapImageSEC, "eglUnmapImageSEC", glsym_func_uint);
-
-   FINDSYM(glsym_eglQueryString, "eglQueryString", glsym_func_const_char_ptr);
-
-   FINDSYM(glsym_eglLockSurface, "eglLockSurface", glsym_func_uint);
-   FINDSYM(glsym_eglLockSurface, "eglLockSurfaceEXT", glsym_func_uint);
-   FINDSYM(glsym_eglLockSurface, "eglLockSurfaceARB", glsym_func_uint);
-   FINDSYM(glsym_eglLockSurface, "eglLockSurfaceKHR", glsym_func_uint);
-
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurface", glsym_func_uint);
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurfaceEXT", glsym_func_uint);
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurfaceARB", glsym_func_uint);
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurfaceKHR", glsym_func_uint);
-
-#else
-#define FINDSYM(dst, sym, typ) \
-   if ((!dst) && (glsym_glXGetProcAddress)) dst = (typ)glsym_glXGetProcAddress(sym); \
-   if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
-
-   FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddress", glsym_func_eng_fn);
-   FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressEXT", glsym_func_eng_fn);
-   FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressARB", glsym_func_eng_fn);
-
-   FINDSYM(glsym_glXBindTexImage, "glXBindTexImage", glsym_func_void);
-   FINDSYM(glsym_glXBindTexImage, "glXBindTexImageEXT", glsym_func_void);
-   FINDSYM(glsym_glXBindTexImage, "glXBindTexImageARB", glsym_func_void);
-
-   FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImage", glsym_func_void);
-   FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageEXT", glsym_func_void);
-   FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageARB", glsym_func_void);
-
-   FINDSYM(glsym_glXGetVideoSync, "glXGetVideoSyncSGI", glsym_func_int);
-
-   FINDSYM(glsym_glXWaitVideoSync, "glXWaitVideoSyncSGI", glsym_func_int);
-
-   FINDSYM(glsym_glXCreatePixmap, "glXCreatePixmap", glsym_func_xid);
-   FINDSYM(glsym_glXCreatePixmap, "glXCreatePixmapEXT", glsym_func_xid);
-   FINDSYM(glsym_glXCreatePixmap, "glXCreatePixmapARB", glsym_func_xid);
-
-   FINDSYM(glsym_glXDestroyPixmap, "glXDestroyPixmap", glsym_func_void);
-   FINDSYM(glsym_glXDestroyPixmap, "glXDestroyPixmapEXT", glsym_func_void);
-   FINDSYM(glsym_glXDestroyPixmap, "glXDestroyPixmapARB", glsym_func_void);
-
-   FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawable", glsym_func_void);
-   FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawableEXT", glsym_func_void);
-   FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawableARB", glsym_func_void);
-
-   FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalMESA", glsym_func_int);
-   FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalSGI", glsym_func_int);
-
-   FINDSYM(glsym_glXSwapIntervalEXT, "glXSwapIntervalEXT", glsym_func_void);
-
-   FINDSYM(glsym_glXQueryExtensionsString, "glXQueryExtensionsString", glsym_func_const_char_ptr);
-#endif
-
-   //----------- GLES 2.0 Extensions ------------//
-   // If the symbol's not found, they get set to NULL
-   // If one of the functions in the extension exists, the extension in supported
-   /* GL_OES_get_program_binary */
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinaryOES", glsym_func_void);
-
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinaryOES", glsym_func_void);
-
-   // Check the first function to see if the extension is supported...
-   if (glsym_glGetProgramBinaryOES) _gl_ext_entries[0].supported = 1;
-
-
-   /* GL_OES_mapbuffer */
-   FINDSYM(glsym_glMapBufferOES, "glMapBuffer", glsym_func_void_ptr);
-   FINDSYM(glsym_glMapBufferOES, "glMapBufferEXT", glsym_func_void_ptr);
-   FINDSYM(glsym_glMapBufferOES, "glMapBufferARB", glsym_func_void_ptr);
-   FINDSYM(glsym_glMapBufferOES, "glMapBufferOES", glsym_func_void_ptr);
-
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBuffer", glsym_func_uchar);
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBufferEXT", glsym_func_uchar);
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBufferARB", glsym_func_uchar);
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBufferOES", glsym_func_uchar);
-
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointerv", glsym_func_void);
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointervEXT", glsym_func_void);
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointervARB", glsym_func_void);
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointervOES", glsym_func_void);
-
-   if (glsym_glMapBufferOES) _gl_ext_entries[1].supported = 1;
-
-   /* GL_OES_texture_3D */
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3D", glsym_func_void);
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3D", glsym_func_void);
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3D", glsym_func_void);
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3D", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3D", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3D", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3DARB", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3DEXT", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3DOES", glsym_func_void);
-
-   if (glsym_glTexSubImage3DOES) _gl_ext_entries[2].supported = 1;
-
-   /* AMD_performance_monitor */
-   FINDSYM(glsym_glGetPerfMonitorGroupsAMD, "glGetPerfMonitorGroupsAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCountersAMD, "glGetPerfMonitorCountersAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorGroupStringAMD, "glGetPerfMonitorGroupStringAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCounterStringAMD, "glGetPerfMonitorCounterStringAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCounterInfoAMD, "glGetPerfMonitorCounterInfoAMD", glsym_func_void);
-   FINDSYM(glsym_glGenPerfMonitorsAMD, "glGenPerfMonitorsAMD", glsym_func_void);
-   FINDSYM(glsym_glDeletePerfMonitorsAMD, "glDeletePerfMonitorsAMD", glsym_func_void);
-   FINDSYM(glsym_glSelectPerfMonitorCountersAMD, "glSelectPerfMonitorCountersAMD", glsym_func_void);
-   FINDSYM(glsym_glBeginPerfMonitorAMD, "glBeginPerfMonitorAMD", glsym_func_void);
-   FINDSYM(glsym_glEndPerfMonitorAMD, "glEndPerfMonitorAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCounterDataAMD, "glGetPerfMonitorCounterDataAMD", glsym_func_void);
-
-   if (glsym_glGetPerfMonitorGroupsAMD) _gl_ext_entries[3].supported = 1;
-
-   /* GL_EXT_discard_framebuffer */
-   FINDSYM(glsym_glDiscardFramebufferEXT, "glDiscardFramebuffer", glsym_func_void);
-   FINDSYM(glsym_glDiscardFramebufferEXT, "glDiscardFramebufferARB", glsym_func_void);
-   FINDSYM(glsym_glDiscardFramebufferEXT, "glDiscardFramebufferEXT", glsym_func_void);
-
-   if (glsym_glDiscardFramebufferEXT) _gl_ext_entries[4].supported = 1;
-
-   /* GL_EXT_multi_draw_arrays */
-   FINDSYM(glsym_glMultiDrawArraysEXT, "glMultiDrawArrays", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawArraysEXT, "glMultiDrawArraysARB", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawArraysEXT, "glMultiDrawArraysEXT", glsym_func_void);
-
-   FINDSYM(glsym_glMultiDrawElementsEXT, "glMultiDrawElements", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawElementsEXT, "glMultiDrawElementsARB", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawElementsEXT, "glMultiDrawElementsEXT", glsym_func_void);
-
-   if (glsym_glMultiDrawArraysEXT) _gl_ext_entries[5].supported = 1;
-
-   /* GL_NV_fence */
-   FINDSYM(glsym_glDeleteFencesNV, "glDeleteFencesNV", glsym_func_void);
-   FINDSYM(glsym_glGenFencesNV, "glGenFencesNV", glsym_func_void);
-   FINDSYM(glsym_glIsFenceNV, "glIsFenceNV", glsym_func_uchar);
-   FINDSYM(glsym_glTestFenceNV, "glTestFenceNV", glsym_func_uchar);
-   FINDSYM(glsym_glGetFenceivNV, "glGetFenceivNV", glsym_func_void);
-   FINDSYM(glsym_glFinishFenceNV, "glFinishFenceNV", glsym_func_void);
-   FINDSYM(glsym_glSetFenceNV, "glSetFenceNV", glsym_func_void);
-
-   if (glsym_glDeleteFencesNV) _gl_ext_entries[6].supported = 1;
-
-   /* GL_QCOM_driver_control */
-   FINDSYM(glsym_glGetDriverControlsQCOM, "glGetDriverControlsQCOM", glsym_func_void);
-   FINDSYM(glsym_glGetDriverControlStringQCOM, "glGetDriverControlStringQCOM", glsym_func_void);
-   FINDSYM(glsym_glEnableDriverControlQCOM, "glEnableDriverControlQCOM", glsym_func_void);
-   FINDSYM(glsym_glDisableDriverControlQCOM, "glDisableDriverControlQCOM", glsym_func_void);
-
-   if (glsym_glGetDriverControlsQCOM) _gl_ext_entries[7].supported = 1;
-
-   /* GL_QCOM_extended_get */
-   FINDSYM(glsym_glExtGetTexturesQCOM, "glExtGetTexturesQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetBuffersQCOM, "glExtGetBuffersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetRenderbuffersQCOM, "glExtGetRenderbuffersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetFramebuffersQCOM, "glExtGetFramebuffersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetTexLevelParameterivQCOM, "glExtGetTexLevelParameterivQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtTexObjectStateOverrideiQCOM, "glExtTexObjectStateOverrideiQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetTexSubImageQCOM, "glExtGetTexSubImageQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetBufferPointervQCOM, "glExtGetBufferPointervQCOM", glsym_func_void);
-
-   if (glsym_glExtGetTexturesQCOM) _gl_ext_entries[8].supported = 1;
-
-   /* GL_QCOM_extended_get2 */
-   FINDSYM(glsym_glExtGetShadersQCOM, "glExtGetShadersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetProgramsQCOM, "glExtGetProgramsQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtIsProgramBinaryQCOM, "glExtIsProgramBinaryQCOM", glsym_func_uchar);
-   FINDSYM(glsym_glExtGetProgramBinarySourceQCOM, "glExtGetProgramBinarySourceQCOM", glsym_func_void);
-
-   if (glsym_glExtGetShadersQCOM) _gl_ext_entries[9].supported = 1;
-}
-
-static void
-_extensions_init(Render_Engine *re)
-{
-   int i;
-   const char *glexts, *evasglexts;
-
-   memset(_gl_ext_string, 0, 1024);
-   memset(_evasgl_ext_string, 0, 1024);
-
-   // GLES 2.0 Extensions
-   glexts = (const char*)glGetString(GL_EXTENSIONS);
-
-   DBG("--------GLES 2.0 Extensions--------");
-   for (i = 0; _gl_ext_entries[i].name != NULL; i++)
-     {
-        if ( (strstr(glexts, _gl_ext_entries[i].name) != NULL) ||
-             (strstr(glexts, _gl_ext_entries[i].real_name) != NULL) )
-          {
-             _gl_ext_entries[i].supported = 1;
-             strcat(_gl_ext_string, _gl_ext_entries[i].name);
-             strcat(_gl_ext_string, " ");
-             DBG("\t%s", _gl_ext_entries[i].name);
-          }
-
-     }
-   DBG(" ");
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // EGL Extensions
-   if (glsym_eglQueryString)
-     {
-        evasglexts = glsym_eglQueryString(re->win->egl_disp, EGL_EXTENSIONS);
-#else
-   if (glsym_glXQueryExtensionsString)
-     {
-        evasglexts = glXQueryExtensionsString(re->info->info.display, 
-                                              re->info->info.screen);
-#endif
-
-        DBG("--------EvasGL Extensions----------");
-        for (i = 0; _evasgl_ext_entries[i].name != NULL; i++)
-          {
-             if ( (strstr(evasglexts, _evasgl_ext_entries[i].name) != NULL) ||
-                  (strstr(evasglexts, _evasgl_ext_entries[i].real_name) != NULL) )
-               {
-                  _evasgl_ext_entries[i].supported = 1;
-                  strcat(_evasgl_ext_string, _evasgl_ext_entries[i].name);
-                  strcat(_evasgl_ext_string, " ");
-                  DBG("\t%s", _evasgl_ext_entries[i].name);
-               }
-          }
-        DBG(" ");
-     }
-}
-
-int _evas_engine_GL_X11_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* Function table for GL APIs */
-static Evas_GL_API gl_funcs;
-/*
-struct xrdb_user
-{
-   time_t last_stat;
-   time_t last_mtime;
-   XrmDatabase db;
-};
-static struct xrdb_user xrdb_user = {0, 0, NULL};
-
-static Eina_Bool
-xrdb_user_query(const char *name, const char *cls, char **type, XrmValue *val)
-{
-   time_t last = xrdb_user.last_stat, now = time(NULL);
-
-   xrdb_user.last_stat = now;
-   if (last != now) // don't stat() more than once every second
-     {
-        struct stat st;
-        const char *home = getenv("HOME");
-        char tmp[PATH_MAX];
-
-        if (!home) goto failed;
-        snprintf(tmp, sizeof(tmp), "%s/.Xdefaults", home);
-        if (stat(tmp, &st) != 0) goto failed;
-        if (xrdb_user.last_mtime != st.st_mtime)
-          {
-             if (xrdb_user.db) XrmDestroyDatabase(xrdb_user.db);
-             xrdb_user.db = XrmGetFileDatabase(tmp);
-             if (!xrdb_user.db) goto failed;
-             xrdb_user.last_mtime = st.st_mtime;
-          }
-     }
-
-   if (!xrdb_user.db) return EINA_FALSE;
-   return XrmGetResource(xrdb_user.db, name, cls, type, val);
-
- failed:
-   if (xrdb_user.db)
-     {
-        XrmDestroyDatabase(xrdb_user.db);
-        xrdb_user.db = NULL;
-     }
-   xrdb_user.last_mtime = 0;
-   return EINA_FALSE;
-}
-*/
-
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_GL_X11 *info;
-
-   info = calloc(1, sizeof(Evas_Engine_Info_GL_X11));
-   info->magic.magic = rand();
-   info->func.best_visual_get = eng_best_visual_get;
-   info->func.best_colormap_get = eng_best_colormap_get;
-   info->func.best_depth_get = eng_best_depth_get;
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_GL_X11 *in;
-// dont free! why bother? its not worth it
-//   eina_log_domain_unregister(_evas_engine_GL_X11_log_dom);
-   in = (Evas_Engine_Info_GL_X11 *)info;
-   free(in);
-}
-
-static int
-_re_wincheck(Render_Engine *re)
-{
-   if (re->win->surf) return 1;
-   eng_window_resurf(re->win);
-   if (!re->win->surf)
-     {
-        ERR("GL engine can't re-create window surface!");
-     }
-   return 0;
-}
-
-static void
-_re_winfree(Render_Engine *re)
-{
-   if (!re->win->surf) return;
-   eng_window_unsurf(re->win);
-}
-
-static Render_Engine_GL_Resource *
-_create_internal_glue_resources(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   Render_Engine_GL_Resource *rsc;
-
-   rsc = calloc(1, sizeof(Render_Engine_GL_Resource));
-
-   if (!rsc) return NULL;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // EGL
-   int context_attrs[3];
-   context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
-   context_attrs[1] = 2;
-   context_attrs[2] = EGL_NONE;
-
-   // Create resource surface for EGL
-   rsc->surface = eglCreateWindowSurface(re->win->egl_disp,
-                                         re->win->egl_config,
-                                         (EGLNativeWindowType)DefaultRootWindow(re->info->info.display),
-                                         NULL);
-   if (!rsc->surface)
-     {
-        ERR("Creating internal resource surface failed.");
-        free(rsc);
-        return NULL;
-     }
-
-   // Create a resource context for EGL
-   rsc->context = eglCreateContext(re->win->egl_disp,
-                                   re->win->egl_config,
-                                   re->win->egl_context[0], // Evas' GL Context
-                                   context_attrs);
-   if (!rsc->context)
-     {
-        ERR("Internal Resource Context Creations Failed.");
-        free(rsc);
-        return NULL;
-     }
-
-   // Add to the resource resource list for cleanup
-   LKL(resource_lock);
-   resource_list = eina_list_prepend(resource_list, rsc);
-   LKU(resource_lock);
-
-   // Set the resource in TLS
-   if (eina_tls_set(resource_key, (void*)rsc) == EINA_FALSE)
-     {
-        ERR("Failed setting TLS Resource");
-        free(rsc);
-        return NULL;
-     }
-
-#else
-   // GLX
-   rsc->context = glXCreateContext(re->info->info.display,
-                                   re->win->visualinfo,
-                                   re->win->context,      // Evas' GL Context
-                                   1);
-   if (!rsc->context)
-     {
-        ERR("Internal Resource Context Creations Failed.");
-        free(rsc);
-        return NULL;
-     }
-
-   // Add to the resource resource list for cleanup
-   LKL(resource_lock);
-   resource_list = eina_list_prepend(resource_list, rsc);
-   LKU(resource_lock);
-
-   // Set the resource in TLS
-   if (eina_tls_set(resource_key, (void*)rsc) == EINA_FALSE)
-     {
-        ERR("Failed setting TLS Resource");
-        free(rsc);
-        return NULL;
-     }
-
-#endif
-
-
-   return rsc;
-}
-
-static int
-_destroy_internal_glue_resources(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   Eina_List *l;
-   Render_Engine_GL_Resource *rsc;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // EGL
-   // Delete the Resources
-   LKL(resource_lock);
-   EINA_LIST_FOREACH(resource_list, l, rsc)
-     {
-        if (rsc->surface) eglDestroySurface(re->win->egl_disp, rsc->surface);
-        if (rsc->context) eglDestroyContext(re->win->egl_disp, rsc->context);
-        free(rsc);
-     }
-   eina_list_free(resource_list);
-   LKU(resource_lock);
-
-   // Destroy TLS
-   eina_tls_free(resource_key);
-#else
-   // GLX
-   // Delete the Resources
-   LKL(resource_lock);
-   EINA_LIST_FOREACH(resource_list, l, rsc)
-     {
-        if (rsc)
-          {
-             glXDestroyContext(re->info->info.display, rsc->context);
-             free(rsc);
-          }
-     }
-   eina_list_free(resource_list);
-   LKU(resource_lock);
-
-   // Destroy TLS
-   eina_tls_free(resource_key);
-#endif
-
-   return 1;
-}
-
-
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_GL_X11 *info;
-
-   info = (Evas_Engine_Info_GL_X11 *)in;
-   if (!e->engine.data.output)
-     {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-#else
-        int eb, evb;
-
-        if (!glXQueryExtension(info->info.display, &eb, &evb)) return 0;
-#endif
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re) return 0;
-        re->info = info;
-        re->evas = e;
-        e->engine.data.output = re;
-        re->w = e->output.w;
-        re->h = e->output.h;
-        re->win = eng_window_new(re->info->info.display,
-                                 re->info->info.drawable,
-                                 re->info->info.screen,
-                                 re->info->info.visual,
-                                 re->info->info.colormap,
-                                 re->info->info.depth,
-                                 re->w,
-                                 re->h,
-                                 re->info->indirect,
-                                 re->info->info.destination_alpha,
-                                 re->info->info.rotation);
-        if (!re->win)
-          {
-             free(re);
-             e->engine.data.output = NULL;
-             return 0;
-          }
-
-        gl_wins++;
-/*
-          {
-             int status;
-             char *type = NULL;
-             XrmValue val;
-
-             re->xr.dpi = 75000; // dpy * 1000
-
-             status = xrdb_user_query("Xft.dpi", "Xft.Dpi", &type, &val);
-             if ((!status) || (!type))
-               {
-                  if (!re->xrdb) re->xrdb = XrmGetDatabase(re->info->info.display);
-                  if (re->xrdb)
-                    status = XrmGetResource(re->xrdb,
-                                            "Xft.dpi", "Xft.Dpi", &type, &val);
-               }
-
-             if ((status) && (type))
-               {
-                  if (!strcmp(type, "String"))
-                    {
-                       const char *str, *dp;
-
-                       str = val.addr;
-                       dp = strchr(str, '.');
-                       if (!dp) dp = strchr(str, ',');
-
-                       if (dp)
-                         {
-                            int subdpi, len, i;
-                            char *buf;
-
-                            buf = alloca(dp - str + 1);
-                            strncpy(buf, str, dp - str);
-                            buf[dp - str] = 0;
-                            len = strlen(dp + 1);
-                            subdpi = atoi(dp + 1);
-
-                            if (len < 3)
-                              {
-                                 for (i = len; i < 3; i++) subdpi *= 10;
-                              }
-                            else if (len > 3)
-                              {
-                                 for (i = len; i > 3; i--) subdpi /= 10;
-                              }
-                            re->xr.dpi = atoi(buf) * 1000;
-                         }
-                       else
-                         re->xr.dpi = atoi(str) * 1000;
-                       evas_common_font_dpi_set(re->xr.dpi / 1000);
-                    }
-               }
-          }
- */
-        if (!initted)
-          {
-             evas_common_cpu_init();
-
-             evas_common_blend_init();
-             evas_common_image_init();
-             evas_common_convert_init();
-             evas_common_scale_init();
-             evas_common_rectangle_init();
-             evas_common_polygon_init();
-             evas_common_line_init();
-             evas_common_font_init();
-             evas_common_draw_init();
-             evas_common_tilebuf_init();
-
-             // Initialize TLS
-             if (eina_tls_new(&resource_key) == EINA_FALSE)
-                ERR("Error creating tls key");
-             DBG("TLS KEY create... %d", resource_key);
-
-             initted = 1;
-          }
-     }
-   else
-     {
-        re = e->engine.data.output;
-        if (_re_wincheck(re))
-          {
-             if ((re->info->info.display != re->win->disp) ||
-                 (re->info->info.drawable != re->win->win) ||
-                 (re->info->info.screen != re->win->screen) ||
-                 (re->info->info.visual != re->win->visual) ||
-                 (re->info->info.colormap != re->win->colormap) ||
-                 (re->info->info.depth != re->win->depth) ||
-                 (re->info->info.destination_alpha != re->win->alpha) ||
-                 (re->info->info.rotation != re->win->rot))
-               {
-                  int inc = 0;
-
-                  if (re->win)
-                    {
-                       re->win->gl_context->references++;
-                       eng_window_free(re->win);
-                       inc = 1;
-                       gl_wins--;
-                    }
-                  re->w = e->output.w;
-                  re->h = e->output.h;
-                  re->win = eng_window_new(re->info->info.display,
-                                           re->info->info.drawable,
-                                           re->info->info.screen,
-                                           re->info->info.visual,
-                                           re->info->info.colormap,
-                                           re->info->info.depth,
-                                           re->w,
-                                           re->h,
-                                           re->info->indirect,
-                                           re->info->info.destination_alpha,
-                                           re->info->info.rotation);
-                  eng_window_use(re->win);
-                  if (re->win) gl_wins++;
-                  if ((re->win) && (inc))
-                     re->win->gl_context->references--;
-               }
-             else if ((re->win->w != e->output.w) ||
-                      (re->win->h != e->output.h))
-               {
-                  re->w = e->output.w;
-                  re->h = e->output.h;
-                  re->win->w = e->output.w;
-                  re->win->h = e->output.h;
-                  eng_window_use(re->win);
-                  evas_gl_common_context_resize(re->win->gl_context, re->win->w, re->win->h, re->win->rot);
-               }
-          }
-     }
-   if (!re->win)
-     {
-        free(re);
-        return 0;
-     }
-
-   if (!e->engine.data.output)
-     {
-        if (re->win)
-          {
-             eng_window_free(re->win);
-             gl_wins--;
-          }
-        free(re);
-        return 0;
-     }
-   re->tb = evas_common_tilebuf_new(re->win->w, re->win->h);
-   if (!re->tb)
-     {
-        if (re->win)
-          {
-             eng_window_free(re->win);
-             gl_wins--;
-          }
-        free(re);
-        return 0;
-     }
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   if (!e->engine.data.context)
-     e->engine.data.context =
-     e->engine.func->context_new(e->engine.data.output);
-   eng_window_use(re->win);
-
-   re->vsync = 0;
-   _sym_init();
-   _extensions_init(re);
-
-   // This is used in extensions.  Not pretty but can't get display otherwise.
-   current_engine = re;
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-
-   if (re)
-     {
-// NOTE: XrmGetDatabase() result is shared per connection, do not free it.
-//   if (re->xrdb) XrmDestroyDatabase(re->xrdb);
-
-#if 0
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        // Destroy the resource surface
-        // Only required for EGL case
-        if (re->surface)
-           eglDestroySurface(re->win->egl_disp, re->surface);
-#endif
-
-        // Destroy the resource context
-        _destroy_internal_context(re, context);
-#endif
-        if (re->win)
-          {
-             if ((initted == 1) && (gl_wins == 1))
-                  _destroy_internal_glue_resources(re);
-             eng_window_free(re->win);
-             gl_wins--;
-          }
-        evas_common_tilebuf_free(re->tb);
-        free(re);
-     }
-   if ((initted == 1) && (gl_wins == 0))
-     {
-        evas_common_image_shutdown();
-        evas_common_font_shutdown();
-        initted = 0;
-     }
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->win->w = w;
-   re->win->h = h;
-   eng_window_use(re->win);
-   evas_gl_common_context_resize(re->win->gl_context, w, h, re->win->rot);
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_resize(re->win->gl_context, re->win->w, re->win->h, re->win->rot);
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-
-   RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, re->win->w, re->win->h);
-   if ((w <= 0) || (h <= 0)) return;
-   if (!re->win->draw.redraw)
-     {
-#if 1
-        re->win->draw.x1 = x;
-        re->win->draw.y1 = y;
-        re->win->draw.x2 = x + w - 1;
-        re->win->draw.y2 = y + h - 1;
-#else
-        re->win->draw.x1 = 0;
-        re->win->draw.y1 = 0;
-        re->win->draw.x2 = re->win->w - 1;
-        re->win->draw.y2 = re->win->h - 1;
-#endif
-     }
-   else
-     {
-        if (x < re->win->draw.x1) re->win->draw.x1 = x;
-        if (y < re->win->draw.y1) re->win->draw.y1 = y;
-        if ((x + w - 1) > re->win->draw.x2) re->win->draw.x2 = x + w - 1;
-        if ((y + h - 1) > re->win->draw.y2) re->win->draw.y2 = y + h - 1;
-     }
-   re->win->draw.redraw = 1;
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-/*   re->win->draw.redraw = 0;*/
-//   INF("GL: finish update cycle!");
-}
-
-/* vsync games - not for now though */
-#define VSYNC_TO_SCREEN 1
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rects;
-
-   re = (Render_Engine *)data;
-   /* get the upate rect surface - return engine data as dummy */
-   rects = evas_common_tilebuf_get_render_rects(re->tb);
-   if (rects)
-     {
-/*        
-        Tilebuf_Rect *r;
-        
-        printf("REAAAAACCTS\n");
-        EINA_INLIST_FOREACH(EINA_INLIST_GET(rects), r)
-          {
-             printf("  %i %i %ix%i\n", r->x, r->y, r->w, r->h);
-          }
- */
-        evas_common_tilebuf_free_render_rects(rects);
-        evas_common_tilebuf_clear(re->tb);
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        // dont need to for egl - eng_window_use() can check for other ctxt's
-#else
-        eng_window_use(NULL);
-#endif
-        eng_window_use(re->win);
-        if (!_re_wincheck(re)) return NULL;
-        evas_gl_common_context_flush(re->win->gl_context);
-        evas_gl_common_context_newframe(re->win->gl_context);
-        if (x) *x = 0;
-        if (y) *y = 0;
-        if (w) *w = re->win->w;
-        if (h) *h = re->win->h;
-        if (cx) *cx = 0;
-        if (cy) *cy = 0;
-        if (cw) *cw = re->win->w;
-        if (ch) *ch = re->win->h;
-        return re->win->gl_context->def_surface;
-     }
-   return NULL;
-/*   
-   if (!re->win->draw.redraw) return NULL;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // dont need to for egl - eng_window_use() can check for other ctxt's
-#else
-   eng_window_use(NULL);
-#endif
-   eng_window_use(re->win);
-   if (!_re_wincheck(re)) return NULL;
-   evas_gl_common_context_flush(re->win->gl_context);
-   evas_gl_common_context_newframe(re->win->gl_context);
-   if (x) *x = re->win->draw.x1;
-   if (y) *y = re->win->draw.y1;
-   if (w) *w = re->win->draw.x2 - re->win->draw.x1 + 1;
-   if (h) *h = re->win->draw.y2 - re->win->draw.y1 + 1;
-   if (cx) *cx = re->win->draw.x1;
-   if (cy) *cy = re->win->draw.y1;
-   if (cw) *cw = re->win->draw.x2 - re->win->draw.x1 + 1;
-   if (ch) *ch = re->win->draw.y2 - re->win->draw.y1 + 1;
-   return re->win->gl_context->def_surface;
- */
-}
-
-//#define FRAMECOUNT 1
-
-#ifdef FRAMECOUNT
-static double
-get_time(void)
-{
-   struct timeval timev;
-
-   gettimeofday(&timev, NULL);
-   return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000);
-}
-#endif
-
-static int safe_native = -1;
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-   Render_Engine *re;
-#ifdef FRAMECOUNT
-   static double pt = 0.0;
-   double ta, tb;
-#endif
-
-   re = (Render_Engine *)data;
-   /* put back update surface.. in this case just unflag redraw */
-   if (!_re_wincheck(re)) return;
-   re->win->draw.redraw = 0;
-   re->win->draw.drew = 1;
-   evas_gl_common_context_flush(re->win->gl_context);
-   if (safe_native == -1)
-     {
-        const char *s = getenv("EVAS_GL_SAFE_NATIVE");
-        safe_native = 0;
-        if (s) safe_native = atoi(s);
-        else
-          {
-             s = (const char *)glGetString(GL_RENDERER);
-             if (s)
-               {
-                  if (strstr(s, "PowerVR SGX 540") ||
-                      strstr(s, "Mali-400 MP"))
-                    safe_native = 1;
-               }
-          }
-     }
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // this is needed to make sure all previous rendering is flushed to
-   // buffers/surfaces
-#ifdef FRAMECOUNT
-   double t0 = get_time();
-   ta = t0 - pt;
-   pt = t0;
-#endif
-   // previous rendering should be done and swapped
-   if (!safe_native) eglWaitNative(EGL_CORE_NATIVE_ENGINE);
-#ifdef FRAMECOUNT
-   double t1 = get_time();
-   tb = t1 - t0;
-   printf("... %1.5f -> %1.5f | ", ta, tb);
-#endif
-//   if (eglGetError() != EGL_SUCCESS)
-//     {
-//        printf("Error:  eglWaitNative(EGL_CORE_NATIVE_ENGINE) fail.\n");
-//     }
-#else
-   // previous rendering should be done and swapped
-   if (!safe_native) glXWaitX();
-#endif
-//x//   printf("frame -> push\n");
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!_re_wincheck(re)) return;
-   if (!re->win->draw.drew) return;
-//x//   printf("frame -> flush\n");
-   re->win->draw.drew = 0;
-   eng_window_use(re->win);
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-#ifdef FRAMECOUNT
-   double t0 = get_time();
-#endif
-   if (!re->vsync)
-     {
-        if (re->info->vsync) eglSwapInterval(re->win->egl_disp, 1);
-        else eglSwapInterval(re->win->egl_disp, 0);
-        re->vsync = 1;
-     }
-   if (re->info->callback.pre_swap)
-     {
-        re->info->callback.pre_swap(re->info->callback.data, re->evas);
-     }
-   eglSwapBuffers(re->win->egl_disp, re->win->egl_surface[0]);
-   if (!safe_native) eglWaitGL();
-   if (re->info->callback.post_swap)
-     {
-        re->info->callback.post_swap(re->info->callback.data, re->evas);
-     }
-#ifdef FRAMECOUNT
-   double t1 = get_time();
-   printf("%1.5f\n", t1 - t0);
-#endif
-//   if (eglGetError() != EGL_SUCCESS)
-//     {
-//        printf("Error:  eglSwapBuffers() fail.\n");
-//     }
-#else
-#ifdef VSYNC_TO_SCREEN
-   if ((re->info->vsync)/* || (1)*/)
-     {
-        if (glsym_glXSwapIntervalEXT)
-          {
-             if (!re->vsync)
-               {
-                  if (re->info->vsync) glsym_glXSwapIntervalEXT(re->win->disp, re->win->win, 1);
-                  else glsym_glXSwapIntervalEXT(re->win->disp, re->win->win, 0);
-                  re->vsync = 1;
-               }
-          }
-        if (glsym_glXSwapIntervalSGI)
-          {
-             if (!re->vsync)
-               {
-                  if (re->info->vsync) glsym_glXSwapIntervalSGI(1);
-                  else glsym_glXSwapIntervalSGI(0);
-                  re->vsync = 1;
-               }
-          }
-        else
-          {
-             if ((glsym_glXGetVideoSync) && (glsym_glXWaitVideoSync))
-               {
-                  unsigned int rc;
-
-                  glsym_glXGetVideoSync(&rc);
-                  glsym_glXWaitVideoSync(1, 0, &rc);
-               }
-          }
-     }
-# endif
-   if (re->info->callback.pre_swap)
-     {
-        re->info->callback.pre_swap(re->info->callback.data, re->evas);
-     }
-#if 1
-   if (1)
-#else
-   if ((re->win->draw.x1 == 0) && (re->win->draw.y1 == 0) && (re->win->draw.x2 == (re->win->w - 1)) && (re->win->draw.y2 == (re->win->h - 1)))
-#endif     
-     {
-//        double t, t2 = 0.0;
-//        t = get_time();
-        glXSwapBuffers(re->win->disp, re->win->win);
-//        t = get_time() - t;
-//        if (!safe_native)
-//          {
-//             t2 = get_time();
-//             glXWaitGL();
-//             t2 = get_time() - t2;
-//          }
-//        printf("swap: %3.5f (%3.5fms), x wait gl: %3.5f (%3.5fms)\n", 
-//               t, t * 1000.0, t2, t2 * 1000.0);
-     }
-   else
-     {
-// FIXME: this doesn't work.. why oh why?
-        int sx, sy, sw, sh;
-
-        sx = re->win->draw.x1;
-        sy = re->win->draw.y1;
-        sw = (re->win->draw.x2 - re->win->draw.x1) + 1;
-        sh = (re->win->draw.y2 - re->win->draw.y1) + 1;
-        sy = re->win->h - sy - sh;
-        
-        glBitmap(0, 0, 0, 0, sx, re->win->h - sy, NULL);
-        glEnable(GL_SCISSOR_TEST);
-        glScissor(sx, sy, sw, sh);
-        glDrawBuffer(GL_FRONT);
-        glCopyPixels(sx, sy, sw, sh, GL_COLOR);
-        glDrawBuffer(GL_BACK);
-        glDisable(GL_SCISSOR_TEST);
-        glBitmap(0, 0, 0, 0, 0, 0, NULL);
-        glFlush();
-     }
-   if (re->info->callback.post_swap)
-     {
-        re->info->callback.post_swap(re->info->callback.data, re->evas);
-     }
-#endif
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-}
-
-static void
-eng_output_dump(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_image_image_all_unload();
-   evas_common_font_font_all_unload();
-   evas_gl_common_image_all_unload(re->win->gl_context);
-   _re_winfree(re);
-}
-
-static void
-eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-//   re->win->gl_context->dc = context;
-   evas_common_draw_context_add_cutout(context, x, y, w, h);
-}
-
-static void
-eng_context_cutout_clear(void *data __UNUSED__, void *context)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-//   re->win->gl_context->dc = context;
-   evas_common_draw_context_clear_cutouts(context);
-}
-
-static void
-eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_rect_draw(re->win->gl_context, x, y, w, h);
-}
-
-static void
-eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_line_draw(re->win->gl_context, x1, y1, x2, y2);
-}
-
-static void *
-eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_point_add(polygon, x, y);
-}
-
-static void *
-eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_points_clear(polygon);
-}
-
-static void
-eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_poly_draw(re->win->gl_context, polygon, x, y);
-}
-
-static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return 1;
-   im = image;
-   return im->alpha;
-}
-
-static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return EVAS_COLORSPACE_ARGB8888;
-   im = image;
-   return im->cs.space;
-}
-
-static void
-eng_image_mask_create(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return;
-   im = image;
-   if (!im->im->image.data)
-      evas_cache_image_load_data(&im->im->cache_entry);
-   if (!im->tex)
-      im->tex = evas_gl_common_texture_new(im->gc, im->im);
-}
-
-
-static void *
-eng_image_alpha_set(void *data, void *image, int has_alpha)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->alpha == has_alpha) return image;
-   if (im->native.data)
-     {
-        im->alpha = has_alpha;
-        return image;
-     }
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        im->alpha = has_alpha;
-        im->tex->alpha = im->alpha;
-        return image;
-     }
-   /* FIXME: can move to gl_common */
-   if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
-   if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image;
-   else if ((!has_alpha) && (!im->im->cache_entry.flags.alpha)) return image;
-   if (im->references > 1)
-     {
-        Evas_GL_Image *im_new;
-
-        im_new = evas_gl_common_image_new_from_copied_data
-           (im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
-               im->im->image.data,
-               eng_image_alpha_get(data, image),
-               eng_image_colorspace_get(data, image));
-        if (!im_new) return im;
-        evas_gl_common_image_free(im);
-        im = im_new;
-     }
-   else
-     evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-   return evas_gl_common_image_alpha_set(im, has_alpha ? 1 : 0);
-//   im->im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
-//   return image;
-}
-
-static void *
-eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-   return image;
-}
-
-static void
-eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-}
-
-static char *
-eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (!im->im) return NULL;
-   return im->im->info.comment;
-}
-
-static char *
-eng_image_format_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   im = image;
-   return NULL;
-}
-
-static void
-eng_image_colorspace_set(void *data, void *image, int cspace)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   im = image;
-   if (im->native.data) return;
-   /* FIXME: can move to gl_common */
-   if (im->cs.space == cspace) return;
-   eng_window_use(re->win);
-   evas_cache_image_colorspace(&im->im->cache_entry, cspace);
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (im->cs.data)
-           {
-              if (!im->cs.no_free) free(im->cs.data);
-              im->cs.data = NULL;
-              im->cs.no_free = 0;
-           }
-         break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         if (im->tex) evas_gl_common_texture_free(im->tex);
-         im->tex = NULL;
-         if (im->cs.data)
-           {
-              if (!im->cs.no_free) free(im->cs.data);
-           }
-         if (im->im->cache_entry.h > 0)
-           im->cs.data =
-              calloc(1, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-         else
-           im->cs.data = NULL;
-         im->cs.no_free = 0;
-         break;
-      default:
-         abort();
-         break;
-     }
-   im->cs.space = cspace;
-}
-
-/////////////////////////////////////////////////////////////////////////
-//
-//
-typedef struct _Native Native;
-
-struct _Native
-{
-   Evas_Native_Surface ns;
-   Pixmap     pixmap;
-   Visual    *visual;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   void      *egl_surface;
-#else
-   void  *fbc;
-   XID    glx_pixmap;
-#endif
-};
-
-// FIXME: this is enabled so updates happen - but its SLOOOOOOOOOOOOOOOW
-// (i am sure this is the reason)  not to mention seemingly superfluous. but
-// i need to enable it for it to work on fglrx at least. havent tried nvidia.
-//
-// why is this the case? does anyone know? has anyone tried it on other gfx
-// drivers?
-//
-//#define GLX_TEX_PIXMAP_RECREATE 1
-
-static void
-_native_bind_cb(void *data, void *image)
-{
-   Evas_GL_Image *im = image;
-   Native *n = im->native.data;
-
-  if (n->ns.type == EVAS_NATIVE_SURFACE_X11)
-    {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-      if (n->egl_surface)
-        {
-          if (glsym_glEGLImageTargetTexture2DOES)
-            {
-              glsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, n->egl_surface);
-              if (eglGetError() != EGL_SUCCESS)
-                ERR("glEGLImageTargetTexture2DOES() failed.");
-            }
-          else
-            ERR("Try glEGLImageTargetTexture2DOES on EGL with no support");
-        }
-#else
-# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
-      Render_Engine *re = data;
-
-      if (glsym_glXBindTexImage)
-        {
-          glsym_glXBindTexImage(re->win->disp, n->glx_pixmap,
-                                GLX_FRONT_LEFT_EXT, NULL);
-          GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        }
-      else
-        ERR("Try glXBindTexImage on GLX with no support");
-# endif
-#endif
-    }
-  else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
-    {
-      glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
-      GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-    }
-   return;
-   data = NULL;
-}
-
-static void
-_native_unbind_cb(void *data, void *image)
-{
-  Evas_GL_Image *im = image;
-  Native *n = im->native.data;
-
-  if (n->ns.type == EVAS_NATIVE_SURFACE_X11)
-    {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-      // nothing
-#else
-# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
-      Render_Engine *re = data;
-
-      if (glsym_glXReleaseTexImage)
-        {
-          glsym_glXReleaseTexImage(re->win->disp, n->glx_pixmap,
-                                   GLX_FRONT_LEFT_EXT);
-          GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-        }
-      else
-        ERR("Try glXReleaseTexImage on GLX with no support");
-# endif
-#endif
-    }
-  else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
-    {
-      glBindTexture(GL_TEXTURE_2D, 0);
-      GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-    }
-   return;
-   data = NULL;
-}
-
-static void
-_native_free_cb(void *data, void *image)
-{
-  Render_Engine *re = data;
-  Evas_GL_Image *im = image;
-  Native *n = im->native.data;
-  uint32_t pmid, texid;
-
-  if (n->ns.type == EVAS_NATIVE_SURFACE_X11)
-    {
-      pmid = n->pixmap;
-      eina_hash_del(re->win->gl_context->shared->native_pm_hash, &pmid, im);
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-      if (n->egl_surface)
-        {
-          if (glsym_eglDestroyImage)
-            {
-              glsym_eglDestroyImage(re->win->egl_disp,
-                                    n->egl_surface);
-              if (eglGetError() != EGL_SUCCESS)
-                ERR("eglDestroyImage() failed.");
-            }
-          else
-            ERR("Try eglDestroyImage on EGL with no support");
-        }
-#else
-# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
-      if (n->glx_pixmap)
-        {
-          if (im->native.loose)
-            {
-              if (glsym_glXReleaseTexImage)
-                {
-                  glsym_glXReleaseTexImage(re->win->disp, n->glx_pixmap,
-                                           GLX_FRONT_LEFT_EXT);
-                  GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-                }
-              else
-                ERR("Try glXReleaseTexImage on GLX with no support");
-            }
-          if (glsym_glXDestroyPixmap)
-            {
-              glsym_glXDestroyPixmap(re->win->disp, n->glx_pixmap);
-              GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-            }
-          else
-            ERR("Try glXDestroyPixmap on GLX with no support");
-          n->glx_pixmap = 0;
-        }
-# endif
-#endif
-    }
-  else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
-    {
-      texid = n->ns.data.opengl.texture_id;
-      eina_hash_del(re->win->gl_context->shared->native_tex_hash, &texid, im);
-    }
-  im->native.data        = NULL;
-  im->native.func.data   = NULL;
-  im->native.func.bind   = NULL;
-  im->native.func.unbind = NULL;
-  im->native.func.free   = NULL;
-  free(n);
-}
-
-static void *
-eng_image_native_set(void *data, void *image, void *native)
-{
-  Render_Engine *re = (Render_Engine *)data;
-  Evas_Native_Surface *ns = native;
-  Evas_GL_Image *im = image, *im2 = NULL;
-  Visual *vis = NULL;
-  Pixmap pm = 0;
-  Native *n = NULL;
-  uint32_t pmid, texid;
-  unsigned int tex = 0;
-  unsigned int fbo = 0;
-
-  if (!im)
-    {
-       if ((!ns) && (ns->type == EVAS_NATIVE_SURFACE_OPENGL))
-         {
-            im = evas_gl_common_image_new_from_data(re->win->gl_context,
-                                                    ns->data.opengl.w,
-                                                    ns->data.opengl.h,
-                                                    NULL, 1,
-                                                    EVAS_COLORSPACE_ARGB8888);
-         }
-       else
-           return NULL;
-    }
-
-  if (ns)
-    {
-      if (ns->type == EVAS_NATIVE_SURFACE_X11)
-        {
-          vis = ns->data.x11.visual;
-          pm = ns->data.x11.pixmap;
-          if (im->native.data)
-            {
-              Evas_Native_Surface *ens = im->native.data;
-              if ((ens->data.x11.visual == vis) &&
-                  (ens->data.x11.pixmap == pm))
-                return im;
-            }
-        }
-      else if (ns->type == EVAS_NATIVE_SURFACE_OPENGL)
-        {
-          tex = ns->data.opengl.texture_id;
-          fbo = ns->data.opengl.framebuffer_id;
-          if (im->native.data)
-            {
-              Evas_Native_Surface *ens = im->native.data;
-              if ((ens->data.opengl.texture_id == tex) &&
-                  (ens->data.opengl.framebuffer_id == fbo))
-                return im;
-            }
-        }
-    }
-  if ((!ns) && (!im->native.data)) return im;
-
-  eng_window_use(re->win);
-
-  if (im->native.data)
-    {
-      if (im->native.func.free)
-        im->native.func.free(im->native.func.data, im);
-      evas_gl_common_image_native_disable(im);
-    }
-
-  if (!ns) return im;
-
-  if (ns->type == EVAS_NATIVE_SURFACE_X11)
-    {
-      pmid = pm;
-      im2 = eina_hash_find(re->win->gl_context->shared->native_pm_hash, &pmid);
-      if (im2 == im) return im;
-      if (im2)
-        {
-           n = im2->native.data;
-           if (n)
-             {
-                evas_gl_common_image_ref(im2);
-                evas_gl_common_image_free(im);
-                return im2;
-             }
-        }
-    }
-  else if (ns->type == EVAS_NATIVE_SURFACE_OPENGL)
-    {
-       texid = tex;
-       im2 = eina_hash_find(re->win->gl_context->shared->native_tex_hash, &texid);
-       if (im2 == im) return im;
-       if (im2)
-         {
-            n = im2->native.data;
-            if (n)
-              {
-                 evas_gl_common_image_ref(im2);
-                 evas_gl_common_image_free(im);
-                 return im2;
-              }
-         }
-
-    }
-  im2 = evas_gl_common_image_new_from_data(re->win->gl_context,
-                                           im->w, im->h, NULL, im->alpha,
-                                           EVAS_COLORSPACE_ARGB8888);
-  evas_gl_common_image_free(im);
-  im = im2;
-  if (ns->type == EVAS_NATIVE_SURFACE_X11)
-    {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-      if (native)
-        {
-          n = calloc(1, sizeof(Native));
-          if (n)
-            {
-              EGLConfig egl_config;
-              int config_attrs[20];
-              int num_config, i = 0;
-
-              eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im);
-
-              config_attrs[i++] = EGL_RED_SIZE;
-              config_attrs[i++] = 8;
-              config_attrs[i++] = EGL_GREEN_SIZE;
-              config_attrs[i++] = 8;
-              config_attrs[i++] = EGL_BLUE_SIZE;
-              config_attrs[i++] = 8;
-              config_attrs[i++] = EGL_ALPHA_SIZE;
-              config_attrs[i++] = 8;
-              config_attrs[i++] = EGL_DEPTH_SIZE;
-              config_attrs[i++] = 0;
-              config_attrs[i++] = EGL_STENCIL_SIZE;
-              config_attrs[i++] = 0;
-              config_attrs[i++] = EGL_RENDERABLE_TYPE;
-              config_attrs[i++] = EGL_OPENGL_ES2_BIT;
-              config_attrs[i++] = EGL_SURFACE_TYPE;
-              config_attrs[i++] = EGL_PIXMAP_BIT;
-              config_attrs[i++] = EGL_NONE;
-
-              if (!eglChooseConfig(re->win->egl_disp, config_attrs,
-                                   &egl_config, 1, &num_config))
-                ERR("eglChooseConfig() failed for pixmap 0x%x, num_config = %i", (unsigned int)pm, num_config);
-              memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
-              n->pixmap = pm;
-              n->visual = vis;
-              if (glsym_eglCreateImage)
-                n->egl_surface = glsym_eglCreateImage(re->win->egl_disp,
-                                                      EGL_NO_CONTEXT,
-                                                      EGL_NATIVE_PIXMAP_KHR,
-                                                      (void *)pm,
-                                                      NULL);
-              else
-                ERR("Try eglCreateImage on EGL with no support");
-              if (!n->egl_surface)
-                ERR("eglCreatePixmapSurface() for 0x%x failed", (unsigned int)pm);
-              im->native.yinvert     = 1;
-              im->native.loose       = 0;
-              im->native.data        = n;
-              im->native.func.data   = re;
-              im->native.func.bind   = _native_bind_cb;
-              im->native.func.unbind = _native_unbind_cb;
-              im->native.func.free   = _native_free_cb;
-              im->native.target      = GL_TEXTURE_2D;
-              im->native.mipmap      = 0;
-              evas_gl_common_image_native_enable(im);
-            }
-        }
-#else
-# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
-      if (native)
-        {
-          int dummy;
-          unsigned int w, h, depth = 32, border;
-          Window wdummy;
-
-          // fixme: round trip :(
-          XGetGeometry(re->win->disp, pm, &wdummy, &dummy, &dummy,
-                       &w, &h, &border, &depth);
-          n = calloc(1, sizeof(Native));
-          if (n)
-            {
-              int pixmap_att[20];
-              unsigned int target = 0;
-              unsigned int i = 0;
-
-              eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im);
-              if ((re->win->depth_cfg[depth].tex_target &
-                   GLX_TEXTURE_2D_BIT_EXT)
-                  //                 && (1) // we assume npo2 for now
-                  // size is pow2 || mnpo2 supported
-                 )
-                target = GLX_TEXTURE_2D_EXT;
-              else if ((re->win->depth_cfg[depth].tex_target &
-                        GLX_TEXTURE_RECTANGLE_BIT_EXT))
-                {
-                  ERR("rect!!! (not handled)");
-                  target = GLX_TEXTURE_RECTANGLE_EXT;
-                }
-              if (!target)
-                {
-                  ERR("broken text-from-pixmap");
-                  if (!(re->win->depth_cfg[depth].tex_target &
-                        GLX_TEXTURE_2D_BIT_EXT))
-                    target = GLX_TEXTURE_RECTANGLE_EXT;
-                  else if (!(re->win->depth_cfg[depth].tex_target &
-                             GLX_TEXTURE_RECTANGLE_BIT_EXT))
-                    target = GLX_TEXTURE_2D_EXT;
-                }
-
-
-              pixmap_att[i++] = GLX_TEXTURE_FORMAT_EXT;
-              pixmap_att[i++] = re->win->depth_cfg[depth].tex_format;
-              pixmap_att[i++] = GLX_MIPMAP_TEXTURE_EXT;
-              pixmap_att[i++] = re->win->depth_cfg[depth].mipmap;
-
-              if (target)
-                {
-                  pixmap_att[i++] = GLX_TEXTURE_TARGET_EXT;
-                  pixmap_att[i++] = target;
-                }
-
-              pixmap_att[i++] = 0;
-
-              memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
-              n->pixmap = pm;
-              n->visual = vis;
-              n->fbc = re->win->depth_cfg[depth].fbc;
-              if (glsym_glXCreatePixmap)
-                n->glx_pixmap = glsym_glXCreatePixmap(re->win->disp,
-                                                      n->fbc,
-                                                      n->pixmap,
-                                                      pixmap_att);
-              else
-                ERR("Try glXCreatePixmap on GLX with no support");
-              if (n->glx_pixmap)
-                {
-//                  printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n",
-//                         n, pm, w, h, depth, n->glx_pixmap);
-                  if (!target)
-                    {
-                      ERR("no target :(");
-                      if (glsym_glXQueryDrawable)
-                        glsym_glXQueryDrawable(re->win->disp,
-                                               n->pixmap,
-                                               GLX_TEXTURE_TARGET_EXT,
-                                               &target);
-                    }
-                  if (target == GLX_TEXTURE_2D_EXT)
-                    {
-                      im->native.target = GL_TEXTURE_2D;
-                      im->native.mipmap = re->win->depth_cfg[depth].mipmap;
-                    }
-#  ifdef GL_TEXTURE_RECTANGLE_ARB
-                  else if (target == GLX_TEXTURE_RECTANGLE_EXT)
-                    {
-                      im->native.target = GL_TEXTURE_RECTANGLE_ARB;
-                      im->native.mipmap = 0;
-                    }
-#  endif
-                  else
-                    {
-                      im->native.target = GL_TEXTURE_2D;
-                      im->native.mipmap = 0;
-                      ERR("still unknown target");
-                    }
-                }
-              else
-                ERR("GLX Pixmap create fail");
-              im->native.yinvert     = re->win->depth_cfg[depth].yinvert;
-              im->native.loose       = re->win->detected.loose_binding;
-              im->native.data        = n;
-              im->native.func.data   = re;
-              im->native.func.bind   = _native_bind_cb;
-              im->native.func.unbind = _native_unbind_cb;
-              im->native.func.free   = _native_free_cb;
-
-              evas_gl_common_image_native_enable(im);
-            }
-        }
-# endif
-#endif
-    }
-  else if (ns->type == EVAS_NATIVE_SURFACE_OPENGL)
-    {
-      if (native)
-        {
-          n = calloc(1, sizeof(Native));
-          if (n)
-            {
-              memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
-
-              eina_hash_add(re->win->gl_context->shared->native_tex_hash, &texid, im);
-
-              n->pixmap = 0;
-              n->visual = 0;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-              n->egl_surface = 0;
-#else
-              n->fbc = 0;
-              n->glx_pixmap = 0;
-#endif
-
-              im->native.yinvert     = 0;
-              im->native.loose       = 0;
-              im->native.data        = n;
-              im->native.func.data   = re;
-              im->native.func.bind   = _native_bind_cb;
-              im->native.func.unbind = _native_unbind_cb;
-              im->native.func.free   = _native_free_cb;
-              im->native.target      = GL_TEXTURE_2D;
-              im->native.mipmap      = 0;
-
-              // FIXME: need to implement mapping sub texture regions
-              // x, y, w, h for possible texture atlasing
-
-              evas_gl_common_image_native_enable(im);
-            }
-        }
-
-    }
-   return im;
-}
-
-static void *
-eng_image_native_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im = image;
-   Native *n;
-   if (!im) return NULL;
-   n = im->native.data;
-   if (!n) return NULL;
-   return &(n->ns);
-}
-
-#if 0 // filtering disabled
-static void
-eng_image_draw_filtered(void *data, void *context, void *surface,
-                        void *image, Evas_Filter_Info *filter)
-{
-   Render_Engine *re = data;
-
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-
-   evas_gl_common_filter_draw(re->win->gl_context, image, filter);
-}
-
-static Filtered_Image *
-eng_image_filtered_get(void *im, uint8_t *key, size_t keylen)
-{
-   return evas_gl_common_image_filtered_get(im, key, keylen);
-}
-
-static Filtered_Image *
-eng_image_filtered_save(void *im, void *fim, uint8_t *key, size_t keylen)
-{
-   return evas_gl_common_image_filtered_save(im, fim, key, keylen);
-}
-
-static void
-eng_image_filtered_free(void *im, Filtered_Image *fim)
-{
-   evas_gl_common_image_filtered_free(im, fim);
-}
-#endif
-
-
-//
-//
-/////////////////////////////////////////////////////////////////////////
-
-static void *
-eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   *error = EVAS_LOAD_ERROR_NONE;
-   eng_window_use(re->win);
-   return evas_gl_common_image_load(re->win->gl_context, file, key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   return evas_gl_common_image_new_from_data(re->win->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   return evas_gl_common_image_new_from_copied_data(re->win->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void
-eng_image_free(void *data, void *image)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_image_free(image);
-}
-
-static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   if (!image)
-     {
-        *w = 0;
-        *h = 0;
-        return;
-     }
-   if (w) *w = ((Evas_GL_Image *)image)->w;
-   if (h) *h = ((Evas_GL_Image *)image)->h;
-}
-
-static void *
-eng_image_size_set(void *data, void *image, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-   Evas_GL_Image *im_old;
-
-   re = (Render_Engine *)data;
-   if (!im) return NULL;
-   if (im->native.data)
-     {
-        im->w = w;
-        im->h = h;
-        return image;
-     }
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        im->w = w;
-        im->h = h;
-        im->tex = evas_gl_common_texture_dynamic_new(im->gc, im);
-        return image;
-     }
-   im_old = image;
-
-   switch (eng_image_colorspace_get(data, image))
-     {
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         w &= ~0x1;
-         break;
-     }
-
-   if ((im_old) &&
-       ((int)im_old->im->cache_entry.w == w) &&
-       ((int)im_old->im->cache_entry.h == h))
-     return image;
-   if (im_old)
-     {
-        im = evas_gl_common_image_new(re->win->gl_context, w, h,
-                                      eng_image_alpha_get(data, image),
-                                      eng_image_colorspace_get(data, image));
-        /*
-        evas_common_load_image_data_from_file(im_old->im);
-        if (im_old->im->image->data)
-          {
-             evas_common_blit_rectangle(im_old->im, im->im, 0, 0, w, h, 0, 0);
-             evas_common_cpu_end_opt();
-          }
- */
-        evas_gl_common_image_free(im_old);
-     }
-   else
-     im = evas_gl_common_image_new(re->win->gl_context, w, h, 1, EVAS_COLORSPACE_ARGB8888);
-   return im;
-}
-
-static void *
-eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   if (im->native.data) return image;
-   eng_window_use(re->win);
-   evas_gl_common_image_dirty(image, x, y, w, h);
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-   int error;
-
-   re = (Render_Engine *)data;
-   if (!image)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_GENERIC;
-        return NULL;
-     }
-   im = image;
-   if (im->native.data)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   eng_window_use(re->win);
-
-   if ((im->tex) && (im->tex->pt) && (im->tex->pt->dyn.img) && (im->cs.space == EVAS_COLORSPACE_ARGB8888))
-     {
-        if (im->tex->pt->dyn.checked_out > 0)
-          {
-             im->tex->pt->dyn.checked_out++;
-             *image_data = im->tex->pt->dyn.data;
-             if (err) *err = EVAS_LOAD_ERROR_NONE;
-             return im;
-          }
-        *image_data = im->tex->pt->dyn.data = glsym_eglMapImageSEC(re->win->egl_disp, im->tex->pt->dyn.img);
-
-        if (!im->tex->pt->dyn.data)
-          {
-             if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             return im;
-          }
-        im->tex->pt->dyn.checked_out++;
-
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-#else
-   if ((im->tex) && (im->tex->pt) && (im->tex->pt->dyn.data))
-     {
-        *image_data = im->tex->pt->dyn.data;
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-
-   eng_window_use(re->win);
-#endif
-
-   /* Engine can be fail to create texture after cache drop like eng_image_content_hint_set function,
-        so it is need to add code which check im->im's NULL value*/
-
-   if (!im->im)
-    {
-       *image_data = NULL;
-       if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       return NULL;
-    }
-
-   error = evas_cache_image_load_data(&im->im->cache_entry);
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (to_write)
-           {
-              if (im->references > 1)
-                {
-                   Evas_GL_Image *im_new;
-
-                   im_new = evas_gl_common_image_new_from_copied_data
-                      (im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
-                       im->im->image.data,
-                       eng_image_alpha_get(data, image),
-                       eng_image_colorspace_get(data, image));
-                   if (!im_new)
-                     {
-                        *image_data = NULL;
-                        if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-                        return NULL;
-                     }
-                   evas_gl_common_image_free(im);
-                   im = im_new;
-                }
-              else
-                evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-           }
-         *image_data = im->im->image.data;
-         break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         *image_data = im->cs.data;
-         break;
-      default:
-         abort();
-         break;
-     }
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data, void *image, DATA32 *image_data)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im, *im2;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->native.data) return image;
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt)
-       && (im->tex->pt->dyn.data)
-       && (im->cs.space == EVAS_COLORSPACE_ARGB8888))
-     {
-        int w, h;
-
-        if (im->tex->pt->dyn.data == image_data)
-          {
-             if (im->tex->pt->dyn.checked_out > 0)
-               {
-                 im->tex->pt->dyn.checked_out--;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-                 if (im->tex->pt->dyn.checked_out == 0)
-                   glsym_eglUnmapImageSEC(re->win->egl_disp, im->tex->pt->dyn.img);
-#endif
-               }
-
-             return image;
-          }
-
-        w = im->im->cache_entry.w;
-        h = im->im->cache_entry.h;
-        im2 = eng_image_new_from_data(data, w, h, image_data,
-                                      eng_image_alpha_get(data, image),
-                                      eng_image_colorspace_get(data, image));
-        if (!im2) return im;
-        evas_gl_common_image_free(im);
-        im = im2;
-        evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-        return im;
-     }
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (image_data != im->im->image.data)
-           {
-              int w, h;
-
-              w = im->im->cache_entry.w;
-              h = im->im->cache_entry.h;
-              im2 = eng_image_new_from_data(data, w, h, image_data,
-                                            eng_image_alpha_get(data, image),
-                                            eng_image_colorspace_get(data, image));
-              if (!im2) return im;
-              evas_gl_common_image_free(im);
-              im = im2;
-           }
-         break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         if (image_data != im->cs.data)
-           {
-              if (im->cs.data)
-                {
-                   if (!im->cs.no_free) free(im->cs.data);
-                }
-              im->cs.data = image_data;
-           }
-         evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-         break;
-      default:
-         abort();
-         break;
-     }
-   return im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-
-   if ((gl_direct_img_obj) && (gl_direct_enabled))
-     {
-        DBG("Rendering Directly to the window");
-        evas_object_image_pixels_dirty_set(gl_direct_img_obj, EINA_TRUE);
-     }
-   else
-     {
-        eng_window_use(re->win);
-        evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-        re->win->gl_context->dc = context;
-        evas_gl_common_image_draw(re->win->gl_context, image,
-                                  src_x, src_y, src_w, src_h,
-                                  dst_x, dst_y, dst_w, dst_h,
-                                  smooth);
-     }
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   if (image) evas_gl_common_image_scale_hint_set(image, hint);
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE;
-   return gim->scale_hint;
-}
-
-static void
-eng_image_map_draw(void *data, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   Evas_GL_Image *gim = image;
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   if (npoints != 4)
-     {
-        // FIXME: nash - you didn't fix this
-        abort();
-     }
-   if ((p[0].x == p[3].x) &&
-       (p[1].x == p[2].x) &&
-       (p[0].y == p[1].y) &&
-       (p[3].y == p[2].y) &&
-       (p[0].x <= p[1].x) &&
-       (p[0].y <= p[2].y) &&
-       (p[0].u == 0) &&
-       (p[0].v == 0) &&
-       (p[1].u == (gim->w << FP)) &&
-       (p[1].v == 0) &&
-       (p[2].u == (gim->w << FP)) &&
-       (p[2].v == (gim->h << FP)) &&
-       (p[3].u == 0) &&
-       (p[3].v == (gim->h << FP)) &&
-       (p[0].col == 0xffffffff) &&
-       (p[1].col == 0xffffffff) &&
-       (p[2].col == 0xffffffff) &&
-       (p[3].col == 0xffffffff))
-     {
-        int dx, dy, dw, dh;
-
-        dx = p[0].x >> FP;
-        dy = p[0].y >> FP;
-        dw = (p[2].x >> FP) - dx;
-        dh = (p[2].y >> FP) - dy;
-        eng_image_draw(data, context, surface, image,
-                       0, 0, gim->w, gim->h, dx, dy, dw, dh, smooth);
-     }
-   else
-     {
-        evas_gl_common_image_map_draw(re->win->gl_context, image, npoints, p,
-                                      smooth, level);
-     }
-}
-
-static void *
-eng_image_map_surface_new(void *data, int w, int h, int alpha)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_image_surface_new(re->win->gl_context, w, h, alpha);
-}
-
-static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_gl_common_image_free(surface);
-}
-
-static void
-eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   if (image) evas_gl_common_image_content_hint_set(image, hint);
-}
-
-static int
-eng_image_content_hint_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE;
-   return gim->content_hint;
-}
-
-static void
-eng_image_cache_flush(void *data)
-{
-   Render_Engine *re;
-   int tmp_size;
-
-   re = (Render_Engine *)data;
-
-   tmp_size = evas_common_image_get_cache();
-   evas_common_image_set_cache(0);
-   evas_common_rgba_image_scalecache_flush();
-   evas_gl_common_image_cache_flush(re->win->gl_context);
-   evas_common_image_set_cache(tmp_size);
-}
-
-static void
-eng_image_cache_set(void *data, int bytes)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_image_set_cache(bytes);
-   evas_common_rgba_image_scalecache_size_set(bytes);
-   evas_gl_common_image_cache_flush(re->win->gl_context);
-}
-
-static int
-eng_image_cache_get(void *data __UNUSED__)
-{
-   return evas_common_image_get_cache();
-}
-
-static void
-eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
-{
-   Evas_GL_Image *im = image;
-
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     *stride = im->tex->pt->dyn.stride;
-   else
-     *stride = im->w * 4;
-}
-
-static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-     {
-        // FIXME: put im into context so we can free it
-        static RGBA_Image *im = NULL;
-
-        if (!im)
-          im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.w = re->win->w;
-        im->cache_entry.h = re->win->h;
-        evas_common_draw_context_font_ext_set(context,
-                                              re->win->gl_context,
-                                              evas_gl_font_texture_new,
-                                              evas_gl_font_texture_free,
-                                              evas_gl_font_texture_draw);
-        evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
-                              intl_props);
-        evas_common_draw_context_font_ext_set(context,
-                                              NULL,
-                                              NULL,
-                                              NULL,
-                                              NULL);
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *info __UNUSED__)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   return re->win->alpha;
-}
-
-static int
-_set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg)
-{
-   // Also initialize pixel format here as well...
-   switch((int)cfg->color_format)
-     {
-      case EVAS_GL_RGB_888:
-         sfc->rt_fmt          = GL_RGB;
-         sfc->rt_internal_fmt = GL_RGB;
-         break;
-      case EVAS_GL_RGBA_8888:
-         sfc->rt_fmt          = GL_RGBA;
-         sfc->rt_internal_fmt = GL_RGBA;
-         break;
-      default:
-         ERR("Invalid Color Format!");
-         return 0;
-     }
-
-   switch(cfg->depth_bits)
-     {
-      case EVAS_GL_DEPTH_NONE:
-         break;
-      case EVAS_GL_DEPTH_BIT_8:
-      case EVAS_GL_DEPTH_BIT_16:
-      case EVAS_GL_DEPTH_BIT_24:
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-         // 24 bit doesn't work... just cover it with 16 for now..
-         sfc->rb_depth_fmt = GL_DEPTH_COMPONENT16;
-#else
-         sfc->rb_depth_fmt = GL_DEPTH_COMPONENT;
-#endif
-         break;
-      case EVAS_GL_DEPTH_BIT_32:
-      default:
-         ERR("Unsupported Depth Bits Format!");
-         return 0;
-     }
-
-   switch(cfg->stencil_bits)
-     {
-      case EVAS_GL_STENCIL_NONE:
-         break;
-      case EVAS_GL_STENCIL_BIT_1:
-      case EVAS_GL_STENCIL_BIT_2:
-      case EVAS_GL_STENCIL_BIT_4:
-      case EVAS_GL_STENCIL_BIT_8:
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-         sfc->rb_stencil_fmt = GL_STENCIL_INDEX8;
-#else
-         sfc->rb_stencil_fmt = GL_STENCIL_INDEX;
-#endif
-         break;
-      case EVAS_GL_STENCIL_BIT_16:
-      default:
-         ERR("Unsupported Stencil Bits Format!");
-         return 0;
-     }
-
-   if (cfg->options_bits)
-     {
-        if (cfg->options_bits & EVAS_GL_OPTIONS_DIRECT)
-           sfc->direct_fb_opt       = 1;
-        // Add other options here...
-     }
-
-   return 1;
-}
-
-static int
-_create_rt_buffers(Render_Engine *data __UNUSED__,
-                   Render_Engine_GL_Surface *sfc)
-{
-   // Render Target texture
-   glGenTextures(1, &sfc->rt_tex );
-
-   // Depth RenderBuffer - Create storage here...
-   if (sfc->depth_bits != EVAS_GL_DEPTH_NONE)
-      glGenRenderbuffers(1, &sfc->rb_depth);
-
-   // Stencil RenderBuffer - Create Storage here...
-   if (sfc->stencil_bits != EVAS_GL_STENCIL_NONE)
-      glGenRenderbuffers(1, &sfc->rb_stencil);
-
-   return 1;
-}
-
-static int
-_attach_fbo_surface(Render_Engine *data __UNUSED__,
-                    Render_Engine_GL_Surface *sfc,
-                    Render_Engine_GL_Context *ctx)
-{
-   int fb_status;
-
-   // Initialize Texture
-   glBindTexture(GL_TEXTURE_2D, sfc->rt_tex );
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, sfc->w, sfc->h, 0,
-                GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-   glBindTexture(GL_TEXTURE_2D, 0);
-
-
-   // Attach texture to FBO
-   glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo);
-   glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                          GL_TEXTURE_2D, sfc->rt_tex, 0);
-
-   // Depth RenderBuffer - Attach it to FBO
-   if (sfc->depth_bits != EVAS_GL_DEPTH_NONE)
-     {
-        glBindRenderbuffer(GL_RENDERBUFFER, sfc->rb_depth);
-        glRenderbufferStorage(GL_RENDERBUFFER, sfc->rb_depth_fmt,
-                              sfc->w, sfc->h);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                  GL_RENDERBUFFER, sfc->rb_depth);
-        glBindRenderbuffer(GL_RENDERBUFFER, 0);
-     }
-
-   // Stencil RenderBuffer - Attach it to FBO
-   if (sfc->stencil_bits != EVAS_GL_STENCIL_NONE)
-     {
-        glBindRenderbuffer(GL_RENDERBUFFER, sfc->rb_stencil);
-        glRenderbufferStorage(GL_RENDERBUFFER, sfc->rb_stencil_fmt,
-                              sfc->w, sfc->h);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                  GL_RENDERBUFFER, sfc->rb_stencil);
-        glBindRenderbuffer(GL_RENDERBUFFER, 0);
-     }
-
-   // Check FBO for completeness
-   fb_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-   if (fb_status != GL_FRAMEBUFFER_COMPLETE)
-     {
-        ERR("FBO not complete!");
-        return 0;
-     }
-
-   return 1;
-}
-
-
-static void *
-eng_gl_surface_create(void *data, void *config, int w, int h)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Resource *rsc;
-   Evas_GL_Config *cfg;
-   int ret;
-
-   sfc = calloc(1, sizeof(Render_Engine_GL_Surface));
-   if (!sfc) return NULL;
-
-   re  = (Render_Engine *)data;
-   cfg = (Evas_GL_Config *)config;
-
-   sfc->initialized  = 0;
-   sfc->fbo_attached = 0;
-   sfc->w            = w;
-   sfc->h            = h;
-   sfc->depth_bits   = cfg->depth_bits;
-   sfc->stencil_bits = cfg->stencil_bits;
-   sfc->rt_tex       = 0;
-   sfc->rb_depth     = 0;
-   sfc->rb_stencil   = 0;
-
-   /* Allow alpha for evas gl direct rendering */
-   // FIXME!!!: A little out of place for for now...
-   if (!gl_direct_override)
-      if (getenv("EVAS_GL_DIRECT_OVERRIDE")) gl_direct_override = 1;
-
-   // Set the internal format based on the config
-   if (!_set_internal_config(sfc, cfg))
-     {
-        ERR("Unsupported Format!");
-        free(sfc);
-        return NULL;
-     }
-
-   if (sfc->direct_fb_opt)
-     {
-        DBG("Enabling Direct rendering to the Evas' window."); 
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        sfc->direct_sfc = re->win->egl_surface[0];
-#else
-        sfc->direct_sfc = re->win->win;
-#endif
-     }
-
-   // Create internal resource context if it hasn't been created already
-   if ((rsc = eina_tls_get(resource_key)) == NULL)
-     {
-        if ((rsc = _create_internal_glue_resources(re)) == NULL)
-          {
-             ERR("Error creating internal resources.");
-             free(sfc);
-             return NULL;
-          }
-     }
-
-   // I'm using evas's original context to create the render target texture
-   // This is to prevent awkwardness in using native_surface_get() function
-   // If the rt texture creation is deferred till the context is created and
-   // make_current called, the user can't call native_surface_get() right
-   // after the surface is created. hence this is done here using evas' context.
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, rsc->surface, rsc->context);
-#else
-   ret = glXMakeCurrent(re->info->info.display, re->win->win, rsc->context);
-#endif
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        free(sfc);
-        return NULL;
-     }
-
-   // Create Render texture
-   if (!_create_rt_buffers(re, sfc))
-     {
-        ERR("_create_rt_buffers() failed.");
-        free(sfc);
-        return NULL;
-     }
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-#else
-   ret = glXMakeCurrent(re->info->info.display, None, NULL);
-#endif
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        free(sfc);
-        return NULL;
-     }
-
-   return sfc;
-}
-
-static int
-eng_gl_surface_destroy(void *data, void *surface)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Resource *rsc;
-   int ret;
-
-   re  = (Render_Engine *)data;
-   sfc = (Render_Engine_GL_Surface*)surface;
-
-   if (!sfc) return 0;
-
-   if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, rsc->surface, rsc->context);
-#else
-   ret = glXMakeCurrent(re->info->info.display, re->win->win, rsc->context);
-#endif
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        return 0;
-     }
-
-   // Reset the Framebuffer binding point
-   if ((current_evgl_ctx) && (current_evgl_ctx->current_fbo == current_evgl_ctx->context_fbo))
-     {
-        //glBindFramebuffer(GL_FRAMEBUFFER, 0);
-        current_evgl_ctx->current_fbo = 0;
-        current_evgl_ctx->current_sfc = NULL;
-     }
-   
-   // Clear direct rendering flag
-   gl_direct_enabled = 0;
-
-   // Delete FBO/RBO and Texture here
-   if (sfc->rt_tex)
-      glDeleteTextures(1, &sfc->rt_tex);
-
-   if (sfc->rb_depth)
-      glDeleteRenderbuffers(1, &sfc->rb_depth);
-
-   if (sfc->rb_stencil)
-      glDeleteRenderbuffers(1, &sfc->rb_stencil);
-
-
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-#else
-   ret = glXMakeCurrent(re->info->info.display, None, NULL);
-#endif
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        free(sfc);
-        return 0;
-     }
-
-   free(sfc);
-   surface = NULL;
-
-   return 1;
-}
-
-static void *
-eng_gl_context_create(void *data, void *share_context)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Context *ctx;
-   Render_Engine_GL_Context *share_ctx;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   int context_attrs[3];
-#endif
-
-   ctx = calloc(1, sizeof(Render_Engine_GL_Context));
-
-   if (!ctx) return NULL;
-
-   re = (Render_Engine *)data;
-   share_ctx = (Render_Engine_GL_Context *)share_context;
-
-   // Set the share context to Evas' GL context if share_context is NULL.
-   // Otherwise set it to the given share_context.
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // EGL
-   context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
-   context_attrs[1] = 2;
-   context_attrs[2] = EGL_NONE;
-
-   if (share_ctx)
-     {
-        ctx->context = eglCreateContext(re->win->egl_disp,
-                                        re->win->egl_config,
-                                        share_ctx->context,      // Share Context
-                                        context_attrs);
-     }
-   else
-     {
-        ctx->context = eglCreateContext(re->win->egl_disp,
-                                        re->win->egl_config,
-                                        re->win->egl_context[0], // Evas' GL Context
-                                        context_attrs);
-     }
-
-   if (!ctx->context)
-     {
-        ERR("eglCreateContext() fail. code=%#x", eglGetError());
-        return NULL;
-     }
-#else
-   // GLX
-   if (share_context)
-     {
-        ctx->context = glXCreateContext(re->info->info.display,
-                                        re->win->visualinfo,
-                                        share_ctx->context,    // Share Context
-                                        1);
-     }
-   else
-     {
-        ctx->context = glXCreateContext(re->info->info.display,
-                                        re->win->visualinfo,
-                                        re->win->context,      // Evas' GL Context
-                                        1);
-     }
-
-   if (!ctx->context)
-     {
-        ERR("glXCreateContext() fail.");
-        return NULL;
-     }
-#endif
-
-   ctx->initialized = 0;
-   ctx->context_fbo = 0;
-   ctx->current_sfc = NULL;
-
-   return ctx;
-}
-
-static int
-eng_gl_context_destroy(void *data, void *context)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Context *ctx;
-   Render_Engine_GL_Resource *rsc;
-   int ret;
-
-   re  = (Render_Engine *)data;
-   ctx = (Render_Engine_GL_Context*)context;
-
-   if (!ctx) return 0;
-
-   if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0;
-
-   // Do a make current with the given context
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   ret = eglMakeCurrent(re->win->egl_disp, rsc->surface,
-                        rsc->surface, ctx->context);
-#else
-   ret = glXMakeCurrent(re->info->info.display, re->win->win,
-                        ctx->context);
-#endif
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        return 0;
-     }
-
-   // Delete the FBO
-   if (ctx->context_fbo)
-        glDeleteFramebuffers(1, &ctx->context_fbo);
-
-   // Destroy the Context
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   eglDestroyContext(re->win->egl_disp, ctx->context);
-
-   ctx->context = EGL_NO_CONTEXT;
-
-   ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE,
-                        EGL_NO_SURFACE, EGL_NO_CONTEXT);
-#else
-   glXDestroyContext(re->info->info.display, ctx->context);
-
-   ctx->context = 0;
-
-   ret = glXMakeCurrent(re->info->info.display, None, NULL);
-#endif
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        return 0;
-     }
-
-   free(ctx);
-   context = NULL;
-
-   return 1;
-}
-
-static int
-eng_gl_make_current(void *data __UNUSED__, void *surface, void *context)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Context *ctx;
-   int ret = 0;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   Render_Engine_GL_Resource *rsc;
-#endif
-
-   re  = (Render_Engine *)data;
-   sfc = (Render_Engine_GL_Surface*)surface;
-   ctx = (Render_Engine_GL_Context*)context;
-
-   // Unset surface/context
-   if ((!sfc) || (!ctx))
-     {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE,
-                             EGL_NO_SURFACE, EGL_NO_CONTEXT);
-#else
-        ret = glXMakeCurrent(re->info->info.display, None, NULL);
-#endif
-        if (!ret)
-          {
-             ERR("xxxMakeCurrent() failed!");
-             return 0;
-          }
-
-        if (ctx) ctx->current_sfc = NULL;
-        if (sfc) sfc->current_ctx = NULL;
-        current_evgl_ctx = NULL;
-        return 1;
-     }
-
-   // Check if direct rendering is possible:
-   //    It's possible when direct_fb_opt is on and either current image 
-   //    object is valid or gl_direct_override is on.  Override allows 
-   //    rendering outside of pixel getter but it doesn't guarantee 
-   //    correct rendering.
-   if ((sfc->direct_fb_opt) && (gl_direct_img_obj || gl_direct_override))
-      gl_direct_enabled = 1;
-   else
-      gl_direct_enabled = 0;
-
-   if (gl_direct_enabled)
-     {
-        // Do a make current only if it's not already current
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        if ((eglGetCurrentContext() != ctx->context) || 
-            (eglGetCurrentSurface(EGL_READ) != sfc->direct_sfc) ||
-            (eglGetCurrentSurface(EGL_DRAW) != sfc->direct_sfc) ) 
-          {
-             int curr_fbo = 0;
-             DBG("Rendering Directly to the window\n");
-
-             // Flush remainder of what's in Evas' pipeline
-             if (re->win) eng_window_use(NULL);
-
-             // Do a make current
-             ret = eglMakeCurrent(re->win->egl_disp, sfc->direct_sfc,
-                                  sfc->direct_sfc, ctx->context);
-             if (!ret)
-               {
-                  ERR("xxxMakeCurrent() failed! code=%#x", eglGetError());
-                  //ERR("xxxMakeCurrent() failed!");
-                  return 0;
-               }
-
-             glGetIntegerv(GL_FRAMEBUFFER_BINDING, &curr_fbo);
-             if (ctx->context_fbo == curr_fbo)
-               {
-                  ctx->current_fbo = 0;
-                  glBindFramebuffer(GL_FRAMEBUFFER, 0);
-               }
-          }
-#else
-        if ((glXGetCurrentContext() != ctx->context))
-          {
-             // Flush remainder of what's in Evas' pipeline
-             if (re->win) eng_window_use(NULL);
-
-             // Do a make current
-             ret = glXMakeCurrent(re->info->info.display, sfc->direct_sfc, ctx->context);
-             if (!ret) 
-               {
-                  ERR("xxxMakeCurrent() failed!");
-                  return 0;
-               }
-          }
-#endif
-     }
-   else
-     {
-        // Do a make current only if it's not already current
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0;
-
-        if ((eglGetCurrentContext() != ctx->context) || 
-            (eglGetCurrentSurface(EGL_READ) != rsc->surface) ||
-            (eglGetCurrentSurface(EGL_DRAW) != rsc->surface) ) 
-          {
-             // Flush remainder of what's in Evas' pipeline
-             if (re->win) eng_window_use(NULL);
-
-             // Do a make current
-             ret = eglMakeCurrent(re->win->egl_disp, rsc->surface,
-                                  rsc->surface, ctx->context);
-             if (!ret)
-               {
-                  ERR("xxxMakeCurrent() failed!");
-                  return 0;
-               }
-          }
-#else
-        if ((glXGetCurrentContext() != ctx->context) ||
-            (glXGetCurrentDrawable() != re->win->win) )
-          {
-             // Flush remainder of what's in Evas' pipeline
-             if (re->win) eng_window_use(NULL);
-
-             // Do a make current
-             ret = glXMakeCurrent(re->info->info.display, re->win->win, ctx->context);
-             if (!ret) 
-               {
-                  ERR("xxxMakeCurrent() failed!");
-                  return 0;
-               }
-          }
-#endif
-
-        // Create FBO if not already created
-        if (!ctx->initialized)
-          {
-             glGenFramebuffers(1, &ctx->context_fbo);
-             ctx->initialized = 1;
-          }
-
-        // Attach FBO if it hasn't been attached or if surface changed
-        if ((!sfc->fbo_attached) || (ctx->current_sfc != sfc))
-          {
-             if (!_attach_fbo_surface(re, sfc, ctx))
-               {
-                  ERR("_attach_fbo_surface() failed.");
-                  return 0;
-               }
-
-             if (ctx->current_fbo)
-                // Bind to the previously bound buffer
-                glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo);
-             else
-                // Bind FBO
-                glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo);
-
-             sfc->fbo_attached = 1;
-          }
-     }
-
-   // Set the current surface/context
-   ctx->current_sfc = sfc;
-   sfc->current_ctx = ctx;
-   current_evgl_ctx = ctx;
-
-   return 1;
-}
-
-static void *
-eng_gl_string_query(void *data __UNUSED__, int name)
-{
-   switch(name)
-     {
-      case EVAS_GL_EXTENSIONS:
-         return (void*)_evasgl_ext_string;
-      default:
-         return NULL;
-     };
-}
-
-static void *
-eng_gl_proc_address_get(void *data __UNUSED__, const char *name)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   if (glsym_eglGetProcAddress) return glsym_eglGetProcAddress(name);
-   return dlsym(RTLD_DEFAULT, name);
-#else
-   if (glsym_glXGetProcAddress) return glsym_glXGetProcAddress(name);
-   return dlsym(RTLD_DEFAULT, name);
-#endif
-}
-
-static int
-eng_gl_native_surface_get(void *data, void *surface, void *native_surface)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Evas_Native_Surface *ns;
-
-   re  = (Render_Engine *)data;
-   sfc = (Render_Engine_GL_Surface*)surface;
-   ns  = (Evas_Native_Surface*)native_surface;
-
-   if (sfc->direct_fb_opt)
-     {
-        ns->type = EVAS_NATIVE_SURFACE_OPENGL;
-        ns->version = EVAS_NATIVE_SURFACE_VERSION;
-        ns->data.opengl.texture_id = sfc->rt_tex;
-        ns->data.opengl.framebuffer_id = 0;
-        ns->data.opengl.x = 0;
-        ns->data.opengl.y = 0;
-        ns->data.opengl.w = sfc->w;
-        ns->data.opengl.h = sfc->h;
-     }
-   else
-     {
-        ns->type = EVAS_NATIVE_SURFACE_OPENGL;
-        ns->version = EVAS_NATIVE_SURFACE_VERSION;
-        ns->data.opengl.texture_id = sfc->rt_tex;
-        ns->data.opengl.framebuffer_id = sfc->rt_tex;
-        ns->data.opengl.x = 0;
-        ns->data.opengl.y = 0;
-        ns->data.opengl.w = sfc->w;
-        ns->data.opengl.h = sfc->h;
-     }
-
-   return 1;
-}
-
-
-static const GLubyte *
-evgl_glGetString(GLenum name)
-{
-   if (name == GL_EXTENSIONS)
-      return (GLubyte *)_gl_ext_string; //glGetString(GL_EXTENSIONS); 
-   else
-      return glGetString(name);
-}
-
-static void
-evgl_glBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-
-   if (!ctx) 
-     {
-        ERR("No current context set.");
-        return;
-     }
-
-   // Take care of BindFramebuffer 0 issue
-   if (framebuffer==0)
-     {
-        if (gl_direct_enabled)
-           glBindFramebuffer(target, 0);
-        else 
-           glBindFramebuffer(target, ctx->context_fbo);
-        ctx->current_fbo = 0;
-     }
-   else
-     {
-        glBindFramebuffer(target, framebuffer);
-
-        // Save this for restore when doing make current
-        ctx->current_fbo = framebuffer;
-     }
-}
-
-static void
-evgl_glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-   // Add logic to take care when renderbuffer=0
-   // On a second thought we don't need this
-   glBindRenderbuffer(target, renderbuffer);
-}
-
-// Transform from Evas Coordinat to GL Coordinate
-// returns: oc[4] original image object dimension in gl coord
-// returns: nc[4] tranformed  (x, y, width, heigth) in gl coord
-static void
-compute_gl_coordinates(Evas_Object *obj, int rot, int clip, 
-                       int x, int y, int width, int height, 
-                       int imgc[4], int objc[4])
-{
-   if (rot == 0)
-     {
-        // oringinal image object coordinate in gl coordinate
-        imgc[0] = obj->cur.geometry.x; 
-        imgc[1] = obj->layer->evas->output.h - obj->cur.geometry.y - obj->cur.geometry.h;
-        imgc[2] = imgc[0] + obj->cur.geometry.w;
-        imgc[3] = imgc[1] + obj->cur.geometry.h;
-
-        // transformed (x,y,width,height) in gl coordinate
-        objc[0] = imgc[0] + x;
-        objc[1] = imgc[1] + y;
-        objc[2] = objc[0] + width;
-        objc[3] = objc[1] + height;
-     }
-   else if (rot == 180)
-     {
-        // oringinal image object coordinate in gl coordinate
-        imgc[0] = obj->layer->evas->output.w - obj->cur.geometry.x - obj->cur.geometry.w;
-        imgc[1] = obj->cur.geometry.y;
-        imgc[2] = imgc[0] + obj->cur.geometry.w;
-        imgc[3] = imgc[1] + obj->cur.geometry.h;
-
-        // transformed (x,y,width,height) in gl coordinate
-        objc[0] = imgc[0] + obj->cur.geometry.w - x - width;
-        objc[1] = imgc[1] + obj->cur.geometry.h - y - height;
-        objc[2] = objc[0] + width;
-        objc[3] = objc[1] + height;
-
-     }
-   else if (rot == 90)
-     {
-        // oringinal image object coordinate in gl coordinate
-        imgc[0] = obj->cur.geometry.y;
-        imgc[1] = obj->cur.geometry.x;
-        imgc[2] = imgc[0] + obj->cur.geometry.h;
-        imgc[3] = imgc[1] + obj->cur.geometry.w;
-
-        // transformed (x,y,width,height) in gl coordinate
-        objc[0] = imgc[0] + obj->cur.geometry.h - y - height;
-        objc[1] = imgc[1] + x;
-        objc[2] = objc[0] + height;
-        objc[3] = objc[1] + width;
-     }
-   else if (rot == 270)
-     {
-        // oringinal image object coordinate in gl coordinate
-        imgc[0] = obj->layer->evas->output.h - obj->cur.geometry.y - obj->cur.geometry.h;
-        imgc[1] = obj->layer->evas->output.w - obj->cur.geometry.x - obj->cur.geometry.w;
-        imgc[2] = imgc[0] + obj->cur.geometry.h;
-        imgc[3] = imgc[1] + obj->cur.geometry.w;
-
-        // transformed (x,y,width,height) in gl coordinate
-        objc[0] = imgc[0] + y;
-        objc[1] = imgc[1] + obj->cur.geometry.w - x - width;
-        objc[2] = objc[0] + height;
-        objc[3] = objc[1] + width;
-     }
-   else
-     {
-        ERR("Invalid rotation angle %d.", rot);
-        return;
-     }
-
-   if (clip)
-     {
-        // Clip against original image object
-        if (objc[0] < imgc[0]) objc[0] = imgc[0];
-        if (objc[0] > imgc[2]) objc[0] = 0;
-
-        if (objc[1] < imgc[1]) objc[1] = imgc[1];
-        if (objc[1] > imgc[3]) objc[1] = 0;
-
-        if (objc[2] < imgc[0]) objc[0] = 0;
-        if (objc[2] > imgc[2]) objc[2] = imgc[2];
-
-        if (objc[3] < imgc[1]) objc[1] = 0;
-        if (objc[3] > imgc[3]) objc[3] = imgc[3];
-     }
-
-   imgc[2] = imgc[2]-imgc[0];     // width
-   imgc[3] = imgc[3]-imgc[1];     // height
-
-   objc[2] = objc[2]-objc[0];     // width
-   objc[3] = objc[3]-objc[1];     // height
-}
-
-static void
-evgl_glClear(GLbitfield mask)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-   int rot = 0;
-   int oc[4], nc[4];
-
-   if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo))
-     {
-        if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context))
-           rot = current_engine->win->gl_context->rot;
-        else
-           ERR("Unable to retrieve rotation angle: %d", rot);
-
-        compute_gl_coordinates(gl_direct_img_obj, rot, 0, 0, 0, 0, 0, oc, nc);
-        glScissor(oc[0], oc[1], oc[2], oc[3]);
-        glClear(mask);
-     }
-   else
-      glClear(mask);
-}
-
-static void
-evgl_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-   current_engine->df_clear_color[0] = red;
-   current_engine->df_clear_color[1] = green;
-   current_engine->df_clear_color[2] = blue;
-   current_engine->df_clear_color[3] = alpha;
-
-   glClearColor(red, green, blue, alpha);
-
-}
-
-static void 
-evgl_glEnable(GLenum cap)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-
-   if (cap == GL_SCISSOR_TEST)
-      if (ctx) ctx->scissor_enabled = 1;
-   glEnable(cap);
-}
-
-static void
-evgl_glDisable(GLenum cap)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-
-   if (cap == GL_SCISSOR_TEST)
-      if (ctx) ctx->scissor_enabled = 0;
-   glDisable(cap);
-}
-
-
-static void
-evgl_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-   int rot = 0;
-   int oc[4], nc[4];
-
-   if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo))
-     {
-        if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context))
-           rot = current_engine->win->gl_context->rot;
-        else
-           ERR("Unable to retrieve rotation angle: %d", rot);
-
-        compute_gl_coordinates(gl_direct_img_obj, rot, 1, x, y, width, height, oc, nc);
-        glReadPixels(nc[0], nc[1], nc[2], nc[3], format, type, pixels);
-     }
-   else
-      glReadPixels(x, y, width, height, format, type, pixels);
-}
-
-static void
-evgl_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-   int rot = 0;
-   int oc[4], nc[4];
-
-   if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo))
-     {
-        if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context))
-           rot = current_engine->win->gl_context->rot;
-        else
-           ERR("Unable to retrieve rotation angle: %d", rot);
-
-        compute_gl_coordinates(gl_direct_img_obj, rot, 1, x, y, width, height, oc, nc);
-        glScissor(nc[0], nc[1], nc[2], nc[3]);
-        ctx->scissor_upated = 1;
-     }
-   else
-      glScissor(x, y, width, height);
-}
-
-static void
-evgl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-   int rot = 0;
-   int oc[4], nc[4];
-
-   if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo))
-     {
-        if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context))
-           rot = current_engine->win->gl_context->rot;
-        else
-           ERR("Unable to retrieve rotation angle: %d", rot);
-
-        compute_gl_coordinates(gl_direct_img_obj, rot, 0, x, y, width, height, oc, nc);
-        glEnable(GL_SCISSOR_TEST);
-        glScissor(oc[0], oc[1], oc[2], oc[3]);
-        glViewport(nc[0], nc[1], nc[2], nc[3]);
-     }
-   else
-      glViewport(x, y, width, height);
-
-}
-
-
-//----------------------------------------------//
-
-static void
-evgl_glClearDepthf(GLclampf depth)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glClearDepthf(depth);
-#else
-   glClearDepth(depth);
-#endif
-}
-
-static void
-evgl_glDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glDepthRangef(zNear, zFar);
-#else
-   glDepthRange(zNear, zFar);
-#endif
-}
-
-static void
-evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-#else
-   if (range)
-     {
-        range[0] = -126; // floor(log2(FLT_MIN))
-        range[1] = 127; // floor(log2(FLT_MAX))
-     }
-   if (precision)
-     {
-        precision[0] = 24; // floor(-log2((1.0/16777218.0)));
-     }
-   return;
-   shadertype = precisiontype = 0;
-#endif
-}
-
-static void
-evgl_glReleaseShaderCompiler(void)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glReleaseShaderCompiler();
-#else
-#endif
-}
-
-static void
-evgl_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length)
-{
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   glShaderBinary(n, shaders, binaryformat, binary, length);
-#else
-// FIXME: need to dlsym/getprocaddress for this
-   return;
-   n = binaryformat = length = 0;
-   shaders = binary = 0;
-#endif
-}
-
-//--------------------------------//
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-// EGL Extensions
-static void *
-evgl_evasglCreateImage(int target, void* buffer, int *attrib_list)
-{
-   if (current_engine)
-     {
-        return glsym_eglCreateImage(current_engine->win->egl_disp,
-                                    EGL_NO_CONTEXT,
-                                    target,
-                                    buffer,
-                                    attrib_list);
-     }
-   else
-     {
-        ERR("Invalid Engine... (Can't acccess EGL Display)\n");
-        return NULL;
-     }
-}
-
-static void
-evgl_evasglDestroyImage(EvasGLImage image)
-{
-   if (current_engine)
-        glsym_eglDestroyImage(current_engine->win->egl_disp, image);
-   else
-      ERR("Invalid Engine... (Can't acccess EGL Display)\n");
-}
-
-static void
-evgl_glEvasGLImageTargetTexture2DOES(GLenum target, EvasGLImage image)
-{
-   glsym_glEGLImageTargetTexture2DOES(target, image);
-}
-
-static void
-evgl_glEvasGLImageTargetRenderbufferStorageOES(GLenum target, EvasGLImage image)
-{
-   glsym_glEGLImageTargetTexture2DOES(target, image);
-}
-#else
-#endif
-
-//--------------------------------//
-
-
-static void *
-eng_gl_api_get(void *data)
-{
-   Render_Engine *re;
-
-   re  = (Render_Engine *)data;
-
-   gl_funcs.version = EVAS_GL_API_VERSION;
-
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, )
-   // GLES 2.0
-   ORD(glActiveTexture);
-   ORD(glAttachShader);
-   ORD(glBindAttribLocation);
-   ORD(glBindBuffer);
-   ORD(glBindTexture);
-   ORD(glBlendColor);
-   ORD(glBlendEquation);
-   ORD(glBlendEquationSeparate);
-   ORD(glBlendFunc);
-   ORD(glBlendFuncSeparate);
-   ORD(glBufferData);
-   ORD(glBufferSubData);
-   ORD(glCheckFramebufferStatus);
-//   ORD(glClear);
-//   ORD(glClearColor);
-//   ORD(glClearDepthf);
-   ORD(glClearStencil);
-   ORD(glColorMask);
-   ORD(glCompileShader);
-   ORD(glCompressedTexImage2D);
-   ORD(glCompressedTexSubImage2D);
-   ORD(glCopyTexImage2D);
-   ORD(glCopyTexSubImage2D);
-   ORD(glCreateProgram);
-   ORD(glCreateShader);
-   ORD(glCullFace);
-   ORD(glDeleteBuffers);
-   ORD(glDeleteFramebuffers);
-   ORD(glDeleteProgram);
-   ORD(glDeleteRenderbuffers);
-   ORD(glDeleteShader);
-   ORD(glDeleteTextures);
-   ORD(glDepthFunc);
-   ORD(glDepthMask);
-//   ORD(glDepthRangef);
-   ORD(glDetachShader);
-//   ORD(glDisable);
-   ORD(glDisableVertexAttribArray);
-   ORD(glDrawArrays);
-   ORD(glDrawElements);
-//   ORD(glEnable);
-   ORD(glEnableVertexAttribArray);
-   ORD(glFinish);
-   ORD(glFlush);
-   ORD(glFramebufferRenderbuffer);
-   ORD(glFramebufferTexture2D);
-   ORD(glFrontFace);
-   ORD(glGenBuffers);
-   ORD(glGenerateMipmap);
-   ORD(glGenFramebuffers);
-   ORD(glGenRenderbuffers);
-   ORD(glGenTextures);
-   ORD(glGetActiveAttrib);
-   ORD(glGetActiveUniform);
-   ORD(glGetAttachedShaders);
-   ORD(glGetAttribLocation);
-   ORD(glGetBooleanv);
-   ORD(glGetBufferParameteriv);
-   ORD(glGetError);
-   ORD(glGetFloatv);
-   ORD(glGetFramebufferAttachmentParameteriv);
-   ORD(glGetIntegerv);
-   ORD(glGetProgramiv);
-   ORD(glGetProgramInfoLog);
-   ORD(glGetRenderbufferParameteriv);
-   ORD(glGetShaderiv);
-   ORD(glGetShaderInfoLog);
-//   ORD(glGetShaderPrecisionFormat);
-   ORD(glGetShaderSource);
-//   ORD(glGetString);
-   ORD(glGetTexParameterfv);
-   ORD(glGetTexParameteriv);
-   ORD(glGetUniformfv);
-   ORD(glGetUniformiv);
-   ORD(glGetUniformLocation);
-   ORD(glGetVertexAttribfv);
-   ORD(glGetVertexAttribiv);
-   ORD(glGetVertexAttribPointerv);
-   ORD(glHint);
-   ORD(glIsBuffer);
-   ORD(glIsEnabled);
-   ORD(glIsFramebuffer);
-   ORD(glIsProgram);
-   ORD(glIsRenderbuffer);
-   ORD(glIsShader);
-   ORD(glIsTexture);
-   ORD(glLineWidth);
-   ORD(glLinkProgram);
-   ORD(glPixelStorei);
-   ORD(glPolygonOffset);
-   ORD(glReadPixels);
-//   ORD(glReleaseShaderCompiler);
-   ORD(glRenderbufferStorage);
-   ORD(glSampleCoverage);
-//   ORD(glScissor);
-//   ORD(glShaderBinary);
-   ORD(glShaderSource);
-   ORD(glStencilFunc);
-   ORD(glStencilFuncSeparate);
-   ORD(glStencilMask);
-   ORD(glStencilMaskSeparate);
-   ORD(glStencilOp);
-   ORD(glStencilOpSeparate);
-   ORD(glTexImage2D);
-   ORD(glTexParameterf);
-   ORD(glTexParameterfv);
-   ORD(glTexParameteri);
-   ORD(glTexParameteriv);
-   ORD(glTexSubImage2D);
-   ORD(glUniform1f);
-   ORD(glUniform1fv);
-   ORD(glUniform1i);
-   ORD(glUniform1iv);
-   ORD(glUniform2f);
-   ORD(glUniform2fv);
-   ORD(glUniform2i);
-   ORD(glUniform2iv);
-   ORD(glUniform3f);
-   ORD(glUniform3fv);
-   ORD(glUniform3i);
-   ORD(glUniform3iv);
-   ORD(glUniform4f);
-   ORD(glUniform4fv);
-   ORD(glUniform4i);
-   ORD(glUniform4iv);
-   ORD(glUniformMatrix2fv);
-   ORD(glUniformMatrix3fv);
-   ORD(glUniformMatrix4fv);
-   ORD(glUseProgram);
-   ORD(glValidateProgram);
-   ORD(glVertexAttrib1f);
-   ORD(glVertexAttrib1fv);
-   ORD(glVertexAttrib2f);
-   ORD(glVertexAttrib2fv);
-   ORD(glVertexAttrib3f);
-   ORD(glVertexAttrib3fv);
-   ORD(glVertexAttrib4f);
-   ORD(glVertexAttrib4fv);
-   ORD(glVertexAttribPointer);
-//   ORD(glViewport);
-#undef ORD
-
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, glsym_)
-   // Extensions
-   ORD(glGetProgramBinaryOES);
-   ORD(glProgramBinaryOES);
-   ORD(glMapBufferOES);
-   ORD(glUnmapBufferOES);
-   ORD(glGetBufferPointervOES);
-   ORD(glTexImage3DOES);
-   ORD(glTexSubImage3DOES);
-   ORD(glCopyTexSubImage3DOES);
-   ORD(glCompressedTexImage3DOES);
-   ORD(glCompressedTexSubImage3DOES);
-   ORD(glFramebufferTexture3DOES);
-   ORD(glGetPerfMonitorGroupsAMD);
-   ORD(glGetPerfMonitorCountersAMD);
-   ORD(glGetPerfMonitorGroupStringAMD);
-   ORD(glGetPerfMonitorCounterStringAMD);
-   ORD(glGetPerfMonitorCounterInfoAMD);
-   ORD(glGenPerfMonitorsAMD);
-   ORD(glDeletePerfMonitorsAMD);
-   ORD(glSelectPerfMonitorCountersAMD);
-   ORD(glBeginPerfMonitorAMD);
-   ORD(glEndPerfMonitorAMD);
-   ORD(glGetPerfMonitorCounterDataAMD);
-   ORD(glDiscardFramebufferEXT);
-   ORD(glMultiDrawArraysEXT);
-   ORD(glMultiDrawElementsEXT);
-   ORD(glDeleteFencesNV);
-   ORD(glGenFencesNV);
-   ORD(glIsFenceNV);
-   ORD(glTestFenceNV);
-   ORD(glGetFenceivNV);
-   ORD(glFinishFenceNV);
-   ORD(glSetFenceNV);
-   ORD(glGetDriverControlsQCOM);
-   ORD(glGetDriverControlStringQCOM);
-   ORD(glEnableDriverControlQCOM);
-   ORD(glDisableDriverControlQCOM);
-   ORD(glExtGetTexturesQCOM);
-   ORD(glExtGetBuffersQCOM);
-   ORD(glExtGetRenderbuffersQCOM);
-   ORD(glExtGetFramebuffersQCOM);
-   ORD(glExtGetTexLevelParameterivQCOM);
-   ORD(glExtTexObjectStateOverrideiQCOM);
-   ORD(glExtGetTexSubImageQCOM);
-   ORD(glExtGetBufferPointervQCOM);
-   ORD(glExtGetShadersQCOM);
-   ORD(glExtGetProgramsQCOM);
-   ORD(glExtIsProgramBinaryQCOM);
-   ORD(glExtGetProgramBinarySourceQCOM);
-#undef ORD
-
-// Override functions wrapped by Evas_GL
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, evgl_)
-   ORD(glBindFramebuffer);
-   ORD(glBindRenderbuffer);
-
-   ORD(glClear);
-   ORD(glClearColor);
-   ORD(glEnable);
-   ORD(glDisable);
-   ORD(glReadPixels);
-   ORD(glScissor);
-   ORD(glViewport);
-
-   // GLES2.0 API compat on top of desktop gl
-   ORD(glClearDepthf);
-   ORD(glDepthRangef);
-   ORD(glGetShaderPrecisionFormat);
-   ORD(glReleaseShaderCompiler);
-   ORD(glShaderBinary);
-
-   ORD(glGetString);
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   // GLES 2.0 Extensions that needs wrapping
-   ORD(evasglCreateImage);
-   ORD(evasglDestroyImage);
-   ORD(glEvasGLImageTargetTexture2DOES);
-   ORD(glEvasGLImageTargetRenderbufferStorageOES);
-#endif
-
-#undef ORD
-
-   return &gl_funcs;
-}
-
-static void
-eng_gl_img_obj_set(void *data, void *image, int has_alpha)
-{
-   Render_Engine *re = (Render_Engine *)data;
-
-   gl_direct_img_obj = NULL;
-
-   // Normally direct rendering isn't allowed if alpha is on and
-   // rotation is not 0.  BUT, if override is on, allow it. 
-   if ((has_alpha) || (re->win->gl_context->rot!=0)) 
-     {
-        if (gl_direct_override)
-           gl_direct_img_obj = image;
-     }
-   else 
-      gl_direct_img_obj = image;   
-}
-
-static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return EVAS_LOAD_ERROR_NONE;
-   im = image;
-   return im->im->cache_entry.load_error;
-}
-
-static Eina_Bool
-eng_image_animated_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return EINA_FALSE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EINA_FALSE;
-
-   return im->flags.animated;
-}
-
-static int
-eng_image_animated_frame_count_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return -1;
-   im = (Image_Entry *)gim->im;
-   if (!im) return -1;
-
-   if (!im->flags.animated) return -1;
-   return im->frame_count;
-}
-
-static Evas_Image_Animated_Loop_Hint
-eng_image_animated_loop_type_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-
-   if (!im->flags.animated) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   return im->loop_hint;
-}
-
-static int
-eng_image_animated_loop_count_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return -1;
-   im = (Image_Entry *)gim->im;
-   if (!im) return -1;
-
-   if (!im->flags.animated) return -1;
-   return im->loop_count;
-}
-
-static double
-eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int start_frame, int frame_num)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return -1;
-   im = (Image_Entry *)gim->im;
-   if (!im) return -1;
-
-   if (!im->flags.animated) return -1;
-   return evas_common_load_rgba_image_frame_duration_from_file(im, start_frame, frame_num);
-}
-
-static Eina_Bool
-eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return EINA_FALSE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EINA_FALSE;
-
-   if (!im->flags.animated) return EINA_FALSE;
-   if (im->cur_frame == frame_index) return EINA_FALSE;
-
-   im->cur_frame = frame_index;
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-eng_image_can_region_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-   if (!gim) return EINA_FALSE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EINA_FALSE;
-   return ((Evas_Image_Load_Func*) im->info.loader)->do_region;
-}
-
-
-static void
-eng_image_max_size_get(void *data, int *maxw, int *maxh)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   if (maxw) *maxw = re->win->gl_context->shared->info.max_texture_size;
-   if (maxh) *maxh = re->win->gl_context->shared->info.max_texture_size;
-}
-
-static int
-module_open(Evas_Module *em)
-{
-   static Eina_Bool xrm_inited = EINA_FALSE;
-   if (!xrm_inited)
-     {
-        xrm_inited = EINA_TRUE;
-        XrmInitialize();
-     }
-
-   if (!em) return 0;
-   if (!evas_gl_common_module_open()) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   if (_evas_engine_GL_X11_log_dom < 0)
-     _evas_engine_GL_X11_log_dom = eina_log_domain_register
-       ("evas-gl_x11", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_GL_X11_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* Allow alpha for evas gl direct rendering */
-   if (getenv("EVAS_GL_DIRECT_OVERRIDE")) gl_direct_override = 1;
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-   #define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(context_cutout_add);
-   ORD(context_cutout_clear);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(output_dump);
-   ORD(rectangle_draw);
-   ORD(line_draw);
-   ORD(polygon_point_add);
-   ORD(polygon_points_clear);
-   ORD(polygon_draw);
-
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_free);
-   ORD(image_size_get);
-   ORD(image_size_set);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_can_region_get);
-   ORD(image_mask_create);
-   ORD(image_native_set);
-   ORD(image_native_get);
-#if 0 // filtering disabled
-   ORD(image_draw_filtered);
-   ORD(image_filtered_get);
-   ORD(image_filtered_save);
-   ORD(image_filtered_free);
-#endif
-
-   ORD(font_draw);
-
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-   ORD(image_stride_get);
-
-   ORD(image_map_draw);
-   ORD(image_map_surface_new);
-   ORD(image_map_surface_free);
-
-   ORD(image_content_hint_set);
-   ORD(image_content_hint_get);
-
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-
-   ORD(gl_surface_create);
-   ORD(gl_surface_destroy);
-   ORD(gl_context_create);
-   ORD(gl_context_destroy);
-   ORD(gl_make_current);
-   ORD(gl_string_query);
-   ORD(gl_proc_address_get);
-   ORD(gl_native_surface_get);
-   ORD(gl_api_get);
-   ORD(gl_img_obj_set);
-
-   ORD(image_load_error_get);
-
-   /* now advertise out own api */
-   ORD(image_animated_get);
-   ORD(image_animated_frame_count_get);
-   ORD(image_animated_loop_type_get);
-   ORD(image_animated_loop_count_get);
-   ORD(image_animated_frame_duration_get);
-   ORD(image_animated_frame_set);
-
-   ORD(image_max_size_get);
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-    eina_log_domain_unregister(_evas_engine_GL_X11_log_dom);
-/*   
-    if (xrdb_user.db)
-      {
-         XrmDestroyDatabase(xrdb_user.db);
-         xrdb_user.last_stat = 0;
-         xrdb_user.last_mtime = 0;
-         xrdb_user.db = NULL;
-      }
- */
-    evas_gl_common_module_close();
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "gl_x11",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_x11);
-
-#ifndef EVAS_STATIC_BUILD_GL_XLIB
-EVAS_EINA_MODULE_DEFINE(engine, gl_x11);
-#endif
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/libraries/evas/src/modules/engines/gl_x11/evas_engine.h b/libraries/evas/src/modules/engines/gl_x11/evas_engine.h
deleted file mode 100644
index 4f62c58..0000000
--- a/libraries/evas/src/modules/engines/gl_x11/evas_engine.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-#include "config.h"
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_gl_common.h"
-#include "Evas.h"
-#include "Evas_Engine_GL_X11.h"
-
-#define GL_GLEXT_PROTOTYPES
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-# if defined(GLES_VARIETY_S3C6410)
-#  include <EGL/egl.h>
-#  include <GLES2/gl2.h>
-#  include <X11/Xlib.h>
-#  include <X11/Xatom.h>
-#  include <X11/Xutil.h>
-#  include <X11/extensions/Xrender.h>
-#  include <X11/Xresource.h> // xres - dpi
-# elif defined(GLES_VARIETY_SGX)
-#  define SUPPORT_X11 1
-#  include <EGL/egl.h>
-#  include <GLES2/gl2.h>
-#  include <GLES2/gl2ext.h>
-#  include <X11/Xlib.h>
-#  include <X11/Xatom.h>
-#  include <X11/Xutil.h>
-#  include <X11/extensions/Xrender.h>
-#  include <X11/Xresource.h> // xres - dpi
-# endif
-#else
-# include <X11/Xlib.h>
-# include <X11/Xatom.h>
-# include <X11/Xutil.h>
-# include <X11/extensions/Xrender.h>
-# include <X11/Xresource.h> // xres - dpi
-# include <GL/gl.h>
-# include <GL/glext.h>
-# include <GL/glx.h>
-#endif
-
-extern int _evas_engine_GL_X11_log_dom ;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
-
-typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window;
-
-struct _Evas_GL_X11_Window
-{
-   Display         *disp;
-   Window           win;
-   int              w, h;
-   int              screen;
-   XVisualInfo     *visualinfo;
-   Visual          *visual;
-   Colormap         colormap;
-   int              depth;
-   int              alpha;
-   int              rot;
-   Evas_Engine_GL_Context *gl_context;
-   struct {
-      int              redraw : 1;
-      int              drew : 1;
-      int              x1, y1, x2, y2;
-   } draw;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   EGLContext       egl_context[1];
-   EGLSurface       egl_surface[1];
-   EGLConfig        egl_config;
-   EGLDisplay       egl_disp;
-#else
-   GLXContext       context;
-   GLXWindow        glxwin;
-   struct {
-      GLXFBConfig   fbc;
-      int           tex_format;
-      int           tex_target;
-      int           mipmap;
-      unsigned char yinvert : 1;
-   } depth_cfg[33]; // config for all 32 possible depths!
-
-   struct {
-      unsigned int loose_binding : 1;
-   } detected;
-#endif
-   int             surf : 1;
-};
-
-Evas_GL_X11_Window *eng_window_new(Display *disp, Window win, int screen,
-                                   Visual *vis, Colormap cmap,
-                                   int depth, int w, int h, int indirect,
-                                   int alpha, int rot);
-void      eng_window_free(Evas_GL_X11_Window *gw);
-void      eng_window_use(Evas_GL_X11_Window *gw);
-void      eng_window_unsurf(Evas_GL_X11_Window *gw);
-void      eng_window_resurf(Evas_GL_X11_Window *gw);
-
-Visual   *eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo);
-Colormap  eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo);
-int       eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/gl_x11/evas_x_main.c b/libraries/evas/src/modules/engines/gl_x11/evas_x_main.c
deleted file mode 100644
index c29ab67..0000000
--- a/libraries/evas/src/modules/engines/gl_x11/evas_x_main.c
+++ /dev/null
@@ -1,901 +0,0 @@
-#include "evas_engine.h"
-
-static Evas_GL_X11_Window *_evas_gl_x11_window = NULL;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-static EGLContext context = EGL_NO_CONTEXT;
-#else
-// FIXME: this will only work for 1 display connection (glx land can have > 1)
-static GLXContext context = 0;
-static GLXContext rgba_context = 0;
-static GLXFBConfig fbconf = 0;
-static GLXFBConfig rgba_fbconf = 0;
-#endif
-
-// fixme: something is up/wrong here - dont know what tho...
-//#define NEWGL 1
-
-static XVisualInfo *_evas_gl_x11_vi = NULL;
-static XVisualInfo *_evas_gl_x11_rgba_vi = NULL;
-static Colormap     _evas_gl_x11_cmap = 0;
-static Colormap     _evas_gl_x11_rgba_cmap = 0;
-
-static int win_count = 0;
-
-Evas_GL_X11_Window *
-eng_window_new(Display *disp,
-               Window   win,
-               int      screen,
-               Visual  *vis,
-               Colormap cmap,
-               int      depth,
-               int      w,
-               int      h,
-               int      indirect,
-               int      alpha,
-               int      rot)
-{
-   Evas_GL_X11_Window *gw;
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   int context_attrs[3];
-   int config_attrs[40];
-   int major_version, minor_version;
-   int num_config, n = 0;
-#endif
-   XVisualInfo *vi_use;
-   const GLubyte *vendor, *renderer, *version;
-
-   if (!_evas_gl_x11_vi) return NULL;
-
-   gw = calloc(1, sizeof(Evas_GL_X11_Window));
-   if (!gw) return NULL;
-
-   win_count++;
-   gw->disp = disp;
-   gw->win = win;
-   gw->screen = screen;
-   gw->visual = vis;
-   gw->colormap = cmap;
-   gw->depth = depth;
-   gw->alpha = alpha;
-   gw->w = w;
-   gw->h = h;
-   gw->rot = rot;
-
-   vi_use = _evas_gl_x11_vi;
-   if (gw->alpha)
-     {
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        if (_evas_gl_x11_rgba_vi)
-          {
-             vi_use = _evas_gl_x11_rgba_vi;
-          }
-#else
-//#ifdef NEWGL
-        if (_evas_gl_x11_rgba_vi)
-          {
-             vi_use = _evas_gl_x11_rgba_vi;
-          }
-//#endif
-#endif
-     }
-   gw->visualinfo = vi_use;
-
-// EGL / GLES
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
-   context_attrs[1] = 2;
-   context_attrs[2] = EGL_NONE;
-
-# if defined(GLES_VARIETY_S3C6410)
-   if (gw->visualinfo->depth == 16) // 16bpp
-     {
-        config_attrs[n++] = EGL_SURFACE_TYPE;
-        config_attrs[n++] = EGL_WINDOW_BIT;
-        config_attrs[n++] = EGL_RENDERABLE_TYPE;
-        config_attrs[n++] = EGL_OPENGL_ES2_BIT;
-        config_attrs[n++] = EGL_RED_SIZE;
-        config_attrs[n++] = 5;
-        config_attrs[n++] = EGL_GREEN_SIZE;
-        config_attrs[n++] = 6;
-        config_attrs[n++] = EGL_BLUE_SIZE;
-        config_attrs[n++] = 5;
-        config_attrs[n++] = EGL_DEPTH_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_STENCIL_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_NONE;
-     }
-   else // 24/32bit. no one does 8bpp anymore. and 15bpp... dead
-     {
-        config_attrs[n++] = EGL_SURFACE_TYPE;
-        config_attrs[n++] = EGL_WINDOW_BIT;
-        config_attrs[n++] = EGL_RENDERABLE_TYPE;
-        config_attrs[n++] = EGL_OPENGL_ES2_BIT;
-        config_attrs[n++] = EGL_RED_SIZE;
-        config_attrs[n++] = 8;
-        config_attrs[n++] = EGL_GREEN_SIZE;
-        config_attrs[n++] = 8;
-        config_attrs[n++] = EGL_BLUE_SIZE;
-        config_attrs[n++] = 8;
-        config_attrs[n++] = EGL_DEPTH_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_STENCIL_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_NONE;
-     }
-# elif defined(GLES_VARIETY_SGX)
-   config_attrs[n++] = EGL_SURFACE_TYPE;
-   config_attrs[n++] = EGL_WINDOW_BIT;
-   config_attrs[n++] = EGL_RENDERABLE_TYPE;
-   config_attrs[n++] = EGL_OPENGL_ES2_BIT;
-#if 0
-// FIXME: n900 - omap3 sgx libs break here
-   config_attrs[n++] = EGL_RED_SIZE;
-   config_attrs[n++] = 1;
-   config_attrs[n++] = EGL_GREEN_SIZE;
-   config_attrs[n++] = 1;
-   config_attrs[n++] = EGL_BLUE_SIZE;
-   config_attrs[n++] = 1;
-// FIXME: end n900 breakage
-#endif
-   if (gw->alpha)
-     {
-        config_attrs[n++] = EGL_ALPHA_SIZE;
-        config_attrs[n++] = 1;
-     }
-   else
-     {
-        config_attrs[n++] = EGL_ALPHA_SIZE;
-        config_attrs[n++] = 0;
-     }
-   config_attrs[n++] = EGL_DEPTH_SIZE;
-   config_attrs[n++] = 0;
-   config_attrs[n++] = EGL_STENCIL_SIZE;
-   config_attrs[n++] = 0;
-   config_attrs[n++] = EGL_NONE;
-# endif
-
-   gw->egl_disp = eglGetDisplay((EGLNativeDisplayType)(gw->disp));
-   if (!gw->egl_disp)
-     {
-        ERR("eglGetDisplay() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   if (!eglInitialize(gw->egl_disp, &major_version, &minor_version))
-     {
-        ERR("eglInitialize() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   eglBindAPI(EGL_OPENGL_ES_API);
-   if (eglGetError() != EGL_SUCCESS)
-     {
-        ERR("eglBindAPI() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   num_config = 0;
-   if (!eglChooseConfig(gw->egl_disp, config_attrs, &gw->egl_config,
-                        1, &num_config) || (num_config != 1))
-     {
-        ERR("eglChooseConfig() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   gw->egl_surface[0] = eglCreateWindowSurface(gw->egl_disp, gw->egl_config,
-                                               (EGLNativeWindowType)gw->win,
-                                               NULL);
-   if (gw->egl_surface[0] == EGL_NO_SURFACE)
-     {
-        ERR("eglCreateWindowSurface() fail for %#x. code=%#x",
-            (unsigned int)gw->win, eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   if (context == EGL_NO_CONTEXT)
-     context = eglCreateContext(gw->egl_disp, gw->egl_config, NULL,
-                                context_attrs);
-   gw->egl_context[0] = context;
-   if (gw->egl_context[0] == EGL_NO_CONTEXT)
-     {
-        ERR("eglCreateContext() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   if (eglMakeCurrent(gw->egl_disp,
-                      gw->egl_surface[0],
-                      gw->egl_surface[0],
-                      gw->egl_context[0]) == EGL_FALSE)
-     {
-        ERR("eglMakeCurrent() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   vendor = glGetString(GL_VENDOR);
-   renderer = glGetString(GL_RENDERER);
-   version = glGetString(GL_VERSION);
-   if (!vendor)   vendor   = (unsigned char *)"-UNKNOWN-";
-   if (!renderer) renderer = (unsigned char *)"-UNKNOWN-";
-   if (!version)  version  = (unsigned char *)"-UNKNOWN-";
-   if (getenv("EVAS_GL_INFO"))
-     {
-        fprintf(stderr, "vendor: %s\n", vendor);
-        fprintf(stderr, "renderer: %s\n", renderer);
-        fprintf(stderr, "version: %s\n", version);
-     }
-// GLX
-#else
-   if (!context)
-     {
-#ifdef NEWGL
-        if (indirect)
-          context = glXCreateNewContext(gw->disp, fbconf,
-                                        GLX_RGBA_TYPE, NULL,
-                                        GL_FALSE);
-        else
-          context = glXCreateNewContext(gw->disp, fbconf,
-                                        GLX_RGBA_TYPE, NULL,
-                                        GL_TRUE);
-#else
-        if (indirect)
-          context = glXCreateContext(gw->disp, gw->visualinfo, NULL, GL_FALSE);
-        else
-          context = glXCreateContext(gw->disp, gw->visualinfo, NULL, GL_TRUE);
-#endif
-     }
-#ifdef NEWGL
-   if ((gw->alpha) && (!rgba_context))
-     {
-        if (indirect)
-          rgba_context = glXCreateNewContext(gw->disp, rgba_fbconf,
-                                             GLX_RGBA_TYPE, context,
-                                             GL_FALSE);
-        else
-          rgba_context = glXCreateNewContext(gw->disp, rgba_fbconf,
-                                             GLX_RGBA_TYPE, context,
-                                             GL_TRUE);
-     }
-   if (gw->alpha)
-     gw->glxwin = glXCreateWindow(gw->disp, rgba_fbconf, gw->win, NULL);
-   else
-     gw->glxwin = glXCreateWindow(gw->disp, fbconf, gw->win, NULL);
-   if (!gw->glxwin)
-     {
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   if (gw->alpha) gw->context = rgba_context;
-   else gw->context = context;
-#else
-   gw->context = context;
-#endif
-
-   if (!gw->context)
-     {
-        eng_window_free(gw);
-        return NULL;
-     }
-   if (gw->context)
-     {
-        int i, j,  num;
-        GLXFBConfig *fbc;
-        int blacklist = 0;
-
-        if (gw->glxwin)
-          {
-             if (!glXMakeContextCurrent(gw->disp, gw->glxwin, gw->glxwin,
-                                        gw->context))
-               {
-                  printf("Error: glXMakeContextCurrent(%p, %p, %p, %p)\n", (void *)gw->disp, (void *)gw->glxwin, (void *)gw->glxwin, (void *)gw->context);
-                  eng_window_free(gw);
-                  return NULL;
-               }
-          }
-        else
-          {
-             if (!glXMakeCurrent(gw->disp, gw->win, gw->context))
-               {
-                  printf("Error: glXMakeCurrent(%p, 0x%x, %p) failed\n", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context);
-                  eng_window_free(gw);
-                  return NULL;
-               }
-          }
-
-        // FIXME: move this up to context creation
-
-        vendor = glGetString(GL_VENDOR);
-        renderer = glGetString(GL_RENDERER);
-        version = glGetString(GL_VERSION);
-        if (getenv("EVAS_GL_INFO"))
-          {
-             fprintf(stderr, "vendor: %s\n", vendor);
-             fprintf(stderr, "renderer: %s\n", renderer);
-             fprintf(stderr, "version: %s\n", version);
-          }
-        //   examples:
-        // vendor: NVIDIA Corporation
-        // renderer: NVIDIA Tegra
-        // version: OpenGL ES 2.0
-        //   or
-        // vendor: Imagination Technologies
-        // renderer: PowerVR SGX 540
-        // version: OpenGL ES 2.0
-        //   or
-        // vendor: NVIDIA Corporation
-        // renderer: GeForce GT 330M/PCI/SSE2
-        // version: 3.3.0 NVIDIA 256.53
-        //   or
-        // vendor: NVIDIA Corporation
-        // renderer: GeForce GT 220/PCI/SSE2
-        // version: 3.2.0 NVIDIA 195.36.24
-        //   or
-        // vendor: NVIDIA Corporation
-        // renderer: GeForce 8600 GTS/PCI/SSE2
-        // version: 3.3.0 NVIDIA 260.19.36
-        //   or
-        // vendor: ATI Technologies Inc.
-        // renderer: ATI Mobility Radeon HD 4650
-        // version: 3.2.9756 Compatibility Profile Context
-        //   or
-        // vendor: Tungsten Graphics, Inc
-        // renderer: Mesa DRI Mobile Intel® GM45 Express Chipset GEM 20100330 DEVELOPMENT x86/MMX/SSE2
-        // version: 2.1 Mesa 7.9-devel
-        //   or
-        // vendor: Advanced Micro Devices, Inc.
-        // renderer: Mesa DRI R600 (RS780 9610) 20090101  TCL DRI2
-        // version: 2.1 Mesa 7.9-devel
-        //   or
-        // vendor: NVIDIA Corporation
-        // renderer: GeForce 9600 GT/PCI/SSE2
-        // version: 3.3.0 NVIDIA 260.19.29
-        //   or
-        // vendor: ATI Technologies Inc.
-        // renderer: ATI Radeon HD 4800 Series
-        // version: 3.3.10237 Compatibility Profile Context
-        //   or
-        // vendor: Advanced Micro Devices, Inc.
-        // renderer: Mesa DRI R600 (RV770 9442) 20090101  TCL DRI2
-        // version: 2.0 Mesa 7.8.2
-        //   or
-        // vendor: Tungsten Graphics, Inc
-        // renderer: Mesa DRI Mobile Intel® GM45 Express Chipset GEM 20100330 DEVELOPMENT
-        // version: 2.1 Mesa 7.9-devel
-        //   or (bad - software renderer)
-        // vendor: Mesa Project
-        // renderer: Software Rasterizer
-        // version: 2.1 Mesa 7.9-devel
-        //   or (bad - software renderer)
-        // vendor: VMware, Inc.
-        // renderer: Gallium 0.4 on softpipe
-        // version: 2.1 Mesa 7.9-devel
-
-        if (strstr((const char *)vendor, "Mesa Project"))
-          {
-             if (strstr((const char *)renderer, "Software Rasterizer"))
-                blacklist = 1;
-          }
-        if (strstr((const char *)renderer, "softpipe"))
-           blacklist = 1;
-        if (blacklist)
-          {
-             ERR("OpenGL Driver blacklisted:");
-             ERR("Vendor: %s", (const char *)vendor);
-             ERR("Renderer: %s", (const char *)renderer);
-             ERR("Version: %s", (const char *)version);
-             eng_window_free(gw);
-             return NULL;
-          }
-        if (strstr((const char *)vendor, "NVIDIA"))
-          {
-             if (!strstr((const char *)renderer, "NVIDIA Tegra"))
-               {
-                  int v1 = 0, v2 = 0, v3 = 0;
-
-                  if (sscanf((const char *)version,
-                             "%*s %*s %i.%i.%i",
-                             &v1, &v2, &v3) != 3)
-                    {
-                       v1 = v2 = v3 = 0;
-                       if (sscanf((const char *)version,
-                                  "%*s %*s %i.%i",
-                                  &v1, &v2) != 2)
-                          v1 = 0;
-                    }
-                  // ALSO as of some nvidia driver version loose binding is
-                  // probably not needed
-                  if (v1 < 195) gw->detected.loose_binding = 1;
-               }
-          }
-        else
-          {
-             // noothing yet. add more cases and options over time
-          }
-
-        fbc = glXGetFBConfigs(gw->disp, screen, &num);
-        if (!fbc)
-          {
-             ERR("glXGetFBConfigs() returned no fb configs");
-             eng_window_free(gw);
-             return NULL;
-          }
-        for (i = 0; i <= 32; i++)
-          {
-             for (j = 0; j < num; j++)
-               {
-                  XVisualInfo *vi;
-                  int vd;
-                  int alph, val, dbuf, stencil, tdepth;
-                  int rgba;
-
-                  vi = glXGetVisualFromFBConfig(gw->disp, fbc[j]);
-                  if (!vi) continue;
-                  vd = vi->depth;
-                  XFree(vi);
-
-                  if (vd != i) continue;
-
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_ALPHA_SIZE, &alph);
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_BUFFER_SIZE, &val);
-
-                  if ((val != i) && ((val - alph) != i)) continue;
-
-                  val = 0;
-                  rgba = 0;
-
-                  if (i == 32)
-                    {
-                       glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_BIND_TO_TEXTURE_RGBA_EXT, &val);
-                       if (val)
-                         {
-                            rgba = 1;
-                            gw->depth_cfg[i].tex_format = GLX_TEXTURE_FORMAT_RGBA_EXT;
-                         }
-                    }
-                  if (!val)
-                    {
-                       if (rgba) continue;
-                       glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_BIND_TO_TEXTURE_RGB_EXT, &val);
-                       if (!val) continue;
-                       gw->depth_cfg[i].tex_format = GLX_TEXTURE_FORMAT_RGB_EXT;
-                    }
-
-                  dbuf = 0x7fff;
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_DOUBLEBUFFER, &val);
-                  if (val > dbuf) continue;
-                  dbuf = val;
-
-                  stencil = 0x7fff;
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_STENCIL_SIZE, &val);
-                  if (val > stencil) continue;
-                  stencil = val;
-
-                  tdepth = 0x7fff;
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_DEPTH_SIZE, &val);
-                  if (val > tdepth) continue;
-                  tdepth = val;
-
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_BIND_TO_MIPMAP_TEXTURE_EXT, &val);
-                  if (val < 0) continue;
-                  gw->depth_cfg[i].mipmap = val;
-
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_Y_INVERTED_EXT, &val);
-                  gw->depth_cfg[i].yinvert = val;
-
-                  glXGetFBConfigAttrib(gw->disp, fbc[j], GLX_BIND_TO_TEXTURE_TARGETS_EXT, &val);
-                  gw->depth_cfg[i].tex_target = val;
-
-                  gw->depth_cfg[i].fbc = fbc[j];
-               }
-          }
-        XFree(fbc);
-        if (!gw->depth_cfg[DefaultDepth(gw->disp, screen)].fbc)
-          {
-             WRN("texture from pixmap not going to work");
-          }
-     }
-#endif
-
-   gw->gl_context = evas_gl_common_context_new();
-   if (!gw->gl_context)
-     {
-        eng_window_free(gw);
-        return NULL;
-     }
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   gw->gl_context->egldisp = gw->egl_disp;
-#endif
-   eng_window_use(gw);
-   evas_gl_common_context_resize(gw->gl_context, w, h, rot);
-   gw->surf = 1;
-   return gw;
-   indirect = 0;
-}
-
-void
-eng_window_free(Evas_GL_X11_Window *gw)
-{
-   int ref = 0;
-   win_count--;
-   eng_window_use(gw);
-   if (gw == _evas_gl_x11_window) _evas_gl_x11_window = NULL;
-   if (gw->gl_context)
-     {
-        ref = gw->gl_context->references - 1;
-        evas_gl_common_context_free(gw->gl_context);
-     }
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   if (gw->egl_surface[0] != EGL_NO_SURFACE)
-      eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
-   eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-   if (ref == 0)
-     {
-        if (context) eglDestroyContext(gw->egl_disp, context);
-        eglTerminate(gw->egl_disp);
-        context = EGL_NO_CONTEXT;
-     }
-#else
-   if (gw->glxwin) glXDestroyWindow(gw->disp, gw->glxwin);
-   if (ref == 0)
-     {
-        if (context) glXDestroyContext(gw->disp, context);
-        if (rgba_context) glXDestroyContext(gw->disp, rgba_context);
-        context = 0;
-        rgba_context = 0;
-        fbconf = 0;
-        rgba_fbconf = 0;
-     }
-#endif
-   free(gw);
-}
-
-void
-eng_window_use(Evas_GL_X11_Window *gw)
-{
-   Eina_Bool force_use = EINA_FALSE;
-
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   if (_evas_gl_x11_window)
-     {
-        if ((eglGetCurrentContext() !=
-             _evas_gl_x11_window->egl_context[0]) ||
-            (eglGetCurrentSurface(EGL_READ) !=
-                _evas_gl_x11_window->egl_surface[0]) ||
-            (eglGetCurrentSurface(EGL_DRAW) !=
-                _evas_gl_x11_window->egl_surface[0]))
-           force_use = EINA_TRUE;
-     }
-#else
-   if (_evas_gl_x11_window)
-     {
-        if (glXGetCurrentContext() != _evas_gl_x11_window->context)
-           force_use = EINA_TRUE;
-     }
-#endif
-   if ((_evas_gl_x11_window != gw) || (force_use))
-     {
-        if (_evas_gl_x11_window)
-          {
-             evas_gl_common_context_use(_evas_gl_x11_window->gl_context);
-             evas_gl_common_context_flush(_evas_gl_x11_window->gl_context);
-          }
-        _evas_gl_x11_window = gw;
-        if (gw)
-          {
-// EGL / GLES
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-           if (gw->egl_surface[0] != EGL_NO_SURFACE)
-             {
-                if (eglMakeCurrent(gw->egl_disp,
-                                   gw->egl_surface[0],
-                                   gw->egl_surface[0],
-                                   gw->egl_context[0]) == EGL_FALSE)
-                  {
-                     ERR("eglMakeCurrent() failed!");
-                  }
-             }
-// GLX
-#else
-           if (gw->glxwin)
-             {
-               if (!glXMakeContextCurrent(gw->disp, gw->glxwin, gw->glxwin,
-                                          gw->context))
-                 {
-                   ERR("glXMakeContextCurrent(%p, %p, %p, %p)", (void *)gw->disp, (void *)gw->glxwin, (void *)gw->glxwin, (void *)gw->context);
-                 }
-             }
-           else
-             {
-               if (!glXMakeCurrent(gw->disp, gw->win, gw->context))
-                 {
-                   ERR("glXMakeCurrent(%p, 0x%x, %p) failed", gw->disp, (unsigned int)gw->win, (void *)gw->context);
-                 }
-             }
-#endif
-          }
-     }
-   if (gw) evas_gl_common_context_use(gw->gl_context);
-}
-
-void
-eng_window_unsurf(Evas_GL_X11_Window *gw)
-{
-   if (!gw->surf) return;
-   if (!getenv("EVAS_GL_WIN_RESURF")) return;
-   if (getenv("EVAS_GL_INFO"))
-      printf("unsurf %p\n", gw);
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   if (_evas_gl_x11_window)
-      evas_gl_common_context_flush(_evas_gl_x11_window->gl_context);
-   if (_evas_gl_x11_window == gw)
-     {
-        eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-        if (gw->egl_surface[0] != EGL_NO_SURFACE)
-           eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
-        gw->egl_surface[0] = EGL_NO_SURFACE;
-        _evas_gl_x11_window = NULL;
-     }
-#else
-   if (gw->glxwin)
-      {
-         glXDestroyWindow(gw->disp, gw->glxwin);
-      }
-   else
-     {
-     }
-#endif
-   gw->surf = 0;
-}
-
-void
-eng_window_resurf(Evas_GL_X11_Window *gw)
-{
-   if (gw->surf) return;
-   if (getenv("EVAS_GL_INFO"))
-      printf("resurf %p\n", gw);
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-   gw->egl_surface[0] = eglCreateWindowSurface(gw->egl_disp, gw->egl_config,
-                                               (EGLNativeWindowType)gw->win,
-                                               NULL);
-   if (gw->egl_surface[0] == EGL_NO_SURFACE)
-     {
-        ERR("eglCreateWindowSurface() fail for %#x. code=%#x",
-            (unsigned int)gw->win, eglGetError());
-        return;
-     }
-   if (eglMakeCurrent(gw->egl_disp,
-                      gw->egl_surface[0],
-                      gw->egl_surface[0],
-                      gw->egl_context[0]) == EGL_FALSE)
-     {
-        ERR("eglMakeCurrent() failed!");
-     }
-#else
-#ifdef NEWGL
-   if (gw->alpha)
-     gw->glxwin = glXCreateWindow(gw->disp, rgba_fbconf, gw->win, NULL);
-   else
-     gw->glxwin = glXCreateWindow(gw->disp, fbconf, gw->win, NULL);
-   if (!glXMakeContextCurrent(gw->disp, gw->glxwin, gw->glxwin,
-                              gw->context))
-     {
-        ERR("glXMakeContextCurrent(%p, %p, %p, %p)", (void *)gw->disp, (void *)gw->glxwin, (void *)gw->glxwin, (void *)gw->context);
-     }
-#else
-   if (!glXMakeCurrent(gw->disp, gw->win, gw->context))
-     {
-        ERR("glXMakeCurrent(%p, 0x%x, %p) failed", (void *)gw->disp, (unsigned int)gw->win, (void *)gw->context);
-     }
-#endif
-#endif
-   gw->surf = 1;
-}
-
-Visual *
-eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo)
-{
-   if (!einfo) return NULL;
-   if (!einfo->info.display) return NULL;
-   if (!_evas_gl_x11_vi)
-     {
-        int alpha;
-
-// EGL / GLES
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        for (alpha = 0; alpha < 2; alpha++)
-          {
-             int depth = DefaultDepth(einfo->info.display,
-                                      einfo->info.screen);
-             if (alpha)
-               {
-                  XVisualInfo *xvi, vi_in;
-                  int nvi, i;
-                  XRenderPictFormat *fmt;
-
-                  vi_in.screen = einfo->info.screen;
-                  vi_in.depth = 32;
-                  vi_in.class = TrueColor;
-                  xvi = XGetVisualInfo(einfo->info.display,
-                                       VisualScreenMask | VisualDepthMask |
-                                       VisualClassMask,
-                                       &vi_in, &nvi);
-                  if (xvi)
-                    {
-                       for (i = 0; i < nvi; i++)
-                         {
-                            fmt = XRenderFindVisualFormat(einfo->info.display,
-                                                          xvi[i].visual);
-                            if ((fmt->type == PictTypeDirect) &&
-                                (fmt->direct.alphaMask))
-                              {
-                                 _evas_gl_x11_rgba_vi =
-                                   calloc(1, sizeof(XVisualInfo));
-                                 if (_evas_gl_x11_rgba_vi)
-                                   memcpy(_evas_gl_x11_rgba_vi,
-                                          &(xvi[i]), sizeof(XVisualInfo));
-                                 break;
-                              }
-                         }
-                       XFree (xvi);
-                    }
-               }
-             else
-               {
-                  _evas_gl_x11_vi = calloc(1, sizeof(XVisualInfo));
-                  XMatchVisualInfo(einfo->info.display,
-                                   einfo->info.screen, depth, TrueColor,
-                                   _evas_gl_x11_vi);
-               }
-          }
-// GLX
-#else
-        for (alpha = 0; alpha < 2; alpha++)
-          {
-             int config_attrs[40];
-             GLXFBConfig *configs = NULL, config = 0;
-             int i, num;
-
-             i = 0;
-             config_attrs[i++] = GLX_DRAWABLE_TYPE;
-             config_attrs[i++] = GLX_WINDOW_BIT;
-             config_attrs[i++] = GLX_DOUBLEBUFFER;
-             config_attrs[i++] = 1;
-             config_attrs[i++] = GLX_RED_SIZE;
-             config_attrs[i++] = 1;
-             config_attrs[i++] = GLX_GREEN_SIZE;
-             config_attrs[i++] =1;
-             config_attrs[i++] = GLX_BLUE_SIZE;
-             config_attrs[i++] = 1;
-             if (alpha)
-               {
-                  config_attrs[i++] = GLX_RENDER_TYPE;
-                  config_attrs[i++] = GLX_RGBA_BIT;
-                  config_attrs[i++] = GLX_ALPHA_SIZE;
-                  config_attrs[i++] = 1;
-               }
-             else
-               {
-                  config_attrs[i++] = GLX_ALPHA_SIZE;
-                  config_attrs[i++] = 0;
-               }
-             config_attrs[i++] = GLX_DEPTH_SIZE;
-             config_attrs[i++] = 0;
-             config_attrs[i++] = GLX_STENCIL_SIZE;
-             config_attrs[i++] = 0;
-             config_attrs[i++] = GLX_AUX_BUFFERS;
-             config_attrs[i++] = 0;
-             config_attrs[i++] = GLX_STEREO;
-             config_attrs[i++] = 0;
-             config_attrs[i++] = GLX_TRANSPARENT_TYPE;
-             config_attrs[i++] = GLX_NONE;//GLX_NONE;//GLX_TRANSPARENT_INDEX//GLX_TRANSPARENT_RGB;
-             config_attrs[i++] = 0;
-             
-             configs = glXChooseFBConfig(einfo->info.display,
-                                         einfo->info.screen,
-                                         config_attrs, &num);
-             if ((!configs) || (num < 1))
-               {
-                  ERR("glXChooseFBConfig returned no configs");
-                  return NULL;
-               }
-             for (i = 0; i < num; i++)
-               {
-                  XVisualInfo *visinfo;
-                  XRenderPictFormat *format = NULL;
-
-                  visinfo = glXGetVisualFromFBConfig(einfo->info.display,
-                                                     configs[i]);
-                  if (!visinfo) continue;
-                  if (!alpha)
-                    {
-                       config = configs[i];
-                       _evas_gl_x11_vi = malloc(sizeof(XVisualInfo));
-                       memcpy(_evas_gl_x11_vi, visinfo, sizeof(XVisualInfo));
-                       fbconf = config;
-                       XFree(visinfo);
-                       break;
-                    }
-                  else
-                    {
-                       format = XRenderFindVisualFormat
-                         (einfo->info.display, visinfo->visual);
-                       if (!format)
-                         {
-                            XFree(visinfo);
-                            continue;
-                         }
-                       if (format->direct.alphaMask > 0)
-                         {
-                            config = configs[i];
-                            _evas_gl_x11_rgba_vi = malloc(sizeof(XVisualInfo));
-                            memcpy(_evas_gl_x11_rgba_vi, visinfo, sizeof(XVisualInfo));
-                            rgba_fbconf = config;
-                            XFree(visinfo);
-                            break;
-                         }
-                    }
-                  XFree(visinfo);
-               }
-          }
-#endif
-     }
-   if (!_evas_gl_x11_vi) return NULL;
-   if (einfo->info.destination_alpha)
-     {
-// EGL / GLES
-#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-        if (_evas_gl_x11_rgba_vi) return _evas_gl_x11_rgba_vi->visual;
-#else
-//# ifdef NEWGL
-        if (_evas_gl_x11_rgba_vi) return _evas_gl_x11_rgba_vi->visual;
-//# endif
-#endif
-     }
-   return _evas_gl_x11_vi->visual;
-}
-
-Colormap
-eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo)
-{
-   if (!einfo) return 0;
-   if (!einfo->info.display) return 0;
-   if (!_evas_gl_x11_vi) eng_best_visual_get(einfo);
-   if (!_evas_gl_x11_vi) return 0;
-   if (einfo->info.destination_alpha)
-     {
-        if (!_evas_gl_x11_rgba_cmap)
-          _evas_gl_x11_rgba_cmap =
-          XCreateColormap(einfo->info.display,
-                          RootWindow(einfo->info.display,
-                                     einfo->info.screen),
-                          _evas_gl_x11_rgba_vi->visual,
-                          0);
-        return _evas_gl_x11_rgba_cmap;
-     }
-   if (!_evas_gl_x11_cmap)
-     _evas_gl_x11_cmap =
-     XCreateColormap(einfo->info.display,
-                     RootWindow(einfo->info.display,
-                                einfo->info.screen),
-                     _evas_gl_x11_vi->visual,
-                     0);
-   return _evas_gl_x11_cmap;
-}
-
-int
-eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo)
-{
-   if (!einfo) return 0;
-   if (!einfo->info.display) return 0;
-   if (!_evas_gl_x11_vi) eng_best_visual_get(einfo);
-   if (!_evas_gl_x11_vi) return 0;
-   if (einfo->info.destination_alpha)
-     {
-        if (_evas_gl_x11_rgba_vi) return _evas_gl_x11_rgba_vi->depth;
-     }
-   return _evas_gl_x11_vi->depth;
-}
diff --git a/libraries/evas/src/modules/engines/psl1ght/Evas_Engine_PSL1GHT.h b/libraries/evas/src/modules/engines/psl1ght/Evas_Engine_PSL1GHT.h
deleted file mode 100644
index f1d5636..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/Evas_Engine_PSL1GHT.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _EVAS_ENGINE_PSL1GHT_H
-#define _EVAS_ENGINE_PSL1GHT_H
-
-typedef struct _Evas_Engine_Info_PSL1GHT Evas_Engine_Info_PSL1GHT;
-
-struct _Evas_Engine_Info_PSL1GHT
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-     Evas_Engine_Info        magic;
-
-     /* non-blocking or blocking mode */
-     Evas_Engine_Render_Mode render_mode;
-};
-#endif
-
diff --git a/libraries/evas/src/modules/engines/psl1ght/Makefile.am b/libraries/evas/src/modules/engines/psl1ght/Makefile.am
deleted file mode 100644
index 92ccea7..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_psl1ght_cflags@
-
-if BUILD_ENGINE_PSL1GHT
-
-PSL1GHT_SOURCES = \
-evas_engine.c \
-rsxutil.c
-
-PSL1GHT_LIBADD = @evas_engine_psl1ght_libs@
-
-
-includes_HEADERS = Evas_Engine_PSL1GHT.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_PSL1GHT
-
-pkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(PSL1GHT_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(PSL1GHT_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_psl1ght.la
-
-libevas_engine_psl1ght_la_SOURCES = $(PSL1GHT_SOURCES)
-libevas_engine_psl1ght_la_LIBADD = $(PSL1GHT_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.h \
-rsxutil.h
diff --git a/libraries/evas/src/modules/engines/psl1ght/Makefile.in b/libraries/evas/src/modules/engines/psl1ght/Makefile.in
deleted file mode 100644
index 9593d02..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/Makefile.in
+++ /dev/null
@@ -1,814 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/psl1ght
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_TRUE@libevas_engine_psl1ght_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_psl1ght_la_SOURCES_DIST = evas_engine.c rsxutil.c
-@BUILD_ENGINE_PSL1GHT_TRUE@am__objects_1 = evas_engine.lo rsxutil.lo
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_TRUE@am_libevas_engine_psl1ght_la_OBJECTS = $(am__objects_1)
-libevas_engine_psl1ght_la_OBJECTS =  \
-        $(am_libevas_engine_psl1ght_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_TRUE@am_libevas_engine_psl1ght_la_rpath =
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@    $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c rsxutil.c
-@BUILD_ENGINE_PSL1GHT_TRUE@am__objects_2 = module_la-evas_engine.lo \
-@BUILD_ENGINE_PSL1GHT_TRUE@     module_la-rsxutil.lo
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@    $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_psl1ght_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_psl1ght_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_PSL1GHT.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_psl1ght_cflags@
-
-@BUILD_ENGINE_PSL1GHT_TRUE@PSL1GHT_SOURCES = \
-@BUILD_ENGINE_PSL1GHT_TRUE@evas_engine.c \
-@BUILD_ENGINE_PSL1GHT_TRUE@rsxutil.c
-
-@BUILD_ENGINE_PSL1GHT_TRUE@PSL1GHT_LIBADD = @evas_engine_psl1ght_libs@
-@BUILD_ENGINE_PSL1GHT_TRUE@includes_HEADERS = Evas_Engine_PSL1GHT.h
-@BUILD_ENGINE_PSL1GHT_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@pkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@module_la_SOURCES = $(PSL1GHT_SOURCES)
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@module_la_LIBADD = @EINA_LIBS@ $(PSL1GHT_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@module_la_LDFLAGS = -module -avoid-version
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_TRUE@noinst_LTLIBRARIES = libevas_engine_psl1ght.la
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_TRUE@libevas_engine_psl1ght_la_SOURCES = $(PSL1GHT_SOURCES)
-@BUILD_ENGINE_PSL1GHT_TRUE@@EVAS_STATIC_BUILD_PSL1GHT_TRUE@libevas_engine_psl1ght_la_LIBADD = $(PSL1GHT_LIBADD)
-EXTRA_DIST = \
-evas_engine.h \
-rsxutil.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/psl1ght/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/psl1ght/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_psl1ght.la: $(libevas_engine_psl1ght_la_OBJECTS) $(libevas_engine_psl1ght_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_psl1ght_la_rpath) $(libevas_engine_psl1ght_la_OBJECTS) $(libevas_engine_psl1ght_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-rsxutil.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsxutil.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-rsxutil.lo: rsxutil.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-rsxutil.lo -MD -MP -MF $(DEPDIR)/module_la-rsxutil.Tpo -c -o module_la-rsxutil.lo `test -f 'rsxutil.c' || echo '$(srcdir)/'`rsxutil.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-rsxutil.Tpo $(DEPDIR)/module_la-rsxutil.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='rsxutil.c' object='module_la-rsxutil.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-rsxutil.lo `test -f 'rsxutil.c' || echo '$(srcdir)/'`rsxutil.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/psl1ght/evas_engine.c b/libraries/evas/src/modules/engines/psl1ght/evas_engine.c
deleted file mode 100644
index 750c098..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/evas_engine.c
+++ /dev/null
@@ -1,511 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "rsxutil.h"
-#include "Evas_Engine_PSL1GHT.h"
-
-#include <malloc.h>
-
-int _evas_engine_psl1ght_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-#define MAX_BUFFERS 2
-
-struct _Render_Engine
-{
-   Tilebuf        *tb;
-   Tilebuf_Rect   *rects;
-   Eina_Inlist    *cur_rect;
-
-   /* RSX device context */
-   gcmContextData *context;
-   void           *host_addr;
-
-   /* The buffers we will be drawing into. */
-   rsxBuffer       buffers[MAX_BUFFERS];
-   int             currentBuffer;
-   int             width;
-   int             height;
-   RGBA_Image     *rgba_image;
-   uint32_t        rgba_image_offset;
-
-   int             end : 1;
-};
-
-/* prototypes we will use here */
-static void *_output_setup(int w, int h);
-
-static void *eng_info(Evas *e);
-static void
-             eng_info_free(Evas *e, void *info);
-static int
-             eng_setup(Evas *e, void *info);
-static void
-             eng_output_free(void *data);
-static void
-             eng_output_resize(void *data, int w, int h);
-static void
-             eng_output_tile_size_set(void *data, int w, int h);
-static void
-             eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void
-             eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void
-             eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void
-             eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void
-             eng_output_flush(void *data);
-static void
-             eng_output_idle_flush(void *data);
-
-/* internal engine routines */
-static void *
-_output_setup(int w, int h)
-{
-   Render_Engine *re;
-   int i;
-   u16 width, height;
-   DATA32 *image_data = NULL;
-   int image_size;
-
-   printf ("_output_setup called : %dx%d\n", w, h);
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-
-   /* Allocate a 1Mb buffer, alligned to a 1Mb boundary
-    * to be our shared IO memory with the RSX. */
-   re->host_addr = memalign (1024 * 1024, HOST_SIZE);
-   if (re->host_addr == NULL)
-     {
-        free (re);
-        return NULL;
-     }
-   re->context = initScreen (re->host_addr, HOST_SIZE);
-   if (re->context == NULL)
-     {
-        free (re->host_addr);
-        free (re);
-        return NULL;
-     }
-   width = w;
-   height = h;
-   setResolution (re->context, &width, &height);
-   re->currentBuffer = 0;
-   re->width = width;
-   re->height = height;
-
-   for (i = 0; i < MAX_BUFFERS; i++)
-     makeBuffer (&re->buffers[i], width, height, i);
-
-   flipBuffer(re->context, MAX_BUFFERS - 1);
-
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   re->tb = evas_common_tilebuf_new(w, h);
-
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   /* Allocate our memaligned backbuffer */
-   image_size = ((w * h * sizeof(u32)) + 0xfffff) & - 0x100000;
-   image_data = memalign (1024 * 1024, image_size);
-   re->rgba_image = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
-                                                        w, h, image_data, 1, EVAS_COLORSPACE_ARGB8888);
-   gcmMapMainMemory(image_data, image_size, &re->rgba_image_offset);
-
-   return re;
-}
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_PSL1GHT *info;
-
-   printf ("eng_info called\n");
-   info = calloc(1, sizeof(Evas_Engine_Info_PSL1GHT));
-   if (!info)
-     return NULL;
-
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_PSL1GHT *in;
-
-   printf ("eng_info_free called\n");
-   in = (Evas_Engine_Info_PSL1GHT *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Evas_Engine_Info_PSL1GHT *info;
-
-   printf ("eng_setup called\n");
-   info = (Evas_Engine_Info_PSL1GHT *)in;
-
-   e->engine.data.output = _output_setup(e->output.w, e->output.h);
-   if (!e->engine.data.output)
-     return 0;
-
-   e->engine.func = &func;
-   e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-   int i;
-
-   printf ("eng_output_free called\n");
-   re = (Render_Engine *)data;
-
-   gcmSetWaitFlip(re->context);
-   for (i = 0; i < MAX_BUFFERS; i++)
-     rsxFree (re->buffers[i].ptr);
-
-   if (re->rgba_image)
-     {
-        DATA32 *image_data;
-
-        image_data = re->rgba_image->image.data;
-        evas_cache_image_drop(&re->rgba_image->cache_entry);
-        free (image_data);
-     }
-
-   freeScreen (re->context);
-   free (re->host_addr);
-
-   evas_common_tilebuf_free(re->tb);
-   if (re->rects)
-     evas_common_tilebuf_free_render_rects(re->rects);
-
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-   int i;
-   u16 width, height;
-   DATA32 *image_data;
-   int image_size;
-
-   printf ("eng_output_resize called : %dx%d\n", w, h);
-   re = (Render_Engine *)data;
-
-   width = w;
-   height = h;
-   if (setResolution (re->context, &width, &height))
-     {
-        re->width = width;
-        re->height = height;
-
-        gcmSetWaitFlip(re->context);
-        for (i = 0; i < MAX_BUFFERS; i++) {
-             rsxFree (re->buffers[i].ptr);
-             makeBuffer (&re->buffers[i], width, height, i);
-          }
-
-        flipBuffer(re->context, MAX_BUFFERS - 1);
-
-        evas_common_tilebuf_free(re->tb);
-        re->tb = evas_common_tilebuf_new(w, h);
-        evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-        /* Realloc our backbuf image */
-        if (re->rgba_image)
-          {
-             image_data = re->rgba_image->image.data;
-             evas_cache_image_drop(&re->rgba_image->cache_entry);
-             free (image_data);
-          }
-        image_size = ((w * h * sizeof(u32)) + 0xfffff) & - 0x100000;
-        image_data = memalign (1024 * 1024, image_size);
-        re->rgba_image = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
-                                                             w, h, image_data, 1, EVAS_COLORSPACE_ARGB8888);
-        gcmMapMainMemory(image_data, image_size, &re->rgba_image_offset);
-     }
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   printf ("eng_output_tile_size_set called : %dx%d\n", w, h);
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   //printf ("eng_output_redraws_rect_add called : %d,%d %dx%d\n", x, y, w, h);
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   //printf ("eng_output_redraws_rect_del called : %d,%d %dx%d\n", x, y, w, h);
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   //printf ("eng_output_redraws_clear called\n");
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   /*printf ("eng_output_redraws_next_update_get called : %d,%d %dx%d -- %d,%d %dx%d\n",
-    *x, *y, *w, *h, *cx, *cy, *cw, *ch);*/
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect)
-     return NULL;
-
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   *x = *cx = ux;
-   *y = *cy = uy;
-   *w = *cw = uw;
-   *h = *ch = uh;
-   /*printf ("eng_output_redraws_next_update_get returning : %d,%d %dx%d -- %d,%d %dx%d\n",
-    *x, *y, *w, *h, *cx, *cy, *cw, *ch);*/
-
-   return re->rgba_image;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   /* Don't do anything, we'll just coy the whole buffer when it's time to flush */
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-   rsxBuffer *buffer;
-   int width;
-   int height;
-
-   //printf ("eng_output_flush called\n");
-   re = (Render_Engine *)data;
-   buffer = &re->buffers[re->currentBuffer];
-   width = re->rgba_image->cache_entry.w;
-   height = re->rgba_image->cache_entry.h;
-
-   /* Wait for the flip before copying the buffer */
-   waitFlip ();
-
-   if (re->width == width &&
-       re->height == height)
-     {
-        /* DMA the back buffer into the rsx buffer */
-         rsxSetTransferImage (re->context,
-                              GCM_TRANSFER_MAIN_TO_LOCAL,
-                              buffer->offset, buffer->width * sizeof(u32),
-                              0, 0,
-                              re->rgba_image_offset, re->width * sizeof(u32),
-                              0, 0, re->width, re->height, sizeof(u32));
-     }
-   else
-     {
-        gcmTransferScale gcm_scale;
-        gcmTransferSurface gcm_surface;
-
-        gcm_surface.format = GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8;
-        gcm_surface.pitch = buffer->width * sizeof(u32);
-        gcm_surface._pad0[0] = gcm_surface._pad0[1] = 0;
-        gcm_surface.offset = buffer->offset;
-
-        gcm_scale.interp = GCM_TRANSFER_INTERPOLATOR_LINEAR;
-        gcm_scale.conversion = GCM_TRANSFER_CONVERSION_TRUNCATE;
-        gcm_scale.format = GCM_TRANSFER_SCALE_FORMAT_A8R8G8B8;
-        gcm_scale.origin = GCM_TRANSFER_ORIGIN_CORNER;
-        gcm_scale.operation = GCM_TRANSFER_OPERATION_SRCCOPY;
-        gcm_scale.offset = re->rgba_image_offset;
-        gcm_scale.clipX = 0;
-        gcm_scale.clipY = 0;
-        gcm_scale.clipW = re->width;
-        gcm_scale.clipH = re->height;
-        gcm_scale.outX = 0;
-        gcm_scale.outY = 0;
-        gcm_scale.outW = re->width;
-        gcm_scale.outH = re->height;
-        gcm_scale.ratioX = rsxGetFixedSint32 ((float)width / (float)re->width);
-        gcm_scale.ratioY = rsxGetFixedSint32 ((float)height / (float)re->height);
-        gcm_scale.inX = 0;
-        gcm_scale.inY = 0;
-        gcm_scale.inW = (width & ~1); // Width must be a multiple of 2
-        gcm_scale.inH = height;
-        if (gcm_scale.inW < 2) // Minimum inW value is 2
-          gcm_scale.inW = 2;
-        if (gcm_scale.inW > 2046) // Maximum inW value is 2046
-          gcm_scale.inW = 2046;
-        if (gcm_scale.inH < 1) // Minimum inH value is 1
-          gcm_scale.inH = 1;
-        if (gcm_scale.inH > 2047) // Maximum inW value is 2047
-          gcm_scale.inH = 2047;
-        gcm_scale.pitch = sizeof(u32) * width;
-
-        rsxSetTransferScaleMode (re->context, GCM_TRANSFER_MAIN_TO_LOCAL, GCM_TRANSFER_SURFACE);
-        rsxSetTransferScaleSurface (re->context, &gcm_scale, &gcm_surface);
-     }
-   /* Wait for the DMA to finish */
-   flushRSX (re->context);
-
-   /* Flip buffer onto screen */
-   flipBuffer (re->context, re->currentBuffer);
-   re->currentBuffer = (re->currentBuffer + 1) % MAX_BUFFERS;
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   printf ("eng_output_idle_flush called\n");
-   re = (Render_Engine *)data;
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context __UNUSED__)
-{
-   Render_Engine *re;
-
-   // printf ("eng_output_alpha_get called\n");
-   re = (Render_Engine *)data;
-   return EINA_TRUE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_engine_psl1ght_log_dom = eina_log_domain_register
-       ("evas-psl1ght", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_psl1ght_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-   eina_log_domain_unregister(_evas_engine_psl1ght_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "psl1ght",
-   "none",
-   {
-      module_open,
-      module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, psl1ght);
-
-#ifndef EVAS_STATIC_BUILD_PSL1GHT
-EVAS_EINA_MODULE_DEFINE(engine, psl1ght);
-#endif
diff --git a/libraries/evas/src/modules/engines/psl1ght/evas_engine.h b/libraries/evas/src/modules/engines/psl1ght/evas_engine.h
deleted file mode 100644
index 0ea6cb1..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/evas_engine.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-extern int _evas_engine_psl1ght_log_dom;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
-
-#endif
diff --git a/libraries/evas/src/modules/engines/psl1ght/rsxutil.c b/libraries/evas/src/modules/engines/psl1ght/rsxutil.c
deleted file mode 100644
index 7567a8c..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/rsxutil.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This software is distributed under the terms of the MIT License
- */
-
-#include <ppu-lv2.h>
-#include <stdio.h>
-#include <malloc.h>
-#include <string.h>
-#include <unistd.h>
-#include <sysutil/video.h>
-#include <rsx/gcm_sys.h>
-#include <rsx/rsx.h>
-#include <io/pad.h>
-#include <time.h>
-#include <cairo/cairo.h>
-#include <math.h>
-
-#include "rsxutil.h"
-
-#define GCM_LABEL_INDEX 255
-
-static void
-waitRSXIdle(gcmContextData *context);
-
-static int flipped = FALSE;
-
-void
-waitFlip()
-{
-   if (flipped)
-     {
-        while (gcmGetFlipStatus () != 0)
-          usleep (200);  /* Sleep, to not stress the cpu. */
-        gcmResetFlipStatus ();
-        flipped = FALSE;
-     }
-}
-
-int
-flipBuffer(gcmContextData *context, s32 buffer)
-{
-   if (gcmSetFlip (context, buffer) == 0)
-     {
-        rsxFlushBuffer (context);
-        // Prevent the RSX from continuing until the flip has finished.
-        gcmSetWaitFlip (context);
-
-        flipped = TRUE;
-        return TRUE;
-     }
-   return FALSE;
-}
-
-int
-makeBuffer(rsxBuffer *buffer, u16 width, u16 height, int id)
-{
-   int depth = sizeof(u32);
-   int pitch = depth * width;
-   int size = depth * width * height;
-
-   buffer->ptr = (uint32_t *)rsxMemalign (64, size);
-
-   if (buffer->ptr == NULL)
-     goto error;
-
-   if (rsxAddressToOffset (buffer->ptr, &buffer->offset) != 0)
-     goto error;
-
-   /* Register the display buffer with the RSX */
-   if (gcmSetDisplayBuffer (id, buffer->offset, pitch, width, height) != 0)
-     goto error;
-
-   buffer->width = width;
-   buffer->height = height;
-   buffer->id = id;
-
-   return TRUE;
-
-error:
-   if (buffer->ptr != NULL)
-     rsxFree (buffer->ptr);
-
-   return FALSE;
-}
-
-int
-copyBuffer(gcmContextData *context, rsxBuffer *source, rsxBuffer *destination)
-{
-   rsxSetTransferData(context, GCM_TRANSFER_LOCAL_TO_LOCAL,
-                      destination->offset,
-                      destination->width * sizeof(u32),
-                      source->offset,
-                      source->width * sizeof(u32),
-                      source->width * sizeof(u32),
-                      source->height);
-}
-
-int
-getResolution(u16 *width, u16 *height)
-{
-   videoState state;
-   videoResolution resolution;
-
-   /* Get the state of the display */
-   if (videoGetState (0, 0, &state) == 0 &&
-       videoGetResolution (state.displayMode.resolution, &resolution) == 0)
-     {
-        if (width)
-          *width = resolution.width;
-        if (height)
-          *height = resolution.height;
-
-        return TRUE;
-     }
-   return FALSE;
-}
-
-static u8
-getPreferredResolution(u16 width, u16 height)
-{
-   videoDeviceInfo info;
-   videoResolution res;
-   int area = width * height;
-   int mode_area;
-   int min_area_diff = abs (area - (720 * 480));
-   int area_diff;
-   u8 resolution = VIDEO_RESOLUTION_480;
-   int i;
-
-   videoGetDeviceInfo(0, 0, &info);
-
-   for (i = 0; i < info.availableModeCount; i++) {
-        videoGetResolution (info.availableModes[i].resolution, &res);
-        mode_area = res.width * res.height;
-        area_diff = abs (area - mode_area);
-        if (area_diff < min_area_diff)
-          {
-             min_area_diff = area_diff;
-             resolution = info.availableModes[i].resolution;
-          }
-     }
-
-   return resolution;
-}
-
-int
-setResolution(gcmContextData *context, u16 *width, u16 *height)
-{
-   videoState state;
-   videoConfiguration vconfig;
-   videoResolution res;
-   u8 resolution;
-
-   resolution = getPreferredResolution (*width, *height);
-
-   /* Get the state of the display */
-   if (videoGetState (0, 0, &state) != 0)
-     return FALSE;
-
-   /* Make sure display is enabled */
-   if (state.state != 0)
-     return FALSE;
-
-   if (videoGetResolution (resolution, &res) != 0)
-     return FALSE;
-
-   /* Configure the buffer format to xRGB */
-   memset (&vconfig, 0, sizeof(videoConfiguration));
-   vconfig.resolution = resolution;
-   vconfig.format = VIDEO_BUFFER_FORMAT_XRGB;
-   vconfig.pitch = res.width * sizeof(u32);
-   vconfig.aspect = VIDEO_ASPECT_AUTO;
-
-   flushRSX(context);
-
-   if (videoConfigure (0, &vconfig, NULL, 0) != 0)
-     return FALSE;
-
-   *width = res.width;
-   *height = res.height;
-
-   return TRUE;
-}
-
-gcmContextData *
-initScreen(void *host_addr, u32 size)
-{
-   gcmContextData *context = NULL; /* Context to keep track of the RSX buffer. */
-   videoState state;
-   videoConfiguration vconfig;
-   videoResolution res; /* Screen Resolution */
-
-   /* Initilise Reality, which sets up the command buffer and shared IO memory */
-   context = rsxInit (CB_SIZE, size, host_addr);
-   if (context == NULL)
-     goto error;
-
-   /* Get the state of the display */
-   if (videoGetState (0, 0, &state) != 0)
-     goto error;
-
-   /* Make sure display is enabled */
-   if (state.state != 0)
-     goto error;
-
-   /* Get the current resolution */
-   if (videoGetResolution (state.displayMode.resolution, &res) != 0)
-     goto error;
-
-   /* Configure the buffer format to xRGB */
-   memset (&vconfig, 0, sizeof(videoConfiguration));
-   vconfig.resolution = state.displayMode.resolution;
-   vconfig.format = VIDEO_BUFFER_FORMAT_XRGB;
-   vconfig.pitch = res.width * sizeof(u32);
-   vconfig.aspect = state.displayMode.aspect;
-
-   flushRSX(context);
-
-   if (videoConfigure (0, &vconfig, NULL, 0) != 0)
-     goto error;
-
-   if (videoGetState (0, 0, &state) != 0)
-     goto error;
-
-   gcmSetFlipMode (GCM_FLIP_VSYNC); // Wait for VSYNC to flip
-
-   gcmResetFlipStatus();
-
-   return context;
-
-error:
-   if (context)
-     rsxFinish (context, 0);
-
-   return NULL;
-}
-
-void
-freeScreen(gcmContextData *context)
-{
-   rsxFinish (context, 0);
-}
-
-static void
-waitFinish(gcmContextData *context, u32 sLabelVal)
-{
-   rsxSetWriteBackendLabel (context, GCM_LABEL_INDEX, sLabelVal);
-
-   rsxFlushBuffer (context);
-
-   while (*(vu32 *)gcmGetLabelAddress (GCM_LABEL_INDEX) != sLabelVal)
-     usleep(30);
-}
-
-static void
-waitRSXIdle(gcmContextData *context)
-{
-   static u32 sLabelVal = 1;
-
-   rsxSetWriteBackendLabel (context, GCM_LABEL_INDEX, sLabelVal);
-   rsxSetWaitLabel (context, GCM_LABEL_INDEX, sLabelVal);
-
-   sLabelVal++;
-
-   waitFinish(context, sLabelVal++);
-}
-
-void
-flushRSX(gcmContextData *context)
-{
-   if (flipped)
-     waitFlip ();
-   waitRSXIdle(context);
-}
-
diff --git a/libraries/evas/src/modules/engines/psl1ght/rsxutil.h b/libraries/evas/src/modules/engines/psl1ght/rsxutil.h
deleted file mode 100644
index 838a751..0000000
--- a/libraries/evas/src/modules/engines/psl1ght/rsxutil.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This software is distributed under the terms of the MIT License
- */
-
-#ifndef __RSXUTIL_H__
-#define __RSXUTIL_H__
-
-#include <rsx/rsx.h>
-#include <ppu-types.h>
-
-#define CB_SIZE   0x100000
-#define HOST_SIZE (32 * 1024 * 1024)
-
-typedef struct
-{
-   int       height;
-   int       width;
-   int       id;
-   uint32_t *ptr;
-   // Internal stuff
-   uint32_t  offset;
-} rsxBuffer;
-
-/* Initilize the RSX properly. Returns NULL on error */
-gcmContextData *initScreen(void *host_addr, u32 size);
-/* Block the PPU thread untill the previous flip operation has finished. */
-void            waitFlip(void);
-/* Flip a buffer onto the screen. Returns TRUE on success */
-int             flipBuffer(gcmContextData *context, s32 buffer);
-/* Create a buffer to draw into and assign it to @id. Returns NULL on error */
-int             makeBuffer(rsxBuffer *buffer, u16 width, u16 height, int id);
-/* Copy the contents of a buffer to another buffer */
-int             copyBuffer(gcmContextData *context, rsxBuffer *source, rsxBuffer *destination);
-/* Get current screen resolution. returns TRUE on success */
-int             getResolution(u16 *width, u16 *height);
-/* Set screen resolution to closest matching and. returns TRUE on success */
-int             setResolution(gcmContextData *context, u16 *width, u16 *height);
-/* Initilize the RSX properly. Returns NULL on error */
-void            freeScreen(gcmContextData *context);
-/* Flush the RSX pipeline (any commands and wait for flip) */
-void            flushRSX(gcmContextData *context);
-
-#endif /* __RSXUTIL_H__ */
diff --git a/libraries/evas/src/modules/engines/software_16/Makefile.am b/libraries/evas/src/modules/engines/software_16/Makefile.am
deleted file mode 100644
index fec60ac..0000000
--- a/libraries/evas/src/modules/engines/software_16/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@
-
-if BUILD_ENGINE_SOFTWARE_16
-
-SOFTWARE_16_SOURCES = evas_engine.c
-
-
-if !EVAS_STATIC_BUILD_SOFTWARE_16
-
-pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(SOFTWARE_16_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_16.la
-
-libevas_engine_software_16_la_SOURCES = $(SOFTWARE_16_SOURCES)
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.c
diff --git a/libraries/evas/src/modules/engines/software_16/Makefile.in b/libraries/evas/src/modules/engines/software_16/Makefile.in
deleted file mode 100644
index bca2deb..0000000
--- a/libraries/evas/src/modules/engines/software_16/Makefile.in
+++ /dev/null
@@ -1,768 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_16
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-libevas_engine_software_16_la_LIBADD =
-am__libevas_engine_software_16_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_16_TRUE@am__objects_1 = evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_TRUE@am_libevas_engine_software_16_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_16_la_OBJECTS =  \
-        $(am_libevas_engine_software_16_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_TRUE@am_libevas_engine_software_16_la_rpath =
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_16_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_16_TRUE@ module_la-evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@    $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_16_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_16_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@
-
-@BUILD_ENGINE_SOFTWARE_16_TRUE@SOFTWARE_16_SOURCES = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@module_la_SOURCES = $(SOFTWARE_16_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16.la
-@BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_TRUE@libevas_engine_software_16_la_SOURCES = $(SOFTWARE_16_SOURCES)
-EXTRA_DIST = \
-evas_engine.c
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_16/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_16/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_16.la: $(libevas_engine_software_16_la_OBJECTS) $(libevas_engine_software_16_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_16_la_rpath) $(libevas_engine_software_16_la_OBJECTS) $(libevas_engine_software_16_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-pkgLTLIBRARIES install-ps install-ps-am install-strip \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_16/evas_engine.c b/libraries/evas/src/modules/engines/software_16/evas_engine.c
deleted file mode 100644
index 643e24f..0000000
--- a/libraries/evas/src/modules/engines/software_16/evas_engine.c
+++ /dev/null
@@ -1,399 +0,0 @@
-#include "evas_common.h"/* Also includes international specific stuff */
-#include "evas_common_soft16.h"
-
-/*
- *****
- **
- ** ENGINE ROUTINES
- **
- *****
- */
-int _evas_soft16_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-#ifdef ERR
-#undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR( _evas_soft16_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-#undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_soft16_log_dom, __VA_ARGS__)
-
-#ifdef INF
-#undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_soft16_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-#undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_soft16_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-#undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_soft16_log_dom, __VA_ARGS__)
-
-#define NOT_IMPLEMENTED()                                               \
-  WRN("NOT_IMPLEMENTED: %s() at %s:%d",                         \
-           __FUNCTION__, __FILE__, __LINE__)
-
-static void
-eng_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, int y, int w, int h)
-{
-   evas_common_soft16_rectangle_draw(surface, context, x, y, w, h);
-}
-
-static void
-eng_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   evas_common_soft16_line_draw(surface, context, x1, y1, x2, y2);
-}
-
-static void
-eng_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
-{
-   evas_common_soft16_polygon_draw(surface, context, polygon, x, y);
-}
-
-static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
-{
-   Soft16_Image *im;
-
-   if (!image) return 0;
-   im = image;
-   return im->cache_entry.flags.alpha;
-}
-
-static void *
-eng_image_alpha_set(void *data __UNUSED__, void *image, int have_alpha)
-{
-   if (!image) return NULL;
-   have_alpha = !!have_alpha;
-   image = evas_common_soft16_image_alpha_set(image, have_alpha);
-   return image;
-}
-
-static char *
-eng_image_comment_get(void *data __UNUSED__, void *image __UNUSED__, char *key __UNUSED__)
-{
-   return NULL;
-}
-
-static char *
-eng_image_format_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-   return NULL;
-}
-
-static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return EVAS_COLORSPACE_RGB565_A5P;
-}
-
-
-static void
-eng_image_colorspace_set(void *data __UNUSED__, void *image __UNUSED__, int cspace __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-}
-
-static void *
-eng_image_native_set(void *data __UNUSED__, void *image __UNUSED__, void *native __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-   return NULL;
-}
-
-static void *
-eng_image_native_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-   return NULL;
-}
-
-static void *
-eng_image_load(void *data __UNUSED__, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   return evas_cache_image_request(evas_common_soft16_image_cache_get(), file, key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   if ((image_data) && (cspace != EVAS_COLORSPACE_RGB565_A5P))
-     {
-        WRN("Unsupported colorspace %d in %s() (%s:%d)",
-                cspace, __FUNCTION__, __FILE__, __LINE__);
-        return NULL;
-     }
-   return evas_cache_image_data(evas_common_soft16_image_cache_get(), w, h, image_data, alpha, EVAS_COLORSPACE_RGB565_A5P);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   if ((image_data) && (cspace != EVAS_COLORSPACE_RGB565_A5P))
-     {
-        WRN("Unsupported colorspace %d in %s() (%s:%d)",
-                cspace, __FUNCTION__, __FILE__, __LINE__);
-        return NULL;
-     }
-   return evas_cache_image_copied_data(evas_common_soft16_image_cache_get(), w, h, image_data, alpha, EVAS_COLORSPACE_RGB565_A5P);
-}
-
-static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   Soft16_Image *im;
-
-   if (w) *w = 0;
-   if (h) *h = 0;
-   if (!image) return;
-   im = image;
-   if (w) *w = im->cache_entry.w;
-   if (h) *h = im->cache_entry.h;
-}
-
-static void *
-eng_image_size_set(void *data __UNUSED__, void *image, int w, int h)
-{
-   if (!image) return NULL;
-   if ((w <= 0) || (h <= 0))
-     {
-        evas_cache_image_drop((Image_Entry *) image);
-        return NULL;
-     }
-   return evas_cache_image_size_set((Image_Entry *) image, w, h);
-}
-
-static void
-eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
-{
-   Soft16_Image *im;
-
-   if (stride) *stride = 0;
-   if (!image) return;
-   im = image;
-   if (stride) *stride = im->stride;
-}
-
-static void *
-eng_image_dirty_region(void *data __UNUSED__, void *image, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-   /* FIXME: is this required? */
-   //NOT_IMPLEMENTED();
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data __UNUSED__, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   Soft16_Image *im;
-   int error;
-
-   if (!image)
-     {
-        *image_data = NULL;
-        return NULL;
-     }
-
-   im = image;
-   error = evas_cache_image_load_data(&im->cache_entry);
-
-   if (to_write)
-     im = (Soft16_Image *) evas_cache_image_alone(&im->cache_entry);
-
-   if (image_data) *image_data = (DATA32 *) im->pixels;
-
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data __UNUSED__, void *image, DATA32 *image_data)
-{
-   Soft16_Image *old_im, *new_im;
-
-   if (!image) return NULL;
-
-   old_im = image;
-   if ((DATA16 *)image_data == old_im->pixels) return old_im;
-
-   new_im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), old_im->cache_entry.w, old_im->cache_entry.h, image_data, old_im->cache_entry.flags.alpha, EVAS_COLORSPACE_RGB565_A5P);
-   evas_cache_image_drop(&old_im->cache_entry);
-   return new_im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   Soft16_Image *im = image;
-
-   if (!im) return ;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   Soft16_Image *im = image;
-
-   if (!im) return ;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data __UNUSED__, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   Soft16_Image *im;
-
-   im = (Soft16_Image *) image;
-
-   evas_cache_image_load_data(&im->cache_entry);
-   evas_common_soft16_image_draw(im, surface, context,
-                     src_x, src_y, src_w, src_h,
-                     dst_x, dst_y, dst_w, dst_h,
-                     smooth);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image __UNUSED__, int hint __UNUSED__)
-{
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-}
-
-static void
-eng_image_cache_flush(void *data __UNUSED__)
-{
-   evas_cache_image_flush(evas_common_soft16_image_cache_get());
-}
-
-static void
-eng_image_cache_set(void *data __UNUSED__, int bytes)
-{
-   evas_cache_image_set(evas_common_soft16_image_cache_get(), bytes);
-}
-
-static int
-eng_image_cache_get(void *data __UNUSED__)
-{
-   return evas_cache_image_get(evas_common_soft16_image_cache_get());
-}
-
-static void
-eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
-{
-   static RGBA_Image    *im = NULL;
-   Soft16_Image         *dst = surface;
-
-   if (!im)
-     im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
-   evas_cache_image_surface_alloc(&im->cache_entry, dst->cache_entry.w, dst->cache_entry.h);
-   evas_common_draw_context_font_ext_set(context,
-                                         surface,
-                                         evas_common_soft16_font_glyph_new,
-                                         evas_common_soft16_font_glyph_free,
-                                         evas_common_soft16_font_glyph_draw);
-   evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, text_props);
-   evas_common_draw_context_font_ext_set(context,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         NULL);
-}
-
-/*
- *****
- **
- ** MODULE ACCESSIBLE API API
- **
- *****
- */
-
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_soft16_log_dom = eina_log_domain_register
-     ("evas-software_16", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_soft16_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-   EVAS_API_RESET(info, &func);
-   EVAS_API_RESET(info_free, &func);
-   EVAS_API_RESET(setup, &func);
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(rectangle_draw);
-   ORD(line_draw);
-   ORD(polygon_draw);
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_size_get);
-   ORD(image_size_set);
-   ORD(image_stride_get);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_native_set);
-   ORD(image_native_get);
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-   ORD(font_draw);
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-
-   em->functions = (void *)(&func);
-   
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-   eina_log_domain_unregister(_evas_soft16_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-  EVAS_MODULE_API_VERSION,
-  "software_16",
-  "none",
-  {
-    module_open,
-    module_close
-  }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_16
-EVAS_EINA_MODULE_DEFINE(engine, software_16);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/Evas_Engine_Software_16_DDraw.h b/libraries/evas/src/modules/engines/software_16_ddraw/Evas_Engine_Software_16_DDraw.h
deleted file mode 100644
index 3c1547a..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/Evas_Engine_Software_16_DDraw.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __EVAS_ENGINE_SOFTWARE_16_DDRAW_H__
-#define __EVAS_ENGINE_SOFTWARE_16_DDRAW_H__
-
-
-#include <windows.h>
-#include <ddraw.h>
-
-typedef struct _Evas_Engine_Info_Software_16_DDraw Evas_Engine_Info_Software_16_DDraw;
-
-struct _Evas_Engine_Info_Software_16_DDraw
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-      HWND                window;
-      LPDIRECTDRAW        object;          /* DirectDraw object */
-      LPDIRECTDRAWSURFACE surface_primary; /* DirectDraw primary surface */
-      LPDIRECTDRAWSURFACE surface_back;    /* DirectDraw back surface */
-      LPDIRECTDRAWSURFACE surface_source;  /* DirectDraw source surface */
-      int                 depth;
-
-      int                 rotation;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-
-#endif /* __EVAS_ENGINE_SOFTWARE_16_DDRAW_H__ */
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.am b/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.am
deleted file mode 100644
index adbf477..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_16 \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_16_ddraw_cflags@
-
-if BUILD_ENGINE_SOFTWARE_16_DDRAW
-
-SOFTWARE_16_DDRAW_SOURCES = \
-evas_engine.c \
-evas_ddraw_buffer.cpp \
-evas_ddraw_main.cpp
-
-SOFTWARE_16_DDRAW_LIBADD = @evas_engine_software_16_ddraw_libs@
-
-
-includes_HEADERS = Evas_Engine_Software_16_DDraw.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
-
-pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(SOFTWARE_16_DDRAW_SOURCES)
-module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_16_DDRAW_LIBADD)
-module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_16_ddraw.la
-
-libevas_engine_software_16_ddraw_la_SOURCES = $(SOFTWARE_16_DDRAW_SOURCES)
-libevas_engine_software_16_ddraw_la_LIBADD = $(SOFTWARE_16_DDRAW_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in b/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in
deleted file mode 100644
index 014411c..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in
+++ /dev/null
@@ -1,873 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_16_ddraw
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_TRUE@libevas_engine_software_16_ddraw_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_16_ddraw_la_SOURCES_DIST = evas_engine.c \
-        evas_ddraw_buffer.cpp evas_ddraw_main.cpp
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@   evas_ddraw_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@   evas_ddraw_main.lo
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_TRUE@am_libevas_engine_software_16_ddraw_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_16_ddraw_la_OBJECTS =  \
-        $(am_libevas_engine_software_16_ddraw_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_TRUE@am_libevas_engine_software_16_ddraw_la_rpath =
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@        $(am__DEPENDENCIES_1)
-am__module_la_SOURCES_DIST = evas_engine.c evas_ddraw_buffer.cpp \
-        evas_ddraw_main.cpp
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@   module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@   module_la-evas_ddraw_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@   module_la-evas_ddraw_main.lo
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-        $(module_la_CXXFLAGS) $(CXXFLAGS) $(module_la_LDFLAGS) \
-        $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@        $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_16_ddraw_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES =  \
-        $(am__libevas_engine_software_16_ddraw_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_16_DDraw.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_16 \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_16_ddraw_cflags@
-
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@SOFTWARE_16_DDRAW_SOURCES = \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@evas_ddraw_buffer.cpp \
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@evas_ddraw_main.cpp
-
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@SOFTWARE_16_DDRAW_LIBADD = @evas_engine_software_16_ddraw_libs@
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@includes_HEADERS = Evas_Engine_Software_16_DDraw.h
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@module_la_SOURCES = $(SOFTWARE_16_DDRAW_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_16_DDRAW_LIBADD)
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_ddraw.la
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_TRUE@libevas_engine_software_16_ddraw_la_SOURCES = $(SOFTWARE_16_DDRAW_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_TRUE@libevas_engine_software_16_ddraw_la_LIBADD = $(SOFTWARE_16_DDRAW_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_16_ddraw/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_16_ddraw/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_16_ddraw.la: $(libevas_engine_software_16_ddraw_la_OBJECTS) $(libevas_engine_software_16_ddraw_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(CXXLINK) $(am_libevas_engine_software_16_ddraw_la_rpath) $(libevas_engine_software_16_ddraw_la_OBJECTS) $(libevas_engine_software_16_ddraw_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_ddraw_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_ddraw_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_ddraw_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_ddraw_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-.cpp.o:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
-
-module_la-evas_ddraw_buffer.lo: evas_ddraw_buffer.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_ddraw_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_ddraw_buffer.Tpo -c -o module_la-evas_ddraw_buffer.lo `test -f 'evas_ddraw_buffer.cpp' || echo '$(srcdir)/'`evas_ddraw_buffer.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_ddraw_buffer.Tpo $(DEPDIR)/module_la-evas_ddraw_buffer.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_ddraw_buffer.cpp' object='module_la-evas_ddraw_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_ddraw_buffer.lo `test -f 'evas_ddraw_buffer.cpp' || echo '$(srcdir)/'`evas_ddraw_buffer.cpp
-
-module_la-evas_ddraw_main.lo: evas_ddraw_main.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_ddraw_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_ddraw_main.Tpo -c -o module_la-evas_ddraw_main.lo `test -f 'evas_ddraw_main.cpp' || echo '$(srcdir)/'`evas_ddraw_main.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_ddraw_main.Tpo $(DEPDIR)/module_la-evas_ddraw_main.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_ddraw_main.cpp' object='module_la-evas_ddraw_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_ddraw_main.lo `test -f 'evas_ddraw_main.cpp' || echo '$(srcdir)/'`evas_ddraw_main.cpp
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/evas_ddraw_buffer.cpp b/libraries/evas/src/modules/engines/software_16_ddraw/evas_ddraw_buffer.cpp
deleted file mode 100644
index 7a0a8b7..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/evas_ddraw_buffer.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-DDraw_Output_Buffer *
-evas_software_ddraw_output_buffer_new(HWND                window,
-                                      LPDIRECTDRAW        object,
-                                      LPDIRECTDRAWSURFACE surface_primary,
-                                      LPDIRECTDRAWSURFACE surface_back,
-                                      LPDIRECTDRAWSURFACE surface_source,
-                                      int                 width,
-                                      int                 height)
-{
-   DDSURFACEDESC        surface_desc;
-   DDraw_Output_Buffer *ddob;
-
-   ddob = (DDraw_Output_Buffer *)calloc(1, sizeof(DDraw_Output_Buffer));
-   if (!ddob) return NULL;
-
-   ddob->dd.window = window;
-   ddob->dd.object = object;
-   ddob->dd.surface_primary = surface_primary;
-   ddob->dd.surface_back = surface_back;
-   ddob->dd.surface_source = surface_source;
-   ddob->width = width;
-   ddob->height = height;
-   ddob->pitch = width * 2;
-
-   ZeroMemory(&surface_desc, sizeof(surface_desc));
-   surface_desc.dwSize = sizeof(surface_desc);
-
-   if (FAILED(ddob->dd.surface_source->Lock(NULL,
-                                            &surface_desc,
-                                            DDLOCK_WAIT | DDLOCK_SURFACEMEMORYPTR,
-                                            NULL)))
-     {
-        free(ddob);
-        return NULL;
-     }
-
-   ddob->data = (DATA16 *)surface_desc.lpSurface;
-
-   if (FAILED(ddob->dd.surface_source->Unlock(NULL)))
-     {
-        free(ddob);
-        return NULL;
-     }
-   if (ddob->im)
-     evas_cache_image_drop(&ddob->im->cache_entry);
-
-   ddob->im =  (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), width, height, (DATA32 *) ddob->data, 0, EVAS_COLORSPACE_RGB565_A5P);
-   if (ddob->im)
-     ddob->im->stride = ddob->pitch;
-
-   return ddob;
-}
-
-void
-evas_software_ddraw_output_buffer_free(DDraw_Output_Buffer *ddob, int sync)
-{
-   free(ddob);
-}
-
-void
-evas_software_ddraw_output_buffer_paste(DDraw_Output_Buffer *ddob)
-{
-   RECT  dst_rect;
-   RECT  src_rect;
-   POINT p;
-
-   SetRect(&src_rect, 0, 0, ddob->width, ddob->height);
-
-   if (FAILED(ddob->dd.surface_back->BltFast(0, 0,
-                                             ddob->dd.surface_source,
-                                             &src_rect,
-                                             DDBLTFAST_NOCOLORKEY | DDBLTFAST_WAIT)))
-     return;
-
-   p.x = 0;
-   p.y = 0;
-   ClientToScreen(ddob->dd.window, &p);
-   GetClientRect(ddob->dd.window, &dst_rect);
-   OffsetRect(&dst_rect, p.x, p.y);
-   ddob->dd.surface_primary->Blt(&dst_rect,
-                                 ddob->dd.surface_back, &src_rect,
-                                 DDBLT_WAIT, NULL);
-}
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/evas_ddraw_main.cpp b/libraries/evas/src/modules/engines/software_16_ddraw/evas_ddraw_main.cpp
deleted file mode 100644
index 7a2eb7f..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/evas_ddraw_main.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "evas_engine.h"
-
-
-void *
-evas_software_ddraw_lock(DDraw_Output_Buffer *ddob, int *ddraw_width, int *ddraw_height, int *ddraw_pitch, int *ddraw_depth)
-{
-   DDSURFACEDESC surface_desc;
-
-   ZeroMemory(&surface_desc, sizeof(surface_desc));
-   surface_desc.dwSize = sizeof(surface_desc);
-
-   if (FAILED(ddob->dd.surface_back->Lock(NULL,
-                                          &surface_desc,
-                                          DDLOCK_WAIT | DDLOCK_SURFACEMEMORYPTR | DDLOCK_WRITEONLY,
-                                          NULL)))
-     return NULL;
-
-   *ddraw_width = surface_desc.dwWidth;
-   *ddraw_height = surface_desc.dwHeight;
-   *ddraw_pitch = surface_desc.lPitch;
-   *ddraw_depth = surface_desc.ddpfPixelFormat.dwRGBBitCount >> 3;
-
-   return surface_desc.lpSurface;
-}
-
-void
-evas_software_ddraw_unlock_and_flip(DDraw_Output_Buffer *ddob)
-{
-   RECT    dst_rect;
-   RECT    src_rect;
-   POINT   p;
-
-   if (FAILED(ddob->dd.surface_back->Unlock(NULL)))
-     return;
-
-   /* we figure out where on the primary surface our window lives */
-   p.x = 0;
-   p.y = 0;
-   ClientToScreen(ddob->dd.window, &p);
-   GetClientRect(ddob->dd.window, &dst_rect);
-   OffsetRect(&dst_rect, p.x, p.y);
-   SetRect(&src_rect, 0, 0, ddob->width, ddob->height);
-
-   /* nothing to do if the function fails, so we don't check the result */
-   ddob->dd.surface_primary->BltFast(0, 0,
-                                     ddob->dd.surface_back, &dst_rect,
-                                     DDBLTFAST_WAIT || DDBLTFAST_NOCOLORKEY);
-}
-
-void
-evas_software_ddraw_surface_resize(DDraw_Output_Buffer *ddob)
-{
-   DDSURFACEDESC surface_desc;
-
-   ddob->dd.surface_back->Release();
-   memset (&surface_desc, 0, sizeof (surface_desc));
-   surface_desc.dwSize = sizeof (surface_desc);
-   /* FIXME: that code does not compile. Must know why */
-#if 0
-   surface_desc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH;
-   surface_desc.dwWidth = width;
-   surface_desc.dwHeight = height;
-   IDirectDrawSurface7_SetSurfaceDesc(ddob->dd.surface_back, &surface_desc, NULL);
-#else
-   surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-   surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-   surface_desc.dwWidth = ddob->width;
-   surface_desc.dwHeight = ddob->height;
-   ddob->dd.object->CreateSurface(&surface_desc, &ddob->dd.surface_back, NULL);
-#endif
-}
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/evas_engine.c b/libraries/evas/src/modules/engines/software_16_ddraw/evas_engine.c
deleted file mode 100644
index 9629781..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/evas_engine.c
+++ /dev/null
@@ -1,628 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Software_16_DDraw.h"
-#include "evas_common_soft16.h"
-
-int _evas_engine_soft16_ddraw_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   HWND                 window;
-   LPDIRECTDRAW         object;
-   LPDIRECTDRAWSURFACE  surface_primary;
-   LPDIRECTDRAWSURFACE  surface_back;
-   LPDIRECTDRAWSURFACE  surface_source;
-   int                  width;
-   int                  height;
-   int                  rotation;
-   Tilebuf             *tb;
-   Tilebuf_Rect        *rects;
-   Tilebuf_Rect        *cur_rect;
-   DDraw_Output_Buffer *ddob;
-   Soft16_Image        *tmp_out; /* used by indirect render, like rotation */
-   HRGN                 clip_rects;
-   unsigned char        end : 1;
-};
-
-/* prototypes we will use here */
-
-static void *eng_info(Evas *e);
-static void eng_info_free(Evas *e, void *info);
-static int eng_setup(Evas *e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_Software_16_DDraw *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_Software_16_DDraw));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e, void *info)
-{
-   Evas_Engine_Info_Software_16_DDraw *in;
-   in = (Evas_Engine_Info_Software_16_DDraw *)info;
-   free(in);
-}
-
-static void
-_tmp_out_alloc(Render_Engine *re)
-{
-   Tilebuf_Rect *r;
-   int w = 0, h = 0;
-
-   EINA_INLIST_FOREACH(re->rects, r)
-     {
-        if (r->w > w) w = r->w;
-        if (r->h > h) h = r->h;
-     }
-
-   if (re->tmp_out)
-     {
-        if ((re->tmp_out->cache_entry.w < w) || (re->tmp_out->cache_entry.h < h))
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-
-   if (!re->tmp_out)
-     {
-        Soft16_Image *im;
-
-        im = (Soft16_Image *) evas_cache_image_empty(evas_common_soft16_image_cache_get());
-        im->cache_entry.flags.alpha = 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-
-        re->tmp_out = im;
-     }
-}
-
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine                      *re;
-   Evas_Engine_Info_Software_16_DDraw *info;
-
-   info = (Evas_Engine_Info_Software_16_DDraw *)in;
-   if (!e->engine.data.output)
-     {
-        /* the only check - simplistic, i know, but enough for this
-         * "special purpose" engine. Remember it is meant to be used
-         * for limited power devices that have a 16bit display mode
-         * and no real other acceleration, and high resolution so we
-         * can pre-dither into 16bpp. */
-        if (info->info.depth != 16)
-         return 0;
-        /* do common routine init - we wil at least use it for core
-         * image loading and font loading/glyph rendering & placement */
-        evas_common_cpu_init();
-
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-        evas_common_soft16_image_init();
-
-        /* render engine specific data */
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re)
-          return 0;
-        e->engine.data.output = re;
-        re->window = info->info.window;
-        re->object = info->info.object;
-        re->surface_primary = info->info.surface_primary;
-        re->surface_back = info->info.surface_back;
-        re->surface_source = info->info.surface_source;
-        re->width = e->output.w;
-        re->height = e->output.h;
-        re->rotation = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-     }
-   else
-     {
-        /* we changed the info after first init - do a re-eval where
-         * appropriate */
-       if (info->info.depth != 16)
-         return 0;
-        re = e->engine.data.output;
-        if (re->tb) evas_common_tilebuf_free(re->tb);
-        re->window = info->info.window;
-        re->object = info->info.object;
-        re->surface_primary = info->info.surface_primary;
-        re->surface_back = info->info.surface_back;
-        re->surface_source = info->info.surface_source;
-        re->width = e->output.w;
-        re->height = e->output.h;
-        re->rotation = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-        if (re->tmp_out)
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-   if (!e->engine.data.output) return 0;
-   /* add a draw context if we dont have one */
-   if (!e->engine.data.context)
-     e->engine.data.context =
-     e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->ddob) evas_software_ddraw_output_buffer_free(re->ddob, 0);
-   if (re->clip_rects) DeleteObject(re->clip_rects);
-   if (re->tb) evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   if (re->tmp_out) evas_cache_image_drop(&re->tmp_out->cache_entry);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-   evas_common_soft16_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-
-   if ((re->width == w) && (re->height == h)) return;
-
-   if (re->ddob)
-     evas_software_ddraw_surface_resize(re->ddob);
-
-   evas_common_tilebuf_free(re->tb);
-   re->width = w;
-   re->height = h;
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   if (re->ddob)
-     {
-        evas_software_ddraw_output_buffer_free(re->ddob, 0);
-        re->ddob = NULL;
-     }
-   if (re->clip_rects)
-     {
-        DeleteObject(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static inline void
-_output_buffer_alloc(Render_Engine *re)
-{
-   int width;
-   int height;
-
-   if (re->ddob) return;
-
-   if ((re->rotation == 0) || (re->rotation == 180))
-     {
-        width = re->width;
-        height = re->height;
-     }
-   else
-     {
-        width = re->height;
-        height = re->width;
-     }
-
-   re->ddob = evas_software_ddraw_output_buffer_new(re->window,
-                                                    re->object,
-                                                    re->surface_primary,
-                                                    re->surface_back,
-                                                    re->surface_source,
-                                                    width,
-                                                    height);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        if (!re->rects) return NULL;
-
-        re->cur_rect = re->rects;
-        _output_buffer_alloc(re);
-        if (re->rotation != 0) _tmp_out_alloc(re); /* grows if required */
-     }
-   if (!re->cur_rect)
-     {
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        return NULL;
-     }
-   rect = re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = (Tilebuf_Rect *)((EINA_INLIST_GET(re->cur_rect))->next);
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   *x = ux; *y = uy; *w = uw; *h = uh;
-   if (re->rotation == 0)
-     {
-        *cx = ux; *cy = uy; *cw = uw; *ch = uh;
-        return &re->ddob->im;
-     }
-   else
-     {
-        *cx = 0; *cy = 0; *cw = uw; *ch = uh;
-        return re->tmp_out;
-     }
-}
-
-static void
-_blit_rot_90(Soft16_Image *dst, const Soft16_Image *src,
-             int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + (out_x +
-                       (w + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr -= dst->stride;
-          }
-        sp += src->stride;
-        dp++;
-     }
-}
-
-static void
-_blit_rot_180(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((w + out_x - 1) +
-                       (h + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr--;
-          }
-        sp += src->stride;
-        dp -= dst->stride;
-     }
-}
-
-static void
-_blit_rot_270(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((h + out_x - 1) +
-                       out_y * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr += dst->stride;
-          }
-        sp += src->stride;
-        dp--;
-     }
-}
-
-static void
-_tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h)
-{
-   Soft16_Image *d, *s;
-
-   d = &re->ddob->im;
-   s = re->tmp_out;
-
-   if ((w < 1) || (h < 1) || (out_x >= d->cache_entry.w) || (out_y >= d->cache_entry.h))
-     return;
-
-   if (re->rotation == 90)
-     _blit_rot_90(d, s, out_x, out_y, w, h);
-   else if (re->rotation == 180)
-     _blit_rot_180(d, s, out_x, out_y, w, h);
-   else if (re->rotation == 270)
-     _blit_rot_270(d, s, out_x, out_y, w, h);
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   HRGN           region;
-   int            xx;
-   int            yy;
-   int            width;
-   int            height;
-
-   re = (Render_Engine *)data;
-
-   if (!re->clip_rects)
-      re->clip_rects = CreateRectRgn(0, 0, 0, 0);
-
-   if (re->rotation == 0)
-     {
-        xx = x;
-        yy = y;
-        width = w;
-        height = h;
-     }
-   else if (re->rotation == 90)
-     {
-        xx = y;
-        yy = re->width - w - x;
-        width = h;
-        height = w;
-     }
-   else if (re->rotation == 180)
-     {
-        xx = re->width - w - x;
-        yy = re->height - h - y;
-        width = w;
-        height = h;
-     }
-   else if (re->rotation == 270)
-     {
-        xx = re->height - h - y;
-        yy = x;
-        width = h;
-        height = w;
-     }
-
-   region = CreateRectRgn(xx, yy, xx + width, yy + height);
-
-   if (re->rotation != 0)
-     _tmp_out_process(re, xx, yy, w, h);
-   CombineRgn(re->clip_rects, re->clip_rects, region, RGN_OR);
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-   void          *ddraw_data;
-   int            ddraw_width;
-   int            ddraw_height;
-   int            ddraw_pitch;
-   int            ddraw_depth;
-
-   re = (Render_Engine *)data;
-   if (re->clip_rects)
-     {
-        /* FIXME : i have to manage that */
-/*      XSetRegion(re->disp, re->gc, re->clip_rects); */
-        DeleteObject(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   else return;
-
-   evas_software_ddraw_output_buffer_paste(re->ddob);
-
-   /* FIXME : i have to manage that */
-/*    XSetClipMask(re->disp, re->gc, None); */
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->ddob)
-     {
-        evas_software_ddraw_output_buffer_free(re->ddob, 0);
-        re->ddob = NULL;
-     }
-   if (re->clip_rects)
-     {
-        DeleteObject(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_16")) return 0;
-   _evas_engine_soft16_ddraw_log_dom = eina_log_domain_register
-     ("evas-software_16_ddraw", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft16_ddraw_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-       return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-  eina_log_domain_unregister(_evas_engine_soft16_ddraw_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_16_ddraw",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_ddraw);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
-EVAS_EINA_MODULE_DEFINE(engine, software_16_ddraw);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/evas_engine.h b/libraries/evas/src/modules/engines/software_16_ddraw/evas_engine.h
deleted file mode 100644
index fe85e97..0000000
--- a/libraries/evas/src/modules/engines/software_16_ddraw/evas_engine.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef __EVAS_ENGINE_H__
-#define __EVAS_ENGINE_H__
-
-#include <windows.h>
-#include <ddraw.h>
-
-#include "evas_common_soft16.h"
-
-extern int _evas_engine_soft16_ddraw_log_dom ;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft16_ddraw_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft16_ddraw_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft16_ddraw_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft16_ddraw_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft16_ddraw_log_dom, __VA_ARGS__)
-
-typedef struct _DDraw_Output_Buffer       DDraw_Output_Buffer;
-
-struct _DDraw_Output_Buffer
-{
-   Soft16_Image *im;
-  struct {
-     HWND                window;
-     LPDIRECTDRAW        object;
-     LPDIRECTDRAWSURFACE surface_primary;
-     LPDIRECTDRAWSURFACE surface_back;
-     LPDIRECTDRAWSURFACE surface_source;
-  } dd;
-   void        *data;
-   int          x;
-   int          y;
-   int          width;
-   int          height;
-   int          depth;
-   int          pitch;
-};
-
-/****/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-DDraw_Output_Buffer *evas_software_ddraw_output_buffer_new        (HWND                window,
-                                                                   LPDIRECTDRAW        object,
-                                                                   LPDIRECTDRAWSURFACE surface_primary,
-                                                                   LPDIRECTDRAWSURFACE surface_back,
-                                                                   LPDIRECTDRAWSURFACE surface_source,
-                                                                   int width,
-                                                                   int height);
-void                 evas_software_ddraw_output_buffer_free       (DDraw_Output_Buffer *ddob, int sync);
-void                 evas_software_ddraw_output_buffer_paste      (DDraw_Output_Buffer *ddob);
-
-
-void *evas_software_ddraw_lock(DDraw_Output_Buffer *ddob, int *ddraw_width, int *ddraw_height, int *ddraw_pitch, int *ddraw_depth);
-
-void  evas_software_ddraw_unlock_and_flip(DDraw_Output_Buffer *ddob);
-
-void  evas_software_ddraw_surface_resize(DDraw_Output_Buffer *ddob);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EVAS_ENGINE_H__ */
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Evas_Engine_SDL_16.h b/libraries/evas/src/modules/engines/software_16_sdl/Evas_Engine_SDL_16.h
deleted file mode 100644
index 5a133fe..0000000
--- a/libraries/evas/src/modules/engines/software_16_sdl/Evas_Engine_SDL_16.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef         _EVAS_ENGINE_SDL_16_H
-# define        _EVAS_ENGINE_SDL_16_H
-
-#include <SDL/SDL.h>
-
-typedef struct _Evas_Engine_Info_SDL_16 Evas_Engine_Info_SDL_16;
-struct _Evas_Engine_Info_SDL_16
-{
-  /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-  /* at you and make nasty noises */
-  Evas_Engine_Info magic;
-
-  struct {
-    int                         rotation;
-    int                         fullscreen : 1;
-    int                         hwsurface : 1;
-    int                         noframe : 1;
-    int                         alpha : 1;
-  } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am
deleted file mode 100644
index 88204c0..0000000
--- a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-MAINTAINERCLEANFILES = Makefile.in
-
-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
-
-if BUILD_ENGINE_SOFTWARE_16_SDL
-
-SOFTWARE_SDL_SOURCES = \
-evas_engine.c \
-evas_engine.h
-
-
-includes_HEADERS = Evas_Engine_SDL_16.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
-
-pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-
-module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la
-
-libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.c \
-evas_engine.h \
-Evas_Engine_SDL_16.h
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in
deleted file mode 100644
index a8f2cc9..0000000
--- a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in
+++ /dev/null
@@ -1,784 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_16_sdl
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-libevas_engine_software_16_sdl_la_DEPENDENCIES =
-am__libevas_engine_software_16_sdl_la_SOURCES_DIST = evas_engine.c \
-        evas_engine.h
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@am__objects_1 = evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@am_libevas_engine_software_16_sdl_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_16_sdl_la_OBJECTS =  \
-        $(am_libevas_engine_software_16_sdl_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@am_libevas_engine_software_16_sdl_la_rpath =
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_engine.h
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_1)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@    $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_16_sdl_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_16_sdl_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_SDL_16.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-AUTOMAKE_OPTIONS = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@SOFTWARE_SDL_SOURCES = \
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@evas_engine.h
-
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@includes_HEADERS = Evas_Engine_SDL_16.h
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@
-EXTRA_DIST = \
-evas_engine.c \
-evas_engine.h \
-Evas_Engine_SDL_16.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/engines/software_16_sdl/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --foreign src/modules/engines/software_16_sdl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_16_sdl.la: $(libevas_engine_software_16_sdl_la_OBJECTS) $(libevas_engine_software_16_sdl_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_16_sdl_la_rpath) $(libevas_engine_software_16_sdl_la_OBJECTS) $(libevas_engine_software_16_sdl_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/evas_engine.c b/libraries/evas/src/modules/engines/software_16_sdl/evas_engine.c
deleted file mode 100644
index 02f9341..0000000
--- a/libraries/evas/src/modules/engines/software_16_sdl/evas_engine.c
+++ /dev/null
@@ -1,1337 +0,0 @@
-#include <assert.h>
-#include <math.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <SDL/SDL.h>
-
-#include "evas_common.h"/* Also includes international specific stuff */
-#include "evas_engine.h"
-int _evas_engine_soft16_sdl_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-static Engine_Image_Entry       *_sdl16_image_alloc       (void);
-static void                      _sdl16_image_delete      (Engine_Image_Entry *eim);
-
-static int                       _sdl16_image_constructor (Engine_Image_Entry *ie, void* data);
-static void                      _sdl16_image_destructor  (Engine_Image_Entry *eim);
-
-static void                      _sdl16_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
-
-static int                       _sdl16_image_dirty       (Engine_Image_Entry *dst, const Engine_Image_Entry *src);
-
-static int                       _sdl16_image_size_set    (Engine_Image_Entry *dst, const Engine_Image_Entry *src);
-
-static int                       _sdl16_image_update_data (Engine_Image_Entry* dst, void* engine_data);
-
-static void                      _sdl16_image_load        (Engine_Image_Entry *eim, const Image_Entry* im);
-static int                       _sdl16_image_mem_size_get(Engine_Image_Entry *eim);
-
-#ifdef DEBUG_SDL
-static void                      _sdl16_image_debug       (const char* context, Engine_Image_Entry* im);
-#endif
-
-static const Evas_Cache_Engine_Image_Func       _sdl16_cache_engine_image_cb = {
-  NULL /* key */,
-  _sdl16_image_alloc /* alloc */,
-  _sdl16_image_delete /* dealloc */,
-  _sdl16_image_constructor /* constructor */,
-  _sdl16_image_destructor /* destructor */,
-  _sdl16_image_dirty_region /* dirty_region */,
-  _sdl16_image_dirty /* dirty */,
-  _sdl16_image_size_set /* size_set */,
-  _sdl16_image_update_data /* update_data */,
-  _sdl16_image_load /* load */,
-  _sdl16_image_mem_size_get /* mem_size_get */,
-#ifdef DEBUG_SDL  /* debug */
-  _sdl16_image_debug
-#else
-  NULL
-#endif
-};
-
-#define _SDL_UPDATE_PIXELS(EIM)                                 \
-  ((Soft16_Image *) EIM->cache_entry.src)->pixels = EIM->surface->pixels;
-
-#define RMASK565 0xf800
-#define GMASK565 0x07e0
-#define BMASK565 0x001f
-#define AMASK565 0x0000
-
-/* engine api this module provides */
-static void *
-evas_engine_sdl16_info(Evas *e __UNUSED__)
-{
-   Evas_Engine_Info_SDL_16      *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_SDL_16));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   return info;
-}
-
-static void
-evas_engine_sdl16_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_SDL_16 *in;
-   in = (Evas_Engine_Info_SDL_16 *)info;
-   free(in);
-}
-
-static void
-_tmp_out_alloc(Render_Engine *re)
-{
-   Tilebuf_Rect *r;
-   unsigned int w = 0, h = 0;
-
-   EINA_INLIST_FOREACH(re->rects, r)
-     {
-        if (r->w > (int)w) w = r->w;
-        if (r->h > (int)h) h = r->h;
-     }
-
-   if (re->tmp_out)
-     {
-        if ((re->tmp_out->cache_entry.w < w) || (re->tmp_out->cache_entry.h < h))
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-
-   if (!re->tmp_out)
-     {
-        Soft16_Image *im;
-
-        im = (Soft16_Image *) evas_cache_image_empty(evas_common_soft16_image_cache_get());
-        im->cache_entry.flags.alpha = 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-
-        re->tmp_out = im;
-     }
-}
-
-static void*
-_sdl16_output_setup(int w, int h, int rotation, int fullscreen, int noframe, int hwsurface)
-{
-   Render_Engine        *re;
-   SDL_Surface          *surface;
-
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-   evas_common_soft16_image_init();
-
-   if (w <= 0) w = 640;
-   if (h <= 0) h = 480;
-
-   re->cache = evas_cache_engine_image_init(&_sdl16_cache_engine_image_cb, evas_common_soft16_image_cache_get());
-   if (!re->cache)
-     {
-        ERR("Evas_Cache_Engine_Image allocation failed!");
-        free(re);
-        return NULL;
-     }
-
-   re->tb = evas_common_tilebuf_new(w, h);
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   re->w = w;
-   re->h = h;
-   re->rot = rotation;
-   re->flags.hwsurface = hwsurface;
-   re->flags.fullscreen = fullscreen;
-   re->flags.noframe = noframe;
-   re->flags.end = 0;
-
-   re->update_rects_count = 0;
-   re->update_rects_limit = 0;
-   re->update_rects = NULL;
-
-   surface = SDL_SetVideoMode(w, h, 16,
-                              (hwsurface ? SDL_HWSURFACE : SDL_SWSURFACE)
-                              | (fullscreen ? SDL_FULLSCREEN : 0)
-                              | (noframe ? SDL_NOFRAME : 0));
-   if (!surface)
-     {
-        ERR("SDL_SetVideoMode [ %i x %i x 16 ] failed", w, h);
-        evas_cache_engine_image_shutdown(re->cache);
-        free(re);
-        return NULL;
-     }
-
-   SDL_SetAlpha(surface, SDL_RLEACCEL, 0);
-   SDL_FillRect(surface, NULL, 0);
-
-   re->soft16_engine_image = (SDL_Engine_Image_Entry *) evas_cache_engine_image_engine(re->cache, surface);
-   if (!re->soft16_engine_image)
-     {
-        ERR("Soft16_Image allocation from SDL failed");
-        evas_cache_engine_image_shutdown(re->cache);
-        free(re);
-        return NULL;
-     }
-
-   return re;
-}
-
-
-static int
-evas_engine_sdl16_setup(Evas *e, void *in)
-{
-   Evas_Engine_Info_SDL_16      *info = (Evas_Engine_Info_SDL_16 *) in;
-
-   if (evas_output_method_get(e) != evas_render_method_lookup("software_16_sdl"))
-     return 0;
-
-   SDL_Init(SDL_INIT_NOPARACHUTE);
-
-   if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
-     {
-        ERR("SDL_Init failed with %s", SDL_GetError());
-        SDL_Quit();
-        return 0;
-     }
-
-   e->engine.data.output = _sdl16_output_setup(e->output.w, e->output.h,
-                                               info->info.rotation,
-                                               info->info.fullscreen,
-                                               info->info.noframe,
-                                               info->info.hwsurface);
-   if (!e->engine.data.output)
-     return 0;
-
-   e->engine.func = &func;
-   e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-evas_engine_sdl16_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->tb) evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   if (re->tmp_out) evas_cache_image_drop(&re->tmp_out->cache_entry);
-   if (re->soft16_engine_image)
-     evas_cache_engine_image_drop(&re->soft16_engine_image->cache_entry);
-   if (re->cache) evas_cache_engine_image_shutdown(re->cache);
-
-   if (re->update_rects)
-     free(re->update_rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-   evas_common_soft16_image_shutdown();
-
-   SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
-
-static void
-evas_engine_sdl16_output_resize(void *data, int w, int h)
-{
-   Render_Engine        *re = data;
-   SDL_Surface          *surface;
-
-   if ((re->tb->outbuf_w == w) && (re->tb->outbuf_h == h)) return;
-
-   evas_cache_engine_image_drop(&re->soft16_engine_image->cache_entry);
-
-   evas_common_tilebuf_free(re->tb);
-   re->w = w;
-   re->h = h;
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   surface = SDL_SetVideoMode(w, h, 16,
-                              (re->flags.hwsurface ? SDL_HWSURFACE : SDL_SWSURFACE)
-                              | (re->flags.fullscreen ? SDL_FULLSCREEN : 0)
-                              | (re->flags.noframe ? SDL_NOFRAME : 0));
-   if (!surface)
-     {
-        ERR("Unable to change the resolution to : %ix%i", w, h);
-        exit(-1);
-     }
-   re->soft16_engine_image = (SDL_Engine_Image_Entry *) evas_cache_engine_image_engine(re->cache, surface);
-   if (!re->soft16_engine_image)
-     {
-        ERR("RGBA_Image allocation from SDL failed");
-        exit(-1);
-     }
-
-   SDL_FillRect(surface, NULL, 0);
-
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static void
-evas_engine_sdl16_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-evas_engine_sdl16_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-evas_engine_sdl16_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-evas_engine_sdl16_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-evas_engine_sdl16_output_redraws_next_update_get(void *data,
-                                                 int *x, int *y, int *w, int *h,
-                                                 int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine        *re = data;
-   Tilebuf_Rect         *tb_rect;
-   SDL_Rect              rect;
-
-   if (re->flags.end)
-     {
-        re->flags.end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = re->rects;
-        if (re->rot != 0) _tmp_out_alloc(re); /* grows if required */
-     }
-
-   if (!re->cur_rect)
-     {
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        return NULL;
-     }
-
-   tb_rect = re->cur_rect;
-   *cx = *x = tb_rect->x;
-   *cy = *y = tb_rect->y;
-   *cw = *w = tb_rect->w;
-   *ch = *h = tb_rect->h;
-   re->cur_rect = (Tilebuf_Rect *)((EINA_INLIST_GET(re->cur_rect))->next);
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->flags.end = 1;
-     }
-
-   if (re->rot != 0)
-     {
-        *cx = 0;
-        *cy = 0;
-     }
-
-   rect.x = *x;
-   rect.y = *y;
-   rect.w = *w;
-   rect.h = *h;
-
-   /* Return the "fake" surface so it is passed to the drawing routines. */
-   return re->soft16_engine_image;
-}
-
-static void
-_blit_rot_90(Soft16_Image *dst, const Soft16_Image *src,
-             int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + (out_x +
-                       (w + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr -= dst->stride;
-          }
-        sp += src->stride;
-        dp++;
-     }
-}
-
-static void
-_blit_rot_180(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((w + out_x - 1) +
-                       (h + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr--;
-          }
-        sp += src->stride;
-        dp -= dst->stride;
-     }
-}
-
-static void
-_blit_rot_270(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((h + out_x - 1) +
-                       out_y * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr += dst->stride;
-          }
-        sp += src->stride;
-        dp--;
-     }
-}
-
-static void
-_tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h)
-{
-   Soft16_Image *d, *s;
-
-   d = (Soft16_Image *) re->soft16_engine_image->cache_entry.src;
-   s = re->tmp_out;
-
-   if ((w < 1) || (h < 1) ||
-       (out_x >= (int)d->cache_entry.w) || (out_y >= (int)d->cache_entry.h))
-     return;
-
-   if (re->rot == 90)
-     _blit_rot_90(d, s, out_x, out_y, w, h);
-   else if (re->rot == 180)
-     _blit_rot_180(d, s, out_x, out_y, w, h);
-   else if (re->rot == 270)
-     _blit_rot_270(d, s, out_x, out_y, w, h);
-}
-
-static void
-evas_engine_sdl16_output_redraws_next_update_push(void *data, void *surface __UNUSED__,
-                                                  int x, int y, int w, int h)
-{
-   Render_Engine        *re = data;
-   SDL_Rect              rect;
-
-   if (re->update_rects_count + 1 > re->update_rects_limit)
-     {
-        re->update_rects_limit += 8;
-        re->update_rects = realloc(re->update_rects, sizeof (SDL_Rect) * re->update_rects_limit);
-     }
-
-   rect.x = x;
-   rect.y = y;
-   rect.w = w;
-   rect.h = h;
-
-   switch (re->rot)
-     {
-      case 0:
-         break;
-      case 90:
-         rect.x = y;
-         rect.y = re->w - w - x;
-         rect.w = h;
-         rect.h = w;
-         break;
-      case 180:
-         rect.x = re->w - w - x;
-         rect.y = re->h - h - y;
-         break;
-      case 270:
-         rect.x = re->h - h - y;
-         rect.y = x;
-         rect.w = h;
-         rect.h = w;
-         break;
-      default:
-         abort();
-     }
-
-   re->update_rects[re->update_rects_count] = rect;
-
-   if (re->rot != 0)
-     _tmp_out_process(re, rect.x, rect.y, w, h);
-
-   ++re->update_rects_count;
-
-   evas_common_cpu_end_opt();
-}
-
-static void
-evas_engine_sdl16_output_flush(void *data)
-{
-   Render_Engine        *re = data;
-
-   if (re->update_rects_count > 0)
-     SDL_UpdateRects(re->soft16_engine_image->surface, re->update_rects_count, re->update_rects);
-
-   re->update_rects_count = 0;
-}
-
-static void
-evas_engine_sdl16_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static void*
-evas_engine_sdl16_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine*       re = (Render_Engine*) data;;
-
-   *error = 0;
-   return evas_cache_engine_image_request(re->cache, file, key, lo, NULL, error);
-}
-
-static int
-evas_engine_sdl16_image_alpha_get(void *data __UNUSED__, void *image)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   Soft16_Image                 *im;
-
-   if (!eim) return 1;
-   im = (Soft16_Image *) eim->cache_entry.src;
-   switch (eim->cache_entry.src->space)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-        if (im->cache_entry.flags.alpha) return 1;
-     default:
-        break;
-     }
-   return 0;
-}
-
-static void
-evas_engine_sdl16_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   SDL_Engine_Image_Entry       *eim;
-
-   eim = image;
-   if (w) *w = eim->cache_entry.src->w;
-   if (h) *h = eim->cache_entry.src->h;
-}
-
-static int
-evas_engine_sdl16_image_colorspace_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   if (!eim) return EVAS_COLORSPACE_RGB565_A5P;
-   return eim->cache_entry.src->space;
-}
-
-static void
-evas_engine_sdl16_image_colorspace_set(void *data __UNUSED__, void *image __UNUSED__, int cspace __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   if (!eim) return;
-   if (eim->cache_entry.src->space == cspace) return;
-
-   evas_cache_engine_image_colorspace(&eim->cache_entry, cspace, NULL);
-}
-
-static void*
-evas_engine_sdl16_image_new_from_copied_data(void *data,
-                                             int w, int h,
-                                             DATA32* image_data,
-                                             int alpha, int cspace)
-{
-   Render_Engine        *re = data;
-
-   if (cspace != EVAS_COLORSPACE_RGB565_A5P)
-     {
-        WRN("Unsupported colorspace %d in %s() (%s:%d)",
-                cspace, __FUNCTION__, __FILE__, __LINE__);
-        return NULL;
-     }
-
-   WRN("s image_data: %p", image_data);
-
-   return evas_cache_engine_image_copied_data(re->cache,
-                                              w, h,
-                                              image_data,
-                                              alpha, cspace, NULL);
-}
-
-static void*
-evas_engine_sdl16_image_new_from_data(void *data, int w, int h, DATA32* image_data, int alpha, int cspace)
-{
-   Render_Engine        *re = data;
-
-   if (cspace != EVAS_COLORSPACE_RGB565_A5P)
-     {
-        WRN("Unsupported colorspace %d in %s() (%s:%d)",
-                cspace, __FUNCTION__, __FILE__, __LINE__);
-        return NULL;
-     }
-
-   return evas_cache_engine_image_data(re->cache,
-                                       w, h,
-                                       image_data,
-                                       alpha, cspace, NULL);
-}
-
-static void
-evas_engine_sdl16_image_free(void *data __UNUSED__, void *image)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   evas_cache_engine_image_drop(&eim->cache_entry);
-}
-
-static void*
-evas_engine_sdl16_image_size_set(void *data __UNUSED__, void *image, int w, int h)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   return evas_cache_engine_image_size_set(&eim->cache_entry, w, h);
-}
-
-static void*
-evas_engine_sdl16_image_dirty_region(void *data __UNUSED__,
-                                     void *image,
-                                     int x, int y, int w, int h)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   return evas_cache_engine_image_dirty(&eim->cache_entry, x, y, w, h);
-}
-
-static void*
-evas_engine_sdl16_image_data_get(void *data __UNUSED__, void *image,
-                                 int to_write, DATA32** image_data, int *err)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   Soft16_Image                 *im;
-   int                           error;
-
-   if (!eim)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_GENERIC;
-        return NULL;
-     }
-   im = (Soft16_Image *) eim->cache_entry.src;
-
-   if (to_write)
-     eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_dirty(&eim->cache_entry,
-         0, 0, eim->cache_entry.src->w, eim->cache_entry.src->h);
-
-   error = evas_cache_image_load_data(&im->cache_entry);
-   /* FIXME: Handle colorspace conversion correctly. */
-   if (image_data) *image_data = (DATA32 *) im->pixels;
-
-   if (err) *err = error;
-   return eim;
-}
-
-static void*
-evas_engine_sdl16_image_data_put(void *data, void *image, DATA32* image_data)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   SDL_Engine_Image_Entry       *eim_new;
-   Render_Engine                *re = data;
-   Soft16_Image                 *im;
-
-   if (!eim) return NULL;
-   im = (Soft16_Image *) eim->cache_entry.src;
-
-   /* FIXME: Handle colorspace conversion correctly. */
-   if ((DATA16 *) image_data == im->pixels) return eim;
-
-   eim_new = (SDL_Engine_Image_Entry *) evas_cache_engine_image_data(re->cache,
-                                                                     eim->cache_entry.w, eim->cache_entry.h,
-                                                                     image_data,
-                                                                     func.image_alpha_get(data, eim),
-                                                                     func.image_colorspace_get(data, eim),
-                                                                     NULL);
-   evas_cache_engine_image_drop(&eim->cache_entry);
-
-   return eim_new;
-}
-
-static void
-evas_engine_sdl16_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   Soft16_Image                 *im;
-
-   if (!eim) return ;
-   im = (Soft16_Image *) eim->cache_entry.src;
-   if (!im) return ;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-evas_engine_sdl16_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   Soft16_Image                 *im;
-
-   if (!eim) return ;
-   im = (Soft16_Image *) eim->cache_entry.src;
-   if (!im) return ;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void*
-evas_engine_sdl16_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   Soft16_Image                 *im;
-
-   if (!eim) return NULL;
-
-   im = (Soft16_Image *) eim->cache_entry.src;
-
-   if (im->cache_entry.flags.alpha == has_alpha) return eim;
-
-   //eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_alone(&eim->cache_entry,  NULL);
-   //im = (Soft16_Image *) eim->cache_entry.src;
-
-   im->cache_entry.flags.alpha = has_alpha;
-   eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_dirty(&eim->cache_entry, 0, 0, eim->cache_entry.w, eim->cache_entry.h);
-
-   return eim;
-}
-
-static void*
-evas_engine_sdl16_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-   return image;
-}
-
-static void
-evas_engine_sdl16_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-   /* FIXME: need to know what evas expect from this call */
-}
-
-static void
-evas_engine_sdl16_image_draw(void *data __UNUSED__, void *context, void *surface, void *image,
-                             int src_region_x, int src_region_y, int src_region_w, int src_region_h,
-                             int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h,
-                             int smooth)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   SDL_Engine_Image_Entry       *dst = surface;
-   int                           mustlock_im = 0;
-   int                           mustlock_dst = 0;
-
-   evas_cache_engine_image_load_data(&eim->cache_entry);
-
-   /* Fallback to software method */
-   if (SDL_MUSTLOCK(dst->surface))
-     {
-        mustlock_dst = 1;
-        SDL_LockSurface(dst->surface);
-        _SDL_UPDATE_PIXELS(dst);
-     }
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_soft16_image_draw((Soft16_Image *) eim->cache_entry.src,
-                     (Soft16_Image *) dst->cache_entry.src,
-                     context,
-                     src_region_x, src_region_y, src_region_w, src_region_h,
-                     dst_region_x, dst_region_y, dst_region_w, dst_region_h,
-                     smooth);
-
-   evas_common_cpu_end_opt ();
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-
-   if (mustlock_dst)
-     SDL_UnlockSurface(dst->surface);
-}
-
-static void
-evas_engine_sdl16_image_map_draw(void *data __UNUSED__, void *context __UNUSED__, void *surface __UNUSED__, void *image __UNUSED__, int npoints __UNUSED__, RGBA_Map_Point *p __UNUSED__, int smooth __UNUSED__, int level __UNUSED__)
-{
-}
-
-static void
-evas_engine_sdl16_image_scale_hint_set(void *data __UNUSED__, void *image __UNUSED__, int hint __UNUSED__)
-{
-}
-
-static int
-evas_engine_sdl16_image_scale_hint_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-}
-
-
-static void
-evas_engine_sdl16_image_cache_flush(void *data)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-   int                   size;
-
-   size = evas_cache_engine_image_get(re->cache);
-   evas_cache_engine_image_set(re->cache, 0);
-   evas_cache_engine_image_set(re->cache, size);
-}
-
-static void
-evas_engine_sdl16_image_cache_set(void *data, int bytes)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-
-   evas_cache_engine_image_set(re->cache, bytes);
-}
-
-static int
-evas_engine_sdl16_image_cache_get(void *data)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-
-   return evas_cache_engine_image_get(re->cache);
-}
-
-static char*
-evas_engine_sdl16_image_comment_get(void *data __UNUSED__, void *image __UNUSED__, char *key __UNUSED__)
-{
-   return NULL;
-}
-
-static char*
-evas_engine_sdl16_image_format_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   /* FIXME: need to know what evas expect from this call */
-   return NULL;
-}
-
-static void
-evas_engine_sdl16_font_draw(void *data __UNUSED__, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   static RGBA_Image            *im = NULL;
-   SDL_Engine_Image_Entry       *eim = surface;
-   Soft16_Image                 *dst = (Soft16_Image *) eim->cache_entry.src;
-   int                           mustlock_im = 0;
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-   evas_common_draw_context_font_ext_set(context,
-                                         dst,
-                                         evas_common_soft16_font_glyph_new,
-                                         evas_common_soft16_font_glyph_free,
-                                         evas_common_soft16_font_glyph_draw);
-   evas_common_font_draw((RGBA_Image *) eim->cache_entry.src, context, font, x, y, intl_props);
-   evas_common_draw_context_font_ext_set(context,
-                                         NULL,
-                                         NULL,
-                                         NULL,
-                                         NULL);
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-}
-
-static void
-evas_engine_sdl16_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-   int                           mustlock_im = 0;
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_soft16_line_draw((Soft16_Image *) eim->cache_entry.src,
-                    context,
-                    x1, y1, x2, y2);
-   evas_common_cpu_end_opt();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-}
-
-static void
-evas_engine_sdl16_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, int y, int w, int h)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-#if ENGINE_SDL_PRIMITIVE
-   RGBA_Draw_Context            *dc = context;
-#endif
-   Soft16_Image                 *im;
-   int                           mustlock_im = 0;
-
-#if ENGINE_SDL_PRIMITIVE
-   if (A_VAL(&dc->col.col) != 0x00)
-     {
-        if (A_VAL(&dc->col.col) != 0xFF)
-          {
-#endif
-             if (eim->surface && SDL_MUSTLOCK(eim->surface))
-               {
-                  mustlock_im = 1;
-                  SDL_LockSurface(eim->surface);
-                  _SDL_UPDATE_PIXELS(eim);
-               }
-
-             im = (Soft16_Image *) eim->cache_entry.src;
-
-             evas_common_soft16_rectangle_draw(im, context, x, y, w, h);
-             evas_common_cpu_end_opt();
-
-             if (mustlock_im)
-               SDL_UnlockSurface(eim->surface);
-#if ENGINE_SDL_PRIMITIVE
-          }
-        else
-          {
-             SDL_Rect        dstrect;
-
-             if (dc->clip.use)
-               {
-                  SDL_Rect   cliprect;
-
-                  cliprect.x = dc->clip.x;
-                  cliprect.y = dc->clip.y;
-                  cliprect.w = dc->clip.w;
-                  cliprect.h = dc->clip.h;
-
-                  SDL_SetClipRect(eim->surface, &cliprect);
-               }
-
-             dstrect.x = x;
-             dstrect.y = y;
-             dstrect.w = w;
-             dstrect.h = h;
-
-             SDL_FillRect(eim->surface, &dstrect, SDL_MapRGBA(eim->surface->format, R_VAL(&dc->col.col), G_VAL(&dc->col.col), B_VAL(&dc->col.col), 0xFF));
-
-             if (dc->clip.use)
-               SDL_SetClipRect(eim->surface, NULL);
-          }
-     }
-#endif
-}
-
-static void
-evas_engine_sdl16_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-   int                           mustlock_im = 0;
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_soft16_polygon_draw((Soft16_Image *) eim->cache_entry.src, context, polygon, x, y);
-   evas_common_cpu_end_opt();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-}
-
-static void
-evas_engine_sdl16_image_stride_get(void *data __UNUSED__, void *image, int *stride)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   if (stride) *stride = 0;
-   if (!image) return;
-   if (stride) *stride = ((Soft16_Image*) eim->cache_entry.src)->stride;
-}
-
-static Eina_Bool
-evas_engine_sdl16_canvas_alpha_get(void *data __UNUSED__, void *context __UNUSED__)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_16")) return 0;
-   _evas_engine_soft16_sdl_log_dom = eina_log_domain_register
-     ("evas-software_16_sdl", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft16_sdl_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, evas_engine_sdl16_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(image_load);
-   ORD(image_alpha_get);
-   ORD(image_size_get);
-   ORD(image_colorspace_get);
-   ORD(image_colorspace_set);
-   ORD(image_new_from_copied_data);
-   ORD(image_new_from_data);
-   ORD(image_free);
-   ORD(image_size_set);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(image_draw);
-   ORD(image_map_draw);
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_stride_get);
-   ORD(font_draw);
-   ORD(line_draw);
-   ORD(rectangle_draw);
-   ORD(polygon_draw);
-   
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-   
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_engine_soft16_sdl_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_16_sdl",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_sdl);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_SDL
-EVAS_EINA_MODULE_DEFINE(engine, software_16_sdl);
-#endif
-
-static Engine_Image_Entry*
-_sdl16_image_alloc(void)
-{
-   SDL_Engine_Image_Entry       *new;
-
-   new = calloc(1, sizeof (SDL_Engine_Image_Entry));
-
-   return (Engine_Image_Entry *) new;
-}
-
-static void
-_sdl16_image_delete(Engine_Image_Entry *eim)
-{
-   free(eim);
-}
-
-static int
-_sdl16_image_constructor(Engine_Image_Entry *ie, void* data __UNUSED__)
-{
-   SDL_Surface                  *sdl = NULL;
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) ie;
-   Soft16_Image                 *im;
-
-   im = (Soft16_Image *) ie->src;
-
-   if (im)
-     {
-        evas_cache_image_load_data(&im->cache_entry);
-
-        if (im->pixels)
-          {
-            /* FIXME: Take care of CSPACE */
-            sdl = SDL_CreateRGBSurfaceFrom(im->pixels,
-                                           ie->w, ie->h,
-                                           16, ie->w * 2,
-                                           RMASK565, GMASK565, BMASK565, AMASK565);
-            eim->surface = sdl;
-            eim->flags.engine_surface = 0;
-          }
-     }
-
-   return EVAS_LOAD_ERROR_NONE;
-}
-
-static void
-_sdl16_image_destructor(Engine_Image_Entry *eim)
-{
-   SDL_Engine_Image_Entry       *seie = (SDL_Engine_Image_Entry *) eim;
-
-   if (seie->surface && !seie->flags.engine_surface)
-     SDL_FreeSurface(seie->surface);
-   seie->surface = NULL;
-}
-
-static void
-_sdl16_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h)
-{
-   SDL_Engine_Image_Entry       *dst;
-   RGBA_Image *im;
-
-   dst = (SDL_Engine_Image_Entry *) eim;
-
-   SDL_UpdateRect(dst->surface, x, y, w, h);
-
-   im = (RGBA_Image *)eim->src;
-   im->flags |= RGBA_IMAGE_IS_DIRTY;
-}
-
-static int
-_sdl16_image_dirty(Engine_Image_Entry *dst, const Engine_Image_Entry *src __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) dst;
-   SDL_Surface                  *sdl = NULL;
-   Soft16_Image                 *im;
-
-   im = (Soft16_Image *) dst->src;
-
-   /* FIXME: Take care of CSPACE */
-   sdl = SDL_CreateRGBSurfaceFrom(im->pixels,
-                                  dst->w, dst->h,
-                                  16, dst->w * 2,
-                                  RMASK565, GMASK565, BMASK565, AMASK565);
-   eim->surface = sdl;
-   eim->flags.engine_surface = 0;
-
-   return 0;
-}
-
-static int
-_sdl16_image_size_set(Engine_Image_Entry *dst, const Engine_Image_Entry *src __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) dst;
-   SDL_Surface                  *sdl;
-   Soft16_Image                 *im;
-
-   im = (Soft16_Image *) dst->src;
-
-   /* FIXME: handle im == NULL */
-   sdl = SDL_CreateRGBSurfaceFrom(im->pixels,
-                                  dst->w, dst->h,
-                                  16, dst->w * 2,
-                                  RMASK565, GMASK565, BMASK565, AMASK565);
-
-   eim->surface = sdl;
-
-   return 0;
-}
-
-static int
-_sdl16_image_update_data(Engine_Image_Entry* dst, void* engine_data)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) dst;
-   SDL_Surface                  *sdl = NULL;
-   Soft16_Image                 *im;
-
-   im = (Soft16_Image *) dst->src;
-
-   if (engine_data)
-     {
-        sdl = engine_data;
-
-        if (im)
-          {
-             im->pixels = sdl->pixels;
-             im->stride = sdl->pitch / 2;
-             im->flags.free_pixels = 0;
-/*              im->alpha = calloc(1, sizeof (DATA8) * _calc_stride(sdl->w) * sdl->h); */
-/*              im->flags.free_alpha = 0; */
-/*              im->flags.have_alpha = 1; */
-             im->alpha = NULL;
-             im->flags.free_alpha = 0;
-             im->cache_entry.flags.alpha = 0;
-
-             dst->src->w = sdl->w;
-             dst->src->h = sdl->h;
-          }
-        dst->w = sdl->w;
-        dst->h = sdl->h;
-     }
-   else
-     {
-        SDL_FreeSurface(eim->surface);
-        /* FIXME: Take care of CSPACE */
-        sdl = SDL_CreateRGBSurfaceFrom(im->pixels,
-                                       dst->w, dst->h,
-                                       16, dst->w * 2,
-                                       RMASK565, GMASK565, BMASK565, AMASK565);
-     }
-
-   eim->surface = sdl;
-
-   return 0;
-}
-
-static void
-_sdl16_image_load(Engine_Image_Entry *eim, const Image_Entry* ie_im)
-{
-   SDL_Engine_Image_Entry       *load = (SDL_Engine_Image_Entry *) eim;
-   SDL_Surface                  *sdl;
-
-   if (!load->surface)
-     {
-        Soft16_Image            *im;
-
-        im = (Soft16_Image *) ie_im;
-
-        sdl = SDL_CreateRGBSurfaceFrom(im->pixels,
-                                       eim->w, eim->h,
-                                       16, eim->w * 2,
-                                       RMASK565, GMASK565, BMASK565, AMASK565);
-        load->surface = sdl;
-     }
-}
-
-static int
-_sdl16_image_mem_size_get(Engine_Image_Entry *eim)
-{
-   SDL_Engine_Image_Entry       *seie = (SDL_Engine_Image_Entry *) eim;
-   int                           size = 0;
-
-   /* FIXME: Count surface size. */
-   if (seie->surface)
-     size = sizeof (SDL_Surface) + sizeof (SDL_PixelFormat);
-
-   return size;
-}
-
-#ifdef DEBUG_SDL
-static void
-_sdl16_image_debug(const char* context, Engine_Image_Entry* im)
-{
-}
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/evas_engine.h b/libraries/evas/src/modules/engines/software_16_sdl/evas_engine.h
deleted file mode 100644
index a1b0ee0..0000000
--- a/libraries/evas/src/modules/engines/software_16_sdl/evas_engine.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef EVAS_ENGINE_SDL_16_H
-#define EVAS_ENGINE_SDL_16_H
-
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_common_soft16.h"
-#include "Evas_Engine_SDL_16.h"
-extern int _evas_engine_soft16_sdl_log_dom ;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft16_sdl_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft16_sdl_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft16_sdl_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft16_sdl_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft16_sdl_log_dom, __VA_ARGS__)
-
-typedef struct _SDL_Engine_Image_Entry SDL_Engine_Image_Entry;
-struct _SDL_Engine_Image_Entry
-{
-  Engine_Image_Entry     cache_entry;
-
-  SDL_Surface           *surface;
-
-  struct
-  {
-    unsigned int         engine_surface : 1;
-  } flags;
-};
-
-
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine
-{
-  SDL_Engine_Image_Entry        *soft16_engine_image;
-
-  Evas_Cache_Engine_Image       *cache;
-
-  Soft16_Image                  *tmp_out;
-
-  int                            w;
-  int                            h;
-  int                            rot;
-
-  Tilebuf                       *tb;
-  Tilebuf_Rect                  *rects;
-  Tilebuf_Rect                  *cur_rect;
-
-  SDL_Rect                      *update_rects;
-  int                            update_rects_count;
-  int                            update_rects_limit;
-
-  struct
-  {
-    unsigned int                 fullscreen : 1;
-    unsigned int                 noframe : 1;
-    unsigned int                 alpha : 1;
-    unsigned int                 hwsurface : 1;
-    unsigned int                 end : 1;
-  } flags;
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h b/libraries/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h
deleted file mode 100644
index e94b7c2..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __EVAS_ENGINE_SOFTWARE_16_WINCE_H__
-#define __EVAS_ENGINE_SOFTWARE_16_WINCE_H__
-
-
-#include <windows.h>
-
-
-typedef struct _Evas_Engine_Info_Software_16_WinCE Evas_Engine_Info_Software_16_WinCE;
-
-struct _Evas_Engine_Info_Software_16_WinCE
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-      HWND         window;
-      int          width;
-      int          height;
-      int          backend; /* 0: auto, 1: raw, 2: gapi, 3: ddraw, 4: gdi */
-      int          rotation;
-      unsigned int fullscreen : 1;
-   } info;
-   /* engine specific function calls to query stuff about messages */
-   struct {
-      int   (*suspend) (int backend);
-      int   (*resume)  (int backend);
-   } func;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-
-#endif /* __EVAS_ENGINE_SOFTWARE_16_WINCE_H__ */
diff --git a/libraries/evas/src/modules/engines/software_16_wince/Makefile.am b/libraries/evas/src/modules/engines/software_16_wince/Makefile.am
deleted file mode 100644
index fcd21b1..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_16 \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_16_wince_cflags@
-
-if BUILD_ENGINE_SOFTWARE_16_WINCE
-
-SOFTWARE_16_WINCE_SOURCE = \
-evas_engine.c \
-evas_wince_ddraw_buffer.cpp \
-evas_wince_fb_buffer.c \
-evas_wince_gapi_buffer.c \
-evas_wince_gdi_buffer.c
-
-SOFTWARE_16_WINCE_LIBADD = @evas_engine_software_16_wince_libs@
-
-
-includes_HEADERS = Evas_Engine_Software_16_WinCE.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
-
-pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
-module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD)
-module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_16_wince.la
-
-libevas_engine_software_16_wince_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
-libevas_engine_software_16_wince_la_LIBADD = $(SOFTWARE_16_WINCE_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_16_wince/Makefile.in b/libraries/evas/src/modules/engines/software_16_wince/Makefile.in
deleted file mode 100644
index d371be5..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/Makefile.in
+++ /dev/null
@@ -1,901 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_16_wince
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_TRUE@libevas_engine_software_16_wince_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_16_wince_la_SOURCES_DIST = evas_engine.c \
-        evas_wince_ddraw_buffer.cpp evas_wince_fb_buffer.c \
-        evas_wince_gapi_buffer.c evas_wince_gdi_buffer.c
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   evas_wince_ddraw_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   evas_wince_fb_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   evas_wince_gapi_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   evas_wince_gdi_buffer.lo
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_TRUE@am_libevas_engine_software_16_wince_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_16_wince_la_OBJECTS =  \
-        $(am_libevas_engine_software_16_wince_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_TRUE@am_libevas_engine_software_16_wince_la_rpath =
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@        $(am__DEPENDENCIES_1)
-am__module_la_SOURCES_DIST = evas_engine.c evas_wince_ddraw_buffer.cpp \
-        evas_wince_fb_buffer.c evas_wince_gapi_buffer.c \
-        evas_wince_gdi_buffer.c
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   module_la-evas_wince_ddraw_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   module_la-evas_wince_fb_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   module_la-evas_wince_gapi_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@   module_la-evas_wince_gdi_buffer.lo
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-        $(module_la_CXXFLAGS) $(CXXFLAGS) $(module_la_LDFLAGS) \
-        $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@        $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_16_wince_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES =  \
-        $(am__libevas_engine_software_16_wince_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_16_WinCE.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_16 \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_16_wince_cflags@
-
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@SOFTWARE_16_WINCE_SOURCE = \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@evas_wince_ddraw_buffer.cpp \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@evas_wince_fb_buffer.c \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@evas_wince_gapi_buffer.c \
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@evas_wince_gdi_buffer.c
-
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@SOFTWARE_16_WINCE_LIBADD = @evas_engine_software_16_wince_libs@
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@includes_HEADERS = Evas_Engine_Software_16_WinCE.h
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD)
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_wince.la
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_TRUE@libevas_engine_software_16_wince_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
-@BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_TRUE@libevas_engine_software_16_wince_la_LIBADD = $(SOFTWARE_16_WINCE_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_16_wince/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_16_wince/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_16_wince.la: $(libevas_engine_software_16_wince_la_OBJECTS) $(libevas_engine_software_16_wince_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(CXXLINK) $(am_libevas_engine_software_16_wince_la_rpath) $(libevas_engine_software_16_wince_la_OBJECTS) $(libevas_engine_software_16_wince_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_wince_ddraw_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_wince_fb_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_wince_gapi_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_wince_gdi_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_wince_ddraw_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_wince_fb_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_wince_gapi_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_wince_gdi_buffer.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_wince_fb_buffer.lo: evas_wince_fb_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_fb_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_fb_buffer.Tpo -c -o module_la-evas_wince_fb_buffer.lo `test -f 'evas_wince_fb_buffer.c' || echo '$(srcdir)/'`evas_wince_fb_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_fb_buffer.Tpo $(DEPDIR)/module_la-evas_wince_fb_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_wince_fb_buffer.c' object='module_la-evas_wince_fb_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_fb_buffer.lo `test -f 'evas_wince_fb_buffer.c' || echo '$(srcdir)/'`evas_wince_fb_buffer.c
-
-module_la-evas_wince_gapi_buffer.lo: evas_wince_gapi_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_gapi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_gapi_buffer.Tpo -c -o module_la-evas_wince_gapi_buffer.lo `test -f 'evas_wince_gapi_buffer.c' || echo '$(srcdir)/'`evas_wince_gapi_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_gapi_buffer.Tpo $(DEPDIR)/module_la-evas_wince_gapi_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_wince_gapi_buffer.c' object='module_la-evas_wince_gapi_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_gapi_buffer.lo `test -f 'evas_wince_gapi_buffer.c' || echo '$(srcdir)/'`evas_wince_gapi_buffer.c
-
-module_la-evas_wince_gdi_buffer.lo: evas_wince_gdi_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_gdi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_gdi_buffer.Tpo -c -o module_la-evas_wince_gdi_buffer.lo `test -f 'evas_wince_gdi_buffer.c' || echo '$(srcdir)/'`evas_wince_gdi_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_gdi_buffer.Tpo $(DEPDIR)/module_la-evas_wince_gdi_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_wince_gdi_buffer.c' object='module_la-evas_wince_gdi_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_gdi_buffer.lo `test -f 'evas_wince_gdi_buffer.c' || echo '$(srcdir)/'`evas_wince_gdi_buffer.c
-
-.cpp.o:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
-
-module_la-evas_wince_ddraw_buffer.lo: evas_wince_ddraw_buffer.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_wince_ddraw_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_ddraw_buffer.Tpo -c -o module_la-evas_wince_ddraw_buffer.lo `test -f 'evas_wince_ddraw_buffer.cpp' || echo '$(srcdir)/'`evas_wince_ddraw_buffer.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_ddraw_buffer.Tpo $(DEPDIR)/module_la-evas_wince_ddraw_buffer.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_wince_ddraw_buffer.cpp' object='module_la-evas_wince_ddraw_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_wince_ddraw_buffer.lo `test -f 'evas_wince_ddraw_buffer.cpp' || echo '$(srcdir)/'`evas_wince_ddraw_buffer.cpp
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_16_wince/evas_engine.c b/libraries/evas/src/modules/engines/software_16_wince/evas_engine.c
deleted file mode 100644
index 74d56e6..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/evas_engine.c
+++ /dev/null
@@ -1,770 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Software_16_WinCE.h"
-#include "evas_common_soft16.h"
-
-int _evas_engine_soft16_wince_log_dom = -1;
-
-typedef enum
-{
-  EVAS_ENGINE_WINCE_FB,
-  EVAS_ENGINE_WINCE_GAPI,
-  EVAS_ENGINE_WINCE_DDRAW,
-  EVAS_ENGINE_WINCE_GDI
-} Evas_Engine_WinCE_Backend;
-
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Evas_Engine_WinCE_Backend backend; /* 1: raw, 2: gapi, 3: ddraw, 4: GDI */
-   void               *backend_priv;
-   void              (*backend_shutdown)(void *priv);
-   FB_Output_Buffer *(*backend_output_buffer_new)(void *priv,
-                                                  int width,
-                                                  int height);
-   void              (*backend_output_buffer_free)(FB_Output_Buffer *fbob);
-   void              (*backend_output_buffer_paste)(FB_Output_Buffer *fbob);
-   void              (*backend_surface_resize)(FB_Output_Buffer *fbob);
-
-   int               width;
-   int               height;
-   int               rotation;
-   Tilebuf          *tb;
-   Tilebuf_Rect     *rects;
-   Tilebuf_Rect     *cur_rect;
-   FB_Output_Buffer *fbob;
-   Soft16_Image     *tmp_out; /* used by indirect render, like rotation */
-   HRGN              clip_rects;
-   unsigned char     end : 1;
-};
-
-/* prototypes we will use here */
-
-static void *eng_info(Evas *e);
-static void eng_info_free(Evas *e, void *info);
-static int eng_setup(Evas *e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-static int
-_suspend(int backend)
-{
-   switch (backend)
-     {
-      case 2: /* gapi */
-         return evas_software_wince_gapi_suspend();
-      default: /* other engines do not need it */
-         return 0;
-     }
-}
-
-static int
-_resume(int backend)
-{
-   switch (backend)
-     {
-      case 2: /* gapi */
-         return evas_software_wince_gapi_resume();
-      default: /* other engines do not need it */
-         return 0;
-     }
-}
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_Software_16_WinCE *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_Software_16_WinCE));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   info->func.suspend = _suspend;
-   info->func.resume = _resume;
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e, void *info)
-{
-   Evas_Engine_Info_Software_16_WinCE *in;
-   in = (Evas_Engine_Info_Software_16_WinCE *)info;
-   free(in);
-}
-
-static void
-_tmp_out_alloc(Render_Engine *re)
-{
-   Tilebuf_Rect *r;
-   int w = 0, h = 0;
-
-   EINA_INLIST_FOREACH(re->rects, r)
-     {
-        if (r->w > w) w = r->w;
-        if (r->h > h) h = r->h;
-     }
-
-   if (re->tmp_out)
-     {
-        if ((re->tmp_out->cache_entry.w < w) || (re->tmp_out->cache_entry.h < h))
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-
-   if (!re->tmp_out)
-     {
-        Soft16_Image *im;
-
-        im = (Soft16_Image *) evas_cache_image_empty(evas_common_soft16_image_cache_get());
-        im->cache_entry.flags.alpha = 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-
-        re->tmp_out = im;
-     }
-}
-
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine                      *re;
-   Evas_Engine_Info_Software_16_WinCE *info;
-
-   info = (Evas_Engine_Info_Software_16_WinCE *)in;
-   if (!e->engine.data.output)
-     {
-        /* do common routine init - we wil at least use it for core
-         * image loading and font loading/glyph rendering & placement */
-        evas_common_cpu_init();
-
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-        evas_common_soft16_image_init();
-
-        /* render engine specific data */
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re)
-          return 0;
-        e->engine.data.output = re;
-
-        switch(info->info.backend)
-          {
-           case 1: /* FB */
-              re->backend = EVAS_ENGINE_WINCE_FB;
-              re->backend_priv = evas_software_wince_fb_init(info->info.window, info->info.width, info->info.height);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_fb_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_fb_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_fb_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_fb_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_fb_surface_resize;
-              break;
-           case 2: /* GAPI */
-              re->backend = EVAS_ENGINE_WINCE_GAPI;
-              re->backend_priv = evas_software_wince_gapi_init(info->info.window, info->info.width, info->info.height);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_gapi_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_gapi_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_gapi_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_gapi_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_gapi_surface_resize;
-              break;
-           case 3: /* DirectDraw */
-              re->backend = EVAS_ENGINE_WINCE_DDRAW;
-              re->backend_priv = evas_software_wince_ddraw_init(info->info.window, info->info.width, info->info.height);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_ddraw_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_ddraw_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_ddraw_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_ddraw_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_ddraw_surface_resize;
-              break;
-           case 4: /* GDI */
-              re->backend = EVAS_ENGINE_WINCE_GDI;
-              re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height, info->info.fullscreen);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_gdi_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_gdi_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_gdi_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_gdi_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_gdi_surface_resize;
-              break;
-           default:
-              free(re);
-              return 0;
-          }
-
-        re->width = e->output.w;
-        re->height = e->output.h;
-        re->rotation = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-     }
-   else
-     {
-        re = e->engine.data.output;
-        if (re->tb) evas_common_tilebuf_free(re->tb);
-
-        switch(info->info.backend)
-          {
-           case 1: /* FB */
-              re->backend = EVAS_ENGINE_WINCE_FB;
-              re->backend_priv = evas_software_wince_fb_init(info->info.window, info->info.width, info->info.height);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_fb_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_fb_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_fb_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_fb_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_fb_surface_resize;
-              break;
-           case 2: /* GAPI */
-              re->backend = EVAS_ENGINE_WINCE_GAPI;
-              re->backend_priv = evas_software_wince_gapi_init(info->info.window, info->info.width, info->info.height);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_gapi_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_gapi_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_gapi_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_gapi_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_gapi_surface_resize;
-              break;
-           case 3: /* DirectDraw */
-              re->backend = EVAS_ENGINE_WINCE_DDRAW;
-              re->backend_priv = evas_software_wince_ddraw_init(info->info.window, info->info.width, info->info.height);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_ddraw_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_ddraw_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_ddraw_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_ddraw_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_ddraw_surface_resize;
-              break;
-           case 4: /* GDI */
-              re->backend = EVAS_ENGINE_WINCE_GDI;
-              re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height, info->info.fullscreen);
-              if (!re->backend_priv)
-                {
-                   free(re);
-                   return 0;
-                }
-              re->backend_shutdown = evas_software_wince_gdi_shutdown;
-              re->backend_output_buffer_new = evas_software_wince_gdi_output_buffer_new;
-              re->backend_output_buffer_free = evas_software_wince_gdi_output_buffer_free;
-              re->backend_output_buffer_paste = evas_software_wince_gdi_output_buffer_paste;
-              re->backend_surface_resize = evas_software_wince_gdi_surface_resize;
-              break;
-           default:
-              free(re);
-              return 0;
-          }
-
-        re->width = e->output.w;
-        re->height = e->output.h;
-        re->rotation = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-        if (re->tmp_out)
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-   if (!e->engine.data.output) return 0;
-   /* add a draw context if we dont have one */
-   if (!e->engine.data.context)
-     e->engine.data.context =
-     e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->fbob) re->backend_output_buffer_free(re->backend_priv);
-   re->backend_shutdown(re->backend_priv);
-   if (re->clip_rects) DeleteObject(re->clip_rects);
-   if (re->tb) evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   if (re->tmp_out) evas_cache_image_drop(&re->tmp_out->cache_entry);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-   evas_common_soft16_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-
-   if ((re->width == w) && (re->height == h)) return;
-
-   /* FIXME: is it needed ?? */
-   if (re->fbob)
-     re->backend_surface_resize(re->fbob);
-
-   evas_common_tilebuf_free(re->tb);
-   re->width = w;
-   re->height = h;
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   if (re->fbob)
-     {
-        re->backend_output_buffer_free(re->fbob);
-        re->fbob = NULL;
-     }
-   if (re->clip_rects)
-     {
-        DeleteObject(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static inline void
-_output_buffer_alloc(Render_Engine *re)
-{
-   int width;
-   int height;
-
-   if (re->fbob) return;
-
-   if ((re->rotation == 0) || (re->rotation == 180))
-     {
-        width = re->width;
-        height = re->height;
-     }
-   else
-     {
-        width = re->height;
-        height = re->width;
-     }
-
-   re->fbob = re->backend_output_buffer_new(re->backend_priv,
-                                            width,
-                                            height);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        if (!re->rects) return NULL;
-
-        re->cur_rect = re->rects;
-        _output_buffer_alloc(re);
-        if (re->rotation != 0) _tmp_out_alloc(re); /* grows if required */
-     }
-   if (!re->cur_rect)
-     {
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        return NULL;
-     }
-   rect = re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = (Tilebuf_Rect *)((EINA_INLIST_GET(re->cur_rect))->next);
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   *x = ux; *y = uy; *w = uw; *h = uh;
-   if (re->rotation == 0)
-     {
-        *cx = ux; *cy = uy; *cw = uw; *ch = uh;
-        return re->fbob->im;
-     }
-   else
-     {
-        *cx = 0; *cy = 0; *cw = uw; *ch = uh;
-        return re->tmp_out;
-     }
-}
-
-static void
-_blit_rot_90(Soft16_Image *dst, const Soft16_Image *src,
-             int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + (out_x +
-                       (w + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr -= dst->stride;
-          }
-        sp += src->stride;
-        dp++;
-     }
-}
-
-static void
-_blit_rot_180(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((w + out_x - 1) +
-                       (h + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr--;
-          }
-        sp += src->stride;
-        dp -= dst->stride;
-     }
-}
-
-static void
-_blit_rot_270(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((h + out_x - 1) +
-                       out_y * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr += dst->stride;
-          }
-        sp += src->stride;
-        dp--;
-     }
-}
-
-static void
-_tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h)
-{
-   Soft16_Image *d, *s;
-
-   d = re->fbob->im;
-   s = re->tmp_out;
-
-   if ((w < 1) || (h < 1) || (out_x >= d->cache_entry.w) || (out_y >= d->cache_entry.h))
-     return;
-
-   if (re->rotation == 90)
-     _blit_rot_90(d, s, out_x, out_y, w, h);
-   else if (re->rotation == 180)
-     _blit_rot_180(d, s, out_x, out_y, w, h);
-   else if (re->rotation == 270)
-     _blit_rot_270(d, s, out_x, out_y, w, h);
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   HRGN           region;
-   int            xx;
-   int            yy;
-   int            width;
-   int            height;
-
-   re = (Render_Engine *)data;
-
-   if (!re->clip_rects)
-      re->clip_rects = CreateRectRgn(0, 0, 0, 0);
-
-   if (re->rotation == 0)
-     {
-        xx = x;
-        yy = y;
-        width = w;
-        height = h;
-     }
-   else if (re->rotation == 90)
-     {
-        xx = y;
-        yy = re->width - w - x;
-        width = h;
-        height = w;
-     }
-   else if (re->rotation == 180)
-     {
-        xx = re->width - w - x;
-        yy = re->height - h - y;
-        width = w;
-        height = h;
-     }
-   else if (re->rotation == 270)
-     {
-        xx = re->height - h - y;
-        yy = x;
-        width = h;
-        height = w;
-     }
-
-   region = CreateRectRgn(xx, yy, xx + width, yy + height);
-
-   if (re->rotation != 0)
-     _tmp_out_process(re, xx, yy, w, h);
-   CombineRgn(re->clip_rects, re->clip_rects, region, RGN_OR);
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->clip_rects)
-     {
-        /* FIXME : i have to manage that */
-/*      XSetRegion(re->disp, re->gc, re->clip_rects); */
-        DeleteObject(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   else return;
-
-   re->backend_output_buffer_paste(re->fbob);
-
-   /* FIXME : i have to manage that */
-/*    XSetClipMask(re->disp, re->gc, None); */
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->fbob)
-     {
-        re->backend_output_buffer_free(re->fbob);
-        re->fbob = NULL;
-     }
-   if (re->clip_rects)
-     {
-        DeleteObject(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_16")) return 0;
-   _evas_engine_soft16_wince_log_dom = eina_log_domain_register
-     ("evas-software_16_wince", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft16_wince_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-  eina_log_domain_unregister(_evas_engine_soft16_wince_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_16_wince",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_wince);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
-EVAS_EINA_MODULE_DEFINE(engine, software_16_wince);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_wince/evas_engine.h b/libraries/evas/src/modules/engines/software_16_wince/evas_engine.h
deleted file mode 100644
index 344e7b9..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/evas_engine.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef __EVAS_ENGINE_H__
-#define __EVAS_ENGINE_H__
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include "evas_common.h"
-#include "evas_common_soft16.h"
-
-extern int _evas_engine_soft16_wince_log_dom;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft16_wince_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft16_wince_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft16_wince_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft16_wince_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft16_wince_log_dom, __VA_ARGS__)
-
-typedef struct _FB_Output_Buffer FB_Output_Buffer;
-
-struct _FB_Output_Buffer
-{
-   Soft16_Image *im;
-   void         *priv;
-};
-
-
-/* Raw FrameBuffer */
-
-void             *evas_software_wince_fb_init (HWND window,
-                                               int  width,
-                                               int  height);
-FB_Output_Buffer *evas_software_wince_fb_output_buffer_new (void *priv,
-                                                            int   width,
-                                                            int   height);
-void              evas_software_wince_fb_shutdown(void *priv);
-void              evas_software_wince_fb_output_buffer_free (FB_Output_Buffer *fbob);
-void              evas_software_wince_fb_output_buffer_paste (FB_Output_Buffer *fbob);
-
-void              evas_software_wince_fb_surface_resize(FB_Output_Buffer *fbob);
-
-
-/* GAPI */
-
-void             *evas_software_wince_gapi_init (HWND window,
-                                                 int  width,
-                                                 int  height);
-FB_Output_Buffer *evas_software_wince_gapi_output_buffer_new (void *priv,
-                                                              int   width,
-                                                              int   height);
-void              evas_software_wince_gapi_shutdown(void *priv);
-void              evas_software_wince_gapi_output_buffer_free (FB_Output_Buffer *fbob);
-void              evas_software_wince_gapi_output_buffer_paste (FB_Output_Buffer *fbob);
-
-void              evas_software_wince_gapi_surface_resize(FB_Output_Buffer *fbob);
-
-void             *evas_software_wince_gapi_default_keys(void);
-int               evas_software_wince_gapi_suspend(void);
-int               evas_software_wince_gapi_resume(void);
-
-
-/* DirectDraw */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-void             *evas_software_wince_ddraw_init (HWND window,
-                                                  int  width,
-                                                  int  height);
-FB_Output_Buffer *evas_software_wince_ddraw_output_buffer_new (void *priv,
-                                                               int   width,
-                                                               int   height);
-void              evas_software_wince_ddraw_shutdown(void *priv);
-void              evas_software_wince_ddraw_output_buffer_free (FB_Output_Buffer *fbob);
-void              evas_software_wince_ddraw_output_buffer_paste (FB_Output_Buffer *fbob);
-
-void              evas_software_wince_ddraw_surface_resize(FB_Output_Buffer *fbob);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-/* GDI */
-
-void             *evas_software_wince_gdi_init (HWND window,
-                                                int  width,
-                                                int  height,
-                                                int  fullscreen);
-FB_Output_Buffer *evas_software_wince_gdi_output_buffer_new (void *priv,
-                                                             int   width,
-                                                             int   height);
-void              evas_software_wince_gdi_shutdown(void *priv);
-void              evas_software_wince_gdi_output_buffer_free (FB_Output_Buffer *fbob);
-void              evas_software_wince_gdi_output_buffer_paste (FB_Output_Buffer *fbob);
-
-void              evas_software_wince_gdi_surface_resize(FB_Output_Buffer *fbob);
-
-
-#endif /* __EVAS_ENGINE_H__ */
diff --git a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp b/libraries/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp
deleted file mode 100644
index 944ed53..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-
-#include <cstdio>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <ddraw.h>
-
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-typedef LONG (*fct_DirectDrawCreate)(LPGUID, LPUNKNOWN *, LPUNKNOWN *);
-
-fct_DirectDrawCreate lib_DirectDrawCreate;
-
-typedef struct Evas_Engine_WinCE_DDraw_Priv Evas_Engine_WinCE_DDraw_Priv;
-
-struct Evas_Engine_WinCE_DDraw_Priv
-{
-   HMODULE             module;
-   LPDIRECTDRAW        object;
-   LPDIRECTDRAWSURFACE surface;
-   int                 width;
-   int                 height;
-   int                 stride;
-};
-
-void *
-evas_software_wince_ddraw_init(HWND window,
-                               int  width,
-                               int  height)
-{
-   DDSURFACEDESC                 surface_desc;
-   Evas_Engine_WinCE_DDraw_Priv *priv;
-   HRESULT                       res;
-
-   priv = (Evas_Engine_WinCE_DDraw_Priv *)malloc(sizeof(Evas_Engine_WinCE_DDraw_Priv));
-   if (!priv)
-     return NULL;
-   
-   priv->module = LoadLibrary(L"ddraw.dll");
-   if (!priv->module)
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Can not load ddraw.dll\n");
-        goto free_priv;
-     }
-
-   lib_DirectDrawCreate = (fct_DirectDrawCreate)GetProcAddress(priv->module, L"DirectDrawCreate");
-   if (!lib_DirectDrawCreate)
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Can not initialize DirectDraw\n");
-        goto free_lib;
-     }
-
-   res = lib_DirectDrawCreate(NULL, (IUnknown**)&priv->object, NULL);
-   if (FAILED(res))
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Can not create DirectDraw object\n");
-        goto free_lib;
-     }
-
-   res = priv->object->SetCooperativeLevel(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
-   if (FAILED(res))
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Can not set window to fullscreen\n");
-        goto release_object;
-     }
-
-   memset(&surface_desc, 0, sizeof(surface_desc));
-   surface_desc.dwSize = sizeof(surface_desc);
-   surface_desc.dwFlags = DDSD_CAPS;
-   surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-
-   res = priv->object->CreateSurface(&surface_desc, &priv->surface, NULL);
-   if (FAILED(res))
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Can not create surface\n");
-        goto release_object;
-     }
-
-   memset(&surface_desc, 0, sizeof(surface_desc));
-   surface_desc.dwSize = sizeof(surface_desc);
-   res = priv->surface->Lock(NULL, &surface_desc, DDLOCK_READONLY, NULL);
-   if (FAILED(res))
-     {
-        fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not lock surface\n");
-        goto release_surface;
-     }
-
-   priv->width = surface_desc.dwWidth;
-   priv->height = surface_desc.dwHeight;
-   priv->stride = surface_desc.lPitch / 2;
-
-   if ((priv->width != width) ||
-       (priv->height != height))
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Size mismatch\n");
-        fprintf(stderr, "[Engine] [WinCE DDraw] asked : %dx%d\n", width, height);
-        fprintf(stderr, "[Engine] [WinCE DDraw] got   : %dx%d\n", priv->width, priv->height);
-        goto release_surface;
-     }
-
-   res = priv->surface->Unlock(NULL);
-   if (FAILED(res))
-     {
-        fprintf(stderr, "[Engine] [WinCE DDraw] Can not unlock surface\n");
-        goto release_surface;
-     }
-
-   return priv;
-
- release_surface:
-   priv->surface->Release();
- release_object:
-   priv->object->Release();
- free_lib:
-   FreeLibrary(priv->module);
- free_priv:
-   free(priv);
-
-  return 0;
-}
-
-void
-evas_software_wince_ddraw_shutdown(void *priv)
-{
-   ((Evas_Engine_WinCE_DDraw_Priv *)priv)->surface->Release();
-   ((Evas_Engine_WinCE_DDraw_Priv *)priv)->object->Release();
-   FreeLibrary(((Evas_Engine_WinCE_DDraw_Priv *)priv)->module);
-   free(priv);
-}
-
-
-FB_Output_Buffer *
-evas_software_wince_ddraw_output_buffer_new(void *priv,
-                                            int   width,
-                                            int   height)
-{
-   FB_Output_Buffer *fbob;
-   void             *buffer;
-
-   fbob = (FB_Output_Buffer *)calloc(1, sizeof(FB_Output_Buffer));
-   if (!fbob) return NULL;
-
-   buffer = malloc (width * height * 2); /* we are sure to have 16bpp */
-   if (!buffer)
-     {
-        free(fbob);
-        return NULL;
-     }
-
-   fbob->priv = priv;
-
-   fbob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), width, height, (DATA32 *)buffer, 0, EVAS_COLORSPACE_RGB565_A5P);
-   if (fbob->im)
-     fbob->im->stride = ((Evas_Engine_WinCE_DDraw_Priv *)priv)->stride;
-
-   return fbob;
-}
-
-void
-evas_software_wince_ddraw_output_buffer_free(FB_Output_Buffer *fbob)
-{
-   free(fbob->im->pixels);
-   free(fbob);
-}
-
-void
-evas_software_wince_ddraw_output_buffer_paste(FB_Output_Buffer *fbob)
-{
-   DDSURFACEDESC                 surface_desc;
-   Evas_Engine_WinCE_DDraw_Priv *priv;
-   HRESULT                       res;
-
-   priv = (Evas_Engine_WinCE_DDraw_Priv *)fbob->priv;
-
-   memset(&surface_desc, 0, sizeof(surface_desc));
-   surface_desc.dwSize = sizeof(surface_desc);
-   res = priv->surface->Lock(NULL, &surface_desc, DDLOCK_WRITEONLY, NULL);
-   if (FAILED(res))
-     return;
-
-   if ((fbob->im->cache_entry.w == surface_desc.dwWidth) &&
-       (fbob->im->cache_entry.h == surface_desc.dwHeight))
-     memcpy(surface_desc.lpSurface, fbob->im->pixels,
-            surface_desc.dwWidth * surface_desc.dwHeight * 2);
-
-   priv->surface->Unlock(NULL);
-}
-
-void
-evas_software_wince_ddraw_surface_resize(FB_Output_Buffer *fbob)
-{
-}
diff --git a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c b/libraries/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c
deleted file mode 100644
index 6a81bf4..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-#define GETGXINFO 0x00020000
-
-typedef struct GXDeviceInfo
-{
-    long Version;               //00 (should filled with 100 before calling ExtEscape)
-    void *pvFrameBuffer;        //04
-    unsigned long cbStride;     //08
-    unsigned long cxWidth;      //0c
-    unsigned long cyHeight;     //10
-    unsigned long cBPP;         //14
-    unsigned long ffFormat;     //18
-    char Unused[0x84 - 7 * 4];
-} GXDeviceInfo;
-
-
-#define GETRAWFRAMEBUFFER 0x00020001
-
-typedef struct _RawFrameBufferInfo
-{
-   WORD  wFormat;
-   WORD  wBPP;
-   VOID *pFramePointer;
-   int   cxStride;
-   int   cyStride;
-   int   cxPixels;
-   int   cyPixels;
-} RawFrameBufferInfo;
-
-
-typedef struct Evas_Engine_WinCE_FB_Priv Evas_Engine_WinCE_FB_Priv;
-
-struct Evas_Engine_WinCE_FB_Priv
-{
-   int   width;
-   int   height;
-   void *buffer;
-};
-
-static int
-_evas_software_wince_gxinfo_init(HDC dc, int *width, int *height, void **buffer)
-{
-   GXDeviceInfo gxInfo = { 0 };
-   int          result;
-
-   gxInfo.Version = 100;
-   result = ExtEscape(dc, GETGXINFO, 0, NULL, sizeof(gxInfo),
-                      (char *) &gxInfo);
-   if (result <= 0)
-     {
-        ERR("ExtEscape() with GETGXINFO failed");
-        return 0;
-     }
-
-   *width = gxInfo.cyHeight;
-   *height = gxInfo.cxWidth;
-   *buffer = gxInfo.pvFrameBuffer;
-
-   return 1;
-}
-
-void *
-evas_software_wince_fb_init(HWND window,
-                            int  width,
-                            int  height)
-{
-   WCHAR                      oemstr[100];
-   RawFrameBufferInfo         rfbi;
-   HDC                        dc;
-   Evas_Engine_WinCE_FB_Priv *priv;
-
-   priv = (Evas_Engine_WinCE_FB_Priv *)malloc(sizeof(Evas_Engine_WinCE_FB_Priv));
-   if (!priv)
-     return NULL;
-
-   dc = GetDC (window);
-   if (!dc)
-     {
-        ERR("Can not get DC");
-        free(priv);
-        return NULL;
-     }
-
-   SystemParametersInfo (SPI_GETOEMINFO, sizeof (oemstr), oemstr, 0);
-   if (((oemstr[12] == 'H') &&
-        (oemstr[13] == '3') &&
-        (oemstr[14] == '8')) ||
-       ((oemstr[12] == 'H') &&
-        (oemstr[13] == '3') &&
-        (oemstr[14] == '9')))
-     {
-       if (!_evas_software_wince_gxinfo_init(dc, &priv->width, &priv->height, &priv->buffer))
-          {
-             ReleaseDC(window, dc);
-             free(priv);
-             return NULL;
-          }
-
-       if ((priv->width != width) ||
-           (priv->height != height))
-         {
-            ERR("Size mismatch: asked: %dx%d, got: %dx%d",
-                width, height, priv->width, priv->height);
-            ReleaseDC(window, dc);
-            free(priv);
-            return NULL;
-         }
-
-        ReleaseDC(window, dc);
-
-        return priv;
-     }
-
-   if (!ExtEscape(dc, GETRAWFRAMEBUFFER, 0, 0, sizeof(rfbi), (char *) &rfbi)||
-       (rfbi.wBPP != 16) ||
-       (rfbi.wFormat != 1))
-     {
-        ERR("ExtEscape() with GETRAWFRAMEBUFFER failed. "
-            "Trying ExtEscape() with GETGXINFO");
-        if (!_evas_software_wince_gxinfo_init(dc, &priv->width, &priv->height, &priv->buffer))
-          {
-             ReleaseDC(window, dc);
-             free(priv);
-             return NULL;
-          }
-
-        ReleaseDC(window, dc);
-        return priv;
-     }
-
-  priv->width = rfbi.cxPixels;
-  priv->height = rfbi.cyPixels;
-  priv->buffer = rfbi.pFramePointer;
-
-  if ((priv->width != width) ||
-      (priv->height != height))
-    {
-        ERR("Size mismatch: asked: %dx%d, got: %dx%d",
-            width, height, priv->width, priv->height);
-       ReleaseDC(window, dc);
-       free(priv);
-       return NULL;
-    }
-
-  ReleaseDC(window, dc);
-
-  return priv;
-}
-
-void
-evas_software_wince_fb_shutdown(void *priv)
-{
-   free(priv);
-}
-
-
-FB_Output_Buffer *
-evas_software_wince_fb_output_buffer_new(void *priv,
-                                         int   width,
-                                         int   height)
-{
-   FB_Output_Buffer *fbob;
-   void             *buffer;
-
-   fbob = calloc(1, sizeof(FB_Output_Buffer));
-   if (!fbob) return NULL;
-
-   buffer = malloc (width * height * 2); /* we are sure to have 16bpp */
-   if (!buffer)
-     {
-        free(fbob);
-        return NULL;
-     }
-
-   fbob->priv = priv;
-
-   fbob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), width, height, (DATA32 *)buffer, 0, EVAS_COLORSPACE_RGB565_A5P);
-   if (fbob->im)
-     fbob->im->stride = width;
-
-   return fbob;
-}
-
-void
-evas_software_wince_fb_output_buffer_free(FB_Output_Buffer *fbob)
-{
-   free(fbob->im->pixels);
-   free(fbob);
-}
-
-void
-evas_software_wince_fb_output_buffer_paste(FB_Output_Buffer *fbob)
-{
-   Evas_Engine_WinCE_FB_Priv *priv;
-
-   priv = (Evas_Engine_WinCE_FB_Priv *)fbob->priv;
-
-   if ((fbob->im->cache_entry.w == priv->width) &&
-       (fbob->im->cache_entry.h == priv->height))
-     memcpy(priv->buffer, fbob->im->pixels,
-            priv->width * priv->height * 2);
-}
-
-void
-evas_software_wince_fb_surface_resize(FB_Output_Buffer *fbob)
-{
-}
diff --git a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c b/libraries/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c
deleted file mode 100644
index c23c863..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c
+++ /dev/null
@@ -1,341 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-typedef int (*evas_engine_wince_close_display)();
-
-typedef struct Evas_Engine_WinCE_GAPI_Priv Evas_Engine_WinCE_GAPI_Priv;
-
-
-#define GETGXINFO 0x00020000
-
-typedef struct
-{
-    long Version;               //00 (should filled with 100 before calling ExtEscape)
-    void *pvFrameBuffer;        //04
-    unsigned long cbStride;     //08
-    unsigned long cxWidth;      //0c
-    unsigned long cyHeight;     //10
-    unsigned long cBPP;         //14
-    unsigned long ffFormat;     //18
-    char Unused[0x84 - 7 * 4];
-} _GXDeviceInfo;
-
-
-#define LINK(type,name,import) \
-  name = (gapi_##type)GetProcAddress (gapi_lib, import)
-
-#define GX_FULLSCREEN 0x01
-#define GX_NORMALKEYS 0x02
-
-#define kfDirect555   0x40
-#define kfDirect565   0x80
-
-
-typedef struct
-{
-   DWORD cxWidth;
-   DWORD cyHeight;
-   LONG  cbxPitch;
-   LONG  cbyPitch;
-   LONG  cBPP;
-   DWORD ffFormat;
-} _GAPI_Display_Properties;
-
-typedef int                      (*gapi_display_open)(HWND hWnd, DWORD dwFlags);
-typedef int                      (*gapi_display_close)();
-typedef _GAPI_Display_Properties (*gapi_display_properties_get)(void);
-typedef void*                    (*gapi_draw_begin)(void);
-typedef int                      (*gapi_draw_end)(void);
-typedef int                      (*gapi_suspend)(void);
-typedef int                      (*gapi_resume)(void);
-
-gapi_suspend          suspend = NULL;
-gapi_resume           resume = NULL;
-
-int
-evas_software_wince_gapi_suspend(void)
-{
-   if (suspend)
-     return suspend();
-   else
-     return 0;
-}
-
-int
-evas_software_wince_gapi_resume(void)
-{
-   if (resume)
-     return resume();
-   else
-     return 0;
-}
-
-
-struct Evas_Engine_WinCE_GAPI_Priv
-{
-   HMODULE            lib;
-   gapi_display_close close_display;
-   gapi_draw_begin    draw_begin;
-   gapi_draw_end      draw_end;
-   void              *buffer;
-   int                width;
-   int                height;
-   int                stride;
-};
-
-void *
-evas_software_wince_gapi_init(HWND window,
-                              int  width,
-                              int  height)
-{
-   WCHAR                        oemstr[100];
-   _GAPI_Display_Properties     prop;
-   HMODULE                      gapi_lib;
-   Evas_Engine_WinCE_GAPI_Priv *priv;
-
-   gapi_display_open            display_open = NULL;
-   gapi_display_close           display_close = NULL;
-   gapi_display_properties_get  display_properties_get = NULL;
-   gapi_draw_begin              draw_begin = NULL;
-   gapi_draw_end                draw_end = NULL;
-
-   priv = (Evas_Engine_WinCE_GAPI_Priv *)malloc(sizeof(Evas_Engine_WinCE_GAPI_Priv));
-   if (!priv)
-     return NULL;
-
-   gapi_lib = LoadLibrary(L"\\Windows\\gx.dll");
-   if (!gapi_lib)
-     {
-        gapi_lib = LoadLibrary(L"gx.dll");
-        if (!gapi_lib)
-          {
-             ERR("[Engine] [WinCE GAPI] Can not load gx.dll");
-             goto free_priv;
-          }
-     }
-
-   LINK(display_open, display_open, L"?GXOpenDisplay@@YAHPAUHWND__@@K@Z");
-   LINK(display_close, display_close, L"?GXCloseDisplay@@YAHXZ");
-   LINK(display_properties_get, display_properties_get, L"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ");
-   LINK(draw_begin, draw_begin, L"?GXBeginDraw@@YAPAXXZ");
-   LINK(draw_end, draw_end, L"?GXEndDraw@@YAHXZ");
-   LINK(suspend, suspend, L"?GXSuspend@@YAHXZ" );
-   LINK(resume, resume, L"?GXResume@@YAHXZ" );
-
-   if (!display_open ||
-       !display_close ||
-       !display_properties_get ||
-       !draw_begin ||
-       !draw_end ||
-       !suspend ||
-       !resume)
-     {
-        ERR("[Engine] [WinCE GAPI] Can not find valid symbols");
-        goto free_lib;
-     }
-
-   if (!display_open(window, GX_FULLSCREEN))
-     {
-        ERR("[Engine] [WinCE GAPI] Can not open display");
-        goto free_lib;
-     }
-
-   prop = display_properties_get();
-
-   // verify pixel format
-   if(!(prop.ffFormat & kfDirect565) || (prop.cBPP != 16))
-     {
-        ERR("display format mismatch");
-        goto close_display;
-     }
-
-   // verify we have a vga device
-   if ((GetSystemMetrics(SM_CXSCREEN) != (int)prop.cxWidth) ||
-       (GetSystemMetrics(SM_CYSCREEN) != (int)prop.cyHeight))
-     {
-        ERR("display size mismatch");
-        goto close_display;
-     }
-
-   priv->lib = gapi_lib;
-   priv->close_display = display_close;
-   priv->draw_begin = draw_begin;
-   priv->draw_end = draw_end;
-
-   /* GAPI on Ipaq H38** and H39** is completely buggy */
-   /* They are detected as portrait device (width = 240 and height = 320) */
-   /* but the framebuffer is managed like a landscape device : */
-   /*
-     240
- +---------+
- |         |
- |         |
- |         |
- |         |
- |         | 320
- | ^^^     |
- | |||     |
- | |||     |
- | |||     |
- +---------+
-  ---->
-
-   */
-   /* So these devices are considered as landscape devices */
-   /* and width and height are switched. */
-   /* Other devices are managed normally : */
-   /*
-     240
-  +---------+
-| |--->     |
-| |--->     |
-| |--->     |
-v |         |
-  |         | 320
-  |         |
-  |         |
-  |         |
-  |         |
-  +---------+
-
-    */
-
-   SystemParametersInfo (SPI_GETOEMINFO, sizeof (oemstr), oemstr, 0);
-
-   if (((oemstr[12] == 'H') &&
-        (oemstr[13] == '3') &&
-        (oemstr[14] == '8')) ||
-       ((oemstr[12] == 'H') &&
-        (oemstr[13] == '3') &&
-        (oemstr[14] == '9')))
-     {
-        _GXDeviceInfo gxInfo = { 0 };
-        HDC           dc;
-        int           result;
-
-        priv->width = prop.cyHeight;
-        priv->height = prop.cxWidth;
-        priv->stride = prop.cbxPitch;
-
-        dc = GetDC (window);
-        if (!dc)
-          {
-             ERR("Can not get device");
-             goto close_display;
-          }
-
-        gxInfo.Version = 100;
-        result = ExtEscape(dc, GETGXINFO, 0, NULL, sizeof(gxInfo),
-                           (char *) &gxInfo);
-        if (result <= 0)
-          {
-             ERR("ExtEscape failed");
-             ReleaseDC(window, dc);
-             goto close_display;
-          }
-
-        priv->buffer = gxInfo.pvFrameBuffer;
-        ReleaseDC(window, dc);
-     }
-   else
-     {
-        priv->width = prop.cxWidth;
-        priv->height = prop.cyHeight;
-        priv->stride = prop.cbyPitch;
-        priv->buffer = NULL;
-     }
-
-   if ((priv->width != width) ||
-       (priv->height != height))
-     {
-        ERR("Size mismatch: asked: %dx%d, got: %dx%d",
-            width, height, priv->width, priv->height);
-        goto close_display;
-     }
-
-   return priv;
-
- close_display:
-   display_close();
- free_lib:
-   FreeLibrary(gapi_lib);
- free_priv:
-   free(priv);
-   return NULL;
-}
-
-void
-evas_software_wince_gapi_shutdown(void *priv)
-{
-   Evas_Engine_WinCE_GAPI_Priv *p;
-
-   p = (Evas_Engine_WinCE_GAPI_Priv *)priv;
-   p->close_display();
-   suspend = NULL;
-   resume = NULL;
-   FreeLibrary(p->lib);
-   free(p);
-}
-
-
-FB_Output_Buffer *
-evas_software_wince_gapi_output_buffer_new(void *priv,
-                                           int   width,
-                                           int   height)
-{
-   FB_Output_Buffer *fbob;
-   void             *buffer;
-
-   fbob = calloc(1, sizeof(FB_Output_Buffer));
-   if (!fbob) return NULL;
-
-   buffer = malloc (width * height * 2); /* we are sure to have 16bpp */
-   if (!buffer)
-     {
-        free(fbob);
-        return NULL;
-     }
-
-   fbob->priv = priv;
-
-   fbob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), width, height, (DATA32 *)buffer, 0, EVAS_COLORSPACE_RGB565_A5P);
-   if (fbob->im)
-     fbob->im->stride = ((Evas_Engine_WinCE_GAPI_Priv *)priv)->stride >> 1;
-
-   return fbob;
-}
-
-void
-evas_software_wince_gapi_output_buffer_free(FB_Output_Buffer *fbob)
-{
-   free(fbob->im->pixels);
-   free(fbob);
-}
-
-void
-evas_software_wince_gapi_output_buffer_paste(FB_Output_Buffer *fbob)
-{
-   Evas_Engine_WinCE_GAPI_Priv *priv;
-   void                        *buffer;
-
-   priv = (Evas_Engine_WinCE_GAPI_Priv *)fbob->priv;
-
-   buffer = priv->draw_begin();
-   if (!buffer)
-     return;
-
-   if (priv->buffer) buffer = priv->buffer;
-
-   if ((fbob->im->cache_entry.w == priv->width) &&
-       (fbob->im->cache_entry.h == priv->height))
-     memcpy(buffer, fbob->im->pixels,
-            priv->width * priv->height * 2);
-
-   priv->draw_end();
-}
-
-void
-evas_software_wince_gapi_surface_resize(FB_Output_Buffer *fbob)
-{
-}
diff --git a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c b/libraries/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c
deleted file mode 100644
index f32db4a..0000000
--- a/libraries/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-typedef struct BITMAPINFO_16bpp BITMAPINFO_16bpp;
-typedef struct Evas_Engine_WinCE_GDI_Priv Evas_Engine_WinCE_GDI_Priv;
-
-struct BITMAPINFO_16bpp
-{
-   BITMAPINFOHEADER bih;
-   DWORD            masks[3];
-};
-
-struct Evas_Engine_WinCE_GDI_Priv
-{
-   HWND              window;
-   HDC               dc;
-   BITMAPINFO_16bpp *bitmap_info;
-   HBITMAP           bitmap;
-   int               width;
-   int               height;
-};
-
-void *
-evas_software_wince_gdi_init(HWND window,
-                             int  width,
-                             int  height,
-                             int  fullscreen)
-{
-   Evas_Engine_WinCE_GDI_Priv *priv;
-
-   priv = (Evas_Engine_WinCE_GDI_Priv *)malloc(sizeof(Evas_Engine_WinCE_GDI_Priv));
-   if (!priv)
-     return NULL;
-
-   priv->window = window;
-   priv->dc = GetDC(window);
-   if (!priv->dc)
-     {
-        ERR("Can not get DC");
-        free(priv);
-        return NULL;
-     }
-
-   if (fullscreen)
-     {
-        priv->width = GetSystemMetrics(SM_CXSCREEN);
-        priv->height = GetSystemMetrics(SM_CYSCREEN);
-     }
-   else
-     {
-        priv->width = width;
-        priv->height = height;
-     }
-
-   priv->bitmap_info = (BITMAPINFO_16bpp *)malloc(sizeof(BITMAPINFO_16bpp));
-   if (!priv->bitmap_info)
-     {
-        ERR("Can not allocate bitmap info");
-        ReleaseDC(window, priv->dc);
-        free(priv);
-        return NULL;
-     }
-
-   priv->bitmap_info->bih.biSize = sizeof(BITMAPINFOHEADER);
-   priv->bitmap_info->bih.biWidth = priv->width;
-   priv->bitmap_info->bih.biHeight = -priv->height;
-   priv->bitmap_info->bih.biPlanes = 1;
-   priv->bitmap_info->bih.biSizeImage = 2 * priv->width * priv->height;
-   priv->bitmap_info->bih.biXPelsPerMeter = 0;
-   priv->bitmap_info->bih.biYPelsPerMeter = 0;
-   priv->bitmap_info->bih.biClrUsed = 0;
-   priv->bitmap_info->bih.biClrImportant = 0;
-   priv->bitmap_info->bih.biBitCount = 16;
-   priv->bitmap_info->bih.biCompression = BI_BITFIELDS;
-   priv->bitmap_info->masks[0] = 0x0000f800;
-   priv->bitmap_info->masks[1] = 0x000007e0;
-   priv->bitmap_info->masks[2] = 0x0000001f;
-
-   return priv;
-}
-
-void
-evas_software_wince_gdi_shutdown(void *priv)
-{
-   free(((Evas_Engine_WinCE_GDI_Priv *)priv)->bitmap_info);
-   ReleaseDC(((Evas_Engine_WinCE_GDI_Priv *)priv)->window, ((Evas_Engine_WinCE_GDI_Priv *)priv)->dc);
-   free(priv);
-}
-
-
-FB_Output_Buffer *
-evas_software_wince_gdi_output_buffer_new(void *priv,
-                                          int   width,
-                                          int   height)
-{
-   Evas_Engine_WinCE_GDI_Priv *priv2;
-   FB_Output_Buffer           *fbob;
-   void                       *buffer;
-
-   fbob = calloc(1, sizeof(FB_Output_Buffer));
-   if (!fbob) return NULL;
-
-   fbob->priv = priv;
-
-   priv2 = (Evas_Engine_WinCE_GDI_Priv *)fbob->priv;
-
-   priv2->bitmap = CreateDIBSection(priv2->dc,
-                                    (const BITMAPINFO *)priv2->bitmap_info,
-                                    DIB_RGB_COLORS,
-                                    (void **)(&buffer),
-                                    NULL,
-                                    0);
-   if (!priv2->bitmap)
-     {
-        free(fbob);
-        return NULL;
-     }
-
-   fbob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), width, height, (DATA32 *)buffer, 0, EVAS_COLORSPACE_RGB565_A5P);
-   if (fbob->im)
-     fbob->im->stride = width;
-
-   return fbob;
-}
-
-void
-evas_software_wince_gdi_output_buffer_free(FB_Output_Buffer *fbob)
-{
-   Evas_Engine_WinCE_GDI_Priv *priv;
-
-   priv = (Evas_Engine_WinCE_GDI_Priv *)fbob->priv;
-   DeleteObject(priv->bitmap);
-   free(fbob);
-}
-
-void
-evas_software_wince_gdi_output_buffer_paste(FB_Output_Buffer *fbob)
-{
-   Evas_Engine_WinCE_GDI_Priv *priv;
-
-   priv = (Evas_Engine_WinCE_GDI_Priv *)fbob->priv;
-
-   if ((fbob->im->cache_entry.w == priv->width) &&
-       (fbob->im->cache_entry.h == priv->height))
-     {
-        HDC dc;
-
-        dc = CreateCompatibleDC(priv->dc);
-        SelectObject(dc, priv->bitmap);
-        BitBlt(priv->dc,
-               0, 0,
-               priv->width, priv->height,
-               dc,
-               0, 0,
-               SRCCOPY);
-        DeleteDC(dc);
-
-     }
-}
-
-void
-evas_software_wince_gdi_surface_resize(FB_Output_Buffer *fbob)
-{
-}
diff --git a/libraries/evas/src/modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h b/libraries/evas/src/modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h
deleted file mode 100644
index 9768f0a..0000000
--- a/libraries/evas/src/modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _EVAS_ENGINE_SOFTWARE_16_X11_H
-#define _EVAS_ENGINE_SOFTWARE_16_X11_H
-
-#include <X11/Xlib.h>
-
-typedef struct _Evas_Engine_Info_Software_16_X11              Evas_Engine_Info_Software_16_X11;
-
-struct _Evas_Engine_Info_Software_16_X11
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   struct {
-      Display  *display;
-      Drawable  drawable;
-      int rotation;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-#endif
-
-
diff --git a/libraries/evas/src/modules/engines/software_16_x11/Makefile.am b/libraries/evas/src/modules/engines/software_16_x11/Makefile.am
deleted file mode 100644
index 812492e..0000000
--- a/libraries/evas/src/modules/engines/software_16_x11/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_16 \
-@FREETYPE_CFLAGS@ \
-@EINA_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_16_x11_cflags@
-
-if BUILD_ENGINE_SOFTWARE_16_X11
-
-SOFTWARE_16_X11_SOURCES =  \
-evas_engine.c \
-evas_x_buffer.c
-
-SOFTWARE_16_X11_LIBADD = @evas_engine_software_16_x11_libs@
-
-
-includes_HEADERS = Evas_Engine_Software_16_X11.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
-
-pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_16_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_16_x11.la
-
-libevas_engine_software_16_x11_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
-libevas_engine_software_16_x11_la_LIBADD = $(SOFTWARE_16_X11_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_16_x11/Makefile.in b/libraries/evas/src/modules/engines/software_16_x11/Makefile.in
deleted file mode 100644
index 2ce18e6..0000000
--- a/libraries/evas/src/modules/engines/software_16_x11/Makefile.in
+++ /dev/null
@@ -1,816 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_16_x11
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_TRUE@libevas_engine_software_16_x11_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_16_x11_la_SOURCES_DIST = evas_engine.c \
-        evas_x_buffer.c
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@     evas_x_buffer.lo
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_TRUE@am_libevas_engine_software_16_x11_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_16_x11_la_OBJECTS =  \
-        $(am_libevas_engine_software_16_x11_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_TRUE@am_libevas_engine_software_16_x11_la_rpath =
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@    $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_x_buffer.c
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@     module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@     module_la-evas_x_buffer.lo
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@    $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_16_x11_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_16_x11_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_16_X11.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_16 \
-@FREETYPE_CFLAGS@ \
-@EINA_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_16_x11_cflags@
-
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@SOFTWARE_16_X11_SOURCES = \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@evas_x_buffer.c
-
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@SOFTWARE_16_X11_LIBADD = @evas_engine_software_16_x11_libs@
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@includes_HEADERS = Evas_Engine_Software_16_X11.h
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@module_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_16_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_x11.la
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_TRUE@libevas_engine_software_16_x11_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
-@BUILD_ENGINE_SOFTWARE_16_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_X11_TRUE@libevas_engine_software_16_x11_la_LIBADD = $(SOFTWARE_16_X11_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_16_x11/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_16_x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_16_x11.la: $(libevas_engine_software_16_x11_la_OBJECTS) $(libevas_engine_software_16_x11_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_16_x11_la_rpath) $(libevas_engine_software_16_x11_la_OBJECTS) $(libevas_engine_software_16_x11_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_x_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_x_buffer.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_x_buffer.lo: evas_x_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_x_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_x_buffer.Tpo -c -o module_la-evas_x_buffer.lo `test -f 'evas_x_buffer.c' || echo '$(srcdir)/'`evas_x_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_x_buffer.Tpo $(DEPDIR)/module_la-evas_x_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_x_buffer.c' object='module_la-evas_x_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_x_buffer.lo `test -f 'evas_x_buffer.c' || echo '$(srcdir)/'`evas_x_buffer.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_16_x11/evas_engine.c b/libraries/evas/src/modules/engines/software_16_x11/evas_engine.c
deleted file mode 100644
index 5378972..0000000
--- a/libraries/evas/src/modules/engines/software_16_x11/evas_engine.c
+++ /dev/null
@@ -1,741 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Software_16_X11.h"
-#include "evas_common_soft16.h"
-
-int _evas_engine_soft16_x11_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-/*
-struct xrdb_user
-{
-   time_t last_stat;
-   time_t last_mtime;
-   XrmDatabase db;
-};
-static struct xrdb_user xrdb_user = {0, 0, NULL};
-
-static Eina_Bool
-xrdb_user_query(const char *name, const char *cls, char **type, XrmValue *val)
-{
-   time_t last = xrdb_user.last_stat, now = time(NULL);
-
-   xrdb_user.last_stat = now;
-   if (last != now) // don't stat() more than once every second
-     {
-        struct stat st;
-        const char *home = getenv("HOME");
-        char tmp[PATH_MAX];
-
-        if (!home) goto failed;
-        snprintf(tmp, sizeof(tmp), "%s/.Xdefaults", home);
-        if (stat(tmp, &st) != 0) goto failed;
-        if (xrdb_user.last_mtime != st.st_mtime)
-          {
-             if (xrdb_user.db) XrmDestroyDatabase(xrdb_user.db);
-             xrdb_user.db = XrmGetFileDatabase(tmp);
-             if (!xrdb_user.db) goto failed;
-             xrdb_user.last_mtime = st.st_mtime;
-          }
-     }
-
-   if (!xrdb_user.db) return EINA_FALSE;
-   return XrmGetResource(xrdb_user.db, name, cls, type, val);
-
- failed:
-   if (xrdb_user.db)
-     {
-        XrmDestroyDatabase(xrdb_user.db);
-        xrdb_user.db = NULL;
-     }
-   xrdb_user.last_mtime = 0;
-   return EINA_FALSE;
-}
-*/
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Display          *disp;
-   Drawable          draw;
-   GC                gc;
-   int               w, h, rot;
-   Tilebuf          *tb;
-   Tilebuf_Rect     *rects;
-   Tilebuf_Rect     *cur_rect;
-/*   
-   XrmDatabase   xrdb; // xres - dpi
-   struct { // xres - dpi
-      int        dpi; // xres - dpi
-   } xr; // xres - dpi
- */
-   X_Output_Buffer  *shbuf;
-   Soft16_Image     *tmp_out; /* used by indirect render, like rotation */
-   Region            clip_rects;
-   unsigned char     end : 1;
-   unsigned char     shm : 1;
-};
-
-/* prototypes we will use here */
-
-static void *eng_info(Evas *e);
-static void eng_info_free(Evas *e, void *info);
-static int eng_setup(Evas *e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_Software_16_X11 *info;
-   
-   info = calloc(1, sizeof(Evas_Engine_Info_Software_16_X11));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_Software_16_X11 *in;
-   in = (Evas_Engine_Info_Software_16_X11 *)info;
-   free(in);
-}
-
-static void
-_tmp_out_alloc(Render_Engine *re)
-{
-   Tilebuf_Rect *r;
-   unsigned int w = 0, h = 0;
-
-   EINA_INLIST_FOREACH(re->rects, r)
-     {
-        if (r->w > (int)w) w = r->w;
-        if (r->h > (int)h) h = r->h;
-     }
-
-   if (re->tmp_out)
-     {
-        if ((re->tmp_out->cache_entry.w < w) || (re->tmp_out->cache_entry.h < h))
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-
-   if (!re->tmp_out)
-     {
-        Soft16_Image *im;
-
-        im = (Soft16_Image *) evas_cache_image_empty(evas_common_soft16_image_cache_get());
-        im->cache_entry.flags.alpha = 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-
-        re->tmp_out = im;
-     }
-}
-
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_Software_16_X11 *info;
-/*    X_Output_Buffer *xob; */
-   XGCValues gcv;
-   
-   info = (Evas_Engine_Info_Software_16_X11 *)in;
-   if (!e->engine.data.output)
-     {
-        /* the only check - simplistic, i know, but enough for this 
-         * "special purpose" engine. Remember it is meant to be used
-         * for limited power devices that have a 16bit display mode
-         * and no real other acceleration, and high resolution so we
-         * can pre-dither into 16bpp. */
-//      if (DefaultDepth(info->info.display, 
-//                       DefaultScreen(info->info.display)) != 16)
-//        return;
-        /* do common routine init - we wil at least use it for core
-         * image loading and font loading/glyph rendering & placement */
-        evas_common_cpu_init();
-        
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-        evas_common_soft16_image_init();
-
-        /* render engine specific data */
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re)
-          return 0;
-        e->engine.data.output = re;
-        re->disp = info->info.display;
-        re->draw = info->info.drawable;
-        re->gc = XCreateGC(re->disp, re->draw, 0, &gcv);
-        re->w = e->output.w;
-        re->h = e->output.h;
-        re->rot = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-     }
-   else
-     {
-        /* we changed the info after first init - do a re-eval where
-         * appropriate */
-//      if (DefaultDepth(info->info.display, 
-//                       DefaultScreen(info->info.display)) != 16)
-//        return;
-        re = e->engine.data.output;
-        if (re->tb) evas_common_tilebuf_free(re->tb);
-        re->disp = info->info.display;
-        re->draw = info->info.drawable;
-        XFreeGC(re->disp, re->gc);
-        re->gc = XCreateGC(re->disp, re->draw, 0, &gcv);
-        re->w = e->output.w;
-        re->h = e->output.h;
-        re->rot = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-        if (re->tmp_out)
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-   if (!e->engine.data.output) return 0;
-   
-/*   
-     {   
-        int status;
-        char *type = NULL;
-        XrmValue val;
-        
-        re->xr.dpi = 75000; // dpy * 1000
-
-        status = xrdb_user_query("Xft.dpi", "Xft.Dpi", &type, &val);
-        if ((!status) || (!type))
-          {
-             if (!re->xrdb) re->xrdb = XrmGetDatabase(re->disp);
-             if (re->xrdb)
-               status = XrmGetResource(re->xrdb,
-                                       "Xft.dpi", "Xft.Dpi", &type, &val);
-          }
-
-        if ((status) && (type))
-          {
-             if (!strcmp(type, "String"))
-               {
-                  const char *str, *dp;
-                  
-                  str = val.addr;
-                  dp = strchr(str, '.');
-                  if (!dp) dp = strchr(str, ',');
-                  
-                  if (dp)
-                    {
-                       int subdpi, len, i;
-                       char *buf;
-                       
-                       buf = alloca(dp - str + 1);
-                       strncpy(buf, str, dp - str);
-                       buf[dp - str] = 0;
-                       len = strlen(dp + 1);
-                       subdpi = atoi(dp + 1);
-                       
-                       if (len < 3)
-                         {
-                            for (i = len; i < 3; i++) subdpi *= 10;
-                         }
-                       else if (len > 3)
-                         {
-                            for (i = len; i > 3; i--) subdpi /= 10;
-                         }
-                       re->xr.dpi = atoi(buf) * 1000;
-                    }
-                  else
-                    re->xr.dpi = atoi(str) * 1000;
-               }
-          }
-        evas_common_font_dpi_set(re->xr.dpi / 1000);
-     }
- */
-   
-   /* add a draw context if we dont have one */
-   if (!e->engine.data.context)
-     e->engine.data.context =
-     e->engine.func->context_new(e->engine.data.output);
-   /* check if the display can do shm */
-   re->shm = evas_software_16_x11_x_can_do_shm(re->disp);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   
-// NOTE: XrmGetDatabase() result is shared per connection, do not free it.
-//   if (re->xrdb) XrmDestroyDatabase(re->xrdb);
-   
-   if (re->shbuf) evas_software_16_x11_x_output_buffer_free(re->shbuf, 0);
-   if (re->clip_rects) XDestroyRegion(re->clip_rects);
-   if (re->gc) XFreeGC(re->disp, re->gc);
-   if (re->tb) evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   if (re->tmp_out) evas_cache_image_drop(&re->tmp_out->cache_entry);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-   evas_common_soft16_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-
-   if ((re->w == w) && (re->h == h)) return;
-
-   evas_common_tilebuf_free(re->tb);
-   re->w = w;
-   re->h = h;
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   if (re->shbuf)
-     {
-        evas_software_16_x11_x_output_buffer_free(re->shbuf, 0);
-        re->shbuf = NULL;
-     }
-   if (re->clip_rects)
-     {
-        XDestroyRegion(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static inline void
-_output_buffer_alloc(Render_Engine *re)
-{
-   int w, h;
-   if (re->shbuf) return;
-
-   if ((re->rot == 0) || (re->rot == 180))
-     {
-        w = re->w;
-        h = re->h;
-     }
-   else
-     {
-        w = re->h;
-        h = re->w;
-     }
-
-   re->shbuf = evas_software_16_x11_x_output_buffer_new
-     (re->disp, DefaultVisual(re->disp, DefaultScreen(re->disp)),
-      DefaultDepth(re->disp, DefaultScreen(re->disp)),
-      w, h, 1, NULL);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        if (!re->rects) return NULL;
-
-        re->cur_rect = re->rects;
-        _output_buffer_alloc(re);
-        if (re->rot != 0) _tmp_out_alloc(re); /* grows if required */
-     }
-   if (!re->cur_rect)
-     {
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        return NULL;
-     }
-   rect = re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = (Tilebuf_Rect *)((EINA_INLIST_GET(re->cur_rect))->next);
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   *x = ux; *y = uy; *w = uw; *h = uh;
-   if (re->rot == 0)
-     {
-        *cx = ux; *cy = uy; *cw = uw; *ch = uh;
-        return re->shbuf->im;
-     }
-   else
-     {
-        *cx = 0; *cy = 0; *cw = uw; *ch = uh;
-        return re->tmp_out;
-     }
-}
-
-static void
-_blit_rot_90(Soft16_Image *dst, const Soft16_Image *src,
-             int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + (out_x +
-                       (w + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr -= dst->stride;
-          }
-        sp += src->stride;
-        dp++;
-     }
-}
-
-static void
-_blit_rot_180(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((w + out_x - 1) +
-                       (h + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr--;
-          }
-        sp += src->stride;
-        dp -= dst->stride;
-     }
-}
-
-static void
-_blit_rot_270(Soft16_Image *dst, const Soft16_Image *src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA16 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((h + out_x - 1) +
-                       out_y * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA16 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr += dst->stride;
-          }
-        sp += src->stride;
-        dp--;
-     }
-}
-
-static void
-_tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h)
-{
-   Soft16_Image *d, *s;
-
-   d = re->shbuf->im;
-   s = re->tmp_out;
-
-   if ((w < 1) || (h < 1) ||
-       (out_x >= (int)d->cache_entry.w) || (out_y >= (int)d->cache_entry.h))
-     return;
-
-   if (re->rot == 90)
-     _blit_rot_90(d, s, out_x, out_y, w, h);
-   else if (re->rot == 180)
-     _blit_rot_180(d, s, out_x, out_y, w, h);
-   else if (re->rot == 270)
-     _blit_rot_270(d, s, out_x, out_y, w, h);
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   XRectangle r = { 0, 0, 0, 0 };
-
-   re = (Render_Engine *)data;
-
-   if (!re->clip_rects)
-      re->clip_rects = XCreateRegion();
-
-   if (re->rot == 0)
-     {
-        r.x = x;
-        r.y = y;
-        r.width = w;
-        r.height = h;
-     }
-   else if (re->rot == 90)
-     {
-        r.x = y;
-        r.y = re->w - w - x;
-        r.width = h;
-        r.height = w;
-     }
-   else if (re->rot == 180)
-     {
-        r.x = re->w - w - x;
-        r.y = re->h - h - y;
-        r.width = w;
-        r.height = h;
-     }
-   else if (re->rot == 270)
-     {
-        r.x = re->h - h - y;
-        r.y = x;
-        r.width = h;
-        r.height = w;
-     }
-
-   if (re->rot != 0)
-     _tmp_out_process(re, r.x, r.y, w, h);
-   XUnionRectWithRegion(&r, re->clip_rects, re->clip_rects);
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->clip_rects)
-     {
-        XSetRegion(re->disp, re->gc, re->clip_rects);
-        XDestroyRegion(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   else return;
-
-   evas_software_16_x11_x_output_buffer_paste
-     (re->shbuf, re->draw, re->gc, 0, 0, re->shbuf->im->cache_entry.w, re->shbuf->im->cache_entry.h, 1);
-   XSetClipMask(re->disp, re->gc, None);
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (re->shbuf)
-     {
-        evas_software_16_x11_x_output_buffer_free(re->shbuf, 0);
-        re->shbuf = NULL;
-     }
-   if (re->clip_rects)
-     {
-        XDestroyRegion(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *context __UNUSED__)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   static Eina_Bool xrm_inited = EINA_FALSE;
-   if (!xrm_inited)
-     {
-        xrm_inited = EINA_TRUE;
-        XrmInitialize();
-     }
-
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_16")) return 0;
-   _evas_engine_soft16_x11_log_dom = eina_log_domain_register
-     ("evas-software_16_x11", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft16_x11_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_engine_soft16_x11_log_dom);
-/*   
-  if (xrdb_user.db)
-    {
-       XrmDestroyDatabase(xrdb_user.db);
-       xrdb_user.last_stat = 0;
-       xrdb_user.last_mtime = 0;
-       xrdb_user.db = NULL;
-    }
- */
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_16_x11",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_x11);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_X11
-EVAS_EINA_MODULE_DEFINE(engine, software_16_x11);
-#endif
-
diff --git a/libraries/evas/src/modules/engines/software_16_x11/evas_engine.h b/libraries/evas/src/modules/engines/software_16_x11/evas_engine.h
deleted file mode 100644
index 066ef50..0000000
--- a/libraries/evas/src/modules/engines/software_16_x11/evas_engine.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/XShm.h>
-#include <X11/Xresource.h> // xres - dpi
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include "evas_common.h"
-#include "evas_common_soft16.h"
-
-extern int _evas_engine_soft16_x11_log_dom;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
-
-typedef struct _X_Output_Buffer       X_Output_Buffer;
-
-struct _X_Output_Buffer
-{
-   Soft16_Image    *im;
-   Display         *display;
-   XImage          *xim;
-   XShmSegmentInfo *shm_info;
-   void            *data;
-};
-
-/****/
-void             evas_software_16_x11_x_init                        (void);
-
-int              evas_software_16_x11_x_can_do_shm                  (Display *d);
-X_Output_Buffer *evas_software_16_x11_x_output_buffer_new           (Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data);
-void             evas_software_16_x11_x_output_buffer_free          (X_Output_Buffer *xob, int sync);
-void             evas_software_16_x11_x_output_buffer_paste         (X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int w, int h, int sync);
-DATA8           *evas_software_16_x11_x_output_buffer_data          (X_Output_Buffer *xob, int *bytes_per_line_ret);
-int              evas_software_16_x11_x_output_buffer_depth         (X_Output_Buffer *xob);
-int              evas_software_16_x11_x_output_buffer_byte_order    (X_Output_Buffer *xob);
-int              evas_software_16_x11_x_output_buffer_bit_order     (X_Output_Buffer *xob);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_16_x11/evas_x_buffer.c b/libraries/evas/src/modules/engines/software_16_x11/evas_x_buffer.c
deleted file mode 100644
index 32784b0..0000000
--- a/libraries/evas/src/modules/engines/software_16_x11/evas_x_buffer.c
+++ /dev/null
@@ -1,186 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-static int _x_err = 0;
-
-int
-evas_software_16_x11_x_can_do_shm(Display *d)
-{
-   static Display *cached_d = NULL;
-   static int cached_result = 0;
-   
-   if (d == cached_d) return cached_result;
-   cached_d = d;
-   if (XShmQueryExtension(d))
-     {
-        X_Output_Buffer *xob;
-
-        xob = evas_software_16_x11_x_output_buffer_new
-          (d, DefaultVisual(d, DefaultScreen(d)),
-           DefaultDepth(d, DefaultScreen(d)), 16, 16, 2, NULL);
-        if (!xob)
-          {
-             cached_result = 0;
-             return 0;
-          }
-        evas_software_16_x11_x_output_buffer_free(xob, 1);
-        cached_result = 1;
-        return 1;
-     }
-   cached_result = 0;
-   return 0;
-}
-
-static void
-x_output_tmp_x_err(Display * d __UNUSED__, XErrorEvent * ev __UNUSED__)
-{
-   _x_err = 1;
-   return;
-}
-
-X_Output_Buffer *
-evas_software_16_x11_x_output_buffer_new(Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data)
-{
-   X_Output_Buffer *xob;
-
-   xob = calloc(1, sizeof(X_Output_Buffer));
-   if (!xob) return NULL;
-
-   xob->display = d;
-   xob->xim = NULL;
-   xob->shm_info = NULL;
-
-   if (try_shm > 0)
-     {
-        xob->shm_info = malloc(sizeof(XShmSegmentInfo));
-        if (xob->shm_info)
-          {
-             xob->xim = XShmCreateImage(d, v, depth, ZPixmap, NULL,
-                                        xob->shm_info, w, h);
-             if (xob->xim)
-               {
-                  xob->shm_info->shmid = shmget(IPC_PRIVATE,
-                                                xob->xim->bytes_per_line *
-                                                xob->xim->height,
-                                                IPC_CREAT | 0777);
-                  if (xob->shm_info->shmid >= 0)
-                    {
-                       xob->shm_info->readOnly = False;
-                       xob->shm_info->shmaddr = xob->xim->data =
-                         shmat(xob->shm_info->shmid, 0, 0);
-                       if (xob->shm_info->shmaddr)
-                         {
-                            XErrorHandler ph;
-
-                            XSync(d, False);
-                            _x_err = 0;
-                            ph = XSetErrorHandler((XErrorHandler)
-                                                  x_output_tmp_x_err);
-                            XShmAttach(d, xob->shm_info);
-                            XSync(d, False);
-                            XSetErrorHandler((XErrorHandler)ph);
-                            if (!_x_err)
-                              {
-                                 xob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), w, h, (DATA32 *) xob->xim->data, 0, EVAS_COLORSPACE_RGB565_A5P);
-                                 if (xob->im)
-                                   xob->im->stride = xob->xim->bytes_per_line / sizeof(DATA16);
-                                 return xob;
-                              }
-                         }
-                       shmdt(xob->shm_info->shmaddr);
-                       shmctl(xob->shm_info->shmid, IPC_RMID, 0);
-                    }
-                  if (xob->xim) XDestroyImage(xob->xim);
-                  xob->xim = NULL;
-               }
-             if (xob->shm_info) free(xob->shm_info);
-             xob->shm_info = NULL;
-          }
-     }
-
-   if (try_shm > 1) return NULL;
-
-   xob->xim = XCreateImage(d, v, depth, ZPixmap, 0, data, w, h, 32, 0);
-   if (!xob->xim)
-     {
-        free(xob);
-        return NULL;
-     }
-
-   xob->data = data;
-
-   if (!xob->xim->data)
-     {
-        xob->xim->data = malloc(xob->xim->bytes_per_line * xob->xim->height);
-        if (!xob->xim->data)
-          {
-             XDestroyImage(xob->xim);
-             free(xob);
-             return NULL;
-          }
-     }
-   if (xob->im)
-     evas_cache_image_drop(&xob->im->cache_entry);
-
-   xob->im =  (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), w, h, (DATA32 *) xob->xim->data, 0, EVAS_COLORSPACE_RGB565_A5P);
-   if (xob->im)
-     xob->im->stride = xob->xim->bytes_per_line / sizeof(DATA16);
-   return xob;
-}
-
-void
-evas_software_16_x11_x_output_buffer_free(X_Output_Buffer *xob, int sync)
-{
-   if (xob->shm_info)
-     {
-        if (sync) XSync(xob->display, False);
-        XShmDetach(xob->display, xob->shm_info);
-        XDestroyImage(xob->xim);
-        shmdt(xob->shm_info->shmaddr);
-        shmctl(xob->shm_info->shmid, IPC_RMID, 0);
-        free(xob->shm_info);
-     }
-   else
-     {
-        if (xob->data) xob->xim->data = NULL;
-        XDestroyImage(xob->xim);
-     }
-   free(xob);
-}
-
-void
-evas_software_16_x11_x_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int w, int h, int sync)
-{
-   if (xob->shm_info)
-     {
-        XShmPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y, w, h, False);
-        if (sync) XSync(xob->display, False);
-     }
-   else
-     XPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y, w, h);
-}
-
-DATA8 *
-evas_software_16_x11_x_output_buffer_data(X_Output_Buffer *xob, int *bytes_per_line_ret)
-{
-   if (bytes_per_line_ret) *bytes_per_line_ret = xob->xim->bytes_per_line;
-   return (DATA8*) xob->xim->data;
-}
-
-int
-evas_software_16_x11_x_output_buffer_depth(X_Output_Buffer *xob)
-{
-   return xob->xim->bits_per_pixel;
-}
-
-int
-evas_software_16_x11_x_output_buffer_byte_order(X_Output_Buffer *xob)
-{
-   return xob->xim->byte_order;
-}
-
-int
-evas_software_16_x11_x_output_buffer_bit_order(X_Output_Buffer *xob)
-{
-   return xob->xim->bitmap_bit_order;
-}
diff --git a/libraries/evas/src/modules/engines/software_8/Makefile.am b/libraries/evas/src/modules/engines/software_8/Makefile.am
deleted file mode 100644
index 46637fb..0000000
--- a/libraries/evas/src/modules/engines/software_8/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@
-
-if BUILD_ENGINE_SOFTWARE_8
-
-SOFTWARE_8_SOURCES = evas_engine.c
-
-
-if !EVAS_STATIC_BUILD_SOFTWARE_8_X11
-
-pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(SOFTWARE_8_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_8.la
-
-libevas_engine_software_8_la_SOURCES = $(SOFTWARE_8_SOURCES)
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.c
diff --git a/libraries/evas/src/modules/engines/software_8/Makefile.in b/libraries/evas/src/modules/engines/software_8/Makefile.in
deleted file mode 100644
index 6da6bbb..0000000
--- a/libraries/evas/src/modules/engines/software_8/Makefile.in
+++ /dev/null
@@ -1,767 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_8
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-libevas_engine_software_8_la_LIBADD =
-am__libevas_engine_software_8_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_8_TRUE@am__objects_1 = evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@am_libevas_engine_software_8_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_8_la_OBJECTS =  \
-        $(am_libevas_engine_software_8_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@am_libevas_engine_software_8_la_rpath =
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_8_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_8_TRUE@  module_la-evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_8_la_SOURCES) $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_8_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@
-
-@BUILD_ENGINE_SOFTWARE_8_TRUE@SOFTWARE_8_SOURCES = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_SOURCES = $(SOFTWARE_8_SOURCES)
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@noinst_LTLIBRARIES = libevas_engine_software_8.la
-@BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@libevas_engine_software_8_la_SOURCES = $(SOFTWARE_8_SOURCES)
-EXTRA_DIST = \
-evas_engine.c
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_8/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_8/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_8.la: $(libevas_engine_software_8_la_OBJECTS) $(libevas_engine_software_8_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_8_la_rpath) $(libevas_engine_software_8_la_OBJECTS) $(libevas_engine_software_8_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-pkgLTLIBRARIES install-ps install-ps-am install-strip \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_8/evas_engine.c b/libraries/evas/src/modules/engines/software_8/evas_engine.c
deleted file mode 100644
index c7c123a..0000000
--- a/libraries/evas/src/modules/engines/software_8/evas_engine.c
+++ /dev/null
@@ -1,440 +0,0 @@
-#include "evas_common.h"
-#include "evas_common_soft8.h"
-
-/*
- *****
- **
- ** ENGINE ROUTINES
- **
- *****
- */
-int _evas_soft8_log_dom = -1;
-
-static Evas_Func func, pfunc;
-
-#ifdef ERR
-#undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR( _evas_soft8_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-#undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_soft8_log_dom, __VA_ARGS__)
-
-#ifdef INF
-#undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_soft8_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-#undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_soft8_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-#undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_soft8_log_dom, __VA_ARGS__)
-
-#define NOT_IMPLEMENTED()                                               \
-  WRN("NOT_IMPLEMENTED: %s() at %s:%d",                         \
-           __FUNCTION__, __FILE__, __LINE__)
-
-static void
-eng_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x,
-                   int y, int w, int h)
-{
-   evas_common_soft8_rectangle_draw(surface, context, x, y, w, h);
-}
-
-static void
-eng_line_draw(void *data __UNUSED__, void *context, void *surface, int x1,
-              int y1, int x2, int y2)
-{
-   evas_common_soft8_line_draw(surface, context, x1, y1, x2, y2);
-}
-
-static void
-eng_polygon_draw(void *data __UNUSED__, void *context, void *surface,
-                 void *polygon, int x, int y)
-{
-   evas_common_soft8_polygon_draw(surface, context, polygon, x, y);
-}
-
-static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
-{
-   Soft8_Image *im;
-
-   if (!image)
-      return 0;
-   im = image;
-   return im->cache_entry.flags.alpha;
-}
-
-static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return EVAS_COLORSPACE_GRY8;
-}
-
-static void *
-eng_image_alpha_set(void *data __UNUSED__, void *image, int have_alpha)
-{
-   if (!image)
-      return NULL;
-   have_alpha = !!have_alpha;
-   image = evas_common_soft8_image_alpha_set(image, have_alpha);
-   return image;
-}
-
-static char *
-eng_image_comment_get(void *data __UNUSED__, void *image __UNUSED__,
-                      char *key __UNUSED__)
-{
-   return NULL;
-}
-
-static char *
-eng_image_format_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-   return NULL;
-}
-
-static void
-eng_image_colorspace_set(void *data __UNUSED__, void *image __UNUSED__,
-                         int cspace __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-}
-
-static void *
-eng_image_native_set(void *data __UNUSED__, void *image,
-                     void *native __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-   return image;
-}
-
-static void *
-eng_image_native_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   NOT_IMPLEMENTED();
-   return NULL;
-}
-
-static void *
-eng_image_load(void *data __UNUSED__, const char *file, const char *key,
-               int *error, Evas_Image_Load_Opts * lo)
-{
-   return evas_cache_image_request(evas_common_soft8_image_cache_get(), file,
-                                   key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data __UNUSED__, int w, int h,
-                        DATA32 * image_data, int alpha, int cspace)
-{
-   if ((image_data) && (cspace != EVAS_COLORSPACE_GRY8))
-     {
-        WRN("Unsupported colorspace %d in %s() (%s:%d)",
-            cspace, __FUNCTION__, __FILE__, __LINE__);
-        return NULL;
-     }
-   return evas_cache_image_data(evas_common_soft8_image_cache_get(), w, h,
-                                image_data, alpha, EVAS_COLORSPACE_GRY8);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data __UNUSED__, int w, int h,
-                               DATA32 * image_data, int alpha, int cspace)
-{
-   if ((image_data) && (cspace != EVAS_COLORSPACE_GRY8))
-     {
-        WRN("Unsupported colorspace %d in %s() (%s:%d)",
-            cspace, __FUNCTION__, __FILE__, __LINE__);
-        return NULL;
-     }
-   return evas_cache_image_copied_data(evas_common_soft8_image_cache_get(), w,
-                                       h, image_data, alpha,
-                                       EVAS_COLORSPACE_GRY8);
-}
-
-static void
-eng_image_free(void *data __UNUSED__, void *image)
-{
-   evas_cache_image_drop((Image_Entry *) image);
-}
-
-static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   Soft8_Image *im;
-
-   if (w)
-      *w = 0;
-   if (h)
-      *h = 0;
-   if (!image)
-      return;
-   im = image;
-   if (w)
-      *w = im->cache_entry.w;
-   if (h)
-      *h = im->cache_entry.h;
-}
-
-static void *
-eng_image_size_set(void *data __UNUSED__, void *image, int w, int h)
-{
-   if (!image)
-      return NULL;
-   if ((w <= 0) || (h <= 0))
-     {
-        evas_cache_image_drop((Image_Entry *) image);
-        return NULL;
-     }
-   return evas_cache_image_size_set((Image_Entry *) image, w, h);
-}
-
-static void
-eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
-{
-   Soft8_Image *im;
-
-   if (stride)
-      *stride = 0;
-   if (!image)
-      return;
-   im = image;
-   if (stride)
-      *stride = im->stride;
-}
-
-static void *
-eng_image_dirty_region(void *data __UNUSED__, void *image __UNUSED__,
-                       int x __UNUSED__, int y __UNUSED__, int w __UNUSED__,
-                       int h __UNUSED__)
-{
-   /* FIXME: is this required? */
-   //NOT_IMPLEMENTED();
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data __UNUSED__, void *image, int to_write,
-                   DATA32 ** image_data, int *err)
-{
-   Soft8_Image *im;
-   int error;
-
-   if (!image)
-     {
-        *image_data = NULL;
-        return NULL;
-     }
-
-   im = image;
-   error = evas_cache_image_load_data(&im->cache_entry);
-
-   if (to_write)
-      im = (Soft8_Image *) evas_cache_image_alone(&im->cache_entry);
-
-   if (image_data)
-      *image_data = (DATA32 *) im->pixels;
-
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data __UNUSED__, void *image, DATA32 * image_data)
-{
-   Soft8_Image *old_im, *new_im;
-
-   if (!image)
-      return NULL;
-
-   old_im = image;
-   if ((DATA8 *) image_data == old_im->pixels)
-      return old_im;
-
-   new_im =
-       (Soft8_Image *)
-       evas_cache_image_data(evas_common_soft8_image_cache_get(),
-                             old_im->cache_entry.w, old_im->cache_entry.h,
-                             image_data, old_im->cache_entry.flags.alpha,
-                             EVAS_COLORSPACE_GRY8);
-   evas_cache_image_drop(&old_im->cache_entry);
-   return new_im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image,
-                               const void *target)
-{
-   Soft8_Image *im = image;
-
-   if (!im)
-      return;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image,
-                              const void *target)
-{
-   Soft8_Image *im = image;
-
-   if (!im)
-      return;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data __UNUSED__, void *context, void *surface, void *image,
-               int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y,
-               int dst_w, int dst_h, int smooth)
-{
-   Soft8_Image *im;
-
-   im = (Soft8_Image *) image;
-
-   evas_cache_image_load_data(&im->cache_entry);
-   evas_common_soft8_image_draw(im, surface, context,
-                    src_x, src_y, src_w, src_h,
-                    dst_x, dst_y, dst_w, dst_h, smooth);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image __UNUSED__,
-                         int hint __UNUSED__)
-{
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-}
-
-static void
-eng_image_cache_flush(void *data __UNUSED__)
-{
-   evas_cache_image_flush(evas_common_soft8_image_cache_get());
-}
-
-static void
-eng_image_cache_set(void *data __UNUSED__, int bytes)
-{
-   evas_cache_image_set(evas_common_soft8_image_cache_get(), bytes);
-}
-
-static int
-eng_image_cache_get(void *data __UNUSED__)
-{
-   return evas_cache_image_get(evas_common_soft8_image_cache_get());
-}
-
-static void
-eng_font_draw(void *data __UNUSED__, void *context, void *surface,
-      Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__,
-      int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
-{
-   evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y,
-         text_props);
-   evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
-}
-
-static void
-eng_font_cache_flush(void *data __UNUSED__)
-{
-   evas_common_font_flush();
-}
-
-/*
- *****
- **
- ** MODULE ACCESSIBLE API API
- **
- *****
- */
-
-static int
-module_open(Evas_Module * em)
-{
-   if (!em)
-      return 0;
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_soft8_log_dom = eina_log_domain_register
-     ("evas-software_8", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_soft8_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-   EVAS_API_RESET(info, &func);
-   EVAS_API_RESET(info_free, &func);
-   EVAS_API_RESET(setup, &func);
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(rectangle_draw);
-   ORD(line_draw);
-   ORD(polygon_draw);
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_free);
-   ORD(image_size_get);
-   ORD(image_size_set);
-   ORD(image_stride_get);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_native_set);
-   ORD(image_native_get);
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-   ORD(font_draw);
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-
-   em->functions = (void *)(&func);
-
-   return 1;
-}
-
-static void
-module_close(Evas_Module * em __UNUSED__)
-{
-   eina_log_domain_unregister(_evas_soft8_log_dom);
-}
-
-static Evas_Module_Api evas_modapi = {
-   EVAS_MODULE_API_VERSION,
-   "software_8",
-   "none",
-   {
-    module_open,
-    module_close}
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_8);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_8
-EVAS_EINA_MODULE_DEFINE(engine, software_8);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_8_x11/Evas_Engine_Software_8_X11.h b/libraries/evas/src/modules/engines/software_8_x11/Evas_Engine_Software_8_X11.h
deleted file mode 100644
index fac3d8e..0000000
--- a/libraries/evas/src/modules/engines/software_8_x11/Evas_Engine_Software_8_X11.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _EVAS_ENGINE_SOFTWARE_8_X11_H
-#define _EVAS_ENGINE_SOFTWARE_8_X11_H
-
-#include <xcb/xcb.h>
-
-typedef struct _Evas_Engine_Info_Software_8_X11              Evas_Engine_Info_Software_8_X11;
-
-struct _Evas_Engine_Info_Software_8_X11
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   struct {
-      xcb_connection_t *connection;
-      xcb_drawable_t drawable;
-      xcb_gcontext_t gc;
-      xcb_screen_t *screen;
-
-      unsigned int mask;
-      void        *visual;
-      unsigned int colormap;
-      int          depth;
-      int          rotation;
-
-      int          alloc_grayscale    : 1;
-      int          debug              : 1;
-      int          shape_dither       : 1;
-      int          destination_alpha  : 1;
-      int          track_mask_changes : 1;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_8_x11/Makefile.am b/libraries/evas/src/modules/engines/software_8_x11/Makefile.am
deleted file mode 100644
index 3689577..0000000
--- a/libraries/evas/src/modules/engines/software_8_x11/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_8 \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_software_8_x11_cflags@ \
--I/usr/include/pixman-1
-
-if BUILD_ENGINE_SOFTWARE_8_X11
-
-SOFTWARE_8_X11_SOURCES =  \
-evas_engine.c \
-evas_x_buffer.c
-
-SOFTWARE_8_X11_LIBADD = @evas_engine_software_8_x11_libs@
-
-
-includes_HEADERS = Evas_Engine_Software_8_X11.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_8_X11
-
-pkgdir = $(libdir)/evas/modules/engines/software_8_x11/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(SOFTWARE_8_X11_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_8_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
-#-lxcb-image -lxcb-shm -lxcb -lpixman-1
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_8_x11.la
-
-libevas_engine_software_8_x11_la_SOURCES = $(SOFTWARE_8_X11_SOURCES)
-libevas_engine_software_8_x11_la_LIBADD = $(SOFTWARE_8_X11_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_8_x11/Makefile.in b/libraries/evas/src/modules/engines/software_8_x11/Makefile.in
deleted file mode 100644
index 3231fd1..0000000
--- a/libraries/evas/src/modules/engines/software_8_x11/Makefile.in
+++ /dev/null
@@ -1,818 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_8_x11
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@libevas_engine_software_8_x11_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_8_x11_la_SOURCES_DIST = evas_engine.c \
-        evas_x_buffer.c
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@      evas_x_buffer.lo
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@am_libevas_engine_software_8_x11_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_8_x11_la_OBJECTS =  \
-        $(am_libevas_engine_software_8_x11_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@am_libevas_engine_software_8_x11_la_rpath =
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@      $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_x_buffer.c
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@      module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@      module_la-evas_x_buffer.lo
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_8_x11_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_8_x11_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_8_X11.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
--I$(top_srcdir)/src/modules/engines/software_8 \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_software_8_x11_cflags@ \
--I/usr/include/pixman-1
-
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@SOFTWARE_8_X11_SOURCES = \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@evas_x_buffer.c
-
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@SOFTWARE_8_X11_LIBADD = @evas_engine_software_8_x11_libs@
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@includes_HEADERS = Evas_Engine_Software_8_X11.h
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_8_x11/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_SOURCES = $(SOFTWARE_8_X11_SOURCES)
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_8_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
-#-lxcb-image -lxcb-shm -lxcb -lpixman-1
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@noinst_LTLIBRARIES = libevas_engine_software_8_x11.la
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@libevas_engine_software_8_x11_la_SOURCES = $(SOFTWARE_8_X11_SOURCES)
-@BUILD_ENGINE_SOFTWARE_8_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_TRUE@libevas_engine_software_8_x11_la_LIBADD = $(SOFTWARE_8_X11_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_8_x11/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_8_x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_8_x11.la: $(libevas_engine_software_8_x11_la_OBJECTS) $(libevas_engine_software_8_x11_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_8_x11_la_rpath) $(libevas_engine_software_8_x11_la_OBJECTS) $(libevas_engine_software_8_x11_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_x_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_x_buffer.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_x_buffer.lo: evas_x_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_x_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_x_buffer.Tpo -c -o module_la-evas_x_buffer.lo `test -f 'evas_x_buffer.c' || echo '$(srcdir)/'`evas_x_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_x_buffer.Tpo $(DEPDIR)/module_la-evas_x_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_x_buffer.c' object='module_la-evas_x_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_x_buffer.lo `test -f 'evas_x_buffer.c' || echo '$(srcdir)/'`evas_x_buffer.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_8_x11/evas_engine.c b/libraries/evas/src/modules/engines/software_8_x11/evas_engine.c
deleted file mode 100644
index c8efb24..0000000
--- a/libraries/evas/src/modules/engines/software_8_x11/evas_engine.c
+++ /dev/null
@@ -1,699 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Software_8_X11.h"
-#include "evas_common_soft8.h"
-#include <pixman.h>
-
-int _evas_engine_soft8_x11_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine {
-   xcb_connection_t *connection;
-   xcb_drawable_t drawable;
-   xcb_screen_t *screen;
-   unsigned char pal[256];
-   int depth;
-
-   int w, h, rot;
-   Tilebuf *tb;
-   Tilebuf_Rect *rects;
-   Tilebuf_Rect *cur_rect;
-
-   X_Output_Buffer *shbuf;
-   Soft8_Image *tmp_out;        /* used by indirect render, like rotation */
-
-   pixman_region16_t *clip_rects;
-   unsigned char end:1;
-   unsigned char shm:1;
-};
-
-/* prototypes we will use here */
-
-static void *eng_info(Evas * e);
-static void eng_info_free(Evas * e, void *info);
-static int eng_setup(Evas * e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y,
-                                                int *w, int *h, int *cx,
-                                                int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface,
-                                                int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-/* engine api this module provides */
-static void *
-eng_info(Evas * e)
-{
-   Evas_Engine_Info_Software_8_X11 *info;
-
-   info = calloc(1, sizeof(Evas_Engine_Info_Software_8_X11));
-   if (!info)
-      return NULL;
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas * e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_Software_8_X11 *in;
-   in = (Evas_Engine_Info_Software_8_X11 *) info;
-   free(in);
-}
-
-static void
-_tmp_out_alloc(Render_Engine * re)
-{
-   Tilebuf_Rect *r;
-   unsigned int w = 0, h = 0;
-
-   EINA_INLIST_FOREACH(re->rects, r)
-   {
-      if (r->w > (int)w)
-         w = r->w;
-      if (r->h > (int)h)
-         h = r->h;
-   }
-
-   if (re->tmp_out)
-     {
-        if ((re->tmp_out->cache_entry.w < w)
-            || (re->tmp_out->cache_entry.h < h))
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-     }
-
-   if (!re->tmp_out)
-     {
-        Soft8_Image *im;
-
-        im = (Soft8_Image *)
-            evas_cache_image_empty(evas_common_soft8_image_cache_get());
-        im->cache_entry.flags.alpha = 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-
-        re->tmp_out = im;
-     }
-}
-
-static void
-alloc_colors(Render_Engine * re)
-{
-   xcb_alloc_color_cookie_t color_rq[256];
-   xcb_alloc_color_reply_t *rep;
-   xcb_colormap_t colormap = re->screen->default_colormap;
-
-   int i;
-   for (i = 0; i < 256; i++)
-      color_rq[i] =
-          xcb_alloc_color(re->connection, colormap, i << 8, i << 8, i << 8);
-
-   for (i = 0; i < 256; i++)
-     {
-        rep = xcb_alloc_color_reply(re->connection, color_rq[i], NULL);
-        re->pal[i] = rep->pixel;
-        free(rep);
-     }
-}
-
-static int
-eng_setup(Evas * e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_Software_8_X11 *info;
-/*    X_Output_Buffer *xob; */
-
-   info = (Evas_Engine_Info_Software_8_X11 *) in;
-   if (!e->engine.data.output)
-     {
-        /* the only check - simplistic, i know, but enough for this
-         * "special purpose" engine. Remember it is meant to be used
-         * for limited power devices that have a 8bit display mode
-         * and no real other acceleration, and high resolution so we
-         * can pre-dither into 8bpp. */
-//      if (DefaultDepth(info->info.display,
-//                       DefaultScreen(info->info.display)) != 8)
-//        return;
-        /* do common routine init - we wil at least use it for core
-         * image loading and font loading/glyph rendering & placement */
-        evas_common_cpu_init();
-
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-        evas_common_soft8_image_init();
-
-        /* render engine specific data */
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re)
-           return 0;
-        e->engine.data.output = re;
-        re->connection = info->info.connection;
-        re->screen = info->info.screen;
-        re->drawable = info->info.drawable;
-        re->depth = info->info.depth;
-        re->w = e->output.w;
-        re->h = e->output.h;
-        re->rot = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-           evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-        alloc_colors(re);
-     }
-   else
-     {
-        /* we changed the info after first init - do a re-eval where
-         * appropriate */
-        re = e->engine.data.output;
-        if (re->tb)
-           evas_common_tilebuf_free(re->tb);
-        re->connection = info->info.connection;
-        re->screen = info->info.screen;
-        re->drawable = info->info.drawable;
-        re->w = e->output.w;
-        re->h = e->output.h;
-        re->rot = info->info.rotation;
-        re->tb = evas_common_tilebuf_new(e->output.w, e->output.h);
-        if (re->tb)
-           evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-        if (re->tmp_out)
-          {
-             evas_cache_image_drop(&re->tmp_out->cache_entry);
-             re->tmp_out = NULL;
-          }
-        alloc_colors(re);
-     }
-   if (!e->engine.data.output)
-      return 0;
-
-   /* add a draw context if we dont have one */
-   if (!e->engine.data.context)
-      e->engine.data.context =
-          e->engine.func->context_new(e->engine.data.output);
-   /* check if the display can do shm */
-   re->shm = evas_software_8_x11_x_can_do_shm(re->connection, re->screen);
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-   if (re->shbuf)
-      evas_software_8_x11_x_output_buffer_free(re->shbuf, 0);
-   if (re->clip_rects)
-     {
-        pixman_region_fini(re->clip_rects);
-        free(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tb)
-      evas_common_tilebuf_free(re->tb);
-   if (re->rects)
-      evas_common_tilebuf_free_render_rects(re->rects);
-   if (re->tmp_out)
-      evas_cache_image_drop(&re->tmp_out->cache_entry);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-   evas_common_soft8_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-
-   if ((re->w == w) && (re->h == h))
-      return;
-
-   evas_common_tilebuf_free(re->tb);
-   re->w = w;
-   re->h = h;
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-      evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   if (re->shbuf)
-     {
-        evas_software_8_x11_x_output_buffer_free(re->shbuf, 0);
-        re->shbuf = NULL;
-     }
-   if (re->clip_rects)
-     {
-        pixman_region_fini(re->clip_rects);
-        free(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static inline void
-_output_buffer_alloc(Render_Engine * re)
-{
-   int w, h;
-   if (re->shbuf)
-      return;
-
-   if ((re->rot == 0) || (re->rot == 180))
-     {
-        w = re->w;
-        h = re->h;
-     }
-   else
-     {
-        w = re->h;
-        h = re->w;
-     }
-
-   re->shbuf = evas_software_8_x11_x_output_buffer_new
-       (re->connection, re->screen, re->depth, re->pal, w, h, 1, NULL);
-
-   re->shbuf->drawable = re->drawable;
-   re->shbuf->screen = re->screen;
-   if (re->shbuf->gc)
-     {
-        xcb_free_gc(re->shbuf->connection, re->shbuf->gc);
-        re->shbuf->gc = 0;
-     }
-
-   re->shbuf->gc = xcb_generate_id(re->shbuf->connection);
-   xcb_create_gc(re->shbuf->connection, re->shbuf->gc, re->shbuf->drawable, 0,
-                 NULL);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h,
-                                   int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *) data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        if (!re->rects)
-           return NULL;
-
-        re->cur_rect = re->rects;
-        _output_buffer_alloc(re);
-        if (re->rot != 0)
-           _tmp_out_alloc(re);  /* grows if required */
-     }
-   if (!re->cur_rect)
-     {
-        if (re->rects)
-           evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        return NULL;
-     }
-   rect = re->cur_rect;
-   ux = rect->x;
-   uy = rect->y;
-   uw = rect->w;
-   uh = rect->h;
-   re->cur_rect = (Tilebuf_Rect *) ((EINA_INLIST_GET(re->cur_rect))->next);
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   *x = ux;
-   *y = uy;
-   *w = uw;
-   *h = uh;
-   if (re->rot == 0)
-     {
-        *cx = ux;
-        *cy = uy;
-        *cw = uw;
-        *ch = uh;
-        return re->shbuf->im;
-     }
-   else
-     {
-        *cx = 0;
-        *cy = 0;
-        *cw = uw;
-        *ch = uh;
-        return re->tmp_out;
-     }
-}
-
-static void
-_blit_rot_90(Soft8_Image * dst, const Soft8_Image * src,
-             int out_x, int out_y, int w, int h)
-{
-   DATA8 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + (out_x + (w + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA8 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr -= dst->stride;
-          }
-        sp += src->stride;
-        dp++;
-     }
-}
-
-static void
-_blit_rot_180(Soft8_Image * dst, const Soft8_Image * src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA8 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((w + out_x - 1) + (h + out_y - 1) * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA8 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr--;
-          }
-        sp += src->stride;
-        dp -= dst->stride;
-     }
-}
-
-static void
-_blit_rot_270(Soft8_Image * dst, const Soft8_Image * src,
-              int out_x, int out_y, int w, int h)
-{
-   DATA8 *dp, *sp;
-   int x, y;
-
-   sp = src->pixels;
-   dp = dst->pixels + ((h + out_x - 1) + out_y * dst->stride);
-
-   for (y = 0; y < h; y++)
-     {
-        DATA8 *dp_itr, *sp_itr;
-
-        sp_itr = sp;
-        dp_itr = dp;
-
-        for (x = 0; x < w; x++)
-          {
-             *dp_itr = *sp_itr;
-
-             sp_itr++;
-             dp_itr += dst->stride;
-          }
-        sp += src->stride;
-        dp--;
-     }
-}
-
-static void
-_tmp_out_process(Render_Engine * re, int out_x, int out_y, int w, int h)
-{
-   Soft8_Image *d, *s;
-
-   d = re->shbuf->im;
-   s = re->tmp_out;
-
-   if ((w < 1) || (h < 1) ||
-       (out_x >= (int)d->cache_entry.w) ||
-       (out_y >= (int)d->cache_entry.h))
-      return;
-
-   if (re->rot == 90)
-      _blit_rot_90(d, s, out_x, out_y, w, h);
-   else if (re->rot == 180)
-      _blit_rot_180(d, s, out_x, out_y, w, h);
-   else if (re->rot == 270)
-      _blit_rot_270(d, s, out_x, out_y, w, h);
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x,
-                                    int y, int w, int h)
-{
-   Render_Engine *re;
-   struct {
-      int x, y, width, height;
-   } r =
-   {
-   0, 0, 0, 0};
-
-   re = (Render_Engine *) data;
-
-   if (!re->clip_rects)
-     {
-        re->clip_rects =
-            (pixman_region16_t *) malloc(sizeof(pixman_region16_t));
-        pixman_region_init(re->clip_rects);
-     }
-
-   if (re->rot == 0)
-     {
-        r.x = x;
-        r.y = y;
-        r.width = w;
-        r.height = h;
-     }
-   else if (re->rot == 90)
-     {
-        r.x = y;
-        r.y = re->w - w - x;
-        r.width = h;
-        r.height = w;
-     }
-   else if (re->rot == 180)
-     {
-        r.x = re->w - w - x;
-        r.y = re->h - h - y;
-        r.width = w;
-        r.height = h;
-     }
-   else if (re->rot == 270)
-     {
-        r.x = re->h - h - y;
-        r.y = x;
-        r.width = h;
-        r.height = w;
-     }
-
-   if (re->rot != 0)
-      _tmp_out_process(re, r.x, r.y, w, h);
-
-   pixman_region_union_rect(re->clip_rects, re->clip_rects,
-                            r.x, r.y, r.width, r.height);
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-
-   if (re->clip_rects)
-     {
-        re->shbuf->drawable = re->drawable;
-        {
-           int i;
-           pixman_box16_t *rects =
-               pixman_region_rectangles(re->clip_rects, NULL);
-           for (i = 0; i < pixman_region_n_rects(re->clip_rects); i++, rects++)
-              evas_software_8_x11_x_output_buffer_paste
-                  (re->shbuf, re->drawable, re->shbuf->gc, rects->x1, rects->y1,
-                   rects->x2 - rects->x1, rects->y2 - rects->y1, 1);
-        }
-
-        pixman_region_fini(re->clip_rects);
-        free(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *) data;
-   if (re->shbuf)
-     {
-        evas_software_8_x11_x_output_buffer_free(re->shbuf, 0);
-        re->shbuf = NULL;
-     }
-   if (re->clip_rects)
-     {
-        pixman_region_fini(re->clip_rects);
-        free(re->clip_rects);
-        re->clip_rects = NULL;
-     }
-   if (re->tmp_out)
-     {
-        evas_cache_image_drop(&re->tmp_out->cache_entry);
-        re->tmp_out = NULL;
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *context __UNUSED__)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module * em)
-{
-   if (!em)
-      return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_8"))
-      return 0;
-   _evas_engine_soft8_x11_log_dom = eina_log_domain_register
-     ("evas-software_8_x11", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft8_x11_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module * em __UNUSED__)
-{
-   eina_log_domain_unregister(_evas_engine_soft8_x11_log_dom);
-}
-
-static Evas_Module_Api evas_modapi = {
-   EVAS_MODULE_API_VERSION,
-   "software_8_x11",
-   "none",
-   {
-    module_open,
-    module_close}
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_8_x11);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_8_X11
-EVAS_EINA_MODULE_DEFINE(engine, software_8_x11);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_8_x11/evas_engine.h b/libraries/evas/src/modules/engines/software_8_x11/evas_engine.h
deleted file mode 100644
index 1fa12df..0000000
--- a/libraries/evas/src/modules/engines/software_8_x11/evas_engine.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-#include <xcb/xcb.h>
-#include <xcb/shm.h>
-#include <xcb/xcb_image.h>
-
-#include "evas_common.h"
-#include "evas_common_soft8.h"
-
-extern int _evas_engine_soft8_x11_log_dom;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft8_x11_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft8_x11_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft8_x11_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft8_x11_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft8_x11_log_dom, __VA_ARGS__)
-
-typedef struct _X_Output_Buffer       X_Output_Buffer;
-
-struct _X_Output_Buffer
-{
-   Soft8_Image                  *im;
-   xcb_connection_t             *connection;
-   xcb_screen_t                 *screen;
-   xcb_image_t                  *xim;
-   xcb_drawable_t               drawable;
-   xcb_gcontext_t               gc;
-   xcb_shm_segment_info_t       *shm_info;
-   unsigned char                *pal;
-   void                         *data;
-};
-
-/****/
-int              evas_software_8_x11_x_can_do_shm                  (xcb_connection_t *c, xcb_screen_t *screen);
-X_Output_Buffer *evas_software_8_x11_x_output_buffer_new           (xcb_connection_t *, xcb_screen_t *screen, int depth, unsigned char *pal, int w, int h, int try_shm, void *data);
-void             evas_software_8_x11_x_output_buffer_free          (X_Output_Buffer *xob, int sync);
-void             evas_software_8_x11_x_output_buffer_paste         (X_Output_Buffer *xob, xcb_drawable_t d, xcb_gcontext_t gc, int x, int y, int w, int h, int sync);
-DATA8           *evas_software_8_x11_x_output_buffer_data          (X_Output_Buffer *xob, int *bytes_per_line_ret);
-int              evas_software_8_x11_x_output_buffer_depth         (X_Output_Buffer *xob);
-int              evas_software_8_x11_x_output_buffer_byte_order    (X_Output_Buffer *xob);
-int              evas_software_8_x11_x_output_buffer_bit_order     (X_Output_Buffer *xob);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_8_x11/evas_x_buffer.c b/libraries/evas/src/modules/engines/software_8_x11/evas_x_buffer.c
deleted file mode 100644
index a2c40b1..0000000
--- a/libraries/evas/src/modules/engines/software_8_x11/evas_x_buffer.c
+++ /dev/null
@@ -1,243 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-static int _xcb_err = 0;
-
-int
-evas_software_8_x11_x_can_do_shm(xcb_connection_t * c, xcb_screen_t * screen)
-{
-   static xcb_connection_t *cached_c = NULL;
-   static int cached_result = 0;
-
-   if (c == cached_c)
-      return cached_result;
-   cached_c = c;
-
-   if (xcb_get_extension_data(c, &xcb_shm_id))
-     {
-        X_Output_Buffer *xob;
-
-        xob = evas_software_8_x11_x_output_buffer_new
-          (c, screen, screen->root_depth, (unsigned char *)NULL,
-           16, 16, 2, NULL);
-        if (!xob)
-          {
-             cached_result = 0;
-             return 0;
-          }
-        evas_software_8_x11_x_output_buffer_free(xob, 1);
-        cached_result = 1;
-        return 1;
-     }
-   cached_result = 0;
-   return 0;
-}
-
-X_Output_Buffer *
-evas_software_8_x11_x_output_buffer_new(xcb_connection_t * c,
-                                        xcb_screen_t * s,
-                                        int depth,
-                                        unsigned char *pal,
-                                        int w, int h, int try_shm, void *data)
-{
-   X_Output_Buffer *xob;
-
-   xob = calloc(1, sizeof(X_Output_Buffer));
-   if (!xob)
-      return NULL;
-
-   xob->connection = c;
-   xob->screen = s;
-   xob->xim = NULL;
-   xob->shm_info = NULL;
-   xob->pal = pal;
-
-   if (try_shm > 0)
-     {
-        xob->shm_info = malloc(sizeof(xcb_shm_segment_info_t));
-        if (xob->shm_info)
-          {
-             xob->shm_info->shmseg = xcb_generate_id(c);
-             xob->xim = xcb_image_create_native(c, w, h,
-                                                XCB_IMAGE_FORMAT_Z_PIXMAP,
-                                                depth, NULL, ~0, NULL);
-             if (xob->xim)
-               {
-                  int shmid = shmget
-                    (IPC_PRIVATE, xob->xim->size, IPC_CREAT | 0777);
-
-                  if (shmid >= 0)
-                    {
-                       xob->shm_info->shmid = shmid;
-                       xob->shm_info->shmaddr = xob->xim->data =
-                           shmat(xob->shm_info->shmid, 0, 0);
-
-                       if (xob->shm_info->shmaddr)
-                         {
-                            /*
-                             * FIXME: no error mechanism
-                             */
-
-                            /* XErrorHandler ph; */
-                            /* EventHandlers eh; */
-
-                            free(xcb_get_input_focus_reply
-                                 (c, xcb_get_input_focus_unchecked(c), NULL));
-                            _xcb_err = 0;
-                            /* ph = XSetErrorHandler((XErrorHandler) */
-                            /* x_output_tmp_x_err); */
-                            xcb_shm_attach(c,
-                                           xob->shm_info->shmseg,
-                                           xob->shm_info->shmid, 0);
-                            free(xcb_get_input_focus_reply
-                                 (c, xcb_get_input_focus_unchecked(c), NULL));
-                            /* XSetErrorHandler((XErrorHandler)ph); */
-                            if (!_xcb_err)
-                              {
-                                 xob->im =
-                                     (Soft8_Image *)
-                                     evas_cache_image_data
-                                     (evas_common_soft8_image_cache_get(), w, h,
-                                      (DATA32 *) xob->xim->data, 0,
-                                      EVAS_COLORSPACE_GRY8);
-
-                                 if (xob->im)
-                                    xob->im->stride =
-                                        xob->xim->stride / sizeof(DATA8);
-                                 return xob;
-                              }
-                         }
-                       shmdt(xob->shm_info->shmaddr);
-                       shmctl(xob->shm_info->shmid, IPC_RMID, 0);
-                    }
-                  if (xob->xim)
-                     xcb_image_destroy(xob->xim);
-                  xob->xim = NULL;
-               }
-             if (xob->shm_info)
-                free(xob->shm_info);
-             xob->shm_info = NULL;
-          }
-     }
-
-   if (try_shm > 1)
-      return NULL;
-
-   xob->xim = xcb_image_create_native(c, w, h, XCB_IMAGE_FORMAT_Z_PIXMAP,
-                                      depth, NULL, ~0, NULL);
-   if (!xob->xim)
-     {
-        free(xob);
-        return NULL;
-     }
-
-   xob->data = data;
-
-   if (!xob->xim->data)
-     {
-        xob->xim->data = malloc(xob->xim->stride * xob->xim->height);
-        if (!xob->xim->data)
-          {
-             xcb_image_destroy(xob->xim);
-             free(xob);
-             return NULL;
-          }
-     }
-   if (xob->im)
-      evas_cache_image_drop(&xob->im->cache_entry);
-
-   xob->im =
-       (Soft8_Image *)
-       evas_cache_image_data(evas_common_soft8_image_cache_get(), w, h,
-                             (DATA32 *) xob->xim->data, 0,
-                             EVAS_COLORSPACE_GRY8);
-   if (xob->im)
-      xob->im->stride = xob->xim->stride / sizeof(DATA8);
-   return xob;
-}
-
-void
-evas_software_8_x11_x_output_buffer_free(X_Output_Buffer * xob, int sync)
-{
-   if (xob->shm_info)
-     {
-        if (sync)
-           free(xcb_get_input_focus_reply(xob->connection,
-                                          xcb_get_input_focus_unchecked(xob->
-                                                                        connection),
-                                          NULL));
-        xcb_shm_detach(xob->connection, xob->shm_info->shmseg);
-        xcb_image_destroy(xob->xim);
-        shmdt(xob->shm_info->shmaddr);
-        shmctl(xob->shm_info->shmid, IPC_RMID, 0);
-        free(xob->shm_info);
-     }
-   else
-     {
-        if (xob->data)
-           xob->xim->data = NULL;
-        free(xob->xim->data);
-        xcb_image_destroy(xob->xim);
-     }
-   free(xob);
-}
-
-void
-evas_software_8_x11_x_output_buffer_paste(X_Output_Buffer * xob,
-                                        xcb_drawable_t d,
-                                        xcb_gcontext_t gc,
-                                        int x, int y, int w, int h, int sync)
-{
-   unsigned char *data;
-   int i, j;
-
-   if (xob->shm_info)
-     {
-        for (i = y; i < y + h; i++)
-          {
-             data = xob->xim->data + i * xob->xim->width + x;
-             for (j = x; j < x + w; j++, data++)
-                *data = xob->pal[*data];
-          }
-
-        xcb_image_shm_put(xob->connection, d, gc,
-                          xob->xim, *xob->shm_info, x, y, x, y, w, h, 0);
-
-        if (sync)
-           free(xcb_get_input_focus_reply(xob->connection,
-                                          xcb_get_input_focus_unchecked(xob->
-                                                                        connection),
-                                          NULL));
-     }
-   else
-     {
-        xcb_image_put(xob->connection, d, gc, xob->xim, x, y, 0);
-     }
-}
-
-DATA8 *
-evas_software_8_x11_x_output_buffer_data(X_Output_Buffer * xob,
-                                       int *bytes_per_line_ret)
-{
-   if (bytes_per_line_ret)
-      *bytes_per_line_ret = xob->xim->stride;
-   return (DATA8 *) xob->xim->data;
-}
-
-int
-evas_software_8_x11_x_output_buffer_depth(X_Output_Buffer * xob)
-{
-   return xob->xim->bpp;
-}
-
-int
-evas_software_8_x11_x_output_buffer_byte_order(X_Output_Buffer * xob)
-{
-   return xob->xim->byte_order;
-}
-
-int
-evas_software_8_x11_x_output_buffer_bit_order(X_Output_Buffer * xob)
-{
-   return xob->xim->bit_order;
-}
diff --git a/libraries/evas/src/modules/engines/software_ddraw/Evas_Engine_Software_DDraw.h b/libraries/evas/src/modules/engines/software_ddraw/Evas_Engine_Software_DDraw.h
deleted file mode 100644
index 9735bb7..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/Evas_Engine_Software_DDraw.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __EVAS_ENGINE_SOFTWARE_DDRAW_H__
-#define __EVAS_ENGINE_SOFTWARE_DDRAW_H__
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-
-typedef struct _Evas_Engine_Info_Software_DDraw Evas_Engine_Info_Software_DDraw;
-
-struct _Evas_Engine_Info_Software_DDraw
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-      HWND         window;
-      int          depth;
-      int          rotation;
-      unsigned int fullscreen : 1;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-
-#endif /* __EVAS_ENGINE_SOFTWARE_DDRAW_H__ */
diff --git a/libraries/evas/src/modules/engines/software_ddraw/Makefile.am b/libraries/evas/src/modules/engines/software_ddraw/Makefile.am
deleted file mode 100644
index 594c7ab..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_ddraw_cflags@
-
-if BUILD_ENGINE_SOFTWARE_DDRAW
-
-SOFTWARE_DDRAW_SOURCES = \
-evas_engine.c \
-evas_outbuf.c \
-evas_ddraw_buffer.c \
-evas_ddraw_main.cpp
-
-SOFTWARE_DDRAW_LIBADD = @evas_engine_software_ddraw_libs@
-
-
-includes_HEADERS = Evas_Engine_Software_DDraw.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
-
-pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
-module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_DDRAW_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_ddraw.la
-
-libevas_engine_software_ddraw_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
-libevas_engine_software_ddraw_la_LIBADD = $(SOFTWARE_DDRAW_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_ddraw/Makefile.in b/libraries/evas/src/modules/engines/software_ddraw/Makefile.in
deleted file mode 100644
index 629b413..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/Makefile.in
+++ /dev/null
@@ -1,884 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_ddraw
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_TRUE@libevas_engine_software_ddraw_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_ddraw_la_SOURCES_DIST = evas_engine.c \
-        evas_outbuf.c evas_ddraw_buffer.c evas_ddraw_main.cpp
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      evas_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      evas_ddraw_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      evas_ddraw_main.lo
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_TRUE@am_libevas_engine_software_ddraw_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_ddraw_la_OBJECTS =  \
-        $(am_libevas_engine_software_ddraw_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_TRUE@am_libevas_engine_software_ddraw_la_rpath =
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@      $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_outbuf.c \
-        evas_ddraw_buffer.c evas_ddraw_main.cpp
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      module_la-evas_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      module_la-evas_ddraw_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@      module_la-evas_ddraw_main.lo
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-        $(module_la_CXXFLAGS) $(CXXFLAGS) $(module_la_LDFLAGS) \
-        $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
-am__v_CXX_0 = @echo "  CXX   " $@;
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_ddraw_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_ddraw_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_DDraw.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_ddraw_cflags@
-
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@SOFTWARE_DDRAW_SOURCES = \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@evas_outbuf.c \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@evas_ddraw_buffer.c \
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@evas_ddraw_main.cpp
-
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@SOFTWARE_DDRAW_LIBADD = @evas_engine_software_ddraw_libs@
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@includes_HEADERS = Evas_Engine_Software_DDraw.h
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_DDRAW_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_TRUE@noinst_LTLIBRARIES = libevas_engine_software_ddraw.la
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_TRUE@libevas_engine_software_ddraw_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
-@BUILD_ENGINE_SOFTWARE_DDRAW_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_DDRAW_TRUE@libevas_engine_software_ddraw_la_LIBADD = $(SOFTWARE_DDRAW_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_ddraw/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_ddraw/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_ddraw.la: $(libevas_engine_software_ddraw_la_OBJECTS) $(libevas_engine_software_ddraw_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(CXXLINK) $(am_libevas_engine_software_ddraw_la_rpath) $(libevas_engine_software_ddraw_la_OBJECTS) $(libevas_engine_software_ddraw_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CXXLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_ddraw_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_ddraw_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_ddraw_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_ddraw_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_outbuf.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_outbuf.lo: evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_outbuf.Tpo -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_outbuf.Tpo $(DEPDIR)/module_la-evas_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_outbuf.c' object='module_la-evas_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-
-module_la-evas_ddraw_buffer.lo: evas_ddraw_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_ddraw_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_ddraw_buffer.Tpo -c -o module_la-evas_ddraw_buffer.lo `test -f 'evas_ddraw_buffer.c' || echo '$(srcdir)/'`evas_ddraw_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_ddraw_buffer.Tpo $(DEPDIR)/module_la-evas_ddraw_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_ddraw_buffer.c' object='module_la-evas_ddraw_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_ddraw_buffer.lo `test -f 'evas_ddraw_buffer.c' || echo '$(srcdir)/'`evas_ddraw_buffer.c
-
-.cpp.o:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
-
-module_la-evas_ddraw_main.lo: evas_ddraw_main.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -MT module_la-evas_ddraw_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_ddraw_main.Tpo -c -o module_la-evas_ddraw_main.lo `test -f 'evas_ddraw_main.cpp' || echo '$(srcdir)/'`evas_ddraw_main.cpp
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_ddraw_main.Tpo $(DEPDIR)/module_la-evas_ddraw_main.Plo
-@am__fastdepCXX_FALSE@  $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='evas_ddraw_main.cpp' object='module_la-evas_ddraw_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CXX $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CXXFLAGS) $(CXXFLAGS) -c -o module_la-evas_ddraw_main.lo `test -f 'evas_ddraw_main.cpp' || echo '$(srcdir)/'`evas_ddraw_main.cpp
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_ddraw/evas_ddraw_buffer.c b/libraries/evas/src/modules/engines/software_ddraw/evas_ddraw_buffer.c
deleted file mode 100644
index 7ef9211..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/evas_ddraw_buffer.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <string.h>
-
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-DD_Output_Buffer *
-evas_software_ddraw_output_buffer_new(int   depth,
-                                      int   width,
-                                      int   height,
-                                      void *data)
-{
-   DD_Output_Buffer *ddob;
-
-   ddob = calloc(1, sizeof(DD_Output_Buffer));
-   if (!ddob) return NULL;
-
-   ddob->data = data;
-   ddob->depth = depth;
-   ddob->width = width;
-   ddob->height = height;
-   ddob->pitch = width * depth / 8;
-   ddob->psize = ddob->pitch * height;
-
-   if (!ddob->data)
-     {
-        ddob->data = malloc(ddob->pitch * height);
-        if (!ddob->data)
-          {
-            free(ddob);
-            return NULL;
-          }
-     }
-
-   return ddob;
-}
-
-void
-evas_software_ddraw_output_buffer_free(DD_Output_Buffer *ddob)
-{
-   if (ddob->data) free(ddob->data);
-   free(ddob);
-}
-
-void
-evas_software_ddraw_output_buffer_paste(DD_Output_Buffer *ddob,
-                                        void             *ddraw_data,
-                                        int               ddraw_width,
-                                        int               ddraw_height,
-                                        int               ddraw_pitch,
-                                        int               ddraw_depth,
-                                        int               x,
-                                        int               y)
-{
-   DATA8 *dd_data;
-   DATA8 *evas_data;
-   int    width;
-   int    height;
-   int    pitch;
-   int    j;
-
-   if ((x >= ddraw_width) || (y >= ddraw_height))
-     return;
-
-   /* compute the size of the data to copy on the back surface */
-   width = ((x + ddob->width) > ddraw_width)
-     ? ddraw_width - x
-     : ddob->width;
-   height = ((y + ddob->height) > ddraw_height)
-     ? ddraw_height - y
-     : ddob->height;
-   pitch = width * ddob->depth / 8;
-
-   dd_data = (DATA8 *)ddraw_data + y * ddraw_pitch + x * ddraw_depth;
-   evas_data = (unsigned char *)ddob->data;
-   for (j = 0; j < height; j++, evas_data += ddob->pitch, dd_data += ddraw_pitch)
-     memcpy(dd_data, evas_data, pitch);
-}
-
-DATA8 *
-evas_software_ddraw_output_buffer_data(DD_Output_Buffer *ddob,
-                                       int              *bytes_per_line_ret)
-{
-   if (bytes_per_line_ret) *bytes_per_line_ret = ddob->pitch;
-   return ddob->data;
-}
-
-int
-evas_software_ddraw_output_buffer_depth(DD_Output_Buffer *ddob)
-{
-   return ddob->depth;
-}
diff --git a/libraries/evas/src/modules/engines/software_ddraw/evas_ddraw_main.cpp b/libraries/evas/src/modules/engines/software_ddraw/evas_ddraw_main.cpp
deleted file mode 100644
index 2c467c8..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/evas_ddraw_main.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-int
-evas_software_ddraw_init (HWND    window,
-                          int     depth,
-                          int     fullscreen,
-                          Outbuf *buf)
-{
-   DDSURFACEDESC  surface_desc;
-   DDPIXELFORMAT  pixel_format;
-   HRESULT        res;
-   int            width;
-   int            height;
-
-   if (!buf)
-     return 0;
-
-   buf->priv.dd.window = window;
-
-   res = DirectDrawCreate(NULL, &buf->priv.dd.object, NULL);
-   if (FAILED(res))
-     return 0;
-
-   if (buf->priv.dd.fullscreen)
-     {
-        DDSCAPS caps;
-
-        res = buf->priv.dd.object->SetCooperativeLevel(window,
-                                                       DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
-        if (FAILED(res))
-          goto release_object;
-
-        width = GetSystemMetrics(SM_CXSCREEN);
-        height = GetSystemMetrics(SM_CYSCREEN);
-
-        ZeroMemory(&pixel_format, sizeof(pixel_format));
-        pixel_format.dwSize = sizeof(pixel_format);
-        buf->priv.dd.surface_primary->GetPixelFormat(&pixel_format);
-
-        if (pixel_format.dwRGBBitCount != (DWORD)depth)
-          goto release_object;
-
-        buf->priv.dd.depth = depth;
-
-        res = buf->priv.dd.object->SetDisplayMode(width, height, depth);
-        if (FAILED(res))
-          goto release_object;
-
-        memset(&surface_desc, 0, sizeof(surface_desc));
-        surface_desc.dwSize = sizeof(surface_desc);
-        surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
-        surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
-        surface_desc.dwBackBufferCount = 1;
-
-        res = buf->priv.dd.object->CreateSurface(&surface_desc,
-                                                 &buf->priv.dd.surface_primary, NULL);
-        if (FAILED(res))
-          goto release_object;
-
-        caps.dwCaps = DDSCAPS_BACKBUFFER;
-        res = buf->priv.dd.surface_primary->GetAttachedSurface(&caps,
-                                                               &buf->priv.dd.surface_back);
-        if (FAILED(res))
-          goto release_surface_primary;
-     }
-   else
-     {
-        RECT           rect;
-
-        if (!GetClientRect(window, &rect))
-          goto release_object;
-
-        width = rect.right - rect.left;
-        height = rect.bottom - rect.top;
-
-        res = buf->priv.dd.object->SetCooperativeLevel(window, DDSCL_NORMAL);
-        if (FAILED(res))
-          goto release_object;
-
-        res = buf->priv.dd.object->CreateClipper(0, &buf->priv.dd.clipper, NULL);
-        if (FAILED(res))
-          goto release_object;
-
-        res = buf->priv.dd.clipper->SetHWnd(0, window);
-        if (FAILED(res))
-          goto release_clipper;
-
-        memset(&surface_desc, 0, sizeof(surface_desc));
-        surface_desc.dwSize = sizeof(surface_desc);
-        surface_desc.dwFlags = DDSD_CAPS;
-        surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-
-        res = buf->priv.dd.object->CreateSurface(&surface_desc, &buf->priv.dd.surface_primary, NULL);
-        if (FAILED(res))
-          goto release_clipper;
-
-        res = buf->priv.dd.surface_primary->SetClipper(buf->priv.dd.clipper);
-        if (FAILED(res))
-          goto release_surface_primary;
-
-        memset (&surface_desc, 0, sizeof(surface_desc));
-        surface_desc.dwSize = sizeof(surface_desc);
-        surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-        surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-        surface_desc.dwWidth = width;
-        surface_desc.dwHeight = height;
-
-        res = buf->priv.dd.object->CreateSurface(&surface_desc, &buf->priv.dd.surface_back, NULL);
-        if (FAILED(res))
-          goto release_surface_primary;
-
-        ZeroMemory(&pixel_format, sizeof(pixel_format));
-        pixel_format.dwSize = sizeof(pixel_format);
-        buf->priv.dd.surface_primary->GetPixelFormat(&pixel_format);
-
-        if (pixel_format.dwRGBBitCount != (DWORD)depth)
-          goto release_surface_back;
-
-        buf->priv.dd.depth = depth;
-     }
-
-   return 1;
-
- release_surface_back:
-   buf->priv.dd.surface_back->Release();
- release_surface_primary:
-   buf->priv.dd.surface_primary->Release();
- release_clipper:
-   if (!buf->priv.dd.fullscreen)
-     buf->priv.dd.clipper->Release();
- release_object:
-   buf->priv.dd.object->Release();
-
-   return 0;
-}
-
-void
-evas_software_ddraw_shutdown(Outbuf *buf)
-{
-   if (!buf)
-     return;
-
-   if (buf->priv.dd.fullscreen)
-     if (buf->priv.dd.surface_back)
-       buf->priv.dd.surface_back->Release();
-   if (buf->priv.dd.surface_primary)
-     buf->priv.dd.surface_primary->Release();
-   if (!buf->priv.dd.fullscreen)
-     if (buf->priv.dd.clipper)
-       buf->priv.dd.clipper->Release();
-   if (buf->priv.dd.object)
-     buf->priv.dd.object->Release();
-}
-
-int
-evas_software_ddraw_masks_get(Outbuf *buf)
-{
-   DDPIXELFORMAT pixel_format;
-
-   ZeroMemory(&pixel_format, sizeof(pixel_format));
-   pixel_format.dwSize = sizeof(pixel_format);
-
-   if (FAILED(buf->priv.dd.surface_primary->GetPixelFormat(&pixel_format)))
-     return 0;
-
-   buf->priv.mask.r = pixel_format.dwRBitMask;
-   buf->priv.mask.g = pixel_format.dwGBitMask;
-   buf->priv.mask.b = pixel_format.dwBBitMask;
-
-   return 1;
-}
-
-void *
-evas_software_ddraw_lock(Outbuf *buf,
-                         int    *ddraw_width,
-                         int    *ddraw_height,
-                         int    *ddraw_pitch,
-                         int    *ddraw_depth)
-{
-   DDSURFACEDESC surface_desc;
-
-   ZeroMemory(&surface_desc, sizeof(surface_desc));
-   surface_desc.dwSize = sizeof(surface_desc);
-
-   if (FAILED(buf->priv.dd.surface_back->Lock(NULL,
-                                              &surface_desc,
-                                              DDLOCK_WAIT | DDLOCK_WRITEONLY | DDLOCK_SURFACEMEMORYPTR | DDLOCK_NOSYSLOCK,
-                                              NULL)))
-     return NULL;
-
-   *ddraw_width = surface_desc.dwWidth;
-   *ddraw_height = surface_desc.dwHeight;
-   *ddraw_pitch = surface_desc.lPitch;
-   *ddraw_depth = surface_desc.ddpfPixelFormat.dwRGBBitCount >> 3;
-
-   return surface_desc.lpSurface;
-}
-
-void
-evas_software_ddraw_unlock_and_flip(Outbuf *buf)
-{
-   RECT    dst_rect;
-   RECT    src_rect;
-   POINT   p;
-
-   if (FAILED(buf->priv.dd.surface_back->Unlock(NULL)))
-     return;
-
-   /* we figure out where on the primary surface our window lives */
-   p.x = 0;
-   p.y = 0;
-   ClientToScreen(buf->priv.dd.window, &p);
-   GetClientRect(buf->priv.dd.window, &dst_rect);
-   OffsetRect(&dst_rect, p.x, p.y);
-   SetRect(&src_rect, 0, 0, buf->width, buf->height);
-
-   /* nothing to do if the function fails, so we don't check the result */
-   buf->priv.dd.surface_primary->Blt(&dst_rect,
-                                     buf->priv.dd.surface_back,
-                                     &src_rect,
-                                     DDBLT_WAIT, NULL);
-}
-
-void
-evas_software_ddraw_surface_resize(Outbuf *buf)
-{
-   DDSURFACEDESC surface_desc;
-
-   buf->priv.dd.surface_back->Release();
-   memset (&surface_desc, 0, sizeof (surface_desc));
-   surface_desc.dwSize = sizeof (surface_desc);
-   /* FIXME: that code does not compile. Must know why */
-#if 0
-   surface_desc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH;
-   surface_desc.dwWidth = width;
-   surface_desc.dwHeight = height;
-   buf->priv.dd.surface_back->SetSurfaceDesc(&surface_desc, NULL);
-#else
-   surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-   surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-   surface_desc.dwWidth = buf->width;
-   surface_desc.dwHeight = buf->height;
-   buf->priv.dd.object->CreateSurface(&surface_desc,
-                                      &buf->priv.dd.surface_back,
-                                      NULL);
-#endif
-}
diff --git a/libraries/evas/src/modules/engines/software_ddraw/evas_engine.c b/libraries/evas/src/modules/engines/software_ddraw/evas_engine.c
deleted file mode 100644
index 5bfc87f..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/evas_engine.c
+++ /dev/null
@@ -1,379 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Software_DDraw.h"
-
-int _evas_engine_soft_ddraw_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Tilebuf          *tb;
-   Outbuf           *ob;
-   Tilebuf_Rect     *rects;
-   Eina_Inlist      *cur_rect;
-   int               end : 1;
-};
-
-
-/* log domain variable */
-int _evas_log_dom_module = -1;
-
-
-static void *
-_output_setup(int  width,
-              int  height,
-              int  rot,
-              HWND window,
-              int  depth,
-              int  fullscreen)
-{
-   Render_Engine *re;
-
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   evas_software_ddraw_outbuf_init();
-
-   re->ob = evas_software_ddraw_outbuf_setup(width, height, rot,
-                                             OUTBUF_DEPTH_INHERIT,
-                                             window, depth, fullscreen);
-   if (!re->ob)
-     {
-        free(re);
-        return NULL;
-     }
-
-   /* for updates return 1 big buffer, but only use portions of it, also cache
-    it and keep it around until an idle_flush */
-   /* disable for now - i am hunting down why some expedite tests are slower,
-    * as well as shaped stuff is broken and probable non-32bpp is broken as
-    * convert funcs dont do the right thing
-    *
-   re->ob->onebuf = 1;
-    */
-
-   re->tb = evas_common_tilebuf_new(width, height);
-   if (!re->tb)
-     {
-        evas_software_ddraw_outbuf_free(re->ob);
-        free(re);
-        return NULL;
-     }
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   return re;
-}
-
-
-/* engine api this module provides */
-
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_Software_DDraw *info;
-
-   info = calloc(1, sizeof(Evas_Engine_Info_Software_DDraw));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e, void *info)
-{
-   Evas_Engine_Info_Software_DDraw *in;
-   in = (Evas_Engine_Info_Software_DDraw *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine                   *re;
-   Evas_Engine_Info_Software_DDraw *info;
-
-   info = (Evas_Engine_Info_Software_DDraw *)in;
-   if (!e->engine.data.output)
-     e->engine.data.output = _output_setup(e->output.w,
-                                           e->output.h,
-                                           info->info.rotation,
-                                           info->info.window,
-                                           info->info.depth,
-                                           info->info.fullscreen);
-   else
-     {
-        int ponebuf = 0;
-
-        re = e->engine.data.output;
-        ponebuf = re->ob->onebuf;
-        evas_software_ddraw_outbuf_free(re->ob);
-        re->ob = evas_software_ddraw_outbuf_setup(e->output.w,
-                                                  e->output.h,
-                                                  info->info.rotation,
-                                                  OUTBUF_DEPTH_INHERIT,
-                                                  info->info.window,
-                                                  info->info.depth,
-                                                  info->info.fullscreen);
-        re->ob->onebuf = ponebuf;
-     }
-   if (!e->engine.data.output) return 0;
-   if (!e->engine.data.context)
-     e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   re = e->engine.data.output;
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   if (!data) return;
-
-   re = (Render_Engine *)data;
-   evas_software_ddraw_outbuf_free(re->ob);
-   evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int width, int height)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_software_ddraw_outbuf_reconfigure(re->ob,
-                                          width,
-                                          height,
-                                          evas_software_ddraw_outbuf_rot_get(re->ob),
-                                          OUTBUF_DEPTH_INHERIT);
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(width, height);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data,
-                                   int  *x,
-                                   int  *y,
-                                   int  *w,
-                                   int  *h,
-                                   int  *cx,
-                                   int  *cy,
-                                   int  *cw,
-                                   int  *ch)
-{
-   Render_Engine *re;
-   RGBA_Image    *surface;
-   Tilebuf_Rect  *rect;
-   int            ux;
-   int            uy;
-   int            uw;
-   int            uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect) return NULL;
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x;
-   uy = rect->y;
-   uw = rect->w;
-   uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   surface = evas_software_ddraw_outbuf_new_region_for_update(re->ob,
-                                                              ux,
-                                                              uy,
-                                                              uw,
-                                                              uh,
-                                                              cx,
-                                                              cy,
-                                                              cw,
-                                                              ch);
-
-   *x = ux;
-   *y = uy;
-   *w = uw;
-   *h = uh;
-
-   return surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-#ifdef BUILD_PIPE_RENDER
-   evas_common_pipe_map_begin(surface);
-#endif   
-   evas_software_ddraw_outbuf_push_updated_region(re->ob, surface, x, y, w, h);
-   evas_software_ddraw_outbuf_free_region_for_update(re->ob, surface);
-   evas_common_cpu_end_opt();
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_software_ddraw_outbuf_flush(re->ob);
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_software_ddraw_outbuf_idle_flush(re->ob);
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_log_dom_module = eina_log_domain_register
-     ("evas-software_ddraw", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_log_dom_module < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-  eina_log_domain_unregister(_evas_log_dom_module);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_ddraw",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_ddraw);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_DDRAW
-EVAS_EINA_MODULE_DEFINE(engine, software_ddraw);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_ddraw/evas_engine.h b/libraries/evas/src/modules/engines/software_ddraw/evas_engine.h
deleted file mode 100644
index 2f59170..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/evas_engine.h
+++ /dev/null
@@ -1,220 +0,0 @@
-#ifndef __EVAS_ENGINE_H__
-#define __EVAS_ENGINE_H__
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <ddraw.h>
-
-typedef struct _Outbuf                Outbuf;
-typedef struct _Outbuf_Region         Outbuf_Region;
-typedef struct _DD_Output_Buffer      DD_Output_Buffer;
-
-enum _Outbuf_Depth
-{
-   OUTBUF_DEPTH_NONE,
-   OUTBUF_DEPTH_INHERIT,
-   OUTBUF_DEPTH_RGB_16BPP_565_565_DITHERED,
-   OUTBUF_DEPTH_RGB_16BPP_555_555_DITHERED,
-   OUTBUF_DEPTH_RGB_16BPP_444_444_DITHERED,
-   OUTBUF_DEPTH_RGB_16BPP_565_444_DITHERED,
-   OUTBUF_DEPTH_RGB_32BPP_888_8888,
-   OUTBUF_DEPTH_LAST
-};
-
-typedef enum   _Outbuf_Depth          Outbuf_Depth;
-
-struct _Outbuf
-{
-   Outbuf_Depth              depth;
-   int                       width;
-   int                       height;
-   int                       rot;
-   int                       onebuf;
-
-   struct {
-      Convert_Pal           *pal;
-      struct {
-         HWND                window;
-         LPDIRECTDRAW        object;
-         LPDIRECTDRAWSURFACE surface_primary;
-         LPDIRECTDRAWSURFACE surface_back;
-         LPDIRECTDRAWCLIPPER clipper;
-         int                 depth;
-         unsigned char       fullscreen : 1;
-         unsigned char       swap       : 1;
-         unsigned char       bit_swap   : 1;
-      } dd;
-      struct {
-         DATA32              r, g, b;
-      } mask;
-
-      /* 1 big buffer for updates - flush on idle_flush */
-      RGBA_Image            *onebuf;
-      Eina_List             *onebuf_regions;
-
-      /* a list of pending regions to write to the target */
-      Eina_List             *pending_writes;
-      /* a list of previous frame pending regions to write to the target */
-      Eina_List             *prev_pending_writes;
-
-      unsigned char          mask_dither       : 1;
-      unsigned char          destination_alpha : 1;
-      unsigned char          debug             : 1;
-      unsigned char          synced            : 1;
-   } priv;
-};
-
-struct _Outbuf_Region
-{
-   DD_Output_Buffer *ddob;
-   int               x;
-   int               y;
-   int               width;
-   int               height;
-};
-
-struct _DD_Output_Buffer
-{
-   void *data;
-   int   width;
-   int   height;
-   int   depth;
-   int   pitch;
-   int   psize;
-};
-
-extern int _evas_log_dom_module;
-
-#ifdef EVAS_DEFAULT_LOG_COLOR
-# undef EVAS_DEFAULT_LOG_COLOR
-#endif
-#define EVAS_DEFAULT_LOG_COLOR EINA_COLOR_CYAN
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_log_dom_module, __VA_ARGS__)
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_log_dom_module, __VA_ARGS__)
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_log_dom_module, __VA_ARGS__)
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_log_dom_module, __VA_ARGS__)
-#ifdef CRT
-# undef CRT
-#endif
-#define CRT(...) EINA_LOG_DOM_CRIT(_evas_log_dom_module, __VA_ARGS__)
-
-/* evas_outbuf.c */
-
-void evas_software_ddraw_outbuf_init(void);
-
-void evas_software_ddraw_outbuf_free(Outbuf *buf);
-
-Outbuf *evas_software_ddraw_outbuf_setup(int          width,
-                                         int          height,
-                                         int          rotation,
-                                         Outbuf_Depth depth,
-                                         HWND         window,
-                                         int          w_depth,
-                                         int          fullscreen);
-
-void evas_software_ddraw_outbuf_reconfigure(Outbuf      *buf,
-                                            int          width,
-                                            int          height,
-                                            int          rotation,
-                                            Outbuf_Depth depth);
-
-RGBA_Image *evas_software_ddraw_outbuf_new_region_for_update(Outbuf *buf,
-                                                             int     x,
-                                                             int     y,
-                                                             int     w,
-                                                             int     h,
-                                                             int    *cx,
-                                                             int    *cy,
-                                                             int    *cw,
-                                                             int    *ch);
-
-void evas_software_ddraw_outbuf_push_updated_region(Outbuf     *buf,
-                                                    RGBA_Image *update,
-                                                    int        x,
-                                                    int        y,
-                                                    int        w,
-                                                    int        h);
-
-void evas_software_ddraw_outbuf_free_region_for_update(Outbuf     *buf,
-                                                       RGBA_Image *update);
-
-void evas_software_ddraw_outbuf_flush(Outbuf *buf);
-
-void evas_software_ddraw_outbuf_idle_flush(Outbuf *buf);
-
-int evas_software_ddraw_outbuf_width_get(Outbuf *buf);
-
-int evas_software_ddraw_outbuf_height_get(Outbuf *buf);
-
-Outbuf_Depth evas_software_ddraw_outbuf_depth_get(Outbuf *buf);
-
-int evas_software_ddraw_outbuf_rot_get(Outbuf *buf);
-
-/* evas_ddraw_buffer.c */
-
-DD_Output_Buffer *evas_software_ddraw_output_buffer_new(int   depth,
-                                                        int   width,
-                                                        int   height,
-                                                        void *data);
-
-void evas_software_ddraw_output_buffer_free(DD_Output_Buffer *ddob);
-
-void evas_software_ddraw_output_buffer_paste(DD_Output_Buffer *ddob,
-                                             void             *ddraw_data,
-                                             int               ddraw_width,
-                                             int               ddraw_height,
-                                             int               ddraw_pitch,
-                                             int               ddraw_depth,
-                                             int               x,
-                                             int               y);
-
-DATA8 *evas_software_ddraw_output_buffer_data(DD_Output_Buffer *ddob,
-                                              int              *bytes_per_line_ret);
-
-int evas_software_ddraw_output_buffer_depth(DD_Output_Buffer *ddob);
-
-/* evas_ddraw_main.cpp */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int evas_software_ddraw_init (HWND    window,
-                              int     depth,
-                              int     fullscreen,
-                              Outbuf *buf);
-
-void evas_software_ddraw_shutdown(Outbuf *buf);
-
-int evas_software_ddraw_masks_get(Outbuf *buf);
-
-void *evas_software_ddraw_lock(Outbuf *buf,
-                               int    *ddraw_width,
-                               int    *ddraw_height,
-                               int    *ddraw_pitch,
-                               int    *ddraw_depth);
-
-void evas_software_ddraw_unlock_and_flip(Outbuf *buf);
-
-void evas_software_ddraw_surface_resize(Outbuf *buf);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __EVAS_ENGINE_H__ */
diff --git a/libraries/evas/src/modules/engines/software_ddraw/evas_outbuf.c b/libraries/evas/src/modules/engines/software_ddraw/evas_outbuf.c
deleted file mode 100644
index 5a5f0a2..0000000
--- a/libraries/evas/src/modules/engines/software_ddraw/evas_outbuf.c
+++ /dev/null
@@ -1,460 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-static Eina_List *ddpool = NULL;
-static int ddsize = 0;
-static int ddmemlimit = 10 * 1024 * 1024;
-static int ddcountlimit = 32;
-
-static DD_Output_Buffer *
-_find_ddob(int depth, int w, int h, void *data)
-{
-   Eina_List        *l;
-   Eina_List        *ddl;
-   DD_Output_Buffer *ddob = NULL;
-   DD_Output_Buffer *ddob2;
-   int               sz;
-   int               lbytes;
-   int               bpp;
-
-   bpp = depth / 8;
-   if (bpp == 3) bpp = 4;
-   lbytes = (((w * bpp) + 3) / 4) * 4;
-   sz = lbytes * h;
-   EINA_LIST_FOREACH(ddpool, l, ddob2)
-     {
-        if (ddob2->depth != depth)
-          continue;
-        if (ddob2->psize == sz)
-          {
-             ddob = ddob2;
-             ddl = l;
-             goto have_ddob;
-          }
-     }
-   if (!ddob)
-     return evas_software_ddraw_output_buffer_new(depth, w, h, data);
-
-   have_ddob:
-   ddpool = eina_list_remove_list(ddpool, ddl);
-   ddob->width = w;
-   ddob->height = h;
-   ddob->pitch = lbytes;
-   ddsize -= ddob->psize * (ddob->depth / 8);
-
-   return ddob;
-}
-
-static void
-_unfind_ddob(DD_Output_Buffer *ddob)
-{
-   ddpool = eina_list_prepend(ddpool, ddob);
-   ddsize += ddob->psize * ddob->depth / 8;
-   while ((ddsize > (ddmemlimit)) ||
-          (eina_list_count(ddpool) > ddcountlimit))
-     {
-        Eina_List *xl;
-
-        xl = eina_list_last(ddpool);
-        if (!xl)
-          {
-             ddsize = 0;
-             break;
-          }
-        ddob = xl->data;
-        ddpool = eina_list_remove_list(ddpool, xl);
-        evas_software_ddraw_output_buffer_free(ddob);
-     }
-}
-
-static void
-_clear_ddob(int sync)
-{
-   while (ddpool)
-     {
-        DD_Output_Buffer *ddob;
-
-        ddob = ddpool->data;
-        ddpool = eina_list_remove_list(ddpool, ddpool);
-        evas_software_ddraw_output_buffer_free(ddob);
-     }
-   ddsize = 0;
-}
-
-void
-evas_software_ddraw_outbuf_init(void)
-{
-}
-
-void
-evas_software_ddraw_outbuf_free(Outbuf *buf)
-{
-   if (!buf)
-     return;
-
-   evas_software_ddraw_shutdown(buf);
-   free(buf);
-}
-
-Outbuf *
-evas_software_ddraw_outbuf_setup(int          width,
-                                 int          height,
-                                 int          rotation,
-                                 Outbuf_Depth depth,
-                                 HWND         window,
-                                 int          w_depth,
-                                 int          fullscreen)
-{
-   Outbuf *buf;
-
-   buf = (Outbuf *)calloc(1, sizeof(Outbuf));
-   if (!buf)
-      return NULL;
-
-   buf->width = width;
-   buf->height = height;
-   buf->depth = depth;
-   buf->rot = rotation;
-
-   if (!evas_software_ddraw_init(window, w_depth, fullscreen, buf))
-     {
-        free(buf);
-        return NULL;
-     }
-
-   {
-      Gfx_Func_Convert  conv_func;
-      DD_Output_Buffer *ddob;
-
-      ddob = evas_software_ddraw_output_buffer_new(w_depth, 1, 1, NULL);
-
-      conv_func = NULL;
-      if (ddob)
-        {
-           if (evas_software_ddraw_masks_get(buf))
-             {
-                if ((rotation == 0) || (rotation == 180))
-                  conv_func = evas_common_convert_func_get(0,
-                                                           width,
-                                                           height,
-                                                           evas_software_ddraw_output_buffer_depth (ddob),
-                                                           buf->priv.mask.r,
-                                                           buf->priv.mask.g,
-                                                           buf->priv.mask.b,
-                                                           PAL_MODE_NONE,
-                                                           rotation);
-                else if ((rotation == 90) || (rotation == 270))
-                  conv_func = evas_common_convert_func_get(0,
-                                                           height,
-                                                           width,
-                                                           evas_software_ddraw_output_buffer_depth (ddob),
-                                                           buf->priv.mask.r,
-                                                           buf->priv.mask.g,
-                                                           buf->priv.mask.b,
-                                                           PAL_MODE_NONE,
-                                                           rotation);
-             }
-
-           evas_software_ddraw_output_buffer_free(ddob);
-
-           if (!conv_func)
-             {
-                ERR("DDraw engine Error"
-                    " {"
-                    "  At depth         %i:"
-                    "  RGB format mask: %08x, %08x, %08x"
-                    "  Not supported by and compiled in converters!"
-                    " }",
-                    buf->priv.dd.depth,
-                    buf->priv.mask.r,
-                    buf->priv.mask.g,
-                    buf->priv.mask.b);
-             }
-        }
-   }
-
-   return buf;
-}
-
-void
-evas_software_ddraw_outbuf_reconfigure(Outbuf      *buf,
-                                       int          width,
-                                       int          height,
-                                       int          rotation,
-                                       Outbuf_Depth depth)
-{
-   if ((width == buf->width) && (height == buf->height) &&
-       (rotation == buf->rot) && (depth == buf->depth))
-     return;
-   buf->width = width;
-   buf->height = height;
-   buf->rot = rotation;
-   evas_software_ddraw_surface_resize(buf);
-}
-
-RGBA_Image *
-evas_software_ddraw_outbuf_new_region_for_update(Outbuf *buf,
-                                                 int     x,
-                                                 int     y,
-                                                 int     w,
-                                                 int     h,
-                                                 int    *cx,
-                                                 int    *cy,
-                                                 int    *cw,
-                                                 int    *ch)
-{
-   RGBA_Image    *im;
-   Outbuf_Region *obr;
-   int            bpl = 0;
-   int            alpha = 0;
-
-   obr = calloc(1, sizeof(Outbuf_Region));
-   obr->x = x;
-   obr->y = y;
-   obr->width = w;
-   obr->height = h;
-   *cx = 0;
-   *cy = 0;
-   *cw = w;
-   *ch = h;
-
-   if ((buf->rot == 0) &&
-       (buf->priv.mask.r == 0xff0000) &&
-       (buf->priv.mask.g == 0x00ff00) &&
-       (buf->priv.mask.b == 0x0000ff))
-     {
-        obr->ddob = _find_ddob(buf->priv.dd.depth, w, h, NULL);
-/*      obr->ddob = evas_software_x11_x_output_buffer_new(buf->priv.dd.disp, */
-/*                                                         buf->priv.dd.vis, */
-/*                                                         buf->priv.dd.depth, */
-/*                                                         w, h, */
-/*                                                         use_shm, */
-/*                                                         NULL); */
-        im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
-                                                 w, h,
-                                                 (DATA32 *) evas_software_ddraw_output_buffer_data(obr->ddob, &bpl),
-                                                 alpha, EVAS_COLORSPACE_ARGB8888);
-        im->extended_info = obr;
-     }
-   else
-     {
-        im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.flags.alpha |= alpha ? 1 : 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-        im->extended_info = obr;
-        if ((buf->rot == 0) || (buf->rot == 180))
-          obr->ddob = _find_ddob(buf->priv.dd.depth, w, h, NULL);
-/*
-          obr->ddob = evas_software_x11_x_output_buffer_new(buf->priv.dd.disp,
-                                                           buf->priv.dd.vis,
-                                                           buf->priv.dd.depth,
-                                                           w, h,
-                                                           use_shm,
-                                                           NULL);
- */
-        else if ((buf->rot == 90) || (buf->rot == 270))
-          obr->ddob = _find_ddob(buf->priv.dd.depth, h, w, NULL);
-/*
-          obr->ddob = evas_software_x11_x_output_buffer_new(buf->priv.dd.disp,
-                                                           buf->priv.dd.vis,
-                                                           buf->priv.dd.depth,
-                                                           h, w,
-                                                           use_shm,
-                                                           NULL);
- */
-     }
-
-   buf->priv.pending_writes = eina_list_append(buf->priv.pending_writes, im);
-   return im;
-}
-
-void
-evas_software_ddraw_outbuf_push_updated_region(Outbuf     *buf,
-                                               RGBA_Image *update,
-                                               int        x,
-                                               int        y,
-                                               int        w,
-                                               int        h)
-{
-   Gfx_Func_Convert    conv_func;
-   Outbuf_Region      *obr;
-   DATA32             *src_data;
-   void               *data;
-   int                 bpl = 0;
-
-   conv_func = NULL;
-   obr = update->extended_info;
-
-   if ((buf->rot == 0) || (buf->rot == 180))
-     conv_func = evas_common_convert_func_get(0, w, h,
-                                              evas_software_ddraw_output_buffer_depth(obr->ddob),
-                                              buf->priv.mask.r,
-                                              buf->priv.mask.g,
-                                              buf->priv.mask.b,
-                                              PAL_MODE_NONE,
-                                              buf->rot);
-   else if ((buf->rot == 90) || (buf->rot == 270))
-     conv_func = evas_common_convert_func_get(0, h, w,
-                                              evas_software_ddraw_output_buffer_depth(obr->ddob),
-                                              buf->priv.mask.r,
-                                              buf->priv.mask.g,
-                                              buf->priv.mask.b,
-                                              PAL_MODE_NONE, buf->rot);
-   if (!conv_func) return;
-
-   data = evas_software_ddraw_output_buffer_data(obr->ddob, &bpl);
-   src_data = update->image.data;
-   if (buf->rot == 0)
-     {
-        obr->x = x;
-        obr->y = y;
-     }
-   else if (buf->rot == 90)
-     {
-        obr->x = y;
-        obr->y = buf->width - x - w;
-     }
-   else if (buf->rot == 180)
-     {
-        obr->x = buf->width - x - w;
-        obr->y = buf->height - y - h;
-     }
-   else if (buf->rot == 270)
-     {
-        obr->x = buf->height - y - h;
-        obr->y = x;
-     }
-   if ((buf->rot == 0) || (buf->rot == 180))
-     {
-        obr->width = w;
-        obr->height = h;
-     }
-   else if ((buf->rot == 90) || (buf->rot == 270))
-     {
-        obr->width = h;
-        obr->height = w;
-     }
-
-   if (data != src_data)
-     conv_func(src_data, data,
-               0,
-               bpl / ((evas_software_ddraw_output_buffer_depth(obr->ddob) / 8)) - obr->width,
-               obr->width,
-               obr->height,
-               x,
-               y,
-               NULL);
-}
-
-void
-evas_software_ddraw_outbuf_free_region_for_update(Outbuf     *buf,
-                                                  RGBA_Image *update)
-{
-   /* no need to do anything - they are cleaned up on flush */
-}
-
-void
-evas_software_ddraw_outbuf_flush(Outbuf *buf)
-{
-   Eina_List *l;
-   RGBA_Image       *im;
-   Outbuf_Region    *obr;
-   void      *ddraw_data;
-   int        ddraw_width;
-   int        ddraw_height;
-   int        ddraw_pitch;
-   int        ddraw_depth;
-
-   /* lock the back surface */
-   if (!(ddraw_data = evas_software_ddraw_lock(buf,
-                                               &ddraw_width,
-                                               &ddraw_height,
-                                               &ddraw_pitch,
-                                               &ddraw_depth)))
-     goto free_images;
-
-   /* copy safely the images that need to be drawn onto the back surface */
-   EINA_LIST_FOREACH(buf->priv.pending_writes, l, im)
-     {
-        DD_Output_Buffer *ddob;
-
-        obr = im->extended_info;
-        ddob = obr->ddob;
-        evas_software_ddraw_output_buffer_paste(ddob,
-                                                ddraw_data,
-                                                ddraw_width,
-                                                ddraw_height,
-                                                ddraw_pitch,
-                                                ddraw_depth,
-                                                obr->x,
-                                                obr->y);
-     }
-
-   /* unlock the back surface and flip the surface */
-   evas_software_ddraw_unlock_and_flip(buf);
-
- free_images:
-   while (buf->priv.prev_pending_writes)
-     {
-        im = buf->priv.prev_pending_writes->data;
-        buf->priv.prev_pending_writes =
-          eina_list_remove_list(buf->priv.prev_pending_writes,
-                                buf->priv.prev_pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop(&im->cache_entry);
-        if (obr->ddob) _unfind_ddob(obr->ddob);
-/*
-             if (obr->ddob) evas_software_x11_x_output_buffer_free(obr->ddob);
- */
-        free(obr);
-     }
-   buf->priv.prev_pending_writes = buf->priv.pending_writes;
-   buf->priv.pending_writes = NULL;
-
-   evas_common_cpu_end_opt();
-}
-
-void
-evas_software_ddraw_outbuf_idle_flush(Outbuf *buf)
-{
-   while (buf->priv.prev_pending_writes)
-     {
-        RGBA_Image *im;
-        Outbuf_Region *obr;
-
-        im = buf->priv.prev_pending_writes->data;
-        buf->priv.prev_pending_writes =
-          eina_list_remove_list(buf->priv.prev_pending_writes,
-                                buf->priv.prev_pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop((Image_Entry *)im);
-        if (obr->ddob) _unfind_ddob(obr->ddob);
-        free(obr);
-     }
-   _clear_ddob(0);
-}
-
-int
-evas_software_ddraw_outbuf_width_get(Outbuf *buf)
-{
-   return buf->width;
-}
-
-int
-evas_software_ddraw_outbuf_height_get(Outbuf *buf)
-{
-   return buf->height;
-}
-
-Outbuf_Depth
-evas_software_ddraw_outbuf_depth_get(Outbuf *buf)
-{
-   return buf->depth;
-}
-
-int
-evas_software_ddraw_outbuf_rot_get(Outbuf *buf)
-{
-   return buf->rot;
-}
diff --git a/libraries/evas/src/modules/engines/software_gdi/Evas_Engine_Software_Gdi.h b/libraries/evas/src/modules/engines/software_gdi/Evas_Engine_Software_Gdi.h
deleted file mode 100644
index deac5b2..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/Evas_Engine_Software_Gdi.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __EVAS_ENGINE_SOFTWARE_GDI_H__
-#define __EVAS_ENGINE_SOFTWARE_GDI_H__
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-
-typedef struct _Evas_Engine_Info_Software_Gdi Evas_Engine_Info_Software_Gdi;
-
-struct _Evas_Engine_Info_Software_Gdi
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-      HWND         window;
-      int          depth;
-      int          rotation;
-      unsigned int borderless : 1;
-      unsigned int fullscreen : 1;
-      unsigned int region     : 1;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-
-#endif /* __EVAS_ENGINE_SOFTWARE_GDI_H__ */
diff --git a/libraries/evas/src/modules/engines/software_gdi/Makefile.am b/libraries/evas/src/modules/engines/software_gdi/Makefile.am
deleted file mode 100644
index ccb8084..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_gdi_cflags@
-
-if BUILD_ENGINE_SOFTWARE_GDI
-
-SOFTWARE_GDI_SOURCES = \
-evas_engine.c \
-evas_outbuf.c \
-evas_gdi_buffer.c \
-evas_gdi_main.c
-
-SOFTWARE_GDI_LIBADD = @evas_engine_software_gdi_libs@
-
-
-includes_HEADERS = Evas_Engine_Software_Gdi.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_GDI
-
-pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_GDI_LIBADD)
-module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_gdi.la
-
-libevas_engine_software_gdi_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
-libevas_engine_software_gdi_la_LIBADD = $(SOFTWARE_GDI_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_gdi/Makefile.in b/libraries/evas/src/modules/engines/software_gdi/Makefile.in
deleted file mode 100644
index 507926d..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/Makefile.in
+++ /dev/null
@@ -1,842 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_gdi
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_TRUE@libevas_engine_software_gdi_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_gdi_la_SOURCES_DIST = evas_engine.c \
-        evas_outbuf.c evas_gdi_buffer.c evas_gdi_main.c
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        evas_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        evas_gdi_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        evas_gdi_main.lo
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_TRUE@am_libevas_engine_software_gdi_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_gdi_la_OBJECTS =  \
-        $(am_libevas_engine_software_gdi_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_TRUE@am_libevas_engine_software_gdi_la_rpath =
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@  $(am__DEPENDENCIES_1)
-am__module_la_SOURCES_DIST = evas_engine.c evas_outbuf.c \
-        evas_gdi_buffer.c evas_gdi_main.c
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        module_la-evas_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        module_la-evas_gdi_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@        module_la-evas_gdi_main.lo
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_gdi_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_gdi_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_Gdi.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@evas_engine_software_gdi_cflags@
-
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@SOFTWARE_GDI_SOURCES = \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@evas_outbuf.c \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@evas_gdi_buffer.c \
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@evas_gdi_main.c
-
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@SOFTWARE_GDI_LIBADD = @evas_engine_software_gdi_libs@
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@includes_HEADERS = Evas_Engine_Software_Gdi.h
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_GDI_LIBADD)
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_TRUE@noinst_LTLIBRARIES = libevas_engine_software_gdi.la
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_TRUE@libevas_engine_software_gdi_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
-@BUILD_ENGINE_SOFTWARE_GDI_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_GDI_TRUE@libevas_engine_software_gdi_la_LIBADD = $(SOFTWARE_GDI_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_gdi/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_gdi/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_gdi.la: $(libevas_engine_software_gdi_la_OBJECTS) $(libevas_engine_software_gdi_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_gdi_la_rpath) $(libevas_engine_software_gdi_la_OBJECTS) $(libevas_engine_software_gdi_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gdi_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gdi_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_gdi_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_gdi_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_outbuf.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_outbuf.lo: evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_outbuf.Tpo -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_outbuf.Tpo $(DEPDIR)/module_la-evas_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_outbuf.c' object='module_la-evas_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-
-module_la-evas_gdi_buffer.lo: evas_gdi_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_gdi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_gdi_buffer.Tpo -c -o module_la-evas_gdi_buffer.lo `test -f 'evas_gdi_buffer.c' || echo '$(srcdir)/'`evas_gdi_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_gdi_buffer.Tpo $(DEPDIR)/module_la-evas_gdi_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_gdi_buffer.c' object='module_la-evas_gdi_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_gdi_buffer.lo `test -f 'evas_gdi_buffer.c' || echo '$(srcdir)/'`evas_gdi_buffer.c
-
-module_la-evas_gdi_main.lo: evas_gdi_main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_gdi_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_gdi_main.Tpo -c -o module_la-evas_gdi_main.lo `test -f 'evas_gdi_main.c' || echo '$(srcdir)/'`evas_gdi_main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_gdi_main.Tpo $(DEPDIR)/module_la-evas_gdi_main.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_gdi_main.c' object='module_la-evas_gdi_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_gdi_main.lo `test -f 'evas_gdi_main.c' || echo '$(srcdir)/'`evas_gdi_main.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_gdi/evas_engine.c b/libraries/evas/src/modules/engines/software_gdi/evas_engine.c
deleted file mode 100644
index 414e880..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/evas_engine.c
+++ /dev/null
@@ -1,387 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Software_Gdi.h"
-
-int _evas_engine_soft_gdi_log_dom = -1;
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Tilebuf          *tb;
-   Outbuf           *ob;
-   Tilebuf_Rect     *rects;
-   Eina_Inlist      *cur_rect;
-   int               end : 1;
-};
-
-
-static void *
-_output_setup(int          width,
-              int          height,
-              int          rot,
-              HWND         window,
-              int          depth,
-              unsigned int borderless,
-              unsigned int fullscreen,
-              unsigned int region)
-{
-   Render_Engine *re;
-
-   re = calloc(1, sizeof(Render_Engine));
-   if (!re)
-     return NULL;
-
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   evas_software_gdi_outbuf_init();
-
-   if (width <= 0)
-     width = 1;
-   if (height <= 0)
-     height = 1;
-
-   re->ob = evas_software_gdi_outbuf_setup(width, height, rot,
-                                           OUTBUF_DEPTH_INHERIT,
-                                           window, depth, borderless, fullscreen, region,
-                                           0, 0);
-   if (!re->ob)
-     {
-        free(re);
-        return NULL;
-     }
-
-   /* for updates return 1 big buffer, but only use portions of it, also cache
-    it and keep it around until an idle_flush */
-   /* disable for now - i am hunting down why some expedite tests are slower,
-    * as well as shaped stuff is broken and probable non-32bpp is broken as
-    * convert funcs dont do the right thing
-    *
-   re->ob->onebuf = 1;
-    */
-
-   re->tb = evas_common_tilebuf_new(width, height);
-   if (!re->tb)
-     {
-        evas_software_gdi_outbuf_free(re->ob);
-        free(re);
-        return NULL;
-     }
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   return re;
-}
-
-
-/* engine api this module provides */
-
-static void *
-eng_info(Evas *e __UNUSED__)
-{
-   Evas_Engine_Info_Software_Gdi *info;
-   info = calloc(1, sizeof(Evas_Engine_Info_Software_Gdi));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_Software_Gdi *in;
-   in = (Evas_Engine_Info_Software_Gdi *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine                 *re;
-   Evas_Engine_Info_Software_Gdi *info;
-
-   info = (Evas_Engine_Info_Software_Gdi *)in;
-   if (!e->engine.data.output)
-     e->engine.data.output = _output_setup(e->output.w,
-                                           e->output.h,
-                                           info->info.rotation,
-                                           info->info.window,
-                                           info->info.depth,
-                                           info->info.borderless,
-                                           info->info.fullscreen,
-                                           info->info.region);
-   else
-     {
-        int ponebuf = 0;
-
-        re = e->engine.data.output;
-        ponebuf = re->ob->onebuf;
-        evas_software_gdi_outbuf_free(re->ob);
-        re->ob = evas_software_gdi_outbuf_setup(e->output.w,
-                                                e->output.h,
-                                                info->info.rotation,
-                                                OUTBUF_DEPTH_INHERIT,
-                                                info->info.window,
-                                                info->info.depth,
-                                                info->info.borderless,
-                                                info->info.fullscreen,
-                                                info->info.region,
-                                                0, 0);
-        re->ob->onebuf = ponebuf;
-     }
-   if (!e->engine.data.output) return 0;
-   if (!e->engine.data.context)
-     e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   re = e->engine.data.output;
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   if (!data) return;
-
-   re = (Render_Engine *)data;
-   evas_software_gdi_outbuf_free(re->ob);
-   evas_common_tilebuf_free(re->tb);
-   if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int width, int height)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_software_gdi_outbuf_reconfigure(re->ob,
-                                        width,
-                                        height,
-                                        evas_software_gdi_outbuf_rot_get(re->ob),
-                                        OUTBUF_DEPTH_INHERIT);
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(width, height);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data,
-                                   int  *x,
-                                   int  *y,
-                                   int  *w,
-                                   int  *h,
-                                   int  *cx,
-                                   int  *cy,
-                                   int  *cw,
-                                   int  *ch)
-{
-   Render_Engine *re;
-   RGBA_Image    *surface;
-   Tilebuf_Rect  *rect;
-   int            ux;
-   int            uy;
-   int            uw;
-   int            uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect) return NULL;
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x;
-   uy = rect->y;
-   uw = rect->w;
-   uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   surface = evas_software_gdi_outbuf_new_region_for_update(re->ob,
-                                                            ux,
-                                                            uy,
-                                                            uw,
-                                                            uh,
-                                                            cx,
-                                                            cy,
-                                                            cw,
-                                                            ch);
-
-   *x = ux;
-   *y = uy;
-   *w = uw;
-   *h = uh;
-
-   return surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-#ifdef BUILD_PIPE_RENDER
-   evas_common_pipe_map_begin(surface);
-#endif
-   evas_software_gdi_outbuf_push_updated_region(re->ob, surface, x, y, w, h);
-   evas_software_gdi_outbuf_free_region_for_update(re->ob, surface);
-   evas_common_cpu_end_opt();
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_software_gdi_outbuf_flush(re->ob);
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_software_gdi_outbuf_idle_flush(re->ob);
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context)
-{
-   return EINA_FALSE;
-}
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-
-   _evas_engine_soft_gdi_log_dom = eina_log_domain_register
-     ("evas-software_gdi", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft_gdi_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em)
-{
-  eina_log_domain_unregister(_evas_engine_soft_gdi_log_dom);
-  _evas_engine_soft_gdi_log_dom = -1;
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_gdi",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_gdi);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_GDI
-EVAS_EINA_MODULE_DEFINE(engine, software_gdi);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_gdi/evas_engine.h b/libraries/evas/src/modules/engines/software_gdi/evas_engine.h
deleted file mode 100644
index b8ddc85..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/evas_engine.h
+++ /dev/null
@@ -1,209 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-extern int _evas_engine_soft_gdi_log_dom;
-
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
-
-typedef enum _Outbuf_Depth Outbuf_Depth;
-
-enum _Outbuf_Depth
-{
-   OUTBUF_DEPTH_NONE,
-   OUTBUF_DEPTH_INHERIT,
-   OUTBUF_DEPTH_RGB_16BPP_565_565_DITHERED,
-   OUTBUF_DEPTH_RGB_32BPP_888_8888,
-   OUTBUF_DEPTH_LAST
-};
-
-typedef struct BITMAPINFO_GDI     BITMAPINFO_GDI;
-typedef struct _Outbuf            Outbuf;
-typedef struct _Outbuf_Region     Outbuf_Region;
-typedef struct _Gdi_Output_Buffer Gdi_Output_Buffer;
-
-struct BITMAPINFO_GDI
-{
-   BITMAPINFOHEADER bih;
-   DWORD            masks[3];
-};
-
-struct _Outbuf
-{
-   Outbuf_Depth          depth;
-   int                   width;
-   int                   height;
-   int                   rot;
-   int                   onebuf;
-
-   struct {
-      Convert_Pal       *pal;
-      struct {
-         BITMAPINFO_GDI *bitmap_info;
-         HWND            window;
-         HDC             dc;
-         HRGN            regions;
-         int             depth;
-         unsigned char   borderless : 1;
-         unsigned char   fullscreen : 1;
-         unsigned char   region     : 1;
-      } gdi;
-
-      /* 1 big buffer for updates - flush on idle_flush */
-      RGBA_Image        *onebuf;
-      Eina_List         *onebuf_regions;
-
-      /* a list of pending regions to write to the target */
-      Eina_List         *pending_writes;
-      /* a list of previous frame pending regions to write to the target */
-      Eina_List         *prev_pending_writes;
-
-      unsigned char      mask_dither       : 1;
-      unsigned char      destination_alpha : 1;
-      unsigned char      debug             : 1;
-      unsigned char      synced            : 1;
-
-      unsigned char      region_built      : 1;
-   } priv;
-};
-
-struct _Outbuf_Region
-{
-   Gdi_Output_Buffer *gdiob;
-   int                x;
-   int                y;
-   int                width;
-   int                height;
-};
-
-struct _Gdi_Output_Buffer
-{
-   BITMAPINFO_GDI *bitmap_info;
-   HBITMAP         bitmap;
-   HDC             dc;
-   int             width;
-   int             height;
-   void           *data;
-   int             depth;
-   int             pitch;
-   int             psize;
-};
-
-/* evas_gdi_main.c */
-
-int evas_software_gdi_init (HWND         window,
-                            int          depth,
-                            unsigned int borderless,
-                            unsigned int fullscreen,
-                            unsigned int region,
-                            Outbuf      *buf);
-
-void evas_software_gdi_shutdown(Outbuf *buf);
-
-void evas_software_gdi_bitmap_resize(Outbuf *buf);
-
-/* evas_gdi_buffer.c */
-
-Gdi_Output_Buffer *evas_software_gdi_output_buffer_new(HDC             dc,
-                                                       BITMAPINFO_GDI *bitmap_info,
-                                                       int             depth,
-                                                       int             width,
-                                                       int             height,
-                                                       void           *data);
-
-void evas_software_gdi_output_buffer_free(Gdi_Output_Buffer *gdiob);
-
-void evas_software_gdi_output_buffer_paste(Gdi_Output_Buffer *gdiob,
-                                           int                x,
-                                           int                y);
-
-DATA8 *evas_software_gdi_output_buffer_data(Gdi_Output_Buffer *gdiob,
-                                            int               *pitch);
-
-int evas_software_gdi_output_buffer_depth(Gdi_Output_Buffer *gdiob);
-
-/* evas_outbuf.c */
-
-void evas_software_gdi_outbuf_init(void);
-
-void evas_software_gdi_outbuf_free(Outbuf *buf);
-
-Outbuf *evas_software_gdi_outbuf_setup(int          width,
-                                       int          height,
-                                       int          rotation,
-                                       Outbuf_Depth depth,
-                                       HWND         window,
-                                       int          w_depth,
-                                       unsigned int borderless,
-                                       unsigned int fullscreen,
-                                       unsigned int region,
-                                       int          mask_dither,
-                                       int          destination_alpha);
-
-void evas_software_gdi_outbuf_reconfigure(Outbuf      *buf,
-                                          int          width,
-                                          int          height,
-                                          int          rotation,
-                                          Outbuf_Depth depth);
-
-RGBA_Image *evas_software_gdi_outbuf_new_region_for_update(Outbuf *buf,
-                                                           int     x,
-                                                           int     y,
-                                                           int     w,
-                                                           int     h,
-                                                           int    *cx,
-                                                           int    *cy,
-                                                           int    *cw,
-                                                           int    *ch);
-
-void evas_software_gdi_outbuf_push_updated_region(Outbuf     *buf,
-                                                  RGBA_Image *update,
-                                                  int         x,
-                                                  int         y,
-                                                  int         w,
-                                                  int         h);
-
-void evas_software_gdi_outbuf_free_region_for_update(Outbuf     *buf,
-                                                     RGBA_Image *update);
-
-void evas_software_gdi_outbuf_flush(Outbuf *buf);
-
-void evas_software_gdi_outbuf_idle_flush(Outbuf *buf);
-
-int evas_software_gdi_outbuf_width_get(Outbuf *buf);
-
-int evas_software_gdi_outbuf_height_get(Outbuf *buf);
-
-Outbuf_Depth evas_software_gdi_outbuf_depth_get(Outbuf *buf);
-
-int evas_software_gdi_outbuf_rot_get(Outbuf *buf);
-
-
-#endif /* EVAS_ENGINE_H */
diff --git a/libraries/evas/src/modules/engines/software_gdi/evas_gdi_buffer.c b/libraries/evas/src/modules/engines/software_gdi/evas_gdi_buffer.c
deleted file mode 100644
index 66a5abf..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/evas_gdi_buffer.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <string.h>
-
-#include "evas_common.h"
-#include "evas_engine.h"
-
-Gdi_Output_Buffer *
-evas_software_gdi_output_buffer_new(HDC             dc,
-                                    BITMAPINFO_GDI *bitmap_info,
-                                    int             depth,
-                                    int             width,
-                                    int             height,
-                                    void           *data)
-{
-   Gdi_Output_Buffer *gdiob;
-
-   gdiob = calloc(1, sizeof(Gdi_Output_Buffer));
-   if (!gdiob) return NULL;
-
-   if (!data)
-     {
-        bitmap_info->bih.biWidth = width;
-        bitmap_info->bih.biHeight = -height;
-        bitmap_info->bih.biSizeImage = (depth >> 3) * width * height;
-        gdiob->bitmap = CreateDIBSection(dc,
-                                         (const BITMAPINFO *)bitmap_info,
-                                         DIB_RGB_COLORS,
-                                         (void **)(&data),
-                                         NULL,
-                                         0);
-        if (!gdiob->bitmap)
-          {
-             free(gdiob);
-             return NULL;
-          }
-     }
-
-   gdiob->bitmap_info = bitmap_info;
-   gdiob->dc = dc;
-   gdiob->data = data;
-   gdiob->width = width;
-   gdiob->height = height;
-   gdiob->depth = depth;
-   gdiob->pitch = width * (depth >> 3);
-/*    gdiob->psize = gdiob->pitch * height; */
-
-   return gdiob;
-}
-
-void
-evas_software_gdi_output_buffer_free(Gdi_Output_Buffer *gdiob)
-{
-   DeleteObject(gdiob->bitmap);
-   free(gdiob);
-}
-
-void
-evas_software_gdi_output_buffer_paste(Gdi_Output_Buffer *gdiob,
-                                      int                x,
-                                      int                y)
-{
-   HDC     dc;
-
-   dc = CreateCompatibleDC(gdiob->dc);
-   if (!dc)
-     return;
-   SelectObject(dc, gdiob->bitmap);
-   BitBlt(gdiob->dc,
-          x, y,
-          gdiob->width, gdiob->height,
-          dc,
-          0, 0,
-          SRCCOPY);
-   DeleteDC(dc);
-}
-
-DATA8 *
-evas_software_gdi_output_buffer_data(Gdi_Output_Buffer *gdiob,
-                                     int               *pitch)
-{
-   if (pitch) *pitch = gdiob->pitch;
-   return gdiob->data;
-}
-
-int
-evas_software_gdi_output_buffer_depth(Gdi_Output_Buffer *gdiob)
-{
-   return gdiob->depth;
-}
diff --git a/libraries/evas/src/modules/engines/software_gdi/evas_gdi_main.c b/libraries/evas/src/modules/engines/software_gdi/evas_gdi_main.c
deleted file mode 100644
index 4a63959..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/evas_gdi_main.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-int
-evas_software_gdi_init (HWND         window,
-                        int          depth,
-                        unsigned int borderless,
-                        unsigned int fullscreen __UNUSED__,
-                        unsigned int region,
-                        Outbuf *buf)
-{
-   if (!window)
-     {
-        ERR("[Engine] [GDI] Window is NULL");
-        return 0;
-     }
-
-   buf->priv.gdi.window = window;
-   buf->priv.gdi.dc = GetDC(window);
-   buf->priv.gdi.borderless = borderless;
-   buf->priv.gdi.region = region;
-   if (!buf->priv.gdi.dc)
-     {
-        ERR("[Engine] [GDI] Can not get DC");
-        return 0;
-     }
-
-   /* FIXME: check depth */
-   if (depth != GetDeviceCaps(buf->priv.gdi.dc, BITSPIXEL))
-     {
-        ERR("[Engine] [GDI] no compatible depth");
-        ReleaseDC(window, buf->priv.gdi.dc);
-        return 0;
-     }
-   buf->priv.gdi.depth = depth;
-
-   /* FIXME: support fullscreen */
-
-   buf->priv.gdi.bitmap_info = (BITMAPINFO_GDI *)malloc(sizeof(BITMAPINFO_GDI));
-   if (!buf->priv.gdi.bitmap_info)
-     {
-        ERR("[Engine] [GDI] Can not allocate bitmap info");
-        ReleaseDC(window, buf->priv.gdi.dc);
-        return 0;
-     }
-
-   buf->priv.gdi.bitmap_info->bih.biSize = sizeof(BITMAPINFOHEADER);
-   buf->priv.gdi.bitmap_info->bih.biWidth = buf->width;
-   buf->priv.gdi.bitmap_info->bih.biHeight = -buf->height;
-   buf->priv.gdi.bitmap_info->bih.biPlanes = 1;
-   buf->priv.gdi.bitmap_info->bih.biSizeImage = (buf->priv.gdi.depth >> 3) * buf->width * buf->height;
-   buf->priv.gdi.bitmap_info->bih.biXPelsPerMeter = 0;
-   buf->priv.gdi.bitmap_info->bih.biYPelsPerMeter = 0;
-   buf->priv.gdi.bitmap_info->bih.biClrUsed = 0;
-   buf->priv.gdi.bitmap_info->bih.biClrImportant = 0;
-   buf->priv.gdi.bitmap_info->bih.biBitCount = buf->priv.gdi.depth;
-   buf->priv.gdi.bitmap_info->bih.biCompression = BI_BITFIELDS;
-
-   switch (depth)
-     {
-      case 16:
-         buf->priv.gdi.bitmap_info->masks[0] = 0x0000f800;
-         buf->priv.gdi.bitmap_info->masks[1] = 0x000007e0;
-         buf->priv.gdi.bitmap_info->masks[2] = 0x0000001f;
-         break;
-      case 32:
-         buf->priv.gdi.bitmap_info->masks[0] = 0x00ff0000;
-         buf->priv.gdi.bitmap_info->masks[1] = 0x0000ff00;
-         buf->priv.gdi.bitmap_info->masks[2] = 0x000000ff;
-         break;
-      default:
-        ERR("[Engine] [GDI] wrong depth");
-        free(buf->priv.gdi.bitmap_info);
-        ReleaseDC(window, buf->priv.gdi.dc);
-        return 0;
-     }
-
-   return 1;
-}
-
-void
-evas_software_gdi_shutdown(Outbuf *buf)
-{
-   if (!buf)
-     return;
-
-   free(buf->priv.gdi.bitmap_info);
-   ReleaseDC(buf->priv.gdi.window, buf->priv.gdi.dc);
-   if (buf->priv.gdi.regions)
-     DeleteObject(buf->priv.gdi.regions);
-}
-
-void
-evas_software_gdi_bitmap_resize(Outbuf *buf)
-{
-   buf->priv.gdi.bitmap_info->bih.biWidth = buf->width;
-   buf->priv.gdi.bitmap_info->bih.biHeight = -buf->height;
-   buf->priv.gdi.bitmap_info->bih.biSizeImage = (buf->priv.gdi.depth >> 3) * buf->width * buf->height;
-}
diff --git a/libraries/evas/src/modules/engines/software_gdi/evas_outbuf.c b/libraries/evas/src/modules/engines/software_gdi/evas_outbuf.c
deleted file mode 100644
index 6841baa..0000000
--- a/libraries/evas/src/modules/engines/software_gdi/evas_outbuf.c
+++ /dev/null
@@ -1,656 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-
-static Eina_List *gdipool = NULL;
-static int gdisize = 0;
-static int gdimemlimit = 10 * 1024 * 1024;
-static int gdicountlimit = 32;
-
-static Gdi_Output_Buffer *
-_find_gdiob(HDC dc, BITMAPINFO_GDI *bitmap_info, int depth, int w, int h, void *data)
-{
-   Eina_List         *l = NULL;
-   Eina_List         *gdil = NULL;
-   Gdi_Output_Buffer *gdiob = NULL;
-   Gdi_Output_Buffer *gdiob2;
-   int                sz;
-   int                lbytes;
-   int                bpp;
-   int                fitness = 0x7fffffff;
-
-   bpp = depth >> 3;
-   if (bpp == 3) bpp = 4;
-   lbytes = (((w * bpp) + 3) / 4) * 4;
-   sz = lbytes * h;
-   EINA_LIST_FOREACH(gdipool, l, gdiob2)
-     {
-        int szdif;
-
-        if ((gdiob2->dc != dc) ||
-            (gdiob2->bitmap_info != bitmap_info) ||
-            (gdiob2->depth != depth))
-          continue;
-        szdif = gdiob2->psize - sz;
-        if (szdif < 0) continue;
-        if (szdif == 0)
-          {
-             gdiob = gdiob2;
-             gdil = l;
-             goto have_gdiob;
-          }
-        if (szdif < fitness)
-          {
-             fitness = szdif;
-             gdiob = gdiob2;
-             gdil = l;
-          }
-     }
-   if ((fitness > (100 * 100)) || (!gdiob))
-     return evas_software_gdi_output_buffer_new(dc, bitmap_info, depth, w, h, data);
-
-   have_gdiob:
-   gdipool = eina_list_remove_list(gdipool, gdil);
-   gdiob->width = w;
-   gdiob->height = h;
-   gdiob->pitch = lbytes;
-   gdisize -= gdiob->psize * (gdiob->depth >> 3);
-
-   return gdiob;
-}
-
-static void
-_unfind_gdiob(Gdi_Output_Buffer *gdiob)
-{
-   gdipool = eina_list_prepend(gdipool, gdiob);
-   gdisize += gdiob->psize * (gdiob->depth >> 3);
-   while ((gdisize > (gdimemlimit)) ||
-          (eina_list_count(gdipool) > gdicountlimit))
-     {
-        Eina_List *xl;
-
-        xl = eina_list_last(gdipool);
-        if (!xl)
-          {
-             gdisize = 0;
-             break;
-          }
-        gdiob = xl->data;
-        gdipool = eina_list_remove_list(gdipool, xl);
-        evas_software_gdi_output_buffer_free(gdiob);
-     }
-}
-
-static void
-_clear_gdiob()
-{
-   while (gdipool)
-     {
-        Gdi_Output_Buffer *gdiob;
-
-        gdiob = gdipool->data;
-        gdipool = eina_list_remove_list(gdipool, gdipool);
-        evas_software_gdi_output_buffer_free(gdiob);
-     }
-   gdisize = 0;
-}
-
-void
-evas_software_gdi_outbuf_init(void)
-{
-}
-
-void
-evas_software_gdi_outbuf_free(Outbuf *buf)
-{
-   if (!buf)
-     return;
-
-   while (buf->priv.pending_writes)
-     {
-        RGBA_Image *im;
-        Outbuf_Region *obr;
-
-        im = buf->priv.pending_writes->data;
-        buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop(&im->cache_entry);
-        if (obr->gdiob) _unfind_gdiob(obr->gdiob);
-/*      if (obr->mxob) _unfind_xob(obr->mxob, 0); */
-        free(obr);
-     }
-   evas_software_gdi_outbuf_idle_flush(buf);
-   evas_software_gdi_outbuf_flush(buf);
-
-   evas_software_gdi_shutdown(buf);
-   free(buf);
-}
-
-Outbuf *
-evas_software_gdi_outbuf_setup(int          width,
-                               int          height,
-                               int          rotation,
-                               Outbuf_Depth depth,
-                               HWND         window,
-                               int          w_depth,
-                               unsigned int borderless,
-                               unsigned int fullscreen,
-                               unsigned int region,
-                               int          mask_dither,
-                               int          destination_alpha)
-{
-   Outbuf *buf;
-
-   buf = (Outbuf *)calloc(1, sizeof(Outbuf));
-   if (!buf)
-      return NULL;
-
-   buf->width = width;
-   buf->height = height;
-   buf->depth = depth;
-   buf->rot = rotation;
-
-   buf->priv.mask_dither = mask_dither;
-   buf->priv.destination_alpha = destination_alpha;
-
-   if (!evas_software_gdi_init(window, w_depth, borderless, fullscreen, region, buf))
-     {
-        free(buf);
-        return NULL;
-     }
-
-   {
-      Gfx_Func_Convert  conv_func;
-      Gdi_Output_Buffer *gdiob;
-
-      gdiob = evas_software_gdi_output_buffer_new(buf->priv.gdi.dc, buf->priv.gdi.bitmap_info, w_depth, 1, 1, NULL);
-
-      conv_func = NULL;
-      if (gdiob)
-        {
-           if ((rotation == 0) || (rotation == 180))
-             conv_func = evas_common_convert_func_get(0,
-                                                      width,
-                                                      height,
-                                                      evas_software_gdi_output_buffer_depth (gdiob),
-                                                      buf->priv.gdi.bitmap_info->masks[0],
-                                                      buf->priv.gdi.bitmap_info->masks[1],
-                                                      buf->priv.gdi.bitmap_info->masks[2],
-                                                      PAL_MODE_NONE,
-                                                      rotation);
-           else if ((rotation == 90) || (rotation == 270))
-             conv_func = evas_common_convert_func_get(0,
-                                                      height,
-                                                      width,
-                                                      evas_software_gdi_output_buffer_depth (gdiob),
-                                                      buf->priv.gdi.bitmap_info->masks[0],
-                                                      buf->priv.gdi.bitmap_info->masks[1],
-                                                      buf->priv.gdi.bitmap_info->masks[2],
-                                                      PAL_MODE_NONE,
-                                                      rotation);
-
-           evas_software_gdi_output_buffer_free(gdiob);
-
-           if (!conv_func)
-             {
-                ERR(".[ soft_gdi engine Error ]."
-                      " {"
-                      "  At depth         %i:"
-                      "  RGB format mask: %08lx, %08lx, %08lx"
-                      "  Not supported by and compiled in converters!"
-                      " }",
-                        buf->priv.gdi.depth,
-                        buf->priv.gdi.bitmap_info->masks[0],
-                        buf->priv.gdi.bitmap_info->masks[1],
-                        buf->priv.gdi.bitmap_info->masks[2]);
-             }
-        }
-   }
-
-   return buf;
-}
-
-void
-evas_software_gdi_outbuf_reconfigure(Outbuf      *buf,
-                                     int          width,
-                                     int          height,
-                                     int          rotation,
-                                     Outbuf_Depth depth)
-{
-   if ((width == buf->width) && (height == buf->height) &&
-       (rotation == buf->rot) && (depth == buf->depth))
-     return;
-   buf->width = width;
-   buf->height = height;
-   buf->rot = rotation;
-   evas_software_gdi_bitmap_resize(buf);
-   buf->priv.region_built = 0;
-}
-
-RGBA_Image *
-evas_software_gdi_outbuf_new_region_for_update(Outbuf *buf,
-                                               int     x,
-                                               int     y,
-                                               int     w,
-                                               int     h,
-                                               int    *cx,
-                                               int    *cy,
-                                               int    *cw,
-                                               int    *ch)
-{
-   RGBA_Image    *im;
-   Outbuf_Region *obr;
-   int            bpl = 0;
-   int            alpha = 0;
-
-   obr = calloc(1, sizeof(Outbuf_Region));
-   obr->x = x;
-   obr->y = y;
-   obr->width = w;
-   obr->height = h;
-   *cx = 0;
-   *cy = 0;
-   *cw = w;
-   *ch = h;
-
-   alpha = ((buf->priv.gdi.region) || (buf->priv.destination_alpha));
-
-   if ((buf->rot == 0) &&
-       (buf->priv.gdi.bitmap_info->masks[0] == 0xff0000) &&
-       (buf->priv.gdi.bitmap_info->masks[1] == 0x00ff00) &&
-       (buf->priv.gdi.bitmap_info->masks[2] == 0x0000ff))
-     {
-        obr->gdiob = _find_gdiob(buf->priv.gdi.dc,
-                                 buf->priv.gdi.bitmap_info,
-                                 buf->priv.gdi.depth,
-                                 w, h, NULL);
-/*      obr->gdiob = evas_software_gdi_output_buffer_new(buf->priv.gdi.dc, */
-/*                                                         buf->priv.gdi.bitmap_info, */
-/*                                                         buf->priv.gdi.depth, */
-/*                                                         w, h, */
-/*                                                         NULL); */
-        im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
-                                                 w, h,
-                                                 (DATA32 *)evas_software_gdi_output_buffer_data(obr->gdiob, &bpl),
-                                                 alpha, EVAS_COLORSPACE_ARGB8888);
-        im->extended_info = obr;
-/*      if (buf->priv.gdi.mask) */
-/*        obr->mgdiob = _find_gdiob(buf->priv.gdi.dc, */
-/*                                     buf->priv.gdi.bitmap_info, */
-/*                                     1, */
-/*                                     w, h, NULL); */
-     }
-   else
-     {
-        im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.flags.alpha |= alpha ? 1 : 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-        im->extended_info = obr;
-        if ((buf->rot == 0) || (buf->rot == 180))
-          obr->gdiob = _find_gdiob(buf->priv.gdi.dc,
-                                   buf->priv.gdi.bitmap_info,
-                                   buf->priv.gdi.depth,
-                                   w, h, NULL);
-/*
-          obr->gdiob = evas_software_x11_x_output_buffer_new(buf->priv.dd.disp,
-                                                           buf->priv.dd.vis,
-                                                           buf->priv.dd.depth,
-                                                           w, h,
-                                                           use_shm,
-                                                           NULL);
- */
-        else if ((buf->rot == 90) || (buf->rot == 270))
-          obr->gdiob = _find_gdiob(buf->priv.gdi.dc,
-                                   buf->priv.gdi.bitmap_info,
-                                   buf->priv.gdi.depth,
-                                   h, w, NULL);
-/*
-          obr->gdiob = evas_software_x11_x_output_buffer_new(buf->priv.dd.disp,
-                                                           buf->priv.dd.vis,
-                                                           buf->priv.dd.depth,
-                                                           h, w,
-                                                           use_shm,
-                                                           NULL);
- */
-/*      if (buf->priv.gdi.mask) */
-/*        obr->mgdiob = _find_gdiob(buf->priv.gdi.dc, */
-/*                                     buf->priv.gdi.bitmap_info, */
-/*                                     1, */
-/*                                     w, h, NULL); */
-     }
-   if ((buf->priv.gdi.region) || (buf->priv.destination_alpha))
-     /* FIXME: faster memset! */
-     memset(im->image.data, 0, w * h * sizeof(DATA32));
-
-   buf->priv.pending_writes = eina_list_append(buf->priv.pending_writes, im);
-   return im;
-}
-
-void
-evas_software_gdi_outbuf_push_updated_region(Outbuf     *buf,
-                                             RGBA_Image *update,
-                                             int         x,
-                                             int         y,
-                                             int         w,
-                                             int         h)
-{
-   HRGN             regions = NULL;
-   Gfx_Func_Convert conv_func;
-   Outbuf_Region   *obr;
-   DATA32          *src_data;
-   void            *data;
-   int              bpl = 0;
-
-   conv_func = NULL;
-   obr = update->extended_info;
-
-   if ((buf->rot == 0) || (buf->rot == 180))
-     conv_func = evas_common_convert_func_get(0, w, h,
-                                              evas_software_gdi_output_buffer_depth(obr->gdiob),
-                                              buf->priv.gdi.bitmap_info->masks[0],
-                                              buf->priv.gdi.bitmap_info->masks[1],
-                                              buf->priv.gdi.bitmap_info->masks[2],
-                                              PAL_MODE_NONE,
-                                              buf->rot);
-   else if ((buf->rot == 90) || (buf->rot == 270))
-     conv_func = evas_common_convert_func_get(0, h, w,
-                                              evas_software_gdi_output_buffer_depth(obr->gdiob),
-                                              buf->priv.gdi.bitmap_info->masks[0],
-                                              buf->priv.gdi.bitmap_info->masks[1],
-                                              buf->priv.gdi.bitmap_info->masks[2],
-                                              PAL_MODE_NONE,
-                                              buf->rot);
-   if (!conv_func) return;
-
-   data = evas_software_gdi_output_buffer_data(obr->gdiob, &bpl);
-   src_data = update->image.data;
-   if (buf->rot == 0)
-     {
-        obr->x = x;
-        obr->y = y;
-     }
-   else if (buf->rot == 90)
-     {
-        obr->x = y;
-        obr->y = buf->width - x - w;
-     }
-   else if (buf->rot == 180)
-     {
-        obr->x = buf->width - x - w;
-        obr->y = buf->height - y - h;
-     }
-   else if (buf->rot == 270)
-     {
-        obr->x = buf->height - y - h;
-        obr->y = x;
-     }
-   if ((buf->rot == 0) || (buf->rot == 180))
-     {
-        obr->width = w;
-        obr->height = h;
-     }
-   else if ((buf->rot == 90) || (buf->rot == 270))
-     {
-        obr->width = h;
-        obr->height = w;
-     }
-
-   if (data != src_data)
-     conv_func(src_data, data,
-               0,
-               bpl / (evas_software_gdi_output_buffer_depth(obr->gdiob) >> 3) - obr->width,
-               obr->width,
-               obr->height,
-               x,
-               y,
-               NULL);
-
-   /* Region code */
-   if (!buf->priv.gdi.region)
-     {
-        if (buf->priv.gdi.regions)
-          DeleteObject(buf->priv.gdi.regions);
-        buf->priv.gdi.regions = NULL;
-        SetWindowRgn(buf->priv.gdi.window, NULL, 1);
-        return;
-     }
-
-   if (!buf->priv.region_built)
-     {
-        RECT  rect;
-        POINT pt = { 0, 0 };
-        HRGN region;
-        int *tmp;
-        int i;
-        int j;
-        int ww;
-        int wh;
-        int dx;
-        int dy;
-        int xmin;
-        int xmax;
-
-        if (!GetClientRect(buf->priv.gdi.window, &rect))
-          return;
-
-        ww = rect.right - rect.left;
-        wh = rect.bottom - rect.top;
-
-        if (!GetWindowRect(buf->priv.gdi.window, &rect))
-          return;
-        if (!ClientToScreen(buf->priv.gdi.window, &pt))
-          return;
-        dx = x + pt.x - rect.left;
-        dy = y + pt.y - rect.top;
-
-        tmp = src_data;
-
-        for (j = 0; j < h; j++)
-          {
-             i = 0;
-             while (i < w)
-               {
-                  if ((*tmp & 0xff000000) == 0xff000000)
-                    {
-                       xmin = dx + i;
-                       if ((i + 1) == w)
-                         {
-                            xmax = dx + i;
-                            region = CreateRectRgn(xmin, dy + j, xmax + 1, dy + j + 1);
-                            if (regions == NULL)
-                              regions = region;
-                            else
-                              {
-                                 CombineRgn(regions, regions, region, RGN_OR);
-                                 DeleteObject(region);
-                              }
-                         }
-                       else
-                         {
-                            i++;
-                            tmp++;
-
-                            while (i < w)
-                              {
-                                 if ((*tmp & 0xff000000) == 0xff000000)
-                                   {
-                                      if ((i + 1) == w)
-                                        {
-                                           xmax = dx + i;
-                                           region = CreateRectRgn(xmin, dy + j, xmax + 1, dy + j + 1);
-                                           if (regions == NULL)
-                                             regions = region;
-                                           else
-                                             {
-                                                CombineRgn(regions, regions, region, RGN_OR);
-                                                DeleteObject(region);
-                                             }
-                                           break;
-                                        }
-                                   }
-                                 else
-                                   {
-                                      xmax = dx + i - 1;
-                                      region = CreateRectRgn(xmin, dy + j, xmax + 1, dy + j + 1);
-                                      if (regions == NULL)
-                                        regions = region;
-                                      else
-                                        {
-                                           CombineRgn(regions, regions, region, RGN_OR);
-                                           DeleteObject(region);
-                                        }
-                                      break;
-                                   }
-                                 i++;
-                                 tmp++;
-                              }
-                         }
-                    }
-                  i++;
-                  tmp++;
-               }
-          }
-
-        if (!buf->priv.gdi.borderless)
-          {
-            RECT rnc;
-            RECT rc;
-            POINT pt = { 0, 0 };
-            LONG ncw;
-            LONG nch;
-            LONG cw;
-            LONG ch;
-
-            if (!GetWindowRect(buf->priv.gdi.window, &rnc))
-              return;
-            if (!GetClientRect(buf->priv.gdi.window, &rc))
-              return;
-            if (!ClientToScreen(buf->priv.gdi.window, &pt))
-              return;
-
-            ncw = rnc.right - rnc.left;
-            nch = rnc.bottom - rnc.top;
-            cw = rc.right - rc.left;
-            ch = rc.bottom - rc.top;
-
-            region = CreateRectRgn(0, 0, ncw, pt.y - rnc.top);
-            if (!regions)
-              regions = region;
-            else
-              {
-                 CombineRgn(regions, regions, region, RGN_OR);
-                 DeleteObject(region);
-              }
-            region = CreateRectRgn(0, pt.y - rnc.top, pt.x - rnc.left, nch);
-            CombineRgn(regions, regions, region, RGN_OR);
-            DeleteObject(region);
-            region = CreateRectRgn(pt.x - rnc.left, pt.y - rnc.top + ch, pt.x - rnc.left + cw, nch);
-            CombineRgn(regions, regions, region, RGN_OR);
-            DeleteObject(region);
-            region = CreateRectRgn(pt.x - rnc.left + cw, pt.y - rnc.top, ncw, nch);
-            CombineRgn(regions, regions, region, RGN_OR);
-            DeleteObject(region);
-          }
-
-        if (regions)
-          SetWindowRgn(buf->priv.gdi.window, regions, 1);
-        buf->priv.gdi.regions = regions;
-
-        buf->priv.region_built = 1;
-     }
-}
-
-void
-evas_software_gdi_outbuf_free_region_for_update(Outbuf     *buf __UNUSED__,
-                                                RGBA_Image *update __UNUSED__)
-{
-   /* no need to do anything - they are cleaned up on flush */
-}
-
-void
-evas_software_gdi_outbuf_flush(Outbuf *buf)
-{
-   Eina_List     *l;
-   RGBA_Image    *im;
-   Outbuf_Region *obr;
-
-   /* copy safely the images that need to be drawn onto the back surface */
-   EINA_LIST_FOREACH(buf->priv.pending_writes, l, im)
-     {
-        Gdi_Output_Buffer *gdiob;
-
-        obr = im->extended_info;
-        gdiob = obr->gdiob;
-        evas_software_gdi_output_buffer_paste(gdiob,
-                                              obr->x,
-                                              obr->y);
-/*         if (obr->mgdiob) */
-/*           evas_software_gdi_output_buffer_paste(obr->mgdiob, */
-/*                                                 buf->priv.x11.xlib.mask, */
-/*                                                 buf->priv.x11.xlib.gcm, */
-/*                                                 obr->x, obr->y, 0); */
-     }
-
-   while (buf->priv.prev_pending_writes)
-     {
-        im = buf->priv.prev_pending_writes->data;
-        buf->priv.prev_pending_writes =
-          eina_list_remove_list(buf->priv.prev_pending_writes,
-                                buf->priv.prev_pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop(&im->cache_entry);
-        if (obr->gdiob) _unfind_gdiob(obr->gdiob);
-/*         if (obr->mgdiob) _unfind_gdiob(obr->mgdiob); */
-/*         if (obr->gdiob) evas_software_x11_x_output_buffer_free(obr->gdiob); */
-        free(obr);
-     }
-   buf->priv.prev_pending_writes = buf->priv.pending_writes;
-   buf->priv.pending_writes = NULL;
-
-   evas_common_cpu_end_opt();
-}
-
-void
-evas_software_gdi_outbuf_idle_flush(Outbuf *buf)
-{
-   while (buf->priv.prev_pending_writes)
-     {
-        RGBA_Image *im;
-        Outbuf_Region *obr;
-
-        im = buf->priv.prev_pending_writes->data;
-        buf->priv.prev_pending_writes =
-          eina_list_remove_list(buf->priv.prev_pending_writes,
-                                buf->priv.prev_pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop((Image_Entry *)im);
-        if (obr->gdiob) _unfind_gdiob(obr->gdiob);
-/*         if (obr->mxob) _unfind_xob(obr->mxob, 0); */
-        free(obr);
-     }
-   _clear_gdiob();
-}
-
-int
-evas_software_gdi_outbuf_width_get(Outbuf *buf)
-{
-   return buf->width;
-}
-
-int
-evas_software_gdi_outbuf_height_get(Outbuf *buf)
-{
-   return buf->height;
-}
-
-Outbuf_Depth
-evas_software_gdi_outbuf_depth_get(Outbuf *buf)
-{
-   return buf->depth;
-}
-
-int
-evas_software_gdi_outbuf_rot_get(Outbuf *buf)
-{
-   return buf->rot;
-}
diff --git a/libraries/evas/src/modules/engines/software_generic/Makefile.am b/libraries/evas/src/modules/engines/software_generic/Makefile.am
deleted file mode 100644
index e605dac..0000000
--- a/libraries/evas/src/modules/engines/software_generic/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@
-
-SOFTWARE_GENERIC_SOURCES = evas_engine.c
-
-
-if !EVAS_STATIC_BUILD_SOFTWARE_GENERIC
-
-pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES  = $(SOFTWARE_GENERIC_SOURCES)
-
-module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_generic.la
-
-libevas_engine_software_generic_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES)
-
-endif
diff --git a/libraries/evas/src/modules/engines/software_generic/Makefile.in b/libraries/evas/src/modules/engines/software_generic/Makefile.in
deleted file mode 100644
index fe0ac3d..0000000
--- a/libraries/evas/src/modules/engines/software_generic/Makefile.in
+++ /dev/null
@@ -1,766 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_generic
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-libevas_engine_software_generic_la_LIBADD =
-am__libevas_engine_software_generic_la_SOURCES_DIST = evas_engine.c
-am__objects_1 = evas_engine.lo
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@am_libevas_engine_software_generic_la_OBJECTS =  \
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@       $(am__objects_1)
-libevas_engine_software_generic_la_OBJECTS =  \
-        $(am_libevas_engine_software_generic_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@am_libevas_engine_software_generic_la_rpath =
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c
-am__objects_2 = module_la-evas_engine.lo
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@am_module_la_OBJECTS =  \
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@      $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@am_module_la_rpath = -rpath \
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@      $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_generic_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_generic_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@
-
-SOFTWARE_GENERIC_SOURCES = evas_engine.c
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkg_LTLIBRARIES = module.la
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES)
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@noinst_LTLIBRARIES = libevas_engine_software_generic.la
-@EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@libevas_engine_software_generic_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_generic/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_generic/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_generic.la: $(libevas_engine_software_generic_la_OBJECTS) $(libevas_engine_software_generic_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_generic_la_rpath) $(libevas_engine_software_generic_la_OBJECTS) $(libevas_engine_software_generic_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-pkgLTLIBRARIES install-ps install-ps-am install-strip \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_generic/evas_engine.c b/libraries/evas/src/modules/engines/software_generic/evas_engine.c
deleted file mode 100644
index 4667f6b..0000000
--- a/libraries/evas/src/modules/engines/software_generic/evas_engine.c
+++ /dev/null
@@ -1,2818 +0,0 @@
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_private.h"
-
-#ifdef HAVE_DLSYM
-# include <dlfcn.h>      /* dlopen,dlclose,etc */
-
-# define EVAS_GL 1
-# define EVAS_GL_NO_GL_H_CHECK 1
-# include "Evas_GL.h"
-
-#else
-# warning software_generic will not be able to have Evas_GL API.
-#endif
-
-#ifdef EVAS_GL
-//----------------------------------//
-// OSMesa...
-
-#define OSMESA_MAJOR_VERSION 6
-#define OSMESA_MINOR_VERSION 5
-#define OSMESA_PATCH_VERSION 0
-
-/*
- * Values for the format parameter of OSMesaCreateContext()
- * New in version 2.0.
- */
-#define OSMESA_COLOR_INDEX      GL_COLOR_INDEX
-#define OSMESA_RGBA             GL_RGBA
-#define OSMESA_BGRA             0x1
-#define OSMESA_ARGB             0x2
-#define OSMESA_RGB              GL_RGB
-#define OSMESA_BGR              0x4
-#define OSMESA_RGB_565          0x5
-
-
-/*
- * OSMesaPixelStore() parameters:
- * New in version 2.0.
- */
-#define OSMESA_ROW_LENGTH       0x10
-#define OSMESA_Y_UP             0x11
-
-
-/*
- * Accepted by OSMesaGetIntegerv:
- */
-#define OSMESA_WIDTH            0x20
-#define OSMESA_HEIGHT           0x21
-#define OSMESA_FORMAT           0x22
-#define OSMESA_TYPE             0x23
-#define OSMESA_MAX_WIDTH        0x24  /* new in 4.0 */
-#define OSMESA_MAX_HEIGHT       0x25  /* new in 4.0 */
-
-
-typedef void (*OSMESAproc)();
-typedef struct osmesa_context *OSMesaContext;
-#endif
-
-typedef struct _Render_Engine_GL_Surface    Render_Engine_GL_Surface;
-typedef struct _Render_Engine_GL_Context    Render_Engine_GL_Context;
-
-struct _Render_Engine_GL_Surface
-{
-   int     initialized;
-   int     w, h;
-
-#ifdef EVAS_GL
-   GLenum  internal_fmt;
-#endif
-   int     internal_cpp;   // Component per pixel.  ie. RGB = 3
-
-   int     depth_bits;
-   int     stencil_bits;
-
-   // Data 
-   void   *buffer;
-
-   Render_Engine_GL_Context   *current_ctx;
-};
-
-#ifdef EVAS_GL
-struct _Render_Engine_GL_Context
-{
-   int            initialized;
-
-   OSMesaContext  context;
-
-   Render_Engine_GL_Context   *share_ctx;
-
-   Render_Engine_GL_Surface   *current_sfc;
-};
-
-//------------------------------------------------------//
-typedef void                   (*_eng_fn) (void );
-typedef _eng_fn                (*glsym_func_eng_fn) ();
-typedef void                   (*glsym_func_void) ();
-typedef unsigned int           (*glsym_func_uint) ();
-typedef int                    (*glsym_func_int) ();
-typedef unsigned char          (*glsym_func_uchar) ();
-typedef unsigned char         *(*glsym_func_uchar_ptr) ();
-typedef const unsigned char   *(*glsym_func_const_uchar_ptr) ();
-typedef char const            *(*glsym_func_char_const_ptr) ();
-typedef GLboolean              (*glsym_func_bool) ();
-typedef OSMesaContext          (*glsym_func_osm_ctx) ();
-//------------------------------------------------------//
-
-/* Function table for GL APIs */
-static Evas_GL_API gl_funcs;
-static void *gl_lib_handle;
-static int gl_lib_is_gles = 0;
-static Evas_GL_API gl_funcs;
-
-//------------------------------------------------------//
-// OSMesa APIS...
-static OSMesaContext (*_sym_OSMesaCreateContextExt)             (GLenum format, GLint depthBits, GLint stencilBits, GLint accumBits, OSMesaContext sharelist) = NULL;
-static void          (*_sym_OSMesaDestroyContext)               (OSMesaContext ctx) = NULL;
-static GLboolean     (*_sym_OSMesaMakeCurrent)                  (OSMesaContext ctx, void *buffer, GLenum type, GLsizei width, GLsizei height) = NULL;
-static void          (*_sym_OSMesaPixelStore)                   (GLint pname, GLint value) = NULL;
-static OSMESAproc    (*_sym_OSMesaGetProcAddress)               (const char *funcName);
-
-
-//------------------------------------------------------//
-// GLES 2.0 APIs...
-static void       (*_sym_glActiveTexture)                       (GLenum texture) = NULL;
-static void       (*_sym_glAttachShader)                        (GLuint program, GLuint shader) = NULL;
-static void       (*_sym_glBindAttribLocation)                  (GLuint program, GLuint index, const char* name) = NULL;
-static void       (*_sym_glBindBuffer)                          (GLenum target, GLuint buffer) = NULL;
-static void       (*_sym_glBindFramebuffer)                     (GLenum target, GLuint framebuffer) = NULL;
-static void       (*_sym_glBindRenderbuffer)                    (GLenum target, GLuint renderbuffer) = NULL;
-static void       (*_sym_glBindTexture)                         (GLenum target, GLuint texture) = NULL;
-static void       (*_sym_glBlendColor)                          (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) = NULL;
-static void       (*_sym_glBlendEquation)                       (GLenum mode) = NULL;
-static void       (*_sym_glBlendEquationSeparate)               (GLenum modeRGB, GLenum modeAlpha) = NULL;
-static void       (*_sym_glBlendFunc)                           (GLenum sfactor, GLenum dfactor) = NULL;
-static void       (*_sym_glBlendFuncSeparate)                   (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) = NULL;
-static void       (*_sym_glBufferData)                          (GLenum target, GLsizeiptr size, const void* data, GLenum usage) = NULL;
-static void       (*_sym_glBufferSubData)                       (GLenum target, GLintptr offset, GLsizeiptr size, const void* data) = NULL;
-static GLenum     (*_sym_glCheckFramebufferStatus)              (GLenum target) = NULL;
-static void       (*_sym_glClear)                               (GLbitfield mask) = NULL;
-static void       (*_sym_glClearColor)                          (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) = NULL;
-static void       (*_sym_glClearDepthf)                         (GLclampf depth) = NULL;
-static void       (*_sym_glClearStencil)                        (GLint s) = NULL;
-static void       (*_sym_glColorMask)                           (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) = NULL;
-static void       (*_sym_glCompileShader)                       (GLuint shader) = NULL;
-static void       (*_sym_glCompressedTexImage2D)                (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data) = NULL;
-static void       (*_sym_glCompressedTexSubImage2D)             (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data) = NULL;
-static void       (*_sym_glCopyTexImage2D)                      (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) = NULL;
-static void       (*_sym_glCopyTexSubImage2D)                   (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
-static GLuint     (*_sym_glCreateProgram)                       (void) = NULL;
-static GLuint     (*_sym_glCreateShader)                        (GLenum type) = NULL;
-static void       (*_sym_glCullFace)                            (GLenum mode) = NULL;
-static void       (*_sym_glDeleteBuffers)                       (GLsizei n, const GLuint* buffers) = NULL;
-static void       (*_sym_glDeleteFramebuffers)                  (GLsizei n, const GLuint* framebuffers) = NULL;
-static void       (*_sym_glDeleteProgram)                       (GLuint program) = NULL;
-static void       (*_sym_glDeleteRenderbuffers)                 (GLsizei n, const GLuint* renderbuffers) = NULL;
-static void       (*_sym_glDeleteShader)                        (GLuint shader) = NULL;
-static void       (*_sym_glDeleteTextures)                      (GLsizei n, const GLuint* textures) = NULL;
-static void       (*_sym_glDepthFunc)                           (GLenum func) = NULL;
-static void       (*_sym_glDepthMask)                           (GLboolean flag) = NULL;
-static void       (*_sym_glDepthRangef)                         (GLclampf zNear, GLclampf zFar) = NULL;
-static void       (*_sym_glDetachShader)                        (GLuint program, GLuint shader) = NULL;
-static void       (*_sym_glDisable)                             (GLenum cap) = NULL;
-static void       (*_sym_glDisableVertexAttribArray)            (GLuint index) = NULL;
-static void       (*_sym_glDrawArrays)                          (GLenum mode, GLint first, GLsizei count) = NULL;
-static void       (*_sym_glDrawElements)                        (GLenum mode, GLsizei count, GLenum type, const void* indices) = NULL;
-static void       (*_sym_glEnable)                              (GLenum cap) = NULL;
-static void       (*_sym_glEnableVertexAttribArray)             (GLuint index) = NULL;
-static void       (*_sym_glFinish)                              (void) = NULL;
-static void       (*_sym_glFlush)                               (void) = NULL;
-static void       (*_sym_glFramebufferRenderbuffer)             (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) = NULL;
-static void       (*_sym_glFramebufferTexture2D)                (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) = NULL;
-static void       (*_sym_glFrontFace)                           (GLenum mode) = NULL;
-static void       (*_sym_glGenBuffers)                          (GLsizei n, GLuint* buffers) = NULL;
-static void       (*_sym_glGenerateMipmap)                      (GLenum target) = NULL;
-static void       (*_sym_glGenFramebuffers)                     (GLsizei n, GLuint* framebuffers) = NULL;
-static void       (*_sym_glGenRenderbuffers)                    (GLsizei n, GLuint* renderbuffers) = NULL;
-static void       (*_sym_glGenTextures)                         (GLsizei n, GLuint* textures) = NULL;
-static void       (*_sym_glGetActiveAttrib)                     (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) = NULL;
-static void       (*_sym_glGetActiveUniform)                    (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) = NULL;
-static void       (*_sym_glGetAttachedShaders)                  (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) = NULL;
-static int        (*_sym_glGetAttribLocation)                   (GLuint program, const char* name) = NULL;
-static void       (*_sym_glGetBooleanv)                         (GLenum pname, GLboolean* params) = NULL;
-static void       (*_sym_glGetBufferParameteriv)                (GLenum target, GLenum pname, GLint* params) = NULL;
-static GLenum     (*_sym_glGetError)                            (void) = NULL;
-static void       (*_sym_glGetFloatv)                           (GLenum pname, GLfloat* params) = NULL;
-static void       (*_sym_glGetFramebufferAttachmentParameteriv) (GLenum target, GLenum attachment, GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetIntegerv)                         (GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetProgramiv)                        (GLuint program, GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetProgramInfoLog)                   (GLuint program, GLsizei bufsize, GLsizei* length, char* infolog) = NULL;
-static void       (*_sym_glGetRenderbufferParameteriv)          (GLenum target, GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetShaderiv)                         (GLuint shader, GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetShaderInfoLog)                    (GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog) = NULL;
-static void       (*_sym_glGetShaderPrecisionFormat)            (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) = NULL;
-static void       (*_sym_glGetShaderSource)                     (GLuint shader, GLsizei bufsize, GLsizei* length, char* source) = NULL;
-static const GLubyte *(*_sym_glGetString)                           (GLenum name) = NULL;
-static void       (*_sym_glGetTexParameterfv)                   (GLenum target, GLenum pname, GLfloat* params) = NULL;
-static void       (*_sym_glGetTexParameteriv)                   (GLenum target, GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetUniformfv)                        (GLuint program, GLint location, GLfloat* params) = NULL;
-static void       (*_sym_glGetUniformiv)                        (GLuint program, GLint location, GLint* params) = NULL;
-static int        (*_sym_glGetUniformLocation)                  (GLuint program, const char* name) = NULL;
-static void       (*_sym_glGetVertexAttribfv)                   (GLuint index, GLenum pname, GLfloat* params) = NULL;
-static void       (*_sym_glGetVertexAttribiv)                   (GLuint index, GLenum pname, GLint* params) = NULL;
-static void       (*_sym_glGetVertexAttribPointerv)             (GLuint index, GLenum pname, void** pointer) = NULL;
-static void       (*_sym_glHint)                                (GLenum target, GLenum mode) = NULL;
-static GLboolean  (*_sym_glIsBuffer)                            (GLuint buffer) = NULL;
-static GLboolean  (*_sym_glIsEnabled)                           (GLenum cap) = NULL;
-static GLboolean  (*_sym_glIsFramebuffer)                       (GLuint framebuffer) = NULL;
-static GLboolean  (*_sym_glIsProgram)                           (GLuint program) = NULL;
-static GLboolean  (*_sym_glIsRenderbuffer)                      (GLuint renderbuffer) = NULL;
-static GLboolean  (*_sym_glIsShader)                            (GLuint shader) = NULL;
-static GLboolean  (*_sym_glIsTexture)                           (GLuint texture) = NULL;
-static void       (*_sym_glLineWidth)                           (GLfloat width) = NULL;
-static void       (*_sym_glLinkProgram)                         (GLuint program) = NULL;
-static void       (*_sym_glPixelStorei)                         (GLenum pname, GLint param) = NULL;
-static void       (*_sym_glPolygonOffset)                       (GLfloat factor, GLfloat units) = NULL;
-static void       (*_sym_glReadPixels)                          (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels) = NULL;
-static void       (*_sym_glReleaseShaderCompiler)               (void) = NULL;
-static void       (*_sym_glRenderbufferStorage)                 (GLenum target, GLenum internalformat, GLsizei width, GLsizei height) = NULL;
-static void       (*_sym_glSampleCoverage)                      (GLclampf value, GLboolean invert) = NULL;
-static void       (*_sym_glScissor)                             (GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
-static void       (*_sym_glShaderBinary)                        (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) = NULL;
-static void       (*_sym_glShaderSource)                        (GLuint shader, GLsizei count, const char** string, const GLint* length) = NULL;
-static void       (*_sym_glStencilFunc)                         (GLenum func, GLint ref, GLuint mask) = NULL;
-static void       (*_sym_glStencilFuncSeparate)                 (GLenum face, GLenum func, GLint ref, GLuint mask) = NULL;
-static void       (*_sym_glStencilMask)                         (GLuint mask) = NULL;
-static void       (*_sym_glStencilMaskSeparate)                 (GLenum face, GLuint mask) = NULL;
-static void       (*_sym_glStencilOp)                           (GLenum fail, GLenum zfail, GLenum zpass) = NULL;
-static void       (*_sym_glStencilOpSeparate)                   (GLenum face, GLenum fail, GLenum zfail, GLenum zpass) = NULL;
-static void       (*_sym_glTexImage2D)                          (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels) = NULL;
-static void       (*_sym_glTexParameterf)                       (GLenum target, GLenum pname, GLfloat param) = NULL;
-static void       (*_sym_glTexParameterfv)                      (GLenum target, GLenum pname, const GLfloat* params) = NULL;
-static void       (*_sym_glTexParameteri)                       (GLenum target, GLenum pname, GLint param) = NULL;
-static void       (*_sym_glTexParameteriv)                      (GLenum target, GLenum pname, const GLint* params) = NULL;
-static void       (*_sym_glTexSubImage2D)                       (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels) = NULL;
-static void       (*_sym_glUniform1f)                           (GLint location, GLfloat x) = NULL;
-static void       (*_sym_glUniform1fv)                          (GLint location, GLsizei count, const GLfloat* v) = NULL;
-static void       (*_sym_glUniform1i)                           (GLint location, GLint x) = NULL;
-static void       (*_sym_glUniform1iv)                          (GLint location, GLsizei count, const GLint* v) = NULL;
-static void       (*_sym_glUniform2f)                           (GLint location, GLfloat x, GLfloat y) = NULL;
-static void       (*_sym_glUniform2fv)                          (GLint location, GLsizei count, const GLfloat* v) = NULL;
-static void       (*_sym_glUniform2i)                           (GLint location, GLint x, GLint y) = NULL;
-static void       (*_sym_glUniform2iv)                          (GLint location, GLsizei count, const GLint* v) = NULL;
-static void       (*_sym_glUniform3f)                           (GLint location, GLfloat x, GLfloat y, GLfloat z) = NULL;
-static void       (*_sym_glUniform3fv)                          (GLint location, GLsizei count, const GLfloat* v) = NULL;
-static void       (*_sym_glUniform3i)                           (GLint location, GLint x, GLint y, GLint z) = NULL;
-static void       (*_sym_glUniform3iv)                          (GLint location, GLsizei count, const GLint* v) = NULL;
-static void       (*_sym_glUniform4f)                           (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) = NULL;
-static void       (*_sym_glUniform4fv)                          (GLint location, GLsizei count, const GLfloat* v) = NULL;
-static void       (*_sym_glUniform4i)                           (GLint location, GLint x, GLint y, GLint z, GLint w) = NULL;
-static void       (*_sym_glUniform4iv)                          (GLint location, GLsizei count, const GLint* v) = NULL;
-static void       (*_sym_glUniformMatrix2fv)                    (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) = NULL;
-static void       (*_sym_glUniformMatrix3fv)                    (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) = NULL;
-static void       (*_sym_glUniformMatrix4fv)                    (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) = NULL;
-static void       (*_sym_glUseProgram)                          (GLuint program) = NULL;
-static void       (*_sym_glValidateProgram)                     (GLuint program) = NULL;
-static void       (*_sym_glVertexAttrib1f)                      (GLuint indx, GLfloat x) = NULL;
-static void       (*_sym_glVertexAttrib1fv)                     (GLuint indx, const GLfloat* values) = NULL;
-static void       (*_sym_glVertexAttrib2f)                      (GLuint indx, GLfloat x, GLfloat y) = NULL;
-static void       (*_sym_glVertexAttrib2fv)                     (GLuint indx, const GLfloat* values) = NULL;
-static void       (*_sym_glVertexAttrib3f)                      (GLuint indx, GLfloat x, GLfloat y, GLfloat z) = NULL;
-static void       (*_sym_glVertexAttrib3fv)                     (GLuint indx, const GLfloat* values) = NULL;
-static void       (*_sym_glVertexAttrib4f)                      (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) = NULL;
-static void       (*_sym_glVertexAttrib4fv)                     (GLuint indx, const GLfloat* values) = NULL;
-static void       (*_sym_glVertexAttribPointer)                 (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr) = NULL;
-static void       (*_sym_glViewport)                            (GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
-
-// GLES Extensions...
-/* static void       (*_sym_glGetProgramBinary)                    (GLuint a, GLsizei b, GLsizei* c, GLenum* d, void* e) = NULL; */
-/* static void       (*_sym_glProgramBinary)                       (GLuint a, GLenum b, const void* c, GLint d) = NULL; */
-/* static void       (*_sym_glProgramParameteri)                   (GLuint a, GLuint b, GLint d) = NULL; */
-#endif
-
-/*
- *****
- **
- ** ENGINE ROUTINES
- **
- *****
- */
-static int cpunum = 0;
-static int _evas_soft_gen_log_dom = -1;
-
-static void
-eng_output_dump(void *data __UNUSED__)
-{
-   evas_common_image_image_all_unload();
-   evas_common_font_font_all_unload();
-}
-
-static void *
-eng_context_new(void *data __UNUSED__)
-{
-   return evas_common_draw_context_new();
-}
-
-static void
-eng_context_free(void *data __UNUSED__, void *context)
-{
-   evas_common_draw_context_free(context);
-}
-
-static void
-eng_context_clip_set(void *data __UNUSED__, void *context, int x, int y, int w, int h)
-{
-   evas_common_draw_context_set_clip(context, x, y, w, h);
-}
-
-static void
-eng_context_clip_clip(void *data __UNUSED__, void *context, int x, int y, int w, int h)
-{
-   evas_common_draw_context_clip_clip(context, x, y, w, h);
-}
-
-static void
-eng_context_clip_unset(void *data __UNUSED__, void *context)
-{
-   evas_common_draw_context_unset_clip(context);
-}
-
-static int
-eng_context_clip_get(void *data __UNUSED__, void *context, int *x, int *y, int *w, int *h)
-{
-   *x = ((RGBA_Draw_Context *)context)->clip.x;
-   *y = ((RGBA_Draw_Context *)context)->clip.y;
-   *w = ((RGBA_Draw_Context *)context)->clip.w;
-   *h = ((RGBA_Draw_Context *)context)->clip.h;
-   return ((RGBA_Draw_Context *)context)->clip.use;
-}
-
-static void
-eng_context_color_set(void *data __UNUSED__, void *context, int r, int g, int b, int a)
-{
-   evas_common_draw_context_set_color(context, r, g, b, a);
-}
-
-static int
-eng_context_color_get(void *data __UNUSED__, void *context, int *r, int *g, int *b, int *a)
-{
-   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
-   return 1;
-}
-
-static void
-eng_context_multiplier_set(void *data __UNUSED__, void *context, int r, int g, int b, int a)
-{
-   evas_common_draw_context_set_multiplier(context, r, g, b, a);
-}
-
-static void
-eng_context_multiplier_unset(void *data __UNUSED__, void *context)
-{
-   evas_common_draw_context_unset_multiplier(context);
-}
-
-static int
-eng_context_multiplier_get(void *data __UNUSED__, void *context, int *r, int *g, int *b, int *a)
-{
-   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
-   return ((RGBA_Draw_Context *)context)->mul.use;
-}
-
-static void
-eng_context_mask_set(void *data __UNUSED__, void *context, void *mask, int x, int y, int w, int h)
-{
-   evas_common_draw_context_set_mask(context, mask, x, y, w, h);
-}
-
-static void
-eng_context_mask_unset(void *data __UNUSED__, void *context)
-{
-   evas_common_draw_context_unset_mask(context);
-}
-/*
-static void *
-eng_context_mask_get(void *data __UNUSED__, void *context)
-{
-   return ((RGBA_Draw_Context *)context)->mask.mask;
-}
-*/
-
-static void
-eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h)
-{
-   evas_common_draw_context_add_cutout(context, x, y, w, h);
-}
-
-static void
-eng_context_cutout_clear(void *data __UNUSED__, void *context)
-{
-   evas_common_draw_context_clear_cutouts(context);
-}
-
-static void
-eng_context_anti_alias_set(void *data __UNUSED__, void *context, unsigned char aa)
-{
-   evas_common_draw_context_set_anti_alias(context, aa);
-}
-
-static unsigned char
-eng_context_anti_alias_get(void *data __UNUSED__, void *context)
-{
-   return ((RGBA_Draw_Context *)context)->anti_alias;
-}
-
-static void
-eng_context_color_interpolation_set(void *data __UNUSED__, void *context, int color_space)
-{
-   evas_common_draw_context_set_color_interpolation(context, color_space);
-}
-
-static int
-eng_context_color_interpolation_get(void *data __UNUSED__, void *context)
-{
-   return ((RGBA_Draw_Context *)context)->interpolation.color_space;
-}
-
-static void
-eng_context_render_op_set(void *data __UNUSED__, void *context, int op)
-{
-   evas_common_draw_context_set_render_op(context, op);
-}
-
-static int
-eng_context_render_op_get(void *data __UNUSED__, void *context)
-{
-   return ((RGBA_Draw_Context *)context)->render_op;
-}
-
-
-
-static void
-eng_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, int y, int w, int h)
-{
-#ifdef BUILD_PIPE_RENDER
-   if ((cpunum > 1)
-#ifdef EVAS_FRAME_QUEUING
-        && evas_common_frameq_enabled()
-#endif
-        )
-     evas_common_pipe_rectangle_draw(surface, context, x, y, w, h);
-   else
-#endif
-     {
-        evas_common_rectangle_draw(surface, context, x, y, w, h);
-        evas_common_cpu_end_opt();
-     }
-}
-
-static void
-eng_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-#ifdef BUILD_PIPE_RENDER
-   if ((cpunum > 1)
- #ifdef EVAS_FRAME_QUEUING
-        && evas_common_frameq_enabled()
-#endif
-        )
-    evas_common_pipe_line_draw(surface, context, x1, y1, x2, y2);
-   else
-#endif   
-     {
-        evas_common_line_draw(surface, context, x1, y1, x2, y2);
-        evas_common_cpu_end_opt();
-     }
-}
-
-static void *
-eng_polygon_point_add(void *data __UNUSED__, void *context __UNUSED__, void *polygon, int x, int y)
-{
-   return evas_common_polygon_point_add(polygon, x, y);
-}
-
-static void *
-eng_polygon_points_clear(void *data __UNUSED__, void *context __UNUSED__, void *polygon)
-{
-   return evas_common_polygon_points_clear(polygon);
-}
-
-static void
-eng_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
-{
-#ifdef BUILD_PIPE_RENDER
-   if ((cpunum > 1)
-#ifdef EVAS_FRAME_QUEUING
-        && evas_common_frameq_enabled()
-#endif
-        )
-     evas_common_pipe_poly_draw(surface, context, polygon, x, y);
-   else
-#endif
-     {
-        evas_common_polygon_draw(surface, context, polygon, x, y);
-        evas_common_cpu_end_opt();
-     }
-}
-
-static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return 1;
-   im = image;
-   switch (im->space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (im->flags.alpha) return 1;
-      default:
-        break;
-     }
-   return 0;
-}
-
-static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return EVAS_COLORSPACE_ARGB8888;
-   im = image;
-   return im->space;
-}
-
-static Eina_Bool
-eng_image_can_region_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-   if (!image) return EINA_FALSE;
-   im = image;
-   return ((Evas_Image_Load_Func*) im->info.loader)->do_region;
-}
-
-static void
-eng_image_mask_create(void *data __UNUSED__, void *image)
-{
-   RGBA_Image *im;
-   int sz;
-   uint8_t *dst,*end;
-   uint32_t *src;
-
-   if (!image) return;
-   im = image;
-   if (im->mask.mask && !im->mask.dirty) return;
-
-   if (im->mask.mask) free(im->mask.mask);
-   sz = im->cache_entry.w * im->cache_entry.h;
-   im->mask.mask = malloc(sz);
-   dst = im->mask.mask;
-   if (!im->image.data)
-      evas_cache_image_load_data(&im->cache_entry);
-   src = (void*) im->image.data;
-   if (!src) return;
-   for (end = dst + sz ; dst < end ; dst ++, src ++)
-      *dst = *src >> 24;
-   im->mask.dirty = 0;
-}
-
-
-static void *
-eng_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha)
-{
-   RGBA_Image *im;
-
-   if (!image) return NULL;
-   im = image;
-   if (im->cache_entry.space != EVAS_COLORSPACE_ARGB8888)
-     {
-        im->cache_entry.flags.alpha = 0;
-        return im;
-     }
-   im = (RGBA_Image *) evas_cache_image_alone(&im->cache_entry);
-   evas_common_image_colorspace_dirty(im);
-
-   im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
-   return im;
-}
-
-static void *
-eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-   RGBA_Image *im;
-
-   im = image;
-   return im;
-}
-
-static void
-eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-}
-
-static char *
-eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
-{
-   RGBA_Image *im;
-
-   if (!image) return NULL;
-   im = image;
-   return im->info.comment;
-}
-
-static char *
-eng_image_format_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return NULL;
-}
-
-static void
-eng_image_colorspace_set(void *data __UNUSED__, void *image, int cspace)
-{
-   Image_Entry *im;
-
-   if (!image) return;
-   im = image;
-   evas_cache_image_colorspace(im, cspace);
-}
-
-static void *
-eng_image_native_set(void *data __UNUSED__, void *image, void *native __UNUSED__)
-{
-   //return image;
-   Evas_Native_Surface *ns = native;
-   Image_Entry *im = image, *im2 = NULL;
-
-   if (!im)
-     {
-        if ((!ns) && (ns->data.x11.visual))
-          {
-             im = evas_cache_image_data(evas_common_image_cache_get(),
-                                        im->w, im->h,
-                                        ns->data.x11.visual, 1,
-                                        EVAS_COLORSPACE_ARGB8888);
-             return im;
-          }
-        else
-           return NULL;
-     }
-
-   if ((!ns) && (!im)) return im;
-
-   if (!ns) return im;
-
-   im2 = evas_cache_image_data(evas_common_image_cache_get(), 
-                               im->w, im->h, 
-                               ns->data.x11.visual, 1,
-                               EVAS_COLORSPACE_ARGB8888);
-   evas_cache_image_drop(im);
-   im = im2;
-
-   return im;
-
-}
-
-static void *
-eng_image_native_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   return NULL;
-}
-
-static void *
-eng_image_load(void *data __UNUSED__, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   *error = EVAS_LOAD_ERROR_NONE;
-   return evas_common_load_image_from_file(file, key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   return evas_cache_image_data(evas_common_image_cache_get(), w, h, image_data, alpha, cspace);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data __UNUSED__, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   return evas_cache_image_copied_data(evas_common_image_cache_get(), w, h, image_data, alpha, cspace);
-}
-
-static void
-eng_image_free(void *data __UNUSED__, void *image)
-{
-   evas_cache_image_drop(image);
-}
-
-static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   Image_Entry *im;
-
-   im = image;
-   if (w) *w = im->w;
-   if (h) *h = im->h;
-}
-
-static void *
-eng_image_size_set(void *data __UNUSED__, void *image, int w, int h)
-{
-   Image_Entry *im = image;
-   if (!im) return NULL;
-   return evas_cache_image_size_set(im, w, h);
-}
-
-static void *
-eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h)
-{
-   Image_Entry *im = image;
-   if (!im) return NULL;
-   return evas_cache_image_dirty(im, x, y, w, h);
-}
-
-static void *
-eng_image_data_get(void *data __UNUSED__, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   RGBA_Image *im;
-   int error;
-
-   if (!image)
-     {
-        *image_data = NULL;
-        return NULL;
-     }
-   im = image;
-   error = evas_cache_image_load_data(&im->cache_entry);
-   switch (im->cache_entry.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (to_write)
-          im = (RGBA_Image *)evas_cache_image_alone(&im->cache_entry);
-        *image_data = im->image.data;
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-        *image_data = im->cs.data;
-        break;
-      default:
-        abort();
-        break;
-     }
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data, void *image, DATA32 *image_data)
-{
-   RGBA_Image *im, *im2;
-
-   if (!image) return NULL;
-   im = image;
-   switch (im->cache_entry.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-        if (image_data != im->image.data)
-          {
-             int w, h;
-
-             w = im->cache_entry.w;
-             h = im->cache_entry.h;
-             im2 = eng_image_new_from_data(data, w, h, image_data,
-                                           eng_image_alpha_get(data, image),
-                                           eng_image_colorspace_get(data, image));
-             evas_cache_image_drop(&im->cache_entry);
-             im = im2;
-          }
-        break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-        if (image_data != im->cs.data)
-          {
-             if (im->cs.data)
-               {
-                  if (!im->cs.no_free) free(im->cs.data);
-               }
-             im->cs.data = image_data;
-          }
-        evas_common_image_colorspace_dirty(im);
-        break;
-      default:
-        abort();
-        break;
-     }
-   return im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   RGBA_Image *im = image;
-
-   if (!im) return ;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   RGBA_Image *im = image;
-
-   if (!im) return ;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data __UNUSED__, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   RGBA_Image *im;
-
-   if (!image) return;
-   im = image;
-#ifdef BUILD_PIPE_RENDER
-   if ((cpunum > 1)
-#ifdef EVAS_FRAME_QUEUING
-        && evas_common_frameq_enabled()
-#endif
-        )
-     {
-        evas_common_rgba_image_scalecache_prepare((Image_Entry *)(im), 
-                                                  surface, context, smooth,
-                                                  src_x, src_y, src_w, src_h,
-                                                  dst_x, dst_y, dst_w, dst_h);
-        
-        evas_common_pipe_image_draw(im, surface, context, smooth,
-                                    src_x, src_y, src_w, src_h,
-                                    dst_x, dst_y, dst_w, dst_h);
-     }
-   else
-#endif
-     {
-//        if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)
-//          evas_cache_image_load_data(&im->cache_entry);
-//        evas_common_image_colorspace_normalize(im);
-        evas_common_rgba_image_scalecache_prepare(&im->cache_entry, surface, context, smooth,
-                                                  src_x, src_y, src_w, src_h,
-                                                  dst_x, dst_y, dst_w, dst_h);
-        evas_common_rgba_image_scalecache_do(&im->cache_entry, surface, context, smooth,
-                                             src_x, src_y, src_w, src_h,
-                                             dst_x, dst_y, dst_w, dst_h);
-/*        
-        if (smooth)
-          evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context,
-                                                       src_x, src_y, src_w, src_h,
-                                                       dst_x, dst_y, dst_w, dst_h);
-        else
-          evas_common_scale_rgba_in_to_out_clip_sample(im, surface, context,
-                                                       src_x, src_y, src_w, src_h,
-                                                       dst_x, dst_y, dst_w, dst_h);
- */
-        evas_common_cpu_end_opt();
-     }
-}
-
-static void
-eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   RGBA_Image *im;
-
-   if (!image) return;
-   if (npoints < 3) return;
-   im = image;
-
-   if ((p[0].x == p[3].x) &&
-       (p[1].x == p[2].x) &&
-       (p[0].y == p[1].y) &&
-       (p[3].y == p[2].y) &&
-       (p[0].x <= p[1].x) &&
-       (p[0].y <= p[2].y) &&
-       (p[0].u == 0) &&
-       (p[0].v == 0) &&
-       (p[1].u == (int)(im->cache_entry.w << FP)) &&
-       (p[1].v == 0) &&
-       (p[2].u == (int)(im->cache_entry.w << FP)) &&
-       (p[2].v == (int)(im->cache_entry.h << FP)) &&
-       (p[3].u == 0) &&
-       (p[3].v == (int)(im->cache_entry.h << FP)) &&
-       (p[0].col == 0xffffffff) &&
-       (p[1].col == 0xffffffff) &&
-       (p[2].col == 0xffffffff) &&
-       (p[3].col == 0xffffffff))
-     {
-        int dx, dy, dw, dh;
-
-        dx = p[0].x >> FP;
-        dy = p[0].y >> FP;
-        dw = (p[2].x >> FP) - dx;
-        dh = (p[2].y >> FP) - dy;
-        eng_image_draw
-          (data, context, surface, image,
-           0, 0, im->cache_entry.w, im->cache_entry.h,
-           dx, dy, dw, dh, smooth);
-     }
-   else
-     {
-#ifdef BUILD_PIPE_RENDER
-        if ((cpunum > 1)
-# ifdef EVAS_FRAME_QUEUING
-       && evas_common_frameq_enabled()
-# endif
-        )
-          evas_common_pipe_map_draw(im, surface, context, npoints, p, smooth, level);
-        else
-#endif
-          evas_common_map_rgba(im, surface, context, npoints, p, smooth, level);
-     }
-   evas_common_cpu_end_opt();
-
-   if (npoints > 4)
-     {
-        eng_image_map_draw(data, context, surface, image, npoints - 2, p + 2,
-                           smooth, level);
-     }
-}
-
-static void *
-eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
-{
-   void *surface;
-   surface = evas_cache_image_copied_data(evas_common_image_cache_get(), 
-                                          w, h, NULL, alpha, 
-                                          EVAS_COLORSPACE_ARGB8888);
-   evas_cache_image_pixels(surface);
-   return surface;
-}
-
-static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_cache_image_drop(surface);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   Image_Entry *im;
-
-   if (!image) return;
-   im = image;
-   im->scale_hint = hint;
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return EVAS_IMAGE_SCALE_HINT_NONE;
-   im = image;
-   return im->scale_hint;
-}
-
-static Eina_Bool
-eng_image_animated_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return EINA_FALSE;
-   im = image;
-   return im->flags.animated;
-}
-
-static int
-eng_image_animated_frame_count_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return -1;
-   im = image;
-   if (!im->flags.animated) return -1;
-   return im->frame_count;
-}
-
-static Evas_Image_Animated_Loop_Hint
-eng_image_animated_loop_type_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   im = image;
-   if (!im->flags.animated) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   return im->loop_hint;
-}
-
-static int
-eng_image_animated_loop_count_get(void *data __UNUSED__, void *image)
-{
-   Image_Entry *im;
-
-   if (!image) return -1;
-   im = image;
-   if (!im->flags.animated) return -1;
-   return im->loop_count;
-}
-
-static double
-eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int start_frame, int frame_num)
-{
-   Image_Entry *im;
-
-   if (!image) return -1;
-   im = image;
-   if (!im->flags.animated) return -1;
-   return evas_common_load_rgba_image_frame_duration_from_file(im, start_frame, frame_num);
-}
-
-static Eina_Bool
-eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index)
-{
-   Image_Entry *im;
-
-   if (!image) return EINA_FALSE;
-   im = image;
-   if (!im->flags.animated) return EINA_FALSE;
-   if (im->cur_frame == frame_index) return EINA_FALSE;
-   im->cur_frame = frame_index;
-   return EINA_TRUE;
-}
-
-static void
-eng_image_cache_flush(void *data __UNUSED__)
-{
-   int tmp_size;
-
-   tmp_size = evas_common_image_get_cache();
-   evas_common_image_set_cache(0);
-   evas_common_rgba_image_scalecache_flush();
-   evas_common_image_set_cache(tmp_size);
-}
-
-static void
-eng_image_cache_set(void *data __UNUSED__, int bytes)
-{
-   evas_common_image_set_cache(bytes);
-   evas_common_rgba_image_scalecache_size_set(bytes);
-}
-
-static int
-eng_image_cache_get(void *data __UNUSED__)
-{
-   return evas_common_image_get_cache();
-}
-
-static Evas_Font_Set *
-eng_font_load(void *data __UNUSED__, const char *name, int size,
-      Font_Rend_Flags wanted_rend)
-{
-   return (Evas_Font_Set *) evas_common_font_load(name, size, wanted_rend);
-}
-
-static Evas_Font_Set *
-eng_font_memory_load(void *data __UNUSED__, char *name, int size, const void *fdata, int fdata_size, Font_Rend_Flags wanted_rend)
-{
-   return (Evas_Font_Set *) evas_common_font_memory_load(name, size, fdata,
-         fdata_size, wanted_rend);
-}
-
-static Evas_Font_Set *
-eng_font_add(void *data __UNUSED__, Evas_Font_Set *font, const char *name, int size, Font_Rend_Flags wanted_rend)
-{
-   return (Evas_Font_Set *) evas_common_font_add((RGBA_Font *) font, name,
-         size, wanted_rend);
-}
-
-static Evas_Font_Set *
-eng_font_memory_add(void *data __UNUSED__, Evas_Font_Set *font, char *name, int size, const void *fdata, int fdata_size, Font_Rend_Flags wanted_rend)
-{
-   return (Evas_Font_Set *) evas_common_font_memory_add((RGBA_Font *) font,
-         name, size, fdata, fdata_size, wanted_rend);
-}
-
-static void
-eng_font_free(void *data __UNUSED__, Evas_Font_Set *font)
-{
-   evas_common_font_free((RGBA_Font *) font);
-}
-
-static int
-eng_font_ascent_get(void *data __UNUSED__, Evas_Font_Set *font)
-{
-   return evas_common_font_ascent_get((RGBA_Font *) font);
-}
-
-static int
-eng_font_descent_get(void *data __UNUSED__, Evas_Font_Set *font)
-{
-   return evas_common_font_descent_get((RGBA_Font *) font);
-}
-
-static int
-eng_font_max_ascent_get(void *data __UNUSED__, Evas_Font_Set *font)
-{
-   return evas_common_font_max_ascent_get((RGBA_Font *) font);
-}
-
-static int
-eng_font_max_descent_get(void *data __UNUSED__, Evas_Font_Set *font)
-{
-   return evas_common_font_max_descent_get((RGBA_Font *) font);
-}
-
-static void
-eng_font_string_size_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int *w, int *h)
-{
-   evas_common_font_query_size((RGBA_Font *) font, text_props, w, h);
-}
-
-static int
-eng_font_inset_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props)
-{
-   return evas_common_font_query_inset((RGBA_Font *) font, text_props);
-}
-
-static int
-eng_font_right_inset_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props)
-{
-   return evas_common_font_query_right_inset((RGBA_Font *) font, text_props);
-}
-
-static int
-eng_font_h_advance_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props)
-{
-   int h, v;
-
-   evas_common_font_query_advance((RGBA_Font *) font, text_props, &h, &v);
-   return h;
-}
-
-static int
-eng_font_v_advance_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props)
-{
-   int h, v;
-
-   evas_common_font_query_advance((RGBA_Font *) font, text_props, &h, &v);
-   return v;
-}
-
-static int
-eng_font_pen_coords_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch)
-{
-   return evas_common_font_query_pen_coords((RGBA_Font *) font, text_props, pos, cpen_x, cy, cadv, ch);
-}
-
-static Eina_Bool
-eng_font_text_props_info_create(void *data __UNUSED__, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props, size_t par_pos, size_t len)
-{
-   return evas_common_text_props_content_create((RGBA_Font_Int *) fi, text,
-         text_props, par_props, par_pos, len);
-}
-
-static int
-eng_font_char_coords_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int pos, int *cx, int *cy, int *cw, int *ch)
-{
-   return evas_common_font_query_char_coords((RGBA_Font *) font, text_props, pos, cx, cy, cw, ch);
-}
-
-static int
-eng_font_char_at_coords_get(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int x, int y, int *cx, int *cy, int *cw, int *ch)
-{
-   return evas_common_font_query_char_at_coords((RGBA_Font *) font, text_props, x, y, cx, cy, cw, ch);
-}
-
-static int
-eng_font_last_up_to_pos(void *data __UNUSED__, Evas_Font_Set *font, const Evas_Text_Props *text_props, int x, int y)
-{
-   return evas_common_font_query_last_up_to_pos((RGBA_Font *) font, text_props, x, y);
-}
-
-static int
-eng_font_run_font_end_get(void *data __UNUSED__, Evas_Font_Set *font, Evas_Font_Instance **script_fi, Evas_Font_Instance **cur_fi, Evas_Script_Type script, const Eina_Unicode *text, int run_len)
-{
-   return evas_common_font_query_run_font_end_get((RGBA_Font *) font,
-         (RGBA_Font_Int **) script_fi, (RGBA_Font_Int **) cur_fi,
-         script, text, run_len);
-}
-
-static void
-eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
-{
-#ifdef BUILD_PIPE_RENDER
-   if ((cpunum > 1)
-#ifdef EVAS_FRAME_QUEUING
-        && evas_common_frameq_enabled()
-#endif
-        )
-     evas_common_pipe_text_draw(surface, context, (RGBA_Font *) font, x, y,
-           text_props);
-   else
-#endif   
-     {
-        evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y,
-              text_props);
-        evas_common_cpu_end_opt();
-     }
-}
-
-static void
-eng_font_cache_flush(void *data __UNUSED__)
-{
-   int tmp_size;
-
-   tmp_size = evas_common_font_cache_get();
-   evas_common_font_cache_set(0);
-   evas_common_font_flush();
-   evas_common_font_cache_set(tmp_size);
-}
-
-static void
-eng_font_cache_set(void *data __UNUSED__, int bytes)
-{
-   evas_common_font_cache_set(bytes);
-}
-
-static int
-eng_font_cache_get(void *data __UNUSED__)
-{
-   return evas_common_font_cache_get();
-}
-
-static void
-eng_font_hinting_set(void *data __UNUSED__, Evas_Font_Set *font, int hinting)
-{
-   evas_common_font_hinting_set((RGBA_Font *) font, hinting);
-}
-
-static int
-eng_font_hinting_can_hint(void *data __UNUSED__, int hinting)
-{
-   return evas_common_hinting_available(hinting);
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__)
-{
-   return EINA_TRUE;
-}
-
-
-/* Filter API */
-#if 0 // filtering disabled
-static void
-eng_image_draw_filtered(void *data __UNUSED__, void *context __UNUSED__,
-                        void *surface, void *image, Evas_Filter_Info *filter)
-{
-   Evas_Software_Filter_Fn fn;
-   RGBA_Image *im = image;
-
-   fn = evas_filter_software_get(filter);
-   if (!fn) return;
-   if (im->cache_entry.cache) evas_cache_image_load_data(&im->cache_entry);
-   fn(filter, image, surface);
-   return;
-}
-
-static Filtered_Image *
-eng_image_filtered_get(void *image, uint8_t *key, size_t keylen)
-{
-   RGBA_Image *im = image;
-   Filtered_Image *fi;
-   Eina_List *l;
-
-   for (l = im->filtered ; l ; l = l->next)
-     {
-         fi = l->data;
-         if (fi->keylen != keylen) continue;
-         if (memcmp(key, fi->key, keylen) != 0) continue;
-         fi->ref ++;
-         return fi;
-     }
-
-   return NULL;
-}
-
-static Filtered_Image *
-eng_image_filtered_save(void *image, void *fimage, uint8_t *key, size_t keylen)
-{
-   RGBA_Image *im = image;
-   Filtered_Image *fi;
-   Eina_List *l;
-
-   for (l = im->filtered ; l ; l = l->next)
-     {
-        fi = l->data;
-        if (fi->keylen != keylen) continue;
-        if (memcmp(key, fi->key, keylen) == 0) continue;
-        evas_cache_image_drop((void *)fi->image);
-        fi->image = fimage;
-        return fi;
-     }
-
-   fi = calloc(1,sizeof(Filtered_Image));
-   if (!fi) return NULL;
-
-   fi->keylen = keylen;
-   fi->key = malloc(keylen);
-   memcpy(fi->key, key, keylen);
-   fi->image = fimage;
-   fi->ref = 1;
-
-   im->filtered = eina_list_prepend(im->filtered, fi);
-
-   return fi;
-}
-
-static void
-eng_image_filtered_free(void *image, Filtered_Image *fi)
-{
-   RGBA_Image *im = image;
-
-   fi->ref --;
-   if (fi->ref) return;
-
-   free(fi->key);
-   evas_cache_image_drop(&fi->image->cache_entry);
-   fi->image = NULL;
-
-   im->filtered = eina_list_remove(im->filtered, fi);
-}
-#endif
-
-static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
-{
-   RGBA_Image *im;
-   
-   if (!image) return EVAS_LOAD_ERROR_NONE;
-   im = image;
-   return im->cache_entry.load_error;
-}
-
-//------------ Evas GL engine code ---------------//
-static void *
-eng_gl_surface_create(void *data __UNUSED__, void *config, int w, int h)
-{
-#ifdef EVAS_GL
-   Render_Engine_GL_Surface *sfc;
-   Evas_GL_Config *cfg;
-
-   sfc = calloc(1, sizeof(Render_Engine_GL_Surface));
-   if (!sfc) return NULL;
-
-   cfg = (Evas_GL_Config *)config;
-
-   sfc->initialized  = 0;
-   sfc->w            = w;
-   sfc->h            = h;
-
-   // Color Format
-   switch (cfg->color_format)
-     {
-
-      case EVAS_GL_RGB_888:
-         sfc->internal_fmt = OSMESA_RGB;
-         sfc->internal_cpp = 3;
-         break;
-      case EVAS_GL_RGBA_8888:
-         sfc->internal_fmt = OSMESA_BGRA;
-         sfc->internal_cpp = 4;
-         break;
-      default:
-         sfc->internal_fmt = OSMESA_RGBA;
-         sfc->internal_cpp = 4;
-         break;
-     }
-
-   // Depth Bits
-   switch (cfg->depth_bits)
-     {
-      case EVAS_GL_DEPTH_BIT_8:
-         sfc->depth_bits = 8;
-         break;
-      case EVAS_GL_DEPTH_BIT_16:
-         sfc->depth_bits = 16;
-         break;
-      case EVAS_GL_DEPTH_BIT_24:
-         sfc->depth_bits = 24;
-         break;
-      case EVAS_GL_DEPTH_BIT_32:
-         sfc->depth_bits = 32;
-         break;
-      case EVAS_GL_DEPTH_NONE:
-      default:
-         sfc->depth_bits = 0;
-         break;
-     }
-   
-   // Stencil Bits
-   switch (cfg->stencil_bits)
-     {
-      case EVAS_GL_STENCIL_BIT_1:
-         sfc->stencil_bits = 1;
-         break;
-      case EVAS_GL_STENCIL_BIT_2:
-         sfc->stencil_bits = 2;
-         break;
-      case EVAS_GL_STENCIL_BIT_4:
-         sfc->stencil_bits = 4;
-         break;
-      case EVAS_GL_STENCIL_BIT_8:
-         sfc->stencil_bits = 8;
-         break;
-      case EVAS_GL_STENCIL_BIT_16:
-         sfc->stencil_bits = 16;
-         break;
-      case EVAS_GL_STENCIL_NONE:
-      default:
-         sfc->stencil_bits = 0;
-         break;
-     }
-
-   sfc->buffer = malloc(sizeof(unsigned char)*sfc->internal_cpp*w*h);
-
-   if (!sfc->buffer)
-     {
-        free(sfc);
-        return NULL;
-     }
-
-   return sfc;
-#else
-   (void) config;
-   (void) w;
-   (void) h;
-   return NULL;
-#endif
-}
-
-static int
-eng_gl_surface_destroy(void *data __UNUSED__, void *surface)
-{
-#ifdef EVAS_GL
-   Render_Engine_GL_Surface *sfc;
-
-   sfc = (Render_Engine_GL_Surface*)surface;
-
-   if (!sfc) return 0;
-
-   if (sfc->buffer) free(sfc->buffer);
-
-   free(sfc);
-
-   surface = NULL;
-
-   return 1;
-#else
-   (void) surface;
-   return 1;
-#endif
-}
-
-static void *
-eng_gl_context_create(void *data __UNUSED__, void *share_context)
-{
-#ifdef EVAS_GL
-   Render_Engine_GL_Context *ctx;
-   Render_Engine_GL_Context *share_ctx;
-
-   ctx = calloc(1, sizeof(Render_Engine_GL_Context));
-
-   if (!ctx) return NULL;
-
-   share_ctx = (Render_Engine_GL_Context *)share_context;
-
-   ctx->share_ctx = share_ctx;
-
-   /*
-   if (share_ctx)
-      ctx->context = OSMesaCreateContextExt( OSMESA_RGBA, 8, 0, 0, share_ctx->context );
-   else
-      ctx->context = OSMesaCreateContextExt( OSMESA_RGBA, 8, 0, 0, NULL );
-
-
-   if (!ctx->context)
-     {
-        ERR("Error creating OSMesa Context.");
-        free(ctx);
-        return NULL;
-     }
-     */
-
-   ctx->initialized = 0;
-
-   return ctx;
-#else
-   (void) share_context;
-   return NULL;
-#endif
-}
-
-static int
-eng_gl_context_destroy(void *data __UNUSED__, void *context)
-{
-#ifdef EVAS_GL
-   Render_Engine_GL_Context *ctx;
-
-   ctx = (Render_Engine_GL_Context*)context;
-
-   if (!ctx) return 0;
-
-   _sym_OSMesaDestroyContext(ctx->context);
-
-   free(ctx);
-   context = NULL;
-
-   return 1;
-#else
-   (void) context;
-   return 0;
-#endif
-}
-
-static int
-eng_gl_make_current(void *data __UNUSED__, void *surface, void *context)
-{
-#ifdef EVAS_GL
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Context *ctx;
-   OSMesaContext share_ctx;
-   GLboolean ret;
-
-   sfc = (Render_Engine_GL_Surface*)surface;
-   ctx = (Render_Engine_GL_Context*)context;
-
-   // Unset surface/context
-   if ((!sfc) || (!ctx))
-     {
-        if (ctx) ctx->current_sfc = NULL;
-        if (sfc) sfc->current_ctx = NULL;
-        return 1;
-     }
-
-   // Initialize Context if it hasn't been.
-   if (!ctx->initialized)
-     {
-        if (ctx->share_ctx)
-           share_ctx = ctx->share_ctx->context;
-        else
-           share_ctx = NULL;
-
-        ctx->context =  _sym_OSMesaCreateContextExt(sfc->internal_fmt, 
-                                               sfc->depth_bits,
-                                               sfc->stencil_bits, 
-                                               0,
-                                               share_ctx);
-        if (!ctx->context)
-          {
-             ERR("Error initializing context.");
-             return 0;
-          }
-
-        ctx->initialized = 1;
-     }
-
-
-   // Call MakeCurrent
-   ret = _sym_OSMesaMakeCurrent(ctx->context, sfc->buffer, GL_UNSIGNED_BYTE, 
-                           sfc->w, sfc->h);
-
-   if (ret == GL_FALSE)
-     {
-        ERR("Error doing MakeCurrent.");
-        return 0;
-     }
-
-   _sym_OSMesaPixelStore(OSMESA_Y_UP, 0);
-
-   // Set the current surface/context
-   ctx->current_sfc = sfc;
-   sfc->current_ctx = ctx;
-
-   return 1;
-#else
-   (void) surface;
-   (void) context;
-   return 1;
-#endif
-}
-
-// FIXME!!! Implement later
-static void *
-eng_gl_string_query(void *data __UNUSED__, int name __UNUSED__)
-{
-   return NULL;
-}
-
-static void *
-eng_gl_proc_address_get(void *data __UNUSED__, const char *name)
-{
-#ifdef EVAS_GL
-   if (_sym_OSMesaGetProcAddress) return _sym_OSMesaGetProcAddress(name);
-   return dlsym(RTLD_DEFAULT, name);
-#else
-   (void) name;
-   return NULL;
-#endif
-}
-
-static int
-eng_gl_native_surface_get(void *data __UNUSED__, void *surface, void *native_surface)
-{
-#ifdef EVAS_GL
-   Render_Engine_GL_Surface *sfc;
-   Evas_Native_Surface *ns;
-
-   sfc = (Render_Engine_GL_Surface*)surface;
-   ns  = (Evas_Native_Surface*)native_surface;
-
-   if (!sfc) return 0;
-
-   ns->type = EVAS_NATIVE_SURFACE_OPENGL;
-   ns->version = EVAS_NATIVE_SURFACE_VERSION;
-   ns->data.x11.visual = sfc->buffer;
-
-   return 1;
-#else
-   (void) surface;
-   (void) native_surface;
-   return 1;
-#endif
-}
-
-
-static void *
-eng_gl_api_get(void *data __UNUSED__)
-{
-#ifdef EVAS_GL
-   return &gl_funcs;
-#else
-   return NULL;
-#endif
-}
-
-//------------------------------------------------//
-
-
-/*
- *****
- **
- ** ENGINE API
- **
- *****
- */
-
-static Evas_Func func =
-{
-   NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     eng_output_dump,
-     /* draw context virtual methods */
-     eng_context_new,
-     eng_canvas_alpha_get,
-     eng_context_free,
-     eng_context_clip_set,
-     eng_context_clip_clip,
-     eng_context_clip_unset,
-     eng_context_clip_get,
-     eng_context_mask_set,
-     eng_context_mask_unset,
-     eng_context_color_set,
-     eng_context_color_get,
-     eng_context_multiplier_set,
-     eng_context_multiplier_unset,
-     eng_context_multiplier_get,
-     eng_context_cutout_add,
-     eng_context_cutout_clear,
-     eng_context_anti_alias_set,
-     eng_context_anti_alias_get,
-     eng_context_color_interpolation_set,
-     eng_context_color_interpolation_get,
-     eng_context_render_op_set,
-     eng_context_render_op_get,
-     /* rect draw funcs */
-     eng_rectangle_draw,
-     /* line draw funcs */
-     eng_line_draw,
-     /* polygon draw funcs */
-     eng_polygon_point_add,
-     eng_polygon_points_clear,
-     eng_polygon_draw,
-     /* image draw funcs */
-     eng_image_load,
-     eng_image_new_from_data,
-     eng_image_new_from_copied_data,
-     eng_image_free,
-     eng_image_size_get,
-     eng_image_size_set,
-     NULL,
-     eng_image_dirty_region,
-     eng_image_data_get,
-     eng_image_data_put,
-     eng_image_data_preload_request,
-     eng_image_data_preload_cancel,
-     eng_image_alpha_set,
-     eng_image_alpha_get,
-     eng_image_border_set,
-     eng_image_border_get,
-     eng_image_draw,
-     eng_image_comment_get,
-     eng_image_format_get,
-     eng_image_colorspace_set,
-     eng_image_colorspace_get,
-     eng_image_can_region_get,
-     eng_image_mask_create,
-     eng_image_native_set,
-     eng_image_native_get,
-     /* image cache funcs */
-     eng_image_cache_flush,
-     eng_image_cache_set,
-     eng_image_cache_get,
-     /* font draw functions */
-     eng_font_load,
-     eng_font_memory_load,
-     eng_font_add,
-     eng_font_memory_add,
-     eng_font_free,
-     eng_font_ascent_get,
-     eng_font_descent_get,
-     eng_font_max_ascent_get,
-     eng_font_max_descent_get,
-     eng_font_string_size_get,
-     eng_font_inset_get,
-     eng_font_h_advance_get,
-     eng_font_v_advance_get,
-     eng_font_char_coords_get,
-     eng_font_char_at_coords_get,
-     eng_font_draw,
-     /* font cache functions */
-     eng_font_cache_flush,
-     eng_font_cache_set,
-     eng_font_cache_get,
-     /* font hinting functions */
-     eng_font_hinting_set,
-     eng_font_hinting_can_hint,
-     eng_image_scale_hint_set,
-     eng_image_scale_hint_get,
-     /* more font draw functions */
-     eng_font_last_up_to_pos,
-     eng_image_map_draw,
-     eng_image_map_surface_new,
-     eng_image_map_surface_free,
-     NULL, // eng_image_content_hint_set - software doesn't use it
-     NULL, // eng_image_content_hint_get - software doesn't use it
-     eng_font_pen_coords_get,
-     eng_font_text_props_info_create,
-     eng_font_right_inset_get,
-#if 0 // filtering disabled
-     eng_image_draw_filtered,
-     eng_image_filtered_get,
-     eng_image_filtered_save,
-     eng_image_filtered_free,
-#endif   
-     NULL, // need software mesa for gl rendering <- gl_surface_create
-     NULL, // need software mesa for gl rendering <- gl_surface_destroy
-     NULL, // need software mesa for gl rendering <- gl_context_create
-     NULL, // need software mesa for gl rendering <- gl_context_destroy
-     NULL, // need software mesa for gl rendering <- gl_make_current
-     NULL, // need software mesa for gl rendering <- gl_string_query
-     NULL, // need software mesa for gl rendering <- gl_proc_address_get
-     NULL, // need software mesa for gl rendering <- gl_native_surface_get
-     NULL, // need software mesa for gl rendering <- gl_api_get
-     NULL, // need software mesa for gl rendering <- gl_img_obj_set
-     eng_image_load_error_get,
-     eng_font_run_font_end_get,
-     eng_image_animated_get,
-     eng_image_animated_frame_count_get,
-     eng_image_animated_loop_type_get,
-     eng_image_animated_loop_count_get,
-     eng_image_animated_frame_duration_get,
-     eng_image_animated_frame_set,
-     NULL
-   /* FUTURE software generic calls go here */
-};
-
-
-//----------------------------------------------------------------//
-//                                                                //
-//                      Load Symbols                              //
-//                                                                //
-//----------------------------------------------------------------//
-#ifdef EVAS_GL
-static void
-sym_missing(void)
-{
-   ERR("GL symbols missing!\n");
-}
-
-static int
-glue_sym_init(void)
-{
-   //------------------------------------------------//
-   // Use eglGetProcAddress
-#define FINDSYM(dst, sym, typ) \
-   if (!dst) dst = (typeof(dst))dlsym(gl_lib_handle, sym); \
-   if (!dst)  \
-     { \
-        ERR("Symbol not found %s\n", sym); \
-        return 0; \
-     }
-#define FALLBAK(dst, typ) if (!dst) dst = (typeof(dst))sym_missing;
-
-    //------------------------------------------------------//
-   // OSMesa APIs...
-   FINDSYM(_sym_OSMesaCreateContextExt, "OSMesaCreateContextExt", glsym_func_osm_ctx);
-   FALLBAK(_sym_OSMesaCreateContextExt, glsym_func_void);
-
-   FINDSYM(_sym_OSMesaDestroyContext, "OSMesaDestroyContext", glsym_func_void);
-   FALLBAK(_sym_OSMesaDestroyContext, glsym_func_void);
-
-   FINDSYM(_sym_OSMesaMakeCurrent, "OSMesaMakeCurrent", glsym_func_bool);
-   FALLBAK(_sym_OSMesaMakeCurrent, glsym_func_void);
-
-   FINDSYM(_sym_OSMesaPixelStore, "OSMesaPixelStore", glsym_func_void);
-   FALLBAK(_sym_OSMesaPixelStore, glsym_func_void);
-
-   FINDSYM(_sym_OSMesaGetProcAddress, "OSMesaGetProcAddress", glsym_func_eng_fn);
-   FALLBAK(_sym_OSMesaGetProcAddress, glsym_func_void);
-
-#undef FINDSYM
-#undef FALLBAK
-
-   return 1;
-}
-
-static int
-gl_sym_init(void)
-{
-   //------------------------------------------------//
-#define FINDSYM(dst, sym, typ) \
-   if (!dst) dst = (typeof(dst))dlsym(gl_lib_handle, sym); \
-   if (!dst) DBG("Symbol not found %s\n", sym);
-#define FALLBAK(dst, typ) if (!dst) dst = (typeof(dst))sym_missing;
-
-
-   //------------------------------------------------------//
-   // GLES 2.0 APIs...
-   FINDSYM(_sym_glActiveTexture, "glActiveTexture", glsym_func_void);
-   FALLBAK(_sym_glActiveTexture, glsym_func_void);
-
-   FINDSYM(_sym_glAttachShader, "glAttachShader", glsym_func_void);
-   FALLBAK(_sym_glAttachShader, glsym_func_void);
-
-   FINDSYM(_sym_glBindAttribLocation, "glBindAttribLocation", glsym_func_void);
-   FALLBAK(_sym_glBindAttribLocation, glsym_func_void);
-
-   FINDSYM(_sym_glBindBuffer, "glBindBuffer", glsym_func_void);
-   FALLBAK(_sym_glBindBuffer, glsym_func_void);
-
-   FINDSYM(_sym_glBindFramebuffer, "glBindFramebuffer", glsym_func_void);
-   FALLBAK(_sym_glBindFramebuffer, glsym_func_void);
-
-   FINDSYM(_sym_glBindRenderbuffer, "glBindRenderbuffer", glsym_func_void);
-   FALLBAK(_sym_glBindRenderbuffer, glsym_func_void);
-
-   FINDSYM(_sym_glBindTexture, "glBindTexture", glsym_func_void);
-   FALLBAK(_sym_glBindTexture, glsym_func_void);
-
-   FINDSYM(_sym_glBlendColor, "glBlendColor", glsym_func_void);
-   FALLBAK(_sym_glBlendColor, glsym_func_void);
-
-   FINDSYM(_sym_glBlendEquation, "glBlendEquation", glsym_func_void);
-   FALLBAK(_sym_glBlendEquation, glsym_func_void);
-
-   FINDSYM(_sym_glBlendEquationSeparate, "glBlendEquationSeparate", glsym_func_void);
-   FALLBAK(_sym_glBlendEquationSeparate, glsym_func_void);
-
-   FINDSYM(_sym_glBlendFunc, "glBlendFunc", glsym_func_void);
-   FALLBAK(_sym_glBlendFunc, glsym_func_void);
-
-   FINDSYM(_sym_glBlendFuncSeparate, "glBlendFuncSeparate", glsym_func_void);
-   FALLBAK(_sym_glBlendFuncSeparate, glsym_func_void);
-
-   FINDSYM(_sym_glBufferData, "glBufferData", glsym_func_void);
-   FALLBAK(_sym_glBufferData, glsym_func_void);
-
-   FINDSYM(_sym_glBufferSubData, "glBufferSubData", glsym_func_void);
-   FALLBAK(_sym_glBufferSubData, glsym_func_void);
-
-   FINDSYM(_sym_glCheckFramebufferStatus, "glCheckFramebufferStatus", glsym_func_uint);
-   FALLBAK(_sym_glCheckFramebufferStatus, glsym_func_uint);
-
-   FINDSYM(_sym_glClear, "glClear", glsym_func_void);
-   FALLBAK(_sym_glClear, glsym_func_void);
-
-   FINDSYM(_sym_glClearColor, "glClearColor", glsym_func_void);
-   FALLBAK(_sym_glClearColor, glsym_func_void);
-
-   FINDSYM(_sym_glClearDepthf, "glClearDepthf", glsym_func_void);
-   FINDSYM(_sym_glClearDepthf, "glClearDepth", glsym_func_void);
-   FALLBAK(_sym_glClearDepthf, glsym_func_void);
-
-   FINDSYM(_sym_glClearStencil, "glClearStencil", glsym_func_void);
-   FALLBAK(_sym_glClearStencil, glsym_func_void);
-
-   FINDSYM(_sym_glColorMask, "glColorMask", glsym_func_void);
-   FALLBAK(_sym_glColorMask, glsym_func_void);
-
-   FINDSYM(_sym_glCompileShader, "glCompileShader", glsym_func_void);
-   FALLBAK(_sym_glCompileShader, glsym_func_void);
-
-   FINDSYM(_sym_glCompressedTexImage2D, "glCompressedTexImage2D", glsym_func_void);
-   FALLBAK(_sym_glCompressedTexImage2D, glsym_func_void);
-
-   FINDSYM(_sym_glCompressedTexSubImage2D, "glCompressedTexSubImage2D", glsym_func_void);
-   FALLBAK(_sym_glCompressedTexSubImage2D, glsym_func_void);
-
-   FINDSYM(_sym_glCopyTexImage2D, "glCopyTexImage2D", glsym_func_void);
-   FALLBAK(_sym_glCopyTexImage2D, glsym_func_void);
-
-   FINDSYM(_sym_glCopyTexSubImage2D, "glCopyTexSubImage2D", glsym_func_void);
-   FALLBAK(_sym_glCopyTexSubImage2D, glsym_func_void);
-
-   FINDSYM(_sym_glCreateProgram, "glCreateProgram", glsym_func_uint);
-   FALLBAK(_sym_glCreateProgram, glsym_func_uint);
-
-   FINDSYM(_sym_glCreateShader, "glCreateShader", glsym_func_uint);
-   FALLBAK(_sym_glCreateShader, glsym_func_uint);
-
-   FINDSYM(_sym_glCullFace, "glCullFace", glsym_func_void);
-   FALLBAK(_sym_glCullFace, glsym_func_void);
-
-   FINDSYM(_sym_glDeleteBuffers, "glDeleteBuffers", glsym_func_void);
-   FALLBAK(_sym_glDeleteBuffers, glsym_func_void);
-
-   FINDSYM(_sym_glDeleteFramebuffers, "glDeleteFramebuffers", glsym_func_void);
-   FALLBAK(_sym_glDeleteFramebuffers, glsym_func_void);
-
-   FINDSYM(_sym_glDeleteProgram, "glDeleteProgram", glsym_func_void);
-   FALLBAK(_sym_glDeleteProgram, glsym_func_void);
-
-   FINDSYM(_sym_glDeleteRenderbuffers, "glDeleteRenderbuffers", glsym_func_void);
-   FALLBAK(_sym_glDeleteRenderbuffers, glsym_func_void);
-
-   FINDSYM(_sym_glDeleteShader, "glDeleteShader", glsym_func_void);
-   FALLBAK(_sym_glDeleteShader, glsym_func_void);
-
-   FINDSYM(_sym_glDeleteTextures, "glDeleteTextures", glsym_func_void);
-   FALLBAK(_sym_glDeleteTextures, glsym_func_void);
-
-   FINDSYM(_sym_glDepthFunc, "glDepthFunc", glsym_func_void);
-   FALLBAK(_sym_glDepthFunc, glsym_func_void);
-
-   FINDSYM(_sym_glDepthMask, "glDepthMask", glsym_func_void);
-   FALLBAK(_sym_glDepthMask, glsym_func_void);
-
-   FINDSYM(_sym_glDepthRangef, "glDepthRangef", glsym_func_void);
-   FINDSYM(_sym_glDepthRangef, "glDepthRange", glsym_func_void);
-   FALLBAK(_sym_glDepthRangef, glsym_func_void);
-
-   FINDSYM(_sym_glDetachShader, "glDetachShader", glsym_func_void);
-   FALLBAK(_sym_glDetachShader, glsym_func_void);
-
-   FINDSYM(_sym_glDisable, "glDisable", glsym_func_void);
-   FALLBAK(_sym_glDisable, glsym_func_void);
-
-   FINDSYM(_sym_glDisableVertexAttribArray, "glDisableVertexAttribArray", glsym_func_void);
-   FALLBAK(_sym_glDisableVertexAttribArray, glsym_func_void);
-
-   FINDSYM(_sym_glDrawArrays, "glDrawArrays", glsym_func_void);
-   FALLBAK(_sym_glDrawArrays, glsym_func_void);
-
-   FINDSYM(_sym_glDrawElements, "glDrawElements", glsym_func_void);
-   FALLBAK(_sym_glDrawElements, glsym_func_void);
-
-   FINDSYM(_sym_glEnable, "glEnable", glsym_func_void);
-   FALLBAK(_sym_glEnable, glsym_func_void);
-
-   FINDSYM(_sym_glEnableVertexAttribArray, "glEnableVertexAttribArray", glsym_func_void);
-   FALLBAK(_sym_glEnableVertexAttribArray, glsym_func_void);
-
-   FINDSYM(_sym_glFinish, "glFinish", glsym_func_void);
-   FALLBAK(_sym_glFinish, glsym_func_void);
-
-   FINDSYM(_sym_glFlush, "glFlush", glsym_func_void);
-   FALLBAK(_sym_glFlush, glsym_func_void);
-
-   FINDSYM(_sym_glFramebufferRenderbuffer, "glFramebufferRenderbuffer", glsym_func_void);
-   FALLBAK(_sym_glFramebufferRenderbuffer, glsym_func_void);
-
-   FINDSYM(_sym_glFramebufferTexture2D, "glFramebufferTexture2D", glsym_func_void);
-   FALLBAK(_sym_glFramebufferTexture2D, glsym_func_void);
-
-   FINDSYM(_sym_glFrontFace, "glFrontFace", glsym_func_void);
-   FALLBAK(_sym_glFrontFace, glsym_func_void);
-
-   FINDSYM(_sym_glGenBuffers, "glGenBuffers", glsym_func_void);
-   FALLBAK(_sym_glGenBuffers, glsym_func_void);
-
-   FINDSYM(_sym_glGenerateMipmap, "glGenerateMipmap", glsym_func_void);
-   FALLBAK(_sym_glGenerateMipmap, glsym_func_void);
-
-   FINDSYM(_sym_glGenFramebuffers, "glGenFramebuffers", glsym_func_void);
-   FALLBAK(_sym_glGenFramebuffers, glsym_func_void);
-
-   FINDSYM(_sym_glGenRenderbuffers, "glGenRenderbuffers", glsym_func_void);
-   FALLBAK(_sym_glGenRenderbuffers, glsym_func_void);
-
-   FINDSYM(_sym_glGenTextures, "glGenTextures", glsym_func_void);
-   FALLBAK(_sym_glGenTextures, glsym_func_void);
-
-   FINDSYM(_sym_glGetActiveAttrib, "glGetActiveAttrib", glsym_func_void);
-   FALLBAK(_sym_glGetActiveAttrib, glsym_func_void);
-
-   FINDSYM(_sym_glGetActiveUniform, "glGetActiveUniform", glsym_func_void);
-   FALLBAK(_sym_glGetActiveUniform, glsym_func_void);
-
-   FINDSYM(_sym_glGetAttachedShaders, "glGetAttachedShaders", glsym_func_void);
-   FALLBAK(_sym_glGetAttachedShaders, glsym_func_void);
-
-   FINDSYM(_sym_glGetAttribLocation, "glGetAttribLocation", glsym_func_int);
-   FALLBAK(_sym_glGetAttribLocation, glsym_func_int);
-
-   FINDSYM(_sym_glGetBooleanv, "glGetBooleanv", glsym_func_void);
-   FALLBAK(_sym_glGetBooleanv, glsym_func_void);
-
-   FINDSYM(_sym_glGetBufferParameteriv, "glGetBufferParameteriv", glsym_func_void);
-   FALLBAK(_sym_glGetBufferParameteriv, glsym_func_void);
-
-   FINDSYM(_sym_glGetError, "glGetError", glsym_func_uint);
-   FALLBAK(_sym_glGetError, glsym_func_uint);
-
-   FINDSYM(_sym_glGetFloatv, "glGetFloatv", glsym_func_void);
-   FALLBAK(_sym_glGetFloatv, glsym_func_void);
-
-   FINDSYM(_sym_glGetFramebufferAttachmentParameteriv, "glGetFramebufferAttachmentParameteriv", glsym_func_void);
-   FALLBAK(_sym_glGetFramebufferAttachmentParameteriv, glsym_func_void);
-
-   FINDSYM(_sym_glGetIntegerv, "glGetIntegerv", glsym_func_void);
-   FALLBAK(_sym_glGetIntegerv, glsym_func_void);
-
-   FINDSYM(_sym_glGetProgramiv, "glGetProgramiv", glsym_func_void);
-   FALLBAK(_sym_glGetProgramiv, glsym_func_void);
-
-   FINDSYM(_sym_glGetProgramInfoLog, "glGetProgramInfoLog", glsym_func_void);
-   FALLBAK(_sym_glGetProgramInfoLog, glsym_func_void);
-
-   FINDSYM(_sym_glGetRenderbufferParameteriv, "glGetRenderbufferParameteriv", glsym_func_void);
-   FALLBAK(_sym_glGetRenderbufferParameteriv, glsym_func_void);
-
-   FINDSYM(_sym_glGetShaderiv, "glGetShaderiv", glsym_func_void);
-   FALLBAK(_sym_glGetShaderiv, glsym_func_void);
-
-   FINDSYM(_sym_glGetShaderInfoLog, "glGetShaderInfoLog", glsym_func_void);
-   FALLBAK(_sym_glGetShaderInfoLog, glsym_func_void);
-
-   FINDSYM(_sym_glGetShaderPrecisionFormat, "glGetShaderPrecisionFormat", glsym_func_void);
-   FALLBAK(_sym_glGetShaderPrecisionFormat, glsym_func_void);
-
-   FINDSYM(_sym_glGetShaderSource, "glGetShaderSource", glsym_func_void);
-   FALLBAK(_sym_glGetShaderSource, glsym_func_void);
-
-   FINDSYM(_sym_glGetString, "glGetString", glsym_func_uchar_ptr);
-   FALLBAK(_sym_glGetString, glsym_func_const_uchar_ptr);
-
-   FINDSYM(_sym_glGetTexParameterfv, "glGetTexParameterfv", glsym_func_void);
-   FALLBAK(_sym_glGetTexParameterfv, glsym_func_void);
-
-   FINDSYM(_sym_glGetTexParameteriv, "glGetTexParameteriv", glsym_func_void);
-   FALLBAK(_sym_glGetTexParameteriv, glsym_func_void);
-
-   FINDSYM(_sym_glGetUniformfv, "glGetUniformfv", glsym_func_void);
-   FALLBAK(_sym_glGetUniformfv, glsym_func_void);
-
-   FINDSYM(_sym_glGetUniformiv, "glGetUniformiv", glsym_func_void);
-   FALLBAK(_sym_glGetUniformiv, glsym_func_void);
-
-   FINDSYM(_sym_glGetUniformLocation, "glGetUniformLocation", glsym_func_int);
-   FALLBAK(_sym_glGetUniformLocation, glsym_func_int);
-
-   FINDSYM(_sym_glGetVertexAttribfv, "glGetVertexAttribfv", glsym_func_void);
-   FALLBAK(_sym_glGetVertexAttribfv, glsym_func_void);
-
-   FINDSYM(_sym_glGetVertexAttribiv, "glGetVertexAttribiv", glsym_func_void);
-   FALLBAK(_sym_glGetVertexAttribiv, glsym_func_void);
-
-   FINDSYM(_sym_glGetVertexAttribPointerv, "glGetVertexAttribPointerv", glsym_func_void);
-   FALLBAK(_sym_glGetVertexAttribPointerv, glsym_func_void);
-
-   FINDSYM(_sym_glHint, "glHint", glsym_func_void);
-   FALLBAK(_sym_glHint, glsym_func_void);
-
-   FINDSYM(_sym_glIsBuffer, "glIsBuffer", glsym_func_uchar);
-   FALLBAK(_sym_glIsBuffer, glsym_func_uchar);
-
-   FINDSYM(_sym_glIsEnabled, "glIsEnabled", glsym_func_uchar);
-   FALLBAK(_sym_glIsEnabled, glsym_func_uchar);
-
-   FINDSYM(_sym_glIsFramebuffer, "glIsFramebuffer", glsym_func_uchar);
-   FALLBAK(_sym_glIsFramebuffer, glsym_func_uchar);
-
-   FINDSYM(_sym_glIsProgram, "glIsProgram", glsym_func_uchar);
-   FALLBAK(_sym_glIsProgram, glsym_func_uchar);
-
-   FINDSYM(_sym_glIsRenderbuffer, "glIsRenderbuffer", glsym_func_uchar);
-   FALLBAK(_sym_glIsRenderbuffer, glsym_func_uchar);
-
-   FINDSYM(_sym_glIsShader, "glIsShader", glsym_func_uchar);
-   FALLBAK(_sym_glIsShader, glsym_func_uchar);
-
-   FINDSYM(_sym_glIsTexture, "glIsTexture", glsym_func_uchar);
-   FALLBAK(_sym_glIsTexture, glsym_func_uchar);
-
-   FINDSYM(_sym_glLineWidth, "glLineWidth", glsym_func_void);
-   FALLBAK(_sym_glLineWidth, glsym_func_void);
-
-   FINDSYM(_sym_glLinkProgram, "glLinkProgram", glsym_func_void);
-   FALLBAK(_sym_glLinkProgram, glsym_func_void);
-
-   FINDSYM(_sym_glPixelStorei, "glPixelStorei", glsym_func_void);
-   FALLBAK(_sym_glPixelStorei, glsym_func_void);
-
-   FINDSYM(_sym_glPolygonOffset, "glPolygonOffset", glsym_func_void);
-   FALLBAK(_sym_glPolygonOffset, glsym_func_void);
-
-   FINDSYM(_sym_glReadPixels, "glReadPixels", glsym_func_void);
-   FALLBAK(_sym_glReadPixels, glsym_func_void);
-
-   FINDSYM(_sym_glReleaseShaderCompiler, "glReleaseShaderCompiler", glsym_func_void);
-   FALLBAK(_sym_glReleaseShaderCompiler, glsym_func_void);
-
-   FINDSYM(_sym_glRenderbufferStorage, "glRenderbufferStorage", glsym_func_void);
-   FALLBAK(_sym_glRenderbufferStorage, glsym_func_void);
-
-   FINDSYM(_sym_glSampleCoverage, "glSampleCoverage", glsym_func_void);
-   FALLBAK(_sym_glSampleCoverage, glsym_func_void);
-
-   FINDSYM(_sym_glScissor, "glScissor", glsym_func_void);
-   FALLBAK(_sym_glScissor, glsym_func_void);
-
-   FINDSYM(_sym_glShaderBinary, "glShaderBinary", glsym_func_void);
-   FALLBAK(_sym_glShaderBinary, glsym_func_void);
-
-   FINDSYM(_sym_glShaderSource, "glShaderSource", glsym_func_void);
-   FALLBAK(_sym_glShaderSource, glsym_func_void);
-
-   FINDSYM(_sym_glStencilFunc, "glStencilFunc", glsym_func_void);
-   FALLBAK(_sym_glStencilFunc, glsym_func_void);
-
-   FINDSYM(_sym_glStencilFuncSeparate, "glStencilFuncSeparate", glsym_func_void);
-   FALLBAK(_sym_glStencilFuncSeparate, glsym_func_void);
-
-   FINDSYM(_sym_glStencilMask, "glStencilMask", glsym_func_void);
-   FALLBAK(_sym_glStencilMask, glsym_func_void);
-
-   FINDSYM(_sym_glStencilMaskSeparate, "glStencilMaskSeparate", glsym_func_void);
-   FALLBAK(_sym_glStencilMaskSeparate, glsym_func_void);
-
-   FINDSYM(_sym_glStencilOp, "glStencilOp", glsym_func_void);
-   FALLBAK(_sym_glStencilOp, glsym_func_void);
-
-   FINDSYM(_sym_glStencilOpSeparate, "glStencilOpSeparate", glsym_func_void);
-   FALLBAK(_sym_glStencilOpSeparate, glsym_func_void);
-
-   FINDSYM(_sym_glTexImage2D, "glTexImage2D", glsym_func_void);
-   FALLBAK(_sym_glTexImage2D, glsym_func_void);
-
-   FINDSYM(_sym_glTexParameterf, "glTexParameterf", glsym_func_void);
-   FALLBAK(_sym_glTexParameterf, glsym_func_void);
-
-   FINDSYM(_sym_glTexParameterfv, "glTexParameterfv", glsym_func_void);
-   FALLBAK(_sym_glTexParameterfv, glsym_func_void);
-
-   FINDSYM(_sym_glTexParameteri, "glTexParameteri", glsym_func_void);
-   FALLBAK(_sym_glTexParameteri, glsym_func_void);
-
-   FINDSYM(_sym_glTexParameteriv, "glTexParameteriv", glsym_func_void);
-   FALLBAK(_sym_glTexParameteriv, glsym_func_void);
-
-   FINDSYM(_sym_glTexSubImage2D, "glTexSubImage2D", glsym_func_void);
-   FALLBAK(_sym_glTexSubImage2D, glsym_func_void);
-
-   FINDSYM(_sym_glUniform1f, "glUniform1f", glsym_func_void);
-   FALLBAK(_sym_glUniform1f, glsym_func_void);
-
-   FINDSYM(_sym_glUniform1fv, "glUniform1fv", glsym_func_void);
-   FALLBAK(_sym_glUniform1fv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform1i, "glUniform1i", glsym_func_void);
-   FALLBAK(_sym_glUniform1i, glsym_func_void);
-
-   FINDSYM(_sym_glUniform1iv, "glUniform1iv", glsym_func_void);
-   FALLBAK(_sym_glUniform1iv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform2f, "glUniform2f", glsym_func_void);
-   FALLBAK(_sym_glUniform2f, glsym_func_void);
-
-   FINDSYM(_sym_glUniform2fv, "glUniform2fv", glsym_func_void);
-   FALLBAK(_sym_glUniform2fv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform2i, "glUniform2i", glsym_func_void);
-   FALLBAK(_sym_glUniform2i, glsym_func_void);
-
-   FINDSYM(_sym_glUniform2iv, "glUniform2iv", glsym_func_void);
-   FALLBAK(_sym_glUniform2iv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform3f, "glUniform3f", glsym_func_void);
-   FALLBAK(_sym_glUniform3f, glsym_func_void);
-
-   FINDSYM(_sym_glUniform3fv, "glUniform3fv", glsym_func_void);
-   FALLBAK(_sym_glUniform3fv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform3i, "glUniform3i", glsym_func_void);
-   FALLBAK(_sym_glUniform3i, glsym_func_void);
-
-   FINDSYM(_sym_glUniform3iv, "glUniform3iv", glsym_func_void);
-   FALLBAK(_sym_glUniform3iv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform4f, "glUniform4f", glsym_func_void);
-   FALLBAK(_sym_glUniform4f, glsym_func_void);
-
-   FINDSYM(_sym_glUniform4fv, "glUniform4fv", glsym_func_void);
-   FALLBAK(_sym_glUniform4fv, glsym_func_void);
-
-   FINDSYM(_sym_glUniform4i, "glUniform4i", glsym_func_void);
-   FALLBAK(_sym_glUniform4i, glsym_func_void);
-
-   FINDSYM(_sym_glUniform4iv, "glUniform4iv", glsym_func_void);
-   FALLBAK(_sym_glUniform4iv, glsym_func_void);
-
-   FINDSYM(_sym_glUniformMatrix2fv, "glUniformMatrix2fv", glsym_func_void);
-   FALLBAK(_sym_glUniformMatrix2fv, glsym_func_void);
-
-   FINDSYM(_sym_glUniformMatrix3fv, "glUniformMatrix3fv", glsym_func_void);
-   FALLBAK(_sym_glUniformMatrix3fv, glsym_func_void);
-
-   FINDSYM(_sym_glUniformMatrix4fv, "glUniformMatrix4fv", glsym_func_void);
-   FALLBAK(_sym_glUniformMatrix4fv, glsym_func_void);
-
-   FINDSYM(_sym_glUseProgram, "glUseProgram", glsym_func_void);
-   FALLBAK(_sym_glUseProgram, glsym_func_void);
-
-   FINDSYM(_sym_glValidateProgram, "glValidateProgram", glsym_func_void);
-   FALLBAK(_sym_glValidateProgram, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib1f, "glVertexAttrib1f", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib1f, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib1fv, "glVertexAttrib1fv", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib1fv, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib2f, "glVertexAttrib2f", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib2f, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib2fv, "glVertexAttrib2fv", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib2fv, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib3f, "glVertexAttrib3f", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib3f, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib3fv, "glVertexAttrib3fv", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib3fv, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib4f, "glVertexAttrib4f", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib4f, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttrib4fv, "glVertexAttrib4fv", glsym_func_void);
-   FALLBAK(_sym_glVertexAttrib4fv, glsym_func_void);
-
-   FINDSYM(_sym_glVertexAttribPointer, "glVertexAttribPointer", glsym_func_void);
-   FALLBAK(_sym_glVertexAttribPointer, glsym_func_void);
-
-   FINDSYM(_sym_glViewport, "glViewport", glsym_func_void);
-   FALLBAK(_sym_glViewport, glsym_func_void);
-
-#undef FINDSYM
-#undef FALLBAK
-
-   // Checking to see if this function exists is a poor but reasonable way to 
-   // check if it's gles but it works for now
-   if (_sym_glGetShaderPrecisionFormat != (typeof(_sym_glGetShaderPrecisionFormat))sym_missing ) 
-     {
-        DBG("GL Library is GLES.");
-        gl_lib_is_gles = 1;
-     }
-
-   return 1;
-}
-
-//--------------------------------------------------------------//
-// Wrapped GL APIs to handle desktop compatibility
-
-// Stripping precision code from GLES shader for desktop compatibility
-// Code adopted from Meego GL code. Temporary Fix.  
-static const char *
-opengl_strtok(const char *s, int *n, char **saveptr, char *prevbuf)
-{
-   char *start;
-   char *ret;
-   char *p;
-   int retlen;
-   static const char *delim = " \t\n\r/";
-
-   if (prevbuf) free(prevbuf);
-
-   if (s) 
-      *saveptr = (char *)s;
-   else 
-     {
-        if (!(*saveptr) || !(*n))
-           return NULL;
-        s = *saveptr;
-     }
-
-   for (; *n && strchr(delim, *s); s++, (*n)--) 
-     {
-        if (*s == '/' && *n > 1) 
-          {
-             if (s[1] == '/') 
-               {
-                  do 
-                    {
-                       s++, (*n)--;
-                    } 
-                  while (*n > 1 && s[1] != '\n' && s[1] != '\r');
-               } 
-             else if (s[1] == '*') 
-               {
-                  do 
-                    {
-                       s++, (*n)--;
-                    } 
-                  while (*n > 2 && (s[1] != '*' || s[2] != '/'));
-                  s++, (*n)--;
-               }
-          }
-     }
-
-   start = (char *)s;
-   for (; *n && *s && !strchr(delim, *s); s++, (*n)--);
-   if (*n > 0) s++, (*n)--;
-
-   *saveptr = (char *)s;
-
-   retlen = s - start;
-   ret = malloc(retlen + 1);
-   p = ret;
-
-   while (retlen > 0) 
-     {
-        if (*start == '/' && retlen > 1) 
-          {
-             if (start[1] == '/') 
-               {
-                  do 
-                    {
-                       start++, retlen--;
-                    } 
-                  while (retlen > 1 && start[1] != '\n' && start[1] != '\r');
-                  start++, retlen--;
-                  continue;
-               } 
-             else if (start[1] == '*') 
-               {
-                  do 
-                    {
-                       start++, retlen--;
-                    } 
-                  while (retlen > 2 && (start[1] != '*' || start[2] != '/'));
-                  start += 3, retlen -= 3;
-                  continue;
-               }
-          }
-        *(p++) = *(start++), retlen--;
-     }
-
-   *p = 0;
-   return ret;
-}       
-
-static char *
-patch_gles_shader(const char *source, int length, int *patched_len)
-{
-   char *saveptr = NULL;
-   char *sp;
-   char *p = NULL;
-
-   if (!length) length = strlen(source);
-
-   *patched_len = 0;
-   int patched_size = length;
-   char *patched = malloc(patched_size + 1);
-
-   if (!patched) return NULL;
-
-   p = (char *)opengl_strtok(source, &length, &saveptr, NULL);
-   for (; p; p = (char *)opengl_strtok(0, &length, &saveptr, p)) 
-     {
-        if (!strncmp(p, "lowp", 4) || !strncmp(p, "mediump", 7) || !strncmp(p, "highp", 5)) 
-          {
-             continue;
-          } 
-        else if (!strncmp(p, "precision", 9)) 
-          {
-             while ((p = (char *)opengl_strtok(0, &length, &saveptr, p)) && !strchr(p, ';'));
-          } 
-        else 
-          {
-             if (!strncmp(p, "gl_MaxVertexUniformVectors", 26)) 
-               {
-                  p = "(gl_MaxVertexUniformComponents / 4)";
-               } 
-             else if (!strncmp(p, "gl_MaxFragmentUniformVectors", 28)) 
-               {
-                  p = "(gl_MaxFragmentUniformComponents / 4)";
-               } 
-             else if (!strncmp(p, "gl_MaxVaryingVectors", 20)) 
-               {
-                  p = "(gl_MaxVaryingFloats / 4)";
-               }
-
-             int new_len = strlen(p);
-             if (*patched_len + new_len > patched_size) 
-               {
-                  patched_size *= 2;
-                  patched = realloc(patched, patched_size + 1);
-
-                  if (!patched) 
-                     return NULL;
-               }
-
-             memcpy(patched + *patched_len, p, new_len);
-             *patched_len += new_len;
-          }     
-     }
-
-   patched[*patched_len] = 0;
-   /* check that we don't leave dummy preprocessor lines */
-   for (sp = patched; *sp;) 
-     {
-        for (; *sp == ' ' || *sp == '\t'; sp++);
-        if (!strncmp(sp, "#define", 7)) 
-          {
-             for (p = sp + 7; *p == ' ' || *p == '\t'; p++);
-             if (*p == '\n' || *p == '\r' || *p == '/') 
-               {
-                  memset(sp, 0x20, 7);
-               }
-          }
-        for (; *sp && *sp != '\n' && *sp != '\r'; sp++);
-        for (; *sp == '\n' || *sp == '\r'; sp++);
-     }
-   return patched;
-}
-
-static void
-evgl_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-{
-   int i = 0, len = 0;
-
-   char **s = malloc(count * sizeof(char*));
-   GLint *l = malloc(count * sizeof(GLint));
-
-   memset(s, 0, count * sizeof(char*));
-   memset(l, 0, count * sizeof(GLint));
-
-   for (i = 0; i < count; ++i) 
-     {
-        if (length) 
-          {
-             len = length[i];
-             if (len < 0) 
-                len = string[i] ? strlen(string[i]) : 0;
-          }
-        else
-           len = string[i] ? strlen(string[i]) : 0;
-
-        if (string[i]) 
-          {
-             s[i] = patch_gles_shader(string[i], len, &l[i]);
-             if (!s[i]) 
-               {
-                  while(i)
-                     free(s[--i]);
-                  free(l);
-                  free(s);
-
-                  DBG("Patching Shader Failed.");
-                  return;
-               }
-          } 
-        else 
-          {
-             s[i] = NULL;
-             l[i] = 0;
-          }
-     }
-
-   _sym_glShaderSource(shader, count, (const char **)s, l);
-
-   while(i)
-      free(s[--i]);
-   free(l);
-   free(s);
-}
-
-
-static void
-evgl_glGetShaderPrecisionFormat(GLenum shadertype __UNUSED__, GLenum precisiontype __UNUSED__, GLint* range, GLint* precision)
-{
-   if (range)
-     {
-        range[0] = -126; // floor(log2(FLT_MIN))
-        range[1] = 127; // floor(log2(FLT_MAX))
-     }
-   if (precision)
-     {
-        precision[0] = 24; // floor(-log2((1.0/16777218.0)));
-     }
-   return;
-}
-
-static void
-evgl_glReleaseShaderCompiler(void)
-{
-   DBG("Not supported in Desktop GL");
-   return;
-}
-
-static void
-evgl_glShaderBinary(GLsizei n __UNUSED__, const GLuint* shaders __UNUSED__, GLenum binaryformat __UNUSED__, const void* binary __UNUSED__, GLsizei length __UNUSED__)
-{
-   // FIXME: need to dlsym/getprocaddress for this
-   DBG("Not supported in Desktop GL");
-   return;
-   //n = binaryformat = length = 0;
-   //shaders = binary = 0;
-}
-#endif
-//--------------------------------------------------------------//
-
-
-#ifdef EVAS_GL
-static void
-override_gl_apis(Evas_GL_API *api)
-{
-
-   api->version = EVAS_GL_API_VERSION;
-
-#define ORD(f) EVAS_API_OVERRIDE(f, api, _sym_)
-   // GLES 2.0
-   ORD(glActiveTexture);
-   ORD(glAttachShader);
-   ORD(glBindAttribLocation);
-   ORD(glBindBuffer);
-   ORD(glBindFramebuffer);
-   ORD(glBindRenderbuffer);
-   ORD(glBindTexture);
-   ORD(glBlendColor);
-   ORD(glBlendEquation);
-   ORD(glBlendEquationSeparate);
-   ORD(glBlendFunc);
-   ORD(glBlendFuncSeparate);
-   ORD(glBufferData);
-   ORD(glBufferSubData);
-   ORD(glCheckFramebufferStatus);
-   ORD(glClear);
-   ORD(glClearColor);
-   ORD(glClearDepthf);     
-   ORD(glClearStencil);
-   ORD(glColorMask);
-   ORD(glCompileShader);
-   ORD(glCompressedTexImage2D);
-   ORD(glCompressedTexSubImage2D);
-   ORD(glCopyTexImage2D);
-   ORD(glCopyTexSubImage2D);
-   ORD(glCreateProgram);
-   ORD(glCreateShader);
-   ORD(glCullFace);
-   ORD(glDeleteBuffers);
-   ORD(glDeleteFramebuffers);
-   ORD(glDeleteProgram);
-   ORD(glDeleteRenderbuffers);
-   ORD(glDeleteShader);
-   ORD(glDeleteTextures);
-   ORD(glDepthFunc);
-   ORD(glDepthMask);
-   ORD(glDepthRangef);     
-   ORD(glDetachShader);
-   ORD(glDisable);
-   ORD(glDisableVertexAttribArray);
-   ORD(glDrawArrays);
-   ORD(glDrawElements);
-   ORD(glEnable);
-   ORD(glEnableVertexAttribArray);
-   ORD(glFinish);
-   ORD(glFlush);
-   ORD(glFramebufferRenderbuffer);
-   ORD(glFramebufferTexture2D);
-   ORD(glFrontFace);
-   ORD(glGenBuffers);
-   ORD(glGenerateMipmap);
-   ORD(glGenFramebuffers);
-   ORD(glGenRenderbuffers);
-   ORD(glGenTextures);
-   ORD(glGetActiveAttrib);
-   ORD(glGetActiveUniform);
-   ORD(glGetAttachedShaders);
-   ORD(glGetAttribLocation);
-   ORD(glGetBooleanv);
-   ORD(glGetBufferParameteriv);
-   ORD(glGetError);
-   ORD(glGetFloatv);
-   ORD(glGetFramebufferAttachmentParameteriv);
-   ORD(glGetIntegerv);
-   ORD(glGetProgramiv);
-   ORD(glGetProgramInfoLog);
-   ORD(glGetRenderbufferParameteriv);
-   ORD(glGetShaderiv);
-   ORD(glGetShaderInfoLog);
-   ORD(glGetShaderPrecisionFormat);  
-   ORD(glGetShaderSource);
-   ORD(glGetString);             // FIXME
-   ORD(glGetTexParameterfv);
-   ORD(glGetTexParameteriv);
-   ORD(glGetUniformfv);
-   ORD(glGetUniformiv);
-   ORD(glGetUniformLocation);
-   ORD(glGetVertexAttribfv);
-   ORD(glGetVertexAttribiv);
-   ORD(glGetVertexAttribPointerv);
-   ORD(glHint);
-   ORD(glIsBuffer);
-   ORD(glIsEnabled);
-   ORD(glIsFramebuffer);
-   ORD(glIsProgram);
-   ORD(glIsRenderbuffer);
-   ORD(glIsShader);
-   ORD(glIsTexture);
-   ORD(glLineWidth);
-   ORD(glLinkProgram);
-   ORD(glPixelStorei);
-   ORD(glPolygonOffset);
-   ORD(glReadPixels);
-   ORD(glReleaseShaderCompiler); 
-   ORD(glRenderbufferStorage);
-   ORD(glSampleCoverage);
-   ORD(glScissor);
-   ORD(glShaderBinary); 
-   ORD(glShaderSource);
-   ORD(glStencilFunc);
-   ORD(glStencilFuncSeparate);
-   ORD(glStencilMask);
-   ORD(glStencilMaskSeparate);
-   ORD(glStencilOp);
-   ORD(glStencilOpSeparate);
-   ORD(glTexImage2D);
-   ORD(glTexParameterf);
-   ORD(glTexParameterfv);
-   ORD(glTexParameteri);
-   ORD(glTexParameteriv);
-   ORD(glTexSubImage2D);
-   ORD(glUniform1f);
-   ORD(glUniform1fv);
-   ORD(glUniform1i);
-   ORD(glUniform1iv);
-   ORD(glUniform2f);
-   ORD(glUniform2fv);
-   ORD(glUniform2i);
-   ORD(glUniform2iv);
-   ORD(glUniform3f);
-   ORD(glUniform3fv);
-   ORD(glUniform3i);
-   ORD(glUniform3iv);
-   ORD(glUniform4f);
-   ORD(glUniform4fv);
-   ORD(glUniform4i);
-   ORD(glUniform4iv);
-   ORD(glUniformMatrix2fv);
-   ORD(glUniformMatrix3fv);
-   ORD(glUniformMatrix4fv);
-   ORD(glUseProgram);
-   ORD(glValidateProgram);
-   ORD(glVertexAttrib1f);
-   ORD(glVertexAttrib1fv);
-   ORD(glVertexAttrib2f);
-   ORD(glVertexAttrib2fv);
-   ORD(glVertexAttrib3f);
-   ORD(glVertexAttrib3fv);
-   ORD(glVertexAttrib4f);
-   ORD(glVertexAttrib4fv);
-   ORD(glVertexAttribPointer);
-   ORD(glViewport);
-#undef ORD
-
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, evgl_)
-   if (!gl_lib_is_gles)
-     {
-        // Override functions wrapped by Evas_GL
-        // GLES2.0 API compat on top of desktop gl
-        ORD(glGetShaderPrecisionFormat);
-        ORD(glReleaseShaderCompiler);
-        ORD(glShaderBinary);
-     }
-
-   ORD(glShaderSource);    // Do precision stripping in both cases
-#undef ORD
-}
-#endif
-
-//-------------------------------------------//
-static int
-gl_lib_init(void)
-{
-#ifdef EVAS_GL
-   // dlopen OSMesa 
-   gl_lib_handle = dlopen("libOSMesa.so.1", RTLD_NOW);
-   if (!gl_lib_handle) gl_lib_handle = dlopen("libOSMesa.so", RTLD_NOW);
-   if (!gl_lib_handle)
-     {
-        DBG("Unable to open libOSMesa:  %s", dlerror());
-        return 0;
-     }
-
-   //------------------------------------------------//
-   if (!glue_sym_init()) return 0;
-   if (!gl_sym_init()) return 0;
-
-   override_gl_apis(&gl_funcs);
-
-   return 1;
-#else
-   return 0;
-#endif
-}
-
-
-static void
-init_gl(void)
-{
-   DBG("Initializing Software OpenGL APIs...\n");
-
-   if (!gl_lib_init())
-      DBG("Unable to support EvasGL in this engine module. Install OSMesa to get it running");
-   else
-     {
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-        ORD(gl_surface_create);
-        ORD(gl_surface_destroy);
-        ORD(gl_context_create);
-        ORD(gl_context_destroy);
-        ORD(gl_make_current);
-        ORD(gl_string_query);           // FIXME: Need to implement
-        ORD(gl_proc_address_get);       // FIXME: Need to implement
-        ORD(gl_native_surface_get);
-        ORD(gl_api_get);
-#undef ORD
-     }
-}
-
-
-/*
- *****
- **
- ** MODULE ACCESSIBLE API API
- **
- *****
- */
-
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   _evas_soft_gen_log_dom = eina_log_domain_register
-     ("evas-software_generic", EVAS_DEFAULT_LOG_COLOR);
-   if(_evas_soft_gen_log_dom<0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   init_gl();
-
-   em->functions = (void *)(&func);
-   cpunum = eina_cpu_count();
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_soft_gen_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "software_generic",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_generic);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_GENERIC
-EVAS_EINA_MODULE_DEFINE(engine, software_generic);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h b/libraries/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h
deleted file mode 100644
index 3cce6ec..0000000
--- a/libraries/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _EVAS_ENGINE_SDL_H
-#define _EVAS_ENGINE_SDL_H
-
-#include <SDL/SDL.h>
-
-typedef struct _Evas_Engine_Info_SDL Evas_Engine_Info_SDL;
-
-struct _Evas_Engine_Info_SDL
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   struct {
-     int                        rotation;
-     int                        fullscreen : 1;
-     int                        hwsurface : 1;
-     int                        noframe : 1;
-     int                        alpha : 1;
-   } info;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-#endif
-
-
diff --git a/libraries/evas/src/modules/engines/software_sdl/Makefile.am b/libraries/evas/src/modules/engines/software_sdl/Makefile.am
deleted file mode 100644
index dc548ba..0000000
--- a/libraries/evas/src/modules/engines/software_sdl/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_software_sdl_cflags@
-
-AM_CFLAGS = @WIN32_CFLAGS@
-
-if BUILD_ENGINE_SOFTWARE_SDL
-
-SOFTWARE_SDL_SOURCES = evas_engine.c
-SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@
-
-
-includes_HEADERS = Evas_Engine_SDL.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_SDL
-
-pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES  = $(SOFTWARE_SDL_SOURCES)
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_SDL_LIBADD)
-module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_sdl.la
-
-libevas_engine_software_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-libevas_engine_software_sdl_la_LIBADD = $(SOFTWARE_SDL_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/software_sdl/Makefile.in b/libraries/evas/src/modules/engines/software_sdl/Makefile.in
deleted file mode 100644
index f63f3eb..0000000
--- a/libraries/evas/src/modules/engines/software_sdl/Makefile.in
+++ /dev/null
@@ -1,800 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/software_sdl
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_sdl_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@am__objects_1 = evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@am_libevas_engine_software_sdl_la_OBJECTS = $(am__objects_1)
-libevas_engine_software_sdl_la_OBJECTS =  \
-        $(am_libevas_engine_software_sdl_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@am_libevas_engine_software_sdl_la_rpath =
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la \
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@  $(am__DEPENDENCIES_1)
-am__module_la_SOURCES_DIST = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@        module_la-evas_engine.lo
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_sdl_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_sdl_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_SDL.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-WIN32_CFLAGS = @WIN32_CFLAGS@
-WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
-evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_software_sdl_cflags@
-
-AM_CFLAGS = @WIN32_CFLAGS@
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@SOFTWARE_SDL_SOURCES = evas_engine.c
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@includes_HEADERS = Evas_Engine_SDL.h
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_SDL_LIBADD)
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_software_sdl.la
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
-@BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_sdl_la_LIBADD = $(SOFTWARE_SDL_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_sdl/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_sdl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_sdl.la: $(libevas_engine_software_sdl_la_OBJECTS) $(libevas_engine_software_sdl_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_sdl_la_rpath) $(libevas_engine_software_sdl_la_OBJECTS) $(libevas_engine_software_sdl_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_sdl/evas_engine.c b/libraries/evas/src/modules/engines/software_sdl/evas_engine.c
deleted file mode 100644
index 22c11b0..0000000
--- a/libraries/evas/src/modules/engines/software_sdl/evas_engine.c
+++ /dev/null
@@ -1,1218 +0,0 @@
-#include <assert.h>
-#include <math.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <SDL/SDL.h>
-
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_engine.h"
-
-int _evas_engine_soft_sdl_log_dom = -1;
-/* #define DEBUG_SDL */
-
-static Evas_Func func, pfunc;
-
-static void*                     _sdl_output_setup      (int w, int h, int fullscreen, int noframe, int alpha, int hwsurface);
-
-static Engine_Image_Entry       *_sdl_image_alloc       (void);
-static void                      _sdl_image_delete      (Engine_Image_Entry *eim);
-
-static int                       _sdl_image_constructor (Engine_Image_Entry*, void* data);
-static void                      _sdl_image_destructor  (Engine_Image_Entry *eim);
-
-static void                      _sdl_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
-
-static int                       _sdl_image_dirty       (Engine_Image_Entry *dst, const Engine_Image_Entry *src);
-
-static int                       _sdl_image_size_set    (Engine_Image_Entry *dst, const Engine_Image_Entry *src);
-
-static int                       _sdl_image_update_data (Engine_Image_Entry* dst, void* engine_data);
-
-static void                      _sdl_image_load        (Engine_Image_Entry *eim, const Image_Entry* im);
-static int                       _sdl_image_mem_size_get(Engine_Image_Entry *eim);
-
-#ifdef DEBUG_SDL
-static void                      _sdl_image_debug       (const char* context, Engine_Image_Entry* im);
-#endif
-
-static const Evas_Cache_Engine_Image_Func       _sdl_cache_engine_image_cb = {
-  NULL /* key */,
-  _sdl_image_alloc /* alloc */,
-  _sdl_image_delete /* dealloc */,
-  _sdl_image_constructor /* constructor */,
-  _sdl_image_destructor /* destructor */,
-  _sdl_image_dirty_region /* dirty_region */,
-  _sdl_image_dirty /* dirty */,
-  _sdl_image_size_set /* size_set */,
-  _sdl_image_update_data /* update_data */,
-  _sdl_image_load /* load */,
-  _sdl_image_mem_size_get /* mem_size_get */,
-#ifdef DEBUG_SDL  /* debug */
-  _sdl_image_debug
-#else
-  NULL
-#endif
-};
-
-#define _SDL_UPDATE_PIXELS(EIM)                                 \
-  ((RGBA_Image *) EIM->cache_entry.src)->image.data = EIM->surface->pixels;
-
-#define RMASK 0x00ff0000
-#define GMASK 0x0000ff00
-#define BMASK 0x000000ff
-#define AMASK 0xff000000
-
-/* SDL engine info function */
-static void*
-evas_engine_sdl_info            (Evas* e __UNUSED__)
-{
-   Evas_Engine_Info_SDL*        info;
-   info = calloc(1, sizeof (Evas_Engine_Info_SDL));
-   if (!info) return NULL;
-   info->magic.magic = rand();
-   return info;
-}
-
-static void
-evas_engine_sdl_info_free       (Evas* e __UNUSED__, void* info)
-{
-   Evas_Engine_Info_SDL*        in;
-   in = (Evas_Engine_Info_SDL*) info;
-   free(in);
-}
-
-/* SDL engine output manipulation function */
-static int
-evas_engine_sdl_setup           (Evas* e, void* in)
-{
-   Evas_Engine_Info_SDL*        info = (Evas_Engine_Info_SDL*) in;
-
-   /* if we arent set to sdl, why the hell do we get called?! */
-   if (evas_output_method_get(e) != evas_render_method_lookup("software_sdl"))
-      return 0;
-
-   SDL_Init(SDL_INIT_NOPARACHUTE);
-
-   if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
-     {
-        ERR("SDL_Init failed with %s", SDL_GetError());
-        SDL_Quit();
-        return 0;
-     }
-
-   /* lets just set up */
-   e->engine.data.output = _sdl_output_setup(e->output.w, e->output.h,
-                                             info->info.fullscreen,
-                                             info->info.noframe,
-                                             info->info.alpha,
-                                             info->info.hwsurface);
-
-   if (!e->engine.data.output)
-      return 0;
-
-   e->engine.func = &func;
-   e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
-
-   return 1;
-}
-
-static void
-evas_engine_sdl_output_free     (void *data)
-{
-   Render_Engine*               re = data;
-
-   if (re->tb)
-     evas_common_tilebuf_free(re->tb);
-   if (re->rects)
-      evas_common_tilebuf_free_render_rects(re->rects);
-   if (re->rgba_engine_image)
-     evas_cache_engine_image_drop(&re->rgba_engine_image->cache_entry);
-   if (re->cache)
-     evas_cache_engine_image_shutdown(re->cache);
-
-   if (re->update_rects)
-     free(re->update_rects);
-   free(re);
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-
-   SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
-
-static void
-evas_engine_sdl_output_resize   (void *data, int w, int h)
-{
-   /* FIXME */
-   Render_Engine        *re = data;
-   SDL_Surface          *surface;
-
-   if (w == re->tb->outbuf_w && h == re->tb->outbuf_h)
-     return;
-
-   /* Destroy the current screen */
-   evas_cache_engine_image_drop(&re->rgba_engine_image->cache_entry);
-
-   /* Rebuil tilebuf */
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-      evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   /* Build the new screen */
-   surface = SDL_SetVideoMode(w, h, 32,
-                              (re->flags.hwsurface ? SDL_HWSURFACE : SDL_SWSURFACE)
-                              | (re->flags.fullscreen ? SDL_FULLSCREEN : 0)
-                              | (re->flags.noframe ? SDL_NOFRAME : 0)
-                              | (re->flags.alpha ? SDL_SRCALPHA : 0));
-
-   if (!surface)
-     {
-        ERR("Unable to change the resolution to : %ix%i", w, h);
-        exit(-1);
-     }
-   re->rgba_engine_image = (SDL_Engine_Image_Entry *) evas_cache_engine_image_engine(re->cache, surface);
-   if (!re->rgba_engine_image)
-     {
-        ERR("RGBA_Image allocation from SDL failed");
-        exit(-1);
-     }
-
-   SDL_FillRect(surface, NULL, 0);
-}
-
-static void
-evas_engine_sdl_output_tile_size_set    (void *data, int w, int h)
-{
-   Render_Engine*                       re = (Render_Engine*) data;
-
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-evas_engine_sdl_output_redraws_rect_add (void *data, int x, int y, int w, int h)
-{
-   Render_Engine*                       re = (Render_Engine*) data;
-
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-evas_engine_sdl_output_redraws_rect_del (void *data, int x, int y, int w, int h)
-{
-   Render_Engine*                       re = (Render_Engine*) data;
-
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-evas_engine_sdl_output_redraws_clear    (void *data)
-{
-   Render_Engine*                       re = (Render_Engine*) data;
-
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void*
-evas_engine_sdl_output_redraws_next_update_get  (void *data,
-                                                 int *x, int *y, int *w, int *h,
-                                                 int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine        *re = data;
-   Tilebuf_Rect         *tb_rect;
-   SDL_Rect              rect;
-
-   if (re->flags.end)
-     {
-        re->flags.end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect)
-     {
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        return NULL;
-     }
-
-   tb_rect = (Tilebuf_Rect*) re->cur_rect;
-   *cx = *x = tb_rect->x;
-   *cy = *y = tb_rect->y;
-   *cw = *w = tb_rect->w;
-   *ch = *h = tb_rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->flags.end = 1;
-     }
-
-   rect.x = *x;
-   rect.y = *y;
-   rect.w = *w;
-   rect.h = *h;
-
-   /* Return the "fake" surface so it is passed to the drawing routines. */
-   return re->rgba_engine_image;
-}
-
-static void
-evas_engine_sdl_output_redraws_next_update_push (void *data, void *surface __UNUSED__,
-                                                 int x, int y, int w, int h)
-{
-   Render_Engine                                *re = (Render_Engine *) data;
-
-   if (re->update_rects_count + 1 > re->update_rects_limit)
-     {
-        re->update_rects_limit += 8;
-        re->update_rects = realloc(re->update_rects, sizeof (SDL_Rect) * re->update_rects_limit);
-     }
-
-   re->update_rects[re->update_rects_count].x = x;
-   re->update_rects[re->update_rects_count].y = y;
-   re->update_rects[re->update_rects_count].w = w;
-   re->update_rects[re->update_rects_count].h = h;
-
-   ++re->update_rects_count;
-
-   evas_common_cpu_end_opt();
-}
-
-static void
-_sdl_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h)
-{
-   SDL_Engine_Image_Entry       *dst;
-   RGBA_Image *im;
-
-   dst = (SDL_Engine_Image_Entry *) eim;
-
-   SDL_UpdateRect(dst->surface, x, y, w, h);
-
-   im = (RGBA_Image *)eim->src;
-   im->flags |= RGBA_IMAGE_IS_DIRTY;
-}
-
-static void
-evas_engine_sdl_output_flush(void *data)
-{
-   Render_Engine        *re = (Render_Engine *) data;
-
-   if (re->update_rects_count > 0)
-     SDL_UpdateRects(re->rgba_engine_image->surface, re->update_rects_count, re->update_rects);
-
-   re->update_rects_count = 0;
-}
-
-
-static void
-evas_engine_sdl_output_idle_flush(void *data)
-{
-   (void) data;
-}
-
-/*
- * Image objects
- */
-
-static void*
-evas_engine_sdl_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine*       re = (Render_Engine*) data;;
-
-   *error = 0;
-   return evas_cache_engine_image_request(re->cache, file, key, lo, NULL, error);
-}
-
-static int
-evas_engine_sdl_image_alpha_get(void *data __UNUSED__, void *image)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   RGBA_Image                   *im;
-
-   if (!eim) return 1;
-   im = (RGBA_Image *) eim->cache_entry.src;
-   switch (eim->cache_entry.src->space)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-        if (im->cache_entry.flags.alpha) return 1;
-     default:
-        break;
-     }
-   return 0;
-}
-
-static void
-evas_engine_sdl_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   SDL_Engine_Image_Entry       *eim;
-
-   eim = image;
-   if (w) *w = eim->cache_entry.src->w;
-   if (h) *h = eim->cache_entry.src->h;
-}
-
-static int
-evas_engine_sdl_image_colorspace_get(void *data __UNUSED__, void *image)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   if (!eim) return EVAS_COLORSPACE_ARGB8888;
-   return eim->cache_entry.src->space;
-}
-
-static void
-evas_engine_sdl_image_colorspace_set(void *data __UNUSED__, void *image, int cspace)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   if (!eim) return;
-   if (eim->cache_entry.src->space == cspace) return;
-
-   evas_cache_engine_image_colorspace(&eim->cache_entry, cspace, NULL);
-}
-
-static void*
-evas_engine_sdl_image_new_from_copied_data(void *data,
-                                           int w, int h,
-                                           DATA32* image_data,
-                                           int alpha, int cspace)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-
-   return evas_cache_engine_image_copied_data(re->cache, w, h, image_data, alpha, cspace, NULL);
-}
-
-static void*
-evas_engine_sdl_image_new_from_data(void *data, int w, int h, DATA32* image_data, int alpha, int cspace)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-
-   return evas_cache_engine_image_data(re->cache, w, h, image_data, alpha, cspace, NULL);
-}
-
-static void
-evas_engine_sdl_image_free(void *data, void *image)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   (void) data;
-
-   evas_cache_engine_image_drop(&eim->cache_entry);
-}
-
-static void*
-evas_engine_sdl_image_size_set(void *data, void *image, int w, int h)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   (void) data;
-
-   return evas_cache_engine_image_size_set(&eim->cache_entry, w, h);
-}
-
-static void*
-evas_engine_sdl_image_dirty_region(void *data,
-                                   void *image,
-                                   int x, int y, int w, int h)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-
-   (void) data;
-
-   return evas_cache_engine_image_dirty(&eim->cache_entry, x, y, w, h);
-}
-
-static void*
-evas_engine_sdl_image_data_get(void *data, void *image,
-                               int to_write, DATA32** image_data, int *err)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   RGBA_Image                   *im;
-
-   (void) data;
-
-   if (!eim)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_GENERIC;
-        return NULL;
-     }
-   im = (RGBA_Image *) eim->cache_entry.src;
-
-   switch (eim->cache_entry.src->space)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-        if (to_write)
-          eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_dirty(&eim->cache_entry, 0, 0, eim->cache_entry.src->w, eim->cache_entry.src->h);
-
-        evas_cache_engine_image_load_data(&eim->cache_entry);
-        *image_data = im->image.data;
-        break;
-     case EVAS_COLORSPACE_YCBCR422P709_PL:
-     case EVAS_COLORSPACE_YCBCR422P601_PL:
-     case EVAS_COLORSPACE_YCBCR422601_PL:
-        *image_data = im->cs.data;
-        break;
-     default:
-        abort();
-        break;
-     }
-   if (err) *err = EVAS_LOAD_ERROR_NONE;
-   return eim;
-}
-
-static void*
-evas_engine_sdl_image_data_put(void *data, void *image, DATA32* image_data)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   Render_Engine                *re = data;
-   RGBA_Image                   *im;
-
-   if (!eim) return NULL;
-   im = (RGBA_Image*) eim->cache_entry.src;
-
-   switch (eim->cache_entry.src->space)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-        if (image_data != im->image.data)
-          {
-             evas_cache_engine_image_drop(&eim->cache_entry);
-             eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_data(re->cache,
-                                                                           eim->cache_entry.w, eim->cache_entry.h,
-                                                                           image_data,
-                                                                           func.image_alpha_get(data, eim),
-                                                                           func.image_colorspace_get(data, eim),
-                                                                           NULL);
-          }
-        break;
-     case EVAS_COLORSPACE_YCBCR422P601_PL:
-     case EVAS_COLORSPACE_YCBCR422P709_PL:
-     case EVAS_COLORSPACE_YCBCR422601_PL:
-        if (image_data != im->cs.data)
-          {
-             if (im->cs.data)
-               if (!im->cs.no_free)
-                 free(im->cs.data);
-             im->cs.data = image_data;
-             evas_common_image_colorspace_dirty(im);
-          }
-        break;
-     default:
-        abort();
-        break;
-     }
-   return eim;
-}
-
-static void
-evas_engine_sdl_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   RGBA_Image                   *im;
-
-   if (!eim) return ;
-   im = (RGBA_Image*) eim->cache_entry.src;
-   if (!im) return ;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-evas_engine_sdl_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   RGBA_Image                   *im;
-
-   if (!eim) return ;
-   im = (RGBA_Image*) eim->cache_entry.src;
-   if (!im) return ;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void*
-evas_engine_sdl_image_alpha_set(void *data, void *image, int has_alpha)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   RGBA_Image                   *im;
-
-   (void) data;
-
-   if (!eim) return NULL;
-
-   im = (RGBA_Image *) eim->cache_entry.src;
-
-   if (eim->cache_entry.src->space != EVAS_COLORSPACE_ARGB8888)
-     {
-        im->cache_entry.flags.alpha = 0;
-        return eim;
-     }
-
-   eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_dirty(&eim->cache_entry, 0, 0, eim->cache_entry.w, eim->cache_entry.h);
-
-   /* FIXME: update SDL_Surface flags */
-   im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
-   return eim;
-}
-
-static void*
-evas_engine_sdl_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-   return image;
-}
-
-static void
-evas_engine_sdl_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-   /* FIXME: need to know what evas expect from this call */
-}
-
-static void
-evas_engine_sdl_image_draw(void *data, void *context, void *surface, void *image,
-                           int src_region_x, int src_region_y, int src_region_w, int src_region_h,
-                           int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h,
-                           int smooth)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   SDL_Engine_Image_Entry       *dst = surface;
-   RGBA_Draw_Context            *dc = (RGBA_Draw_Context*) context;
-   int                           mustlock_im = 0;
-   int                           mustlock_dst = 0;
-
-   (void) data;
-
-   if (eim->cache_entry.src->space == EVAS_COLORSPACE_ARGB8888)
-     evas_cache_engine_image_load_data(&eim->cache_entry);
-
-   /* Fallback to software method */
-   if (SDL_MUSTLOCK(dst->surface))
-     {
-        mustlock_dst = 1;
-        SDL_LockSurface(dst->surface);
-        _SDL_UPDATE_PIXELS(dst);
-     }
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_image_colorspace_normalize((RGBA_Image *) eim->cache_entry.src);
-
-   if (smooth)
-     evas_common_scale_rgba_in_to_out_clip_smooth((RGBA_Image *) eim->cache_entry.src,
-                                                  (RGBA_Image *) dst->cache_entry.src,
-                                                  dc,
-                                                  src_region_x, src_region_y, src_region_w, src_region_h,
-                                                  dst_region_x, dst_region_y, dst_region_w, dst_region_h);
-   else
-     evas_common_scale_rgba_in_to_out_clip_sample((RGBA_Image *) eim->cache_entry.src,
-                                                  (RGBA_Image *) dst->cache_entry.src,
-                                                  dc,
-                                                  src_region_x, src_region_y, src_region_w, src_region_h,
-                                                  dst_region_x, dst_region_y, dst_region_w, dst_region_h);
-   evas_common_cpu_end_opt ();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-
-   if (mustlock_dst)
-     SDL_UnlockSurface(dst->surface);
-}
-
-static void
-evas_engine_sdl_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   SDL_Engine_Image_Entry *eim = image;
-   SDL_Engine_Image_Entry *dst = surface;
-   int mustlock_im = 0;
-   int mustlock_dst = 0;
-
-   if (!eim || !dst) return;
-
-   if (SDL_MUSTLOCK(dst->surface))
-     {
-        mustlock_dst = 1;
-        SDL_LockSurface(dst->surface);
-        _SDL_UPDATE_PIXELS(dst);
-     }
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_map_rgba((RGBA_Image*) eim->cache_entry.src,
-                         (RGBA_Image*) dst->cache_entry.src, context, npoints, p, smooth, level);
-   evas_common_cpu_end_opt();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-
-   if (mustlock_dst)
-     SDL_UnlockSurface(dst->surface);
-}
-
-static void *
-evas_engine_sdl_image_map_surface_new(void *data, int w, int h, int alpha)
-{
-   Render_Engine *re = (Render_Engine*) data;
-   void *surface;
-
-   surface = evas_cache_engine_image_copied_data(re->cache,
-                                                 w, h, NULL, alpha,
-                                                 EVAS_COLORSPACE_ARGB8888,
-                                                 NULL);
-   return surface;
-}
-
-static void
-evas_engine_sdl_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_cache_engine_image_drop(surface);
-}
-
-static void
-evas_engine_sdl_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   SDL_Engine_Image_Entry *eim;
-
-   if (!image) return ;
-   eim = image;
-   eim->cache_entry.src->scale_hint = hint;
-}
-
-static int
-evas_engine_sdl_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   SDL_Engine_Image_Entry *eim;
-
-   if (!image) return EVAS_IMAGE_SCALE_HINT_NONE;
-   eim = image;
-   return eim->cache_entry.src->scale_hint;
-}
-
-static void
-evas_engine_sdl_image_cache_flush(void *data)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-   int                   size;
-
-   size = evas_cache_engine_image_get(re->cache);
-   evas_cache_engine_image_set(re->cache, 0);
-   evas_cache_engine_image_set(re->cache, size);
-}
-
-static void
-evas_engine_sdl_image_cache_set(void *data, int bytes)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-
-   evas_cache_engine_image_set(re->cache, bytes);
-}
-
-static int
-evas_engine_sdl_image_cache_get(void *data)
-{
-   Render_Engine        *re = (Render_Engine*) data;
-
-   return evas_cache_engine_image_get(re->cache);
-}
-
-static char*
-evas_engine_sdl_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = image;
-   RGBA_Image                   *im;
-
-   if (!eim) return NULL;
-   im = (RGBA_Image *) eim->cache_entry.src;
-
-   return im->info.comment;
-}
-
-static char*
-evas_engine_sdl_image_format_get(void *data __UNUSED__, void *image __UNUSED__)
-{
-   /* FIXME: need to know what evas expect from this call */
-   return NULL;
-}
-
-static void
-evas_engine_sdl_font_draw(void *data __UNUSED__, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-   int                           mustlock_im = 0;
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_font_draw((RGBA_Image *) eim->cache_entry.src, context, font, x, y, intl_props);
-   evas_common_cpu_end_opt();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-}
-
-static void
-evas_engine_sdl_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-   int                           mustlock_im = 0;
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_line_draw((RGBA_Image *) eim->cache_entry.src, context, x1, y1, x2, y2);
-   evas_common_cpu_end_opt();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-}
-
-static void
-evas_engine_sdl_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, int y, int w, int h)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-#if ENGINE_SDL_PRIMITIVE
-   RGBA_Draw_Context            *dc = context;
-#endif
-   int                           mustlock_im = 0;
-
-#if ENGINE_SDL_PRIMITIVE
-   if (A_VAL(&dc->col.col) != 0x00)
-     {
-        if (A_VAL(&dc->col.col) != 0xFF)
-          {
-#endif
-             if (eim->surface && SDL_MUSTLOCK(eim->surface))
-               {
-                  mustlock_im = 1;
-                  SDL_LockSurface(eim->surface);
-                  _SDL_UPDATE_PIXELS(eim);
-               }
-
-             evas_common_rectangle_draw((RGBA_Image *) eim->cache_entry.src, context, x, y, w, h);
-             evas_common_cpu_end_opt();
-
-             if (mustlock_im)
-               SDL_UnlockSurface(eim->surface);
-#if ENGINE_SDL_PRIMITIVE
-          }
-        else
-          {
-             SDL_Rect        dstrect;
-
-             if (dc->clip.use)
-               {
-                  SDL_Rect   cliprect;
-
-                  cliprect.x = dc->clip.x;
-                  cliprect.y = dc->clip.y;
-                  cliprect.w = dc->clip.w;
-                  cliprect.h = dc->clip.h;
-
-                  SDL_SetClipRect(eim->surface, &cliprect);
-               }
-
-             dstrect.x = x;
-             dstrect.y = y;
-             dstrect.w = w;
-             dstrect.h = h;
-
-             SDL_FillRect(eim->surface, &dstrect, SDL_MapRGBA(eim->surface->format, R_VAL(&dc->col.col), G_VAL(&dc->col.col), B_VAL(&dc->col.col), 0xFF));
-
-             if (dc->clip.use)
-               SDL_SetClipRect(eim->surface, NULL);
-          }
-     }
-#endif
-}
-
-static void
-evas_engine_sdl_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
-{
-   SDL_Engine_Image_Entry       *eim = surface;
-   int                           mustlock_im = 0;
-
-   if (eim->surface && SDL_MUSTLOCK(eim->surface))
-     {
-        mustlock_im = 1;
-        SDL_LockSurface(eim->surface);
-        _SDL_UPDATE_PIXELS(eim);
-     }
-
-   evas_common_polygon_draw((RGBA_Image *) eim->cache_entry.src, context, polygon, x, y);
-   evas_common_cpu_end_opt();
-
-   if (mustlock_im)
-     SDL_UnlockSurface(eim->surface);
-}
-
-static int module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   _evas_engine_soft_sdl_log_dom = eina_log_domain_register
-     ("evas-software_sdl", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_soft_sdl_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, evas_engine_sdl_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_free);
-   ORD(image_size_set);
-   ORD(image_size_get);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(image_draw);
-   ORD(image_map_draw);
-   ORD(image_map_surface_new);
-   ORD(image_map_surface_free);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-   ORD(font_draw);
-   ORD(line_draw);
-   ORD(rectangle_draw);
-   ORD(polygon_draw);
-
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_engine_soft_sdl_log_dom);
-}
-
-static Evas_Module_Api evas_modapi =
-{
-  EVAS_MODULE_API_VERSION,
-  "software_sdl",
-  "none",
-  {
-    module_open,
-    module_close
-  }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_sdl);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_SDL
-EVAS_EINA_MODULE_DEFINE(engine, software_sdl);
-#endif
-
-/* Private routines. */
-
-static void*
-_sdl_output_setup               (int w, int h, int fullscreen, int noframe, int alpha, int hwsurface)
-{
-   Render_Engine                *re = calloc(1, sizeof(Render_Engine));
-   SDL_Surface                  *surface;
-
-   if (!re)
-     return NULL;
-
-   /* if we haven't initialized - init (automatic abort if already done) */
-   evas_common_cpu_init();
-   evas_common_blend_init();
-   evas_common_image_init();
-   evas_common_convert_init();
-   evas_common_scale_init();
-   evas_common_rectangle_init();
-   evas_common_polygon_init();
-   evas_common_line_init();
-   evas_common_font_init();
-   evas_common_draw_init();
-   evas_common_tilebuf_init();
-
-   if (w <= 0) w = 640;
-   if (h <= 0) h = 480;
-
-   re->cache = evas_cache_engine_image_init(&_sdl_cache_engine_image_cb, evas_common_image_cache_get());
-   if (!re->cache)
-     {
-        ERR("Evas_Cache_Engine_Image allocation failed!");
-        free (re);
-        return NULL;
-     }
-
-   re->tb = evas_common_tilebuf_new(w, h);
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   surface = SDL_SetVideoMode(w, h, 32,
-                              (hwsurface ? SDL_HWSURFACE : SDL_SWSURFACE)
-                              | (fullscreen ? SDL_FULLSCREEN : 0)
-                              | (noframe ? SDL_NOFRAME : 0)
-                              | (alpha ? SDL_SRCALPHA : 0));
-
-   if (!surface)
-     {
-        ERR("SDL_SetVideoMode [ %i x %i x 32 ] failed.", w, h);
-        evas_cache_engine_image_shutdown(re->cache);
-        free (re);
-        return NULL;
-     }
-
-   SDL_SetAlpha(surface, SDL_SRCALPHA | SDL_RLEACCEL, 0);
-
-   /* We create a "fake" RGBA_Image which points to the SDL surface. Each access
-    * to that surface is wrapped in Lock / Unlock calls whenever the data is
-    * manipulated directly. */
-   re->rgba_engine_image = (SDL_Engine_Image_Entry *) evas_cache_engine_image_engine(re->cache, surface);
-   if (!re->rgba_engine_image)
-     {
-        CRIT("RGBA_Image allocation from SDL failed");
-        evas_cache_engine_image_shutdown(re->cache);
-        free (re);
-        return NULL;
-     }
-
-   SDL_FillRect(surface, NULL, 0);
-
-   re->flags.alpha = alpha;
-   re->flags.hwsurface = hwsurface;
-   re->flags.fullscreen = fullscreen;
-   re->flags.noframe = noframe;
-   return re;
-}
-
-static Engine_Image_Entry*
-_sdl_image_alloc(void)
-{
-   SDL_Engine_Image_Entry       *new;
-
-   new = calloc(1, sizeof (SDL_Engine_Image_Entry));
-
-   return (Engine_Image_Entry *) new;
-}
-
-static void
-_sdl_image_delete(Engine_Image_Entry *eim)
-{
-   free(eim);
-}
-
-static int
-_sdl_image_constructor(Engine_Image_Entry *ie, void *data __UNUSED__)
-{
-   SDL_Surface                  *sdl = NULL;
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) ie;
-   RGBA_Image                   *im;
-
-   im = (RGBA_Image *) ie->src;
-
-   if (im)
-     {
-        evas_cache_image_load_data(&im->cache_entry);
-
-        if (im->image.data)
-          {
-             /* FIXME: Take care of CSPACE */
-             sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
-                                            ie->w, ie->h,
-                                            32, ie->w * 4,
-                                            RMASK, GMASK, BMASK, AMASK);
-             eim->surface = sdl;
-             eim->flags.engine_surface = 0;
-          }
-     }
-
-   return EVAS_LOAD_ERROR_NONE;
-}
-
-static void
-_sdl_image_destructor(Engine_Image_Entry *eie)
-{
-   SDL_Engine_Image_Entry       *seie = (SDL_Engine_Image_Entry *) eie;
-
-   if (seie->surface && !seie->flags.engine_surface)
-     SDL_FreeSurface(seie->surface);
-   seie->surface = NULL;
-}
-
-static int
-_sdl_image_dirty(Engine_Image_Entry *dst, const Engine_Image_Entry *src __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) dst;
-   SDL_Surface                  *sdl = NULL;
-   RGBA_Image                   *im;
-
-   im = (RGBA_Image *) dst->src;
-
-   /* FIXME: Take care of CSPACE */
-   sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
-                                  dst->w, dst->h,
-                                  32, dst->w * 4,
-                                  0xff0000, 0xff00, 0xff, 0xff000000);
-   eim->surface = sdl;
-   eim->flags.engine_surface = 0;
-
-   return 0;
-}
-
-static int
-_sdl_image_update_data(Engine_Image_Entry *dst, void* engine_data)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) dst;
-   SDL_Surface                  *sdl = NULL;
-   RGBA_Image                   *im;
-
-   im = (RGBA_Image *) dst->src;
-
-   if (engine_data)
-     {
-        sdl = engine_data;
-
-        if (im)
-          {
-             im->image.data = sdl->pixels;
-             im->image.no_free = 1;
-             im->cache_entry.flags.alpha = 0;
-             dst->src->w = sdl->w;
-             dst->src->h = sdl->h;
-          }
-        dst->w = sdl->w;
-        dst->h = sdl->h;
-     }
-   else
-     {
-        /* FIXME: Take care of CSPACE */
-        SDL_FreeSurface(eim->surface);
-        sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
-                                       dst->w, dst->h,
-                                       32, dst->w * 4,
-                                       RMASK, GMASK, BMASK, AMASK);
-     }
-
-   eim->surface = sdl;
-
-   return 0;
-}
-
-static int
-_sdl_image_size_set(Engine_Image_Entry *dst, const Engine_Image_Entry *src __UNUSED__)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) dst;
-   SDL_Surface                  *sdl;
-   RGBA_Image                   *im;
-
-   im = (RGBA_Image *) dst->src;
-
-   /* FIXME: handle im == NULL */
-   sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
-                                  dst->w, dst->h,
-                                  32, dst->w * 4,
-                                  RMASK, GMASK, BMASK, AMASK);
-
-   eim->surface = sdl;
-
-   return 0;
-}
-
-static void
-_sdl_image_load(Engine_Image_Entry *eim, const Image_Entry *ie_im)
-{
-   SDL_Engine_Image_Entry       *load = (SDL_Engine_Image_Entry *) eim;
-   SDL_Surface                  *sdl;
-
-   if (!load->surface)
-     {
-        RGBA_Image      *im;
-
-        im = (RGBA_Image *) ie_im;
-
-        sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
-                                       eim->w, eim->h,
-                                       32, eim->w * 4,
-                                       RMASK, GMASK, BMASK, AMASK);
-        load->surface = sdl;
-     }
-}
-
-static int
-_sdl_image_mem_size_get(Engine_Image_Entry *eim)
-{
-   SDL_Engine_Image_Entry       *seie = (SDL_Engine_Image_Entry *) eim;
-   int                           size = 0;
-
-   /* FIXME: Count surface size. */
-   if (seie->surface)
-     size = sizeof (SDL_Surface) + sizeof (SDL_PixelFormat);
-
-   return size;
-}
-
-#ifdef DEBUG_SDL
-static void
-_sdl_image_debug(const char* context, Engine_Image_Entry* eie)
-{
-   SDL_Engine_Image_Entry       *eim = (SDL_Engine_Image_Entry *) eie;
-
-   DBG("*** %s image (%p) ***", context, eim);
-   if (eim)
-     {
-        DBG("W: %i, H: %i, R: %i", eim->cache_entry.w, eim->cache_entry.h, eim->cache_entry.references);
-        if (eim->cache_entry.src)
-          DBG("Pixels: %p, SDL Surface: %p",((RGBA_Image*) eim->cache_entry.src)->image.data, eim->surface);
-        if (eim->surface)
-          DBG("Surface->pixels: %p", eim->surface->pixels);
-        DBG("Key: %s", eim->cache_entry.cache_key);
-        DBG("Reference: %i", eim->cache_entry.references);
-     }
-   DBG("*** ***");
-}
-#endif
diff --git a/libraries/evas/src/modules/engines/software_sdl/evas_engine.h b/libraries/evas/src/modules/engines/software_sdl/evas_engine.h
deleted file mode 100644
index 5133fec..0000000
--- a/libraries/evas/src/modules/engines/software_sdl/evas_engine.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef EVAS_ENGINE_SDL_H
-#define EVAS_ENGINE_SDL_H
-
-#include "evas_common.h"
-#include "evas_private.h"
-#include "Evas_Engine_SDL.h"
-
-extern int _evas_engine_soft_sdl_log_dom ;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
-
-typedef struct _SDL_Engine_Image_Entry SDL_Engine_Image_Entry;
-struct _SDL_Engine_Image_Entry
-{
-   Engine_Image_Entry            cache_entry;
-
-   SDL_Surface                  *surface;
-
-   struct
-   {
-     unsigned int                engine_surface : 1;
-   } flags;
-};
-
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine
-{
-   SDL_Engine_Image_Entry       *rgba_engine_image;
-
-   Tilebuf                      *tb;
-   Tilebuf_Rect                 *rects;
-   Eina_Inlist                  *cur_rect;
-
-   Evas_Cache_Engine_Image      *cache;
-
-   SDL_Rect                     *update_rects;
-   int                           update_rects_count;
-   int                           update_rects_limit;
-
-   struct
-   {
-     unsigned int               fullscreen : 1;
-     unsigned int               noframe : 1;
-     unsigned int               alpha : 1;
-     unsigned int               hwsurface : 1;
-     unsigned int               end : 1;
-   } flags;
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/Evas_Engine_Software_X11.h b/libraries/evas/src/modules/engines/software_x11/Evas_Engine_Software_X11.h
deleted file mode 100644
index e42c10a..0000000
--- a/libraries/evas/src/modules/engines/software_x11/Evas_Engine_Software_X11.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _EVAS_ENGINE_SOFTWARE_X11_H
-# define _EVAS_ENGINE_SOFTWARE_X11_H
-
-typedef enum
-{
-   EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB,
-   EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB
-} Evas_Engine_Info_Software_X11_Backend;
-
-typedef struct _Evas_Engine_Info_Software_X11 Evas_Engine_Info_Software_X11;
-
-struct _Evas_Engine_Info_Software_X11
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   struct 
-     {
-        Evas_Engine_Info_Software_X11_Backend backend;
-
-        void *connection, *screen;
-        unsigned int drawable, mask;
-        void *visual;
-        unsigned int colormap;
-        int depth, rotation;
-
-        Eina_Bool alloc_grayscale : 1;
-        Eina_Bool debug : 1;
-        Eina_Bool shape_dither : 1;
-        Eina_Bool destination_alpha : 1;
-        Eina_Bool track_mask_changes : 1;
-
-        int alloc_colors_max;
-     } info;
-
-   /* engine specific function calls to query stuff about the destination */
-   struct 
-     {
-        void *(*best_visual_get) (int backend, void *connection, int screen);
-        unsigned int (*best_colormap_get) (int backend, void *connection, int screen);
-        int (*best_depth_get) (int backend, void *connection, int screen);
-     } func;
-
-   unsigned char mask_changed : 1;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/Makefile.am b/libraries/evas/src/modules/engines/software_x11/Makefile.am
deleted file mode 100644
index 5a2e345..0000000
--- a/libraries/evas/src/modules/engines/software_x11/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-if BUILD_ENGINE_SOFTWARE_X11
-
-SOFTWARE_X11_SOURCES = evas_engine.c
-
-if BUILD_ENGINE_SOFTWARE_XLIB
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_software_xlib_cflags@
-
-SOFTWARE_X11_SOURCES += \
-evas_xlib_outbuf.c \
-evas_xlib_buffer.c \
-evas_xlib_color.c \
-evas_xlib_main.c
-
-SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @EINA_LIBS@ @evas_engine_software_xlib_libs@
-
-endif
-
-if BUILD_ENGINE_SOFTWARE_XCB
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_software_xcb_cflags@
-
-SOFTWARE_X11_SOURCES += \
-evas_xcb_xdefaults.c \
-evas_xcb_outbuf.c \
-evas_xcb_buffer.c \
-evas_xcb_color.c \
-evas_xcb_main.c
-
-SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_software_xcb_libs@
-
-endif
-
-includes_HEADERS = Evas_Engine_Software_X11.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_SOFTWARE_X11
-
-pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(SOFTWARE_X11_LIBADD)
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_software_x11.la
-
-libevas_engine_software_x11_la_SOURCES = $(SOFTWARE_X11_SOURCES)
-libevas_engine_software_x11_la_LIBADD = $(SOFTWARE_X11_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.h \
-evas_xlib_outbuf.h \
-evas_xlib_buffer.h \
-evas_xlib_color.h \
-evas_xcb_outbuf.h \
-evas_xcb_buffer.h \
-evas_xcb_color.h \
-evas_xcb_xdefaults.h
-
diff --git a/libraries/evas/src/modules/engines/software_x11/Makefile.in b/libraries/evas/src/modules/engines/software_x11/Makefile.in
deleted file mode 100644
index caab918..0000000
--- a/libraries/evas/src/modules/engines/software_x11/Makefile.in
+++ /dev/null
@@ -1,952 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@am__append_1 = \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@evas_xlib_outbuf.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@evas_xlib_buffer.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@evas_xlib_color.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@evas_xlib_main.c
-
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@am__append_2 = \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@evas_xcb_xdefaults.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@evas_xcb_outbuf.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@evas_xcb_buffer.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@evas_xcb_color.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@evas_xcb_main.c
-
-subdir = src/modules/engines/software_x11
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_TRUE@libevas_engine_software_x11_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_software_x11_la_SOURCES_DIST = evas_engine.c \
-        evas_xlib_outbuf.c evas_xlib_buffer.c evas_xlib_color.c \
-        evas_xlib_main.c evas_xcb_xdefaults.c evas_xcb_outbuf.c \
-        evas_xcb_buffer.c evas_xcb_color.c evas_xcb_main.c
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@am__objects_1 = evas_xlib_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@       evas_xlib_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@       evas_xlib_color.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@       evas_xlib_main.lo
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@am__objects_2 = evas_xcb_xdefaults.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        evas_xcb_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        evas_xcb_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        evas_xcb_color.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        evas_xcb_main.lo
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@am__objects_3 = evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        $(am__objects_1) \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        $(am__objects_2)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_TRUE@am_libevas_engine_software_x11_la_OBJECTS = $(am__objects_3)
-libevas_engine_software_x11_la_OBJECTS =  \
-        $(am_libevas_engine_software_x11_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_TRUE@am_libevas_engine_software_x11_la_rpath =
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@  $(am__DEPENDENCIES_1)
-am__module_la_SOURCES_DIST = evas_engine.c evas_xlib_outbuf.c \
-        evas_xlib_buffer.c evas_xlib_color.c evas_xlib_main.c \
-        evas_xcb_xdefaults.c evas_xcb_outbuf.c evas_xcb_buffer.c \
-        evas_xcb_color.c evas_xcb_main.c
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@am__objects_4 = module_la-evas_xlib_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@       module_la-evas_xlib_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@       module_la-evas_xlib_color.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@       module_la-evas_xlib_main.lo
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@am__objects_5 = module_la-evas_xcb_xdefaults.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        module_la-evas_xcb_outbuf.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        module_la-evas_xcb_buffer.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        module_la-evas_xcb_color.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@        module_la-evas_xcb_main.lo
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@am__objects_6 =  \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        module_la-evas_engine.lo \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        $(am__objects_4) \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        $(am__objects_5)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@am_module_la_OBJECTS = $(am__objects_6)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@  $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_software_x11_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_software_x11_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Software_X11.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@SOFTWARE_X11_SOURCES = evas_engine.c \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        $(am__append_1) \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@        $(am__append_2)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@AM_CPPFLAGS = \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@-I. \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@-I$(top_srcdir)/src/lib \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@-I$(top_srcdir)/src/lib/include \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@-I$(top_srcdir)/src/modules/engines \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@@FREETYPE_CFLAGS@ \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@@PIXMAN_CFLAGS@ \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@@EINA_CFLAGS@ \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@@evas_engine_software_xcb_cflags@
-
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@AM_CPPFLAGS = \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@-I. \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@-I$(top_srcdir)/src/lib \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@-I$(top_srcdir)/src/lib/include \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@-I$(top_srcdir)/src/modules/engines \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@@FREETYPE_CFLAGS@ \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@@PIXMAN_CFLAGS@ \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@@EINA_CFLAGS@ \
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@@evas_engine_software_xlib_cflags@
-
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XCB_TRUE@SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_software_xcb_libs@
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@BUILD_ENGINE_SOFTWARE_XLIB_TRUE@SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @EINA_LIBS@ @evas_engine_software_xlib_libs@
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@includes_HEADERS = Evas_Engine_Software_X11.h
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(SOFTWARE_X11_LIBADD)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_TRUE@noinst_LTLIBRARIES = libevas_engine_software_x11.la
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_TRUE@libevas_engine_software_x11_la_SOURCES = $(SOFTWARE_X11_SOURCES)
-@BUILD_ENGINE_SOFTWARE_X11_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_X11_TRUE@libevas_engine_software_x11_la_LIBADD = $(SOFTWARE_X11_LIBADD)
-EXTRA_DIST = \
-evas_engine.h \
-evas_xlib_outbuf.h \
-evas_xlib_buffer.h \
-evas_xlib_color.h \
-evas_xcb_outbuf.h \
-evas_xcb_buffer.h \
-evas_xcb_color.h \
-evas_xcb_xdefaults.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/software_x11/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/software_x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_software_x11.la: $(libevas_engine_software_x11_la_OBJECTS) $(libevas_engine_software_x11_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_software_x11_la_rpath) $(libevas_engine_software_x11_la_OBJECTS) $(libevas_engine_software_x11_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xcb_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xcb_color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xcb_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xcb_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xcb_xdefaults.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xlib_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xlib_color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xlib_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_xlib_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xcb_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xcb_color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xcb_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xcb_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xcb_xdefaults.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xlib_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xlib_color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xlib_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_xlib_outbuf.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_xlib_outbuf.lo: evas_xlib_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xlib_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xlib_outbuf.Tpo -c -o module_la-evas_xlib_outbuf.lo `test -f 'evas_xlib_outbuf.c' || echo '$(srcdir)/'`evas_xlib_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xlib_outbuf.Tpo $(DEPDIR)/module_la-evas_xlib_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xlib_outbuf.c' object='module_la-evas_xlib_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xlib_outbuf.lo `test -f 'evas_xlib_outbuf.c' || echo '$(srcdir)/'`evas_xlib_outbuf.c
-
-module_la-evas_xlib_buffer.lo: evas_xlib_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xlib_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xlib_buffer.Tpo -c -o module_la-evas_xlib_buffer.lo `test -f 'evas_xlib_buffer.c' || echo '$(srcdir)/'`evas_xlib_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xlib_buffer.Tpo $(DEPDIR)/module_la-evas_xlib_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xlib_buffer.c' object='module_la-evas_xlib_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xlib_buffer.lo `test -f 'evas_xlib_buffer.c' || echo '$(srcdir)/'`evas_xlib_buffer.c
-
-module_la-evas_xlib_color.lo: evas_xlib_color.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xlib_color.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xlib_color.Tpo -c -o module_la-evas_xlib_color.lo `test -f 'evas_xlib_color.c' || echo '$(srcdir)/'`evas_xlib_color.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xlib_color.Tpo $(DEPDIR)/module_la-evas_xlib_color.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xlib_color.c' object='module_la-evas_xlib_color.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xlib_color.lo `test -f 'evas_xlib_color.c' || echo '$(srcdir)/'`evas_xlib_color.c
-
-module_la-evas_xlib_main.lo: evas_xlib_main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xlib_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xlib_main.Tpo -c -o module_la-evas_xlib_main.lo `test -f 'evas_xlib_main.c' || echo '$(srcdir)/'`evas_xlib_main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xlib_main.Tpo $(DEPDIR)/module_la-evas_xlib_main.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xlib_main.c' object='module_la-evas_xlib_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xlib_main.lo `test -f 'evas_xlib_main.c' || echo '$(srcdir)/'`evas_xlib_main.c
-
-module_la-evas_xcb_xdefaults.lo: evas_xcb_xdefaults.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xcb_xdefaults.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xcb_xdefaults.Tpo -c -o module_la-evas_xcb_xdefaults.lo `test -f 'evas_xcb_xdefaults.c' || echo '$(srcdir)/'`evas_xcb_xdefaults.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xcb_xdefaults.Tpo $(DEPDIR)/module_la-evas_xcb_xdefaults.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xcb_xdefaults.c' object='module_la-evas_xcb_xdefaults.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xcb_xdefaults.lo `test -f 'evas_xcb_xdefaults.c' || echo '$(srcdir)/'`evas_xcb_xdefaults.c
-
-module_la-evas_xcb_outbuf.lo: evas_xcb_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xcb_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xcb_outbuf.Tpo -c -o module_la-evas_xcb_outbuf.lo `test -f 'evas_xcb_outbuf.c' || echo '$(srcdir)/'`evas_xcb_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xcb_outbuf.Tpo $(DEPDIR)/module_la-evas_xcb_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xcb_outbuf.c' object='module_la-evas_xcb_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xcb_outbuf.lo `test -f 'evas_xcb_outbuf.c' || echo '$(srcdir)/'`evas_xcb_outbuf.c
-
-module_la-evas_xcb_buffer.lo: evas_xcb_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xcb_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xcb_buffer.Tpo -c -o module_la-evas_xcb_buffer.lo `test -f 'evas_xcb_buffer.c' || echo '$(srcdir)/'`evas_xcb_buffer.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xcb_buffer.Tpo $(DEPDIR)/module_la-evas_xcb_buffer.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xcb_buffer.c' object='module_la-evas_xcb_buffer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xcb_buffer.lo `test -f 'evas_xcb_buffer.c' || echo '$(srcdir)/'`evas_xcb_buffer.c
-
-module_la-evas_xcb_color.lo: evas_xcb_color.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xcb_color.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xcb_color.Tpo -c -o module_la-evas_xcb_color.lo `test -f 'evas_xcb_color.c' || echo '$(srcdir)/'`evas_xcb_color.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xcb_color.Tpo $(DEPDIR)/module_la-evas_xcb_color.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xcb_color.c' object='module_la-evas_xcb_color.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xcb_color.lo `test -f 'evas_xcb_color.c' || echo '$(srcdir)/'`evas_xcb_color.c
-
-module_la-evas_xcb_main.lo: evas_xcb_main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_xcb_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_xcb_main.Tpo -c -o module_la-evas_xcb_main.lo `test -f 'evas_xcb_main.c' || echo '$(srcdir)/'`evas_xcb_main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_xcb_main.Tpo $(DEPDIR)/module_la-evas_xcb_main.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_xcb_main.c' object='module_la-evas_xcb_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_xcb_main.lo `test -f 'evas_xcb_main.c' || echo '$(srcdir)/'`evas_xcb_main.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_engine.c b/libraries/evas/src/modules/engines/software_x11/evas_engine.c
deleted file mode 100644
index 0a2d2a3..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_engine.c
+++ /dev/null
@@ -1,929 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-#include "Evas_Engine_Software_X11.h"
-#include "evas_engine.h"
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-# include "evas_xlib_outbuf.h"
-# include "evas_xlib_color.h"
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-# include "evas_xcb_outbuf.h"
-# include "evas_xcb_color.h"
-# include "evas_xcb_xdefaults.h"
-#endif
-
-int _evas_engine_soft_x11_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-/*
-struct xrdb_user
-{
-   time_t last_stat;
-   time_t last_mtime;
-   XrmDatabase db;
-};
-static struct xrdb_user xrdb_user = {0, 0, NULL};
-
-static Eina_Bool
-xrdb_user_query(const char *name, const char *cls, char **type, XrmValue *val)
-{
-   time_t last, now;
-
-   last = xrdb_user.last_stat;
-   now = time(NULL);
-
-   xrdb_user.last_stat = now;
-   if (last != now) // don't stat() more than once every second
-     {
-        struct stat st;
-        const char *home;
-        char tmp[PATH_MAX];
-
-        if (!(home = getenv("HOME"))) 
-          goto failed;
-
-        snprintf(tmp, sizeof(tmp), "%s/.Xdefaults", home);
-        if (stat(tmp, &st) != 0) goto failed;
-        if (xrdb_user.last_mtime != st.st_mtime)
-          {
-             if (xrdb_user.db) XrmDestroyDatabase(xrdb_user.db);
-             xrdb_user.db = XrmGetFileDatabase(tmp);
-             if (!xrdb_user.db) goto failed;
-             xrdb_user.last_mtime = st.st_mtime;
-          }
-     }
-
-   if (!xrdb_user.db) return EINA_FALSE;
-   return XrmGetResource(xrdb_user.db, name, cls, type, val);
-
- failed:
-   if (xrdb_user.db)
-     {
-        XrmDestroyDatabase(xrdb_user.db);
-        xrdb_user.db = NULL;
-     }
-   xrdb_user.last_mtime = 0;
-   return EINA_FALSE;
-}
-*/
-#endif
-
-/* engine struct data */
-typedef struct _Render_Engine Render_Engine;
-
-struct _Render_Engine
-{
-   Tilebuf *tb;
-   Outbuf *ob;
-   Tilebuf_Rect *rects;
-   Eina_Inlist *cur_rect;
-   unsigned char end : 1;
-/*
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-   XrmDatabase xrdb;
-#endif
-   struct 
-     {
-        int dpi;
-     } xr;
- */
-#ifdef EVAS_FRAME_QUEUING
-   Evas_Engine_Render_Mode render_mode;
-#endif
-
-   void (*outbuf_free)(Outbuf *ob);
-   void (*outbuf_reconfigure)(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth);
-   int (*outbuf_get_rot)(Outbuf *ob);
-   RGBA_Image *(*outbuf_new_region_for_update)(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
-   void (*outbuf_push_updated_region)(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h);
-   void (*outbuf_free_region_for_update)(Outbuf *ob, RGBA_Image *update);
-   void (*outbuf_flush)(Outbuf *ob);
-   void (*outbuf_idle_flush)(Outbuf *ob);
-   Eina_Bool (*outbuf_alpha_get)(Outbuf *ob);
-#ifdef EVAS_FRAME_QUEUING
-   void (*outbuf_set_priv)(Outbuf *ob, void *cur, void *prev);
-#endif
-};
-
-/* prototypes we will use here */
-static void *_best_visual_get(int backend, void *connection, int screen);
-static unsigned int _best_colormap_get(int backend, void *connection, int screen);
-static int _best_depth_get(int backend, void *connection, int screen);
-
-static void *eng_info(Evas *e);
-static void eng_info_free(Evas *e, void *info);
-static int eng_setup(Evas *e, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-
-/* internal engine routines */
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-static void *
-_output_xlib_setup(int w, int h, int rot, Display *disp, Drawable draw,
-                   Visual *vis, Colormap cmap, int depth, int debug,
-                   int grayscale, int max_colors, Pixmap mask,
-                   int shape_dither, int destination_alpha)
-{
-   Render_Engine *re;
-//   int status;
-//   char *type = NULL;
-//   XrmValue val;
-
-   if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
-
-   evas_software_xlib_x_init();
-   evas_software_xlib_x_color_init();
-   evas_software_xlib_outbuf_init();
-/*
-   re->xr.dpi = 75000; // dpy * 1000
-
-   status = xrdb_user_query("Xft.dpi", "Xft.Dpi", &type, &val);
-   if ((!status) || (!type))
-     {
-        if (!re->xrdb) re->xrdb = XrmGetDatabase(disp);
-        if (re->xrdb)
-          status = XrmGetResource(re->xrdb,
-                                  "Xft.dpi", "Xft.Dpi", &type, &val);
-     }
-
-   if ((status) && (type))
-     {
-        if (!strcmp(type, "String"))
-          {
-             const char *str, *dp;
-                  
-             str = val.addr;
-             dp = strchr(str, '.');
-             if (!dp) dp = strchr(str, ',');
-
-             if (dp)
-               {
-                  int subdpi, len, i;
-                  char *buf;
-                       
-                  buf = alloca(dp - str + 1);
-                  strncpy(buf, str, dp - str);
-                  buf[dp - str] = 0;
-                  len = strlen(dp + 1);
-                  subdpi = atoi(dp + 1);
-
-                  if (len < 3)
-                    {
-                       for (i = len; i < 3; i++) 
-                         subdpi *= 10;
-                    }
-                  else if (len > 3)
-                    {
-                       for (i = len; i > 3; i--) 
-                         subdpi /= 10;
-                    }
-                  re->xr.dpi = atoi(buf) * 1000;
-               }
-             else
-               re->xr.dpi = atoi(str) * 1000;
-             evas_common_font_dpi_set(re->xr.dpi / 1000);
-          }
-     }
- */
-   re->ob = 
-     evas_software_xlib_outbuf_setup_x(w, h, rot, OUTBUF_DEPTH_INHERIT, disp, 
-                                       draw, vis, cmap, depth, grayscale,
-                                       max_colors, mask, shape_dither,
-                                       destination_alpha);
-   if (!re->ob)
-     {
-        free(re);
-        return NULL;
-     }
-
-   /* for updates return 1 big buffer, but only use portions of it, also cache
-    * it and keepit around until an idle_flush */
-
-   /* disable for now - i am hunting down why some expedite tests are slower,
-    * as well as shaped stuff is broken and probable non-32bpp is broken as
-    * convert funcs dont do the right thing
-    *
-    */
-//   re->ob->onebuf = 1;
-
-   evas_software_xlib_outbuf_debug_set(re->ob, debug);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (!re->tb)
-     {
-        evas_software_xlib_outbuf_free(re->ob);
-        free(re);
-        return NULL;
-     }
-
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   return re;
-}
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-static void *
-_output_xcb_setup(int w, int h, int rot, xcb_connection_t *conn, 
-                  xcb_screen_t *screen, xcb_drawable_t draw, 
-                  xcb_visualtype_t *vis, xcb_colormap_t cmap, int depth,
-                  int debug, int grayscale, int max_colors, xcb_drawable_t mask,
-                  int shape_dither, int destination_alpha)
-{
-   Render_Engine *re;
-//   int v = 0;
-
-   if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
-
-   evas_software_xcb_init();
-   evas_software_xcb_color_init();
-   evas_software_xcb_outbuf_init();
-/*
-   // FIXME: re->xrdb
-   _evas_xcb_xdefaults_init();
-   v = _evas_xcb_xdefaults_int_get("Xft", "dpi");
-   _evas_xcb_xdefaults_shutdown();
-   if (v) re->xr.dpi = (v * 1000);
-   else re->xr.dpi = 75000; // dpy * 1000
-
-   evas_common_font_dpi_set(re->xr.dpi / 1000);
- */
-   re->ob = 
-     evas_software_xcb_outbuf_setup(w, h, rot, OUTBUF_DEPTH_INHERIT, conn, 
-                                    screen, draw, vis, cmap, depth,
-                                    grayscale, max_colors, mask, 
-                                    shape_dither, destination_alpha);
-   if (!re->ob)
-     {
-        free(re);
-        return NULL;
-     }
-
-   /* for updates return 1 big buffer, but only use portions of it, also cache 
-    * it and keepit around until an idle_flush */
-
-   /* disable for now - i am hunting down why some expedite tests are slower,
-    * as well as shaped stuff is broken and probable non-32bpp is broken as
-    * convert funcs dont do the right thing
-    *
-    */
-//   re->ob->onebuf = 1;
-
-   evas_software_xcb_outbuf_debug_set(re->ob, debug);
-
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (!re->tb)
-     {
-        evas_software_xcb_outbuf_free(re->ob);
-        free(re);
-        return NULL;
-     }
-
-   /* in preliminary tests 16x16 gave highest framerates */
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   return re;
-}
-#endif
-
-static void *
-_best_visual_get(int backend, void *connection, int screen)
-{
-   if (!connection) return NULL;
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-   if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
-     return DefaultVisual((Display *)connection, screen);
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-   if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB)
-     {
-        xcb_screen_iterator_t iter_screen;
-        xcb_depth_iterator_t iter_depth;
-        xcb_screen_t *s = NULL;
-
-        iter_screen = 
-          xcb_setup_roots_iterator(xcb_get_setup((xcb_connection_t *)connection));
-        for (; iter_screen.rem; --screen, xcb_screen_next(&iter_screen))
-          if (screen == 0)
-            {
-               s = iter_screen.data;
-               break;
-            }
-
-        iter_depth = xcb_screen_allowed_depths_iterator(s);
-        for (; iter_depth.rem; xcb_depth_next(&iter_depth))
-          {
-             xcb_visualtype_iterator_t iter_vis;
-
-             iter_vis = xcb_depth_visuals_iterator(iter_depth.data);
-             for (; iter_vis.rem; xcb_visualtype_next(&iter_vis))
-               {
-                  if (s->root_visual == iter_vis.data->visual_id)
-                    return iter_vis.data;
-               }
-          }
-     }
-#endif
-
-   return NULL;
-}
-
-static unsigned int
-_best_colormap_get(int backend, void *connection, int screen)
-{
-   if (!connection) return 0;
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-   if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
-     return DefaultColormap((Display *)connection, screen);
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-   if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB)
-     {
-        xcb_screen_iterator_t iter_screen;
-        xcb_screen_t *s = NULL;
-
-        iter_screen = 
-          xcb_setup_roots_iterator(xcb_get_setup((xcb_connection_t *)connection));
-        for (; iter_screen.rem; --screen, xcb_screen_next(&iter_screen))
-          if (screen == 0)
-            {
-               s = iter_screen.data;
-               break;
-            }
-
-        return s->default_colormap;
-     }
-#endif
-
-   return 0;
-}
-
-static int
-_best_depth_get(int backend, void *connection, int screen)
-{
-   if (!connection) return 0;
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-   if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
-     return DefaultDepth((Display *)connection, screen);
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-   if (backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB)
-     {
-        xcb_screen_iterator_t iter_screen;
-        xcb_screen_t *s = NULL;
-
-        iter_screen = 
-          xcb_setup_roots_iterator(xcb_get_setup((xcb_connection_t *)connection));
-        for (; iter_screen.rem; --screen, xcb_screen_next(&iter_screen))
-          if (screen == 0)
-            {
-               s = iter_screen.data;
-               break;
-            }
-
-        return s->root_depth;
-     }
-#endif
-
-   return 0;
-}
-
-/* engine api this module provides */
-static void *
-eng_info(Evas *e __UNUSED__)
-{
-   Evas_Engine_Info_Software_X11 *info;
-
-   if (!(info = calloc(1, sizeof(Evas_Engine_Info_Software_X11))))
-     return NULL;
-
-   info->magic.magic = rand();
-   info->info.debug = 0;
-   info->info.alloc_grayscale = 0;
-   info->info.alloc_colors_max = 216;
-   info->func.best_visual_get = _best_visual_get;
-   info->func.best_colormap_get = _best_colormap_get;
-   info->func.best_depth_get = _best_depth_get;
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_Software_X11 *in;
-
-   in = (Evas_Engine_Info_Software_X11 *)info;
-   free(in);
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Evas_Engine_Info_Software_X11 *info;
-   Render_Engine *re = NULL;
-
-   info = (Evas_Engine_Info_Software_X11 *)in;
-   if (!e->engine.data.output)
-     {
-        /* if we haven't initialized - init (automatic abort if already done) */
-        evas_common_cpu_init();
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-        if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
-          {
-             re = _output_xlib_setup(e->output.w, e->output.h,
-                                     info->info.rotation, info->info.connection,
-                                     info->info.drawable, info->info.visual,
-                                     info->info.colormap,
-                                     info->info.depth, info->info.debug,
-                                     info->info.alloc_grayscale,
-                                     info->info.alloc_colors_max,
-                                     info->info.mask, info->info.shape_dither,
-                                     info->info.destination_alpha);
-
-             re->outbuf_free = evas_software_xlib_outbuf_free;
-             re->outbuf_reconfigure = evas_software_xlib_outbuf_reconfigure;
-             re->outbuf_get_rot = evas_software_xlib_outbuf_get_rot;
-             re->outbuf_new_region_for_update = 
-               evas_software_xlib_outbuf_new_region_for_update;
-             re->outbuf_push_updated_region = 
-               evas_software_xlib_outbuf_push_updated_region;
-             re->outbuf_free_region_for_update = 
-               evas_software_xlib_outbuf_free_region_for_update;
-             re->outbuf_flush = evas_software_xlib_outbuf_flush;
-             re->outbuf_idle_flush = evas_software_xlib_outbuf_idle_flush;
-             re->outbuf_alpha_get = evas_software_xlib_outbuf_alpha_get;
-# ifdef EVAS_FRAME_QUEUING
-             re->outbuf_set_priv = evas_software_xlib_outbuf_set_priv;
-             re->render_mode = info->render_mode;
-# endif
-          }
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-        if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB)
-          {
-             re = _output_xcb_setup(e->output.w, e->output.h,
-                                    info->info.rotation, info->info.connection, 
-                                    info->info.screen, info->info.drawable, 
-                                    info->info.visual, info->info.colormap, 
-                                    info->info.depth, info->info.debug, 
-                                    info->info.alloc_grayscale,
-                                    info->info.alloc_colors_max,
-                                    info->info.mask, info->info.shape_dither,
-                                    info->info.destination_alpha);
-
-             re->outbuf_free = evas_software_xcb_outbuf_free;
-             re->outbuf_reconfigure = evas_software_xcb_outbuf_reconfigure;
-             re->outbuf_get_rot = evas_software_xcb_outbuf_rotation_get;
-             re->outbuf_new_region_for_update = 
-               evas_software_xcb_outbuf_new_region_for_update;
-             re->outbuf_push_updated_region = 
-               evas_software_xcb_outbuf_push_updated_region;
-             re->outbuf_free_region_for_update = 
-               evas_software_xcb_outbuf_free_region_for_update;
-             re->outbuf_flush = evas_software_xcb_outbuf_flush;
-             re->outbuf_idle_flush = evas_software_xcb_outbuf_idle_flush;
-             re->outbuf_alpha_get = evas_software_xcb_outbuf_alpha_get;
-# ifdef EVAS_FRAME_QUEUING
-             re->outbuf_set_priv = evas_software_xcb_outbuf_priv_set;
-             re->render_mode = info->render_mode;
-# endif
-          }
-#endif
-
-        e->engine.data.output = re;
-     }
-   else
-     {
-        int ponebuf = 0;
-
-#ifdef EVAS_FRAME_QUEUING
-        evas_common_frameq_flush();
-#endif
-        re = e->engine.data.output;
-        ponebuf = re->ob->onebuf;
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-        if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
-          {
-             evas_software_xlib_outbuf_free(re->ob);
-             re->ob = 
-               evas_software_xlib_outbuf_setup_x(e->output.w, e->output.h,
-                                                 info->info.rotation,
-                                                 OUTBUF_DEPTH_INHERIT,
-                                                 info->info.connection,
-                                                 info->info.drawable,
-                                                 info->info.visual,
-                                                 info->info.colormap,
-                                                 info->info.depth,
-                                                 info->info.alloc_grayscale,
-                                                 info->info.alloc_colors_max,
-                                                 info->info.mask,
-                                                 info->info.shape_dither,
-                                                 info->info.destination_alpha);
-
-             evas_software_xlib_outbuf_debug_set(re->ob, info->info.debug);
-# ifdef EVAS_FRAME_QUEUING
-             re->render_mode = info->render_mode;
-# endif
-          }
-#endif
-
-#ifdef BUILD_ENGINE_SOFTWARE_XCB
-        if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB)
-          {
-             evas_software_xcb_outbuf_free(re->ob);
-             re->ob = 
-               evas_software_xcb_outbuf_setup(e->output.w, e->output.h,
-                                              info->info.rotation,
-                                              OUTBUF_DEPTH_INHERIT,
-                                              info->info.connection,
-                                              info->info.screen,
-                                              info->info.drawable,
-                                              info->info.visual,
-                                              info->info.colormap,
-                                              info->info.depth,
-                                              info->info.alloc_grayscale,
-                                              info->info.alloc_colors_max,
-                                              info->info.mask,
-                                              info->info.shape_dither,
-                                              info->info.destination_alpha);
-
-             evas_software_xcb_outbuf_debug_set(re->ob, info->info.debug);
-#ifdef EVAS_FRAME_QUEUING
-             re->render_mode = info->render_mode;
-#endif
-          }
-#endif
-        re->ob->onebuf = ponebuf;
-     }
-   if (!e->engine.data.output) return 0;
-   if (!e->engine.data.context) 
-     {
-        e->engine.data.context = 
-          e->engine.func->context_new(e->engine.data.output);
-     }
-
-   re = e->engine.data.output;
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-// NOTE: XrmGetDatabase() result is shared per connection, do not free it.
-//   if (re->xrdb) XrmDestroyDatabase(re->xrdb);
-#endif
-
-   if ((re = (Render_Engine *)data))
-     {
-        re->outbuf_free(re->ob);
-        evas_common_tilebuf_free(re->tb);
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        free(re);
-     }
-
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->outbuf_reconfigure(re->ob, w, h, re->outbuf_get_rot(re->ob),
-                          OUTBUF_DEPTH_INHERIT);
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   RGBA_Image *surface;
-   Tilebuf_Rect *rect;
-   int ux, uy, uw, uh;
-
-   re = (Render_Engine *)data;
-   if (re->end)
-     {
-        re->end = 0;
-        return NULL;
-     }
-   if (!re->rects)
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect) return NULL;
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect)
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = 1;
-     }
-
-   surface = 
-     re->outbuf_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch);
-
-   *x = ux; *y = uy; *w = uw; *h = uh;
-   return surface;
-}
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-#ifdef EVAS_FRAME_QUEUING
-   Evas_Surface *e_surface;
-#endif
-
-   re = (Render_Engine *)data;
-#if defined(BUILD_PIPE_RENDER) && !defined(EVAS_FRAME_QUEUING)
-   evas_common_pipe_map_begin(surface);
-#endif /* BUILD_PIPE_RENDER  && !EVAS_FRAME_QUEUING*/
-
-#ifdef EVAS_FRAME_QUEUING
-   if (re->render_mode == EVAS_RENDER_MODE_NONBLOCKING)
-     {
-        /* create a new frame if this is the first surface of this frame */
-        evas_common_frameq_prepare_frame();
-        /* add surface into the frame */
-        e_surface = evas_common_frameq_new_surface(surface, x, y, w, h);
-        evas_common_frameq_add_surface(e_surface);
-        return;
-     }
-#endif
-
-   re->outbuf_push_updated_region(re->ob, surface, x, y, w, h);
-   re->outbuf_free_region_for_update(re->ob, surface);
-   evas_common_cpu_end_opt();
-}
-
-#ifdef EVAS_FRAME_QUEUING
-static void *
-eng_image_map_surface_new(void *data , int w, int h, int alpha)
-{
-   void *surface;
-   DATA32 *pixels;
-   Render_Engine *re;
-   Evas_Surface *e_surface;
-
-   re = (Render_Engine *)data;
-
-   surface = 
-     evas_cache_image_copied_data(evas_common_image_cache_get(), w, h, NULL, 
-                                  alpha, EVAS_COLORSPACE_ARGB8888);
-   pixels = evas_cache_image_pixels(surface);
-
-   if (re->render_mode == EVAS_RENDER_MODE_NONBLOCKING)
-     {
-        /* create a new frame if this is the first surface of this frame */
-        evas_common_frameq_prepare_frame();
-
-        /* add surface into the frame */
-        e_surface = evas_common_frameq_new_surface(surface, 0, 0, w, h);
-
-        /* this surface is not going to be pushed to screen */
-        e_surface->dontpush = 1;
-        evas_common_frameq_add_surface(e_surface);
-     }
-   return surface;
-}
-
-static void
-eng_output_frameq_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->outbuf_push_updated_region(re->ob, surface, x, y, w, h);
-   re->outbuf_free_region_for_update(re->ob, surface);
-   evas_common_cpu_end_opt();
-}
-
-static void
-eng_output_frameq_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->outbuf_flush(re->ob);
-}
-
-static void
-eng_output_frameq_set_priv(void *data, void *cur, void *prev)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->outbuf_set_priv(re->ob, cur, prev);
-}
-#endif
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-#ifdef EVAS_FRAME_QUEUING
-   if (re->render_mode == EVAS_RENDER_MODE_NONBLOCKING)
-     {
-        evas_common_frameq_set_frame_data(data,
-                                          eng_output_frameq_redraws_next_update_push,
-                                          eng_output_frameq_flush,
-                                          eng_output_frameq_set_priv);
-        evas_common_frameq_ready_frame();
-        evas_common_frameq_begin();
-     } 
-   else
-#endif
-     re->outbuf_flush(re->ob);
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->outbuf_idle_flush(re->ob);
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context __UNUSED__)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return (re->ob->priv.destination_alpha) || (re->outbuf_alpha_get(re->ob));
-}
-
-
-/* module advertising code */
-static int
-module_open(Evas_Module *em)
-{
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-   static Eina_Bool xrm_inited = EINA_FALSE;
-
-   if (!xrm_inited)
-     {
-        xrm_inited = EINA_TRUE;
-        XrmInitialize();
-     }
-#endif
-
-   if (!em) return 0;
-
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-
-   _evas_engine_soft_x11_log_dom = 
-     eina_log_domain_register("evas-software_x11", EVAS_DEFAULT_LOG_COLOR);
-
-   if (_evas_engine_soft_x11_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-
-   /* store it for later use */
-   func = pfunc;
-
-   /* now to override methods */
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-#ifdef EVAS_FRAME_QUEUING
-   ORD(image_map_surface_new);
-#endif
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-  eina_log_domain_unregister(_evas_engine_soft_x11_log_dom);
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
-/*   
-  if (xrdb_user.db)
-    {
-       XrmDestroyDatabase(xrdb_user.db);
-       xrdb_user.last_stat = 0;
-       xrdb_user.last_mtime = 0;
-       xrdb_user.db = NULL;
-    }
- */
-#endif
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION, "software_x11", "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_x11);
-
-#ifndef EVAS_STATIC_BUILD_SOFTWARE_X11
-EVAS_EINA_MODULE_DEFINE(engine, software_x11);
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_engine.h b/libraries/evas/src/modules/engines/software_x11/evas_engine.h
deleted file mode 100644
index 80b71b7..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_engine.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef EVAS_ENGINE_H
-# define EVAS_ENGINE_H
-
-# include <sys/ipc.h>
-# include <sys/shm.h>
-
-# ifdef BUILD_ENGINE_SOFTWARE_XLIB
-#  include <X11/Xlib.h>
-#  include <X11/Xutil.h>
-#  include <X11/Xatom.h>
-#  include <X11/extensions/XShm.h>
-#  include <X11/Xresource.h> // xres - dpi
-# endif
-
-# ifdef BUILD_ENGINE_SOFTWARE_XCB
-#  include <xcb/xcb.h>
-#  include <xcb/shm.h>
-#  include <xcb/xcb_image.h>
-# endif
-
-extern int _evas_engine_soft_x11_log_dom;
-
-# ifdef ERR
-#  undef ERR
-# endif
-# define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
-
-# ifdef DBG
-#  undef DBG
-# endif
-# define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
-
-# ifdef INF
-#  undef INF
-# endif
-# define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
-
-# ifdef WRN
-#  undef WRN
-# endif
-# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
-
-# ifdef CRIT
-#  undef CRIT
-# endif
-# define CRIT(...) \
-   EINA_LOG_DOM_CRIT(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
-
-typedef enum _Outbuf_Depth Outbuf_Depth;
-
-enum _Outbuf_Depth
-{
-   OUTBUF_DEPTH_NONE,
-   OUTBUF_DEPTH_INHERIT,
-   OUTBUF_DEPTH_RGB_16BPP_565_565_DITHERED,
-   OUTBUF_DEPTH_RGB_16BPP_555_555_DITHERED,
-   OUTBUF_DEPTH_RGB_16BPP_444_444_DITHERED,
-   OUTBUF_DEPTH_RGB_16BPP_565_444_DITHERED,
-   OUTBUF_DEPTH_RGB_32BPP_888_8888,
-   OUTBUF_DEPTH_LAST
-};
-
-typedef struct _Outbuf Outbuf;
-
-struct _Outbuf
-{
-   Outbuf_Depth depth;
-   int w, h;
-   int rot;
-   int onebuf;
-
-   struct 
-     {
-        Convert_Pal *pal;
-        union 
-          {
-# ifdef BUILD_ENGINE_SOFTWARE_XLIB
-             struct 
-               {
-                  Display *disp;
-                  Window win;
-                  Pixmap mask;
-                  Visual *vis;
-                  Colormap cmap;
-                  int depth, shm;
-                  GC gc, gcm;
-                  unsigned char swap : 1;
-                  unsigned char bit_swap : 1;
-               } xlib;
-# endif
-# ifdef BUILD_ENGINE_SOFTWARE_XCB
-             struct 
-               {
-                  xcb_connection_t *conn;
-                  xcb_screen_t *screen;
-                  xcb_window_t win;
-                  xcb_pixmap_t mask;
-                  xcb_visualtype_t *visual;
-                  xcb_colormap_t cmap;
-                  int depth, shm;
-                  xcb_gcontext_t gc, gcm;
-                  unsigned char swap : 1;
-                  unsigned char bit_swap : 1;
-               } xcb;
-# endif
-          } x11;
-        struct 
-          {
-             DATA32 r, g, b;
-          } mask;
-
-        /* 1 big buffer for updates - flush on idle_flush */
-        RGBA_Image *onebuf;
-        Eina_List *onebuf_regions;
-
-        /* a list of pending regions to write to the target */
-        Eina_List *pending_writes;
-
-        /* a list of previous frame pending regions to write to the target */
-        Eina_List *prev_pending_writes;
-
-# ifdef EVAS_FRAME_QUEUING
-        /* protecting prev_pending_writes */
-        LK(lock);
-# endif
-
-        unsigned char mask_dither : 1;
-        unsigned char destination_alpha : 1;
-        unsigned char debug : 1;
-        unsigned char synced : 1;
-     } priv;
-};
-
-void evas_software_xlib_x_init(void);
-void evas_software_xcb_init(void);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_buffer.c b/libraries/evas/src/modules/engines/software_x11/evas_xcb_buffer.c
deleted file mode 100644
index 49ce721..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_buffer.c
+++ /dev/null
@@ -1,498 +0,0 @@
-#include "evas_common.h"
-#include "evas_xcb_buffer.h"
-
-/* local function prototypes */
-static void _xcbob_sync(xcb_connection_t *conn);
-static xcb_image_t *_xcbob_create_native(xcb_connection_t *conn, int w, int h, xcb_image_format_t format, uint8_t depth, void *base, uint32_t bytes, uint8_t *data);
-static xcb_format_t *_xcbob_find_format(const xcb_setup_t *setup, uint8_t depth);
-static xcb_visualtype_t *_xcbob_find_visual_by_id(xcb_screen_t *screen, xcb_visualid_t id);
-
-void 
-evas_software_xcb_write_mask_line(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int w, int y) 
-{
-   int x, bpl = 0;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-
-   src_ptr = src;
-   dst_ptr = evas_software_xcb_output_buffer_data(xcbob, &bpl);
-   dst_ptr = dst_ptr + (bpl * y);
-   w -= 7;
-   if (buf->priv.x11.xcb.bit_swap)
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[1])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[2])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[3])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[4])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[5])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[6])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[7])) >> 7) << 0);
-             src_ptr += 8;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[1])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[2])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[3])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[4])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[5])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[6])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[7])) >> 7) << 7);
-             src_ptr += 8;
-             dst_ptr++;
-          }
-     }
-   w += 7;
-   for (; x < w; x ++)
-     {
-        xcb_image_put_pixel(xcbob->xim, x, y, A_VAL(src_ptr) >> 7);
-        src_ptr++;
-     }
-}
-
-void 
-evas_software_xcb_write_mask_line_rev(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int w, int y) 
-{
-   int x, bpl = 0;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-
-   src_ptr = src + w - 1;
-   dst_ptr = evas_software_xcb_output_buffer_data(xcbob, &bpl);
-   dst_ptr = dst_ptr + (bpl * y);
-   w -= 7;
-   if (buf->priv.x11.xcb.bit_swap)
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[-1])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-2])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-3])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-4])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-5])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-6])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-7])) >> 7) << 0);
-             src_ptr -= 8;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[-1])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-2])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-3])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-4])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-5])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-6])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-7])) >> 7) << 7);
-             src_ptr -= 8;
-             dst_ptr++;
-          }
-     }
-   w += 7;
-   for (; x < w; x ++)
-     {
-        xcb_image_put_pixel(xcbob->xim, x, y, A_VAL(src_ptr) >> 7);
-        src_ptr--;
-     }
-}
-
-void 
-evas_software_xcb_write_mask_line_vert(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int h, int y, int w) 
-{
-   int yy, bpl = 0;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-
-   src_ptr = src;
-   dst_ptr = evas_software_xcb_output_buffer_data(xcbob, &bpl);
-   dst_ptr = dst_ptr + (bpl * y);
-   h -= 7;
-   if (buf->priv.x11.xcb.bit_swap)
-     {
-        for (yy = 0; yy < h; yy += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0 * w])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[1 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[2 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[3 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[4 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[5 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[6 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[7 * w])) >> 7) << 0);
-             src_ptr += 8 * w;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (yy = 0; yy < h; yy += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0 * w])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[1 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[2 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[3 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[4 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[5 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[6 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[7 * w])) >> 7) << 7);
-             src_ptr += 8 * w;
-             dst_ptr++;
-          }
-     }
-   h += 7;
-   for (; yy < h; yy ++)
-     {
-        xcb_image_put_pixel(xcbob->xim, yy, y, A_VAL(src_ptr) >> 7);
-        src_ptr += w;
-     }
-}
-
-void 
-evas_software_xcb_write_mask_line_vert_rev(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int h, int y, int w) 
-{
-   int yy, bpl = 0;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-
-   src_ptr = src + ((h - 1) * w);
-   dst_ptr = evas_software_xcb_output_buffer_data(xcbob, &bpl);
-   dst_ptr = dst_ptr + (bpl * y);
-   h -= 7;
-   if (buf->priv.x11.xcb.bit_swap)
-     {
-        for (yy = 0; yy < h; yy += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0 * w])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[-1 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-2 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-3 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-4 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-5 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-6 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-7 * w])) >> 7) << 0);
-             src_ptr -= 8 * w;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (yy = 0; yy < h; yy += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0 * w])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[-1 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-2 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-3 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-4 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-5 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-6 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-7 * w])) >> 7) << 7);
-             src_ptr -= 8 * w;
-             dst_ptr++;
-          }
-     }
-   h += 7;
-   for (; yy < h; yy ++)
-     {
-        xcb_image_put_pixel(xcbob->xim, yy, y, A_VAL(src_ptr) >> 7);
-        src_ptr -= w;
-     }
-}
-
-Eina_Bool 
-evas_software_xcb_can_do_shm(xcb_connection_t *conn, xcb_screen_t *screen) 
-{
-   const xcb_query_extension_reply_t *reply;
-   static xcb_connection_t *cached_conn = NULL;
-   static int cached_result = 0;
-
-   if (conn == cached_conn) return cached_result;
-   cached_conn = conn;
-
-   reply = xcb_get_extension_data(conn, &xcb_shm_id);
-   if ((reply) && (reply->present)) 
-     {
-        xcb_visualtype_t *visual;
-        Xcb_Output_Buffer *xcbob = NULL;
-
-        visual = _xcbob_find_visual_by_id(screen, screen->root_visual);
-        xcbob = 
-          evas_software_xcb_output_buffer_new(conn, visual, screen->root_depth,
-                                              16, 16, 2, NULL);
-        if (!xcbob)
-          cached_result = 0;
-        else 
-          {
-             evas_software_xcb_output_buffer_free(xcbob, EINA_TRUE);
-             cached_result = 1;
-          }
-     }
-   else
-     cached_result = 0;
-
-   return cached_result;
-}
-
-Xcb_Output_Buffer *
-evas_software_xcb_output_buffer_new(xcb_connection_t *conn, xcb_visualtype_t *vis, int depth, int w, int h, int try_shm, unsigned char *data) 
-{
-   Xcb_Output_Buffer *xcbob = NULL;
-
-   if (!(xcbob = calloc(1, sizeof(Xcb_Output_Buffer))))
-     return NULL;
-
-   xcbob->connection = conn;
-   xcbob->visual = vis;
-   xcbob->xim = NULL;
-   xcbob->shm_info = NULL;
-   xcbob->w = w;
-   xcbob->h = h;
-
-   if (try_shm > 0) 
-     {
-        xcbob->shm_info = malloc(sizeof(xcb_shm_segment_info_t));
-        if (xcbob->shm_info) 
-          {
-             xcbob->shm_info->shmseg = xcb_generate_id(conn);
-             xcbob->xim = 
-               _xcbob_create_native(conn, w, h, XCB_IMAGE_FORMAT_Z_PIXMAP, 
-                                    depth, NULL, ~0, NULL);
-             if (xcbob->xim) 
-               {
-                  xcbob->shm_info->shmid = 
-                    shmget(IPC_PRIVATE, 
-                           xcbob->xim->stride * xcbob->xim->height, 
-                           (IPC_CREAT | 0777));
-                  if (xcbob->shm_info->shmid == (uint32_t)-1) 
-                    {
-                       xcb_image_destroy(xcbob->xim);
-                       free(xcbob->shm_info);
-                       free(xcbob);
-                       return NULL;
-                    }
-                  xcbob->shm_info->shmaddr = xcbob->xim->data = 
-                    shmat(xcbob->shm_info->shmid, 0, 0);
-                  if (xcbob->shm_info->shmaddr != ((void *)-1))
-                    {
-                       /* Sync only needed for testing */
-                       if (try_shm == 2) _xcbob_sync(conn);
-
-#if defined(EVAS_FRAME_QUEUING) && defined(LIBXEXT_VERSION_LOW)
-                       if (evas_common_frameq_enabled())
-                         xcb_grab_server(conn);
-#endif
-                       xcb_shm_attach(conn, xcbob->shm_info->shmseg, 
-                                      xcbob->shm_info->shmid, 0);
-#if defined(EVAS_FRAME_QUEUING) && defined(LIBXEXT_VERSION_LOW)
-                       if (evas_common_frameq_enabled()) 
-                         xcb_ungrab_server(conn);
-#endif
-                       if (try_shm == 2) _xcbob_sync(conn);
-
-                       xcbob->bpl = xcbob->xim->stride;
-                       xcbob->psize = (xcbob->bpl * xcbob->h);
-                       return xcbob;
-                    }
-                  shmdt(xcbob->shm_info->shmaddr);
-                  shmctl(xcbob->shm_info->shmid, IPC_RMID, 0);
-               }
-             if (xcbob->xim) xcb_image_destroy(xcbob->xim);
-             xcbob->xim = NULL;
-          }
-        if (xcbob->shm_info) free(xcbob->shm_info);
-        xcbob->shm_info = NULL;
-     }
-
-   if (try_shm > 1) return NULL;
-
-   /* no shm */
-   xcbob->xim = 
-     _xcbob_create_native(conn, w, h, XCB_IMAGE_FORMAT_Z_PIXMAP, 
-                          depth, NULL, ~0, NULL);
-   if (!xcbob->xim) 
-     {
-        free(xcbob);
-        return NULL;
-     }
-
-   xcbob->data = data;
-
-   if (!xcbob->xim->data) 
-     {
-        xcbob->xim->data = malloc(xcbob->xim->stride * xcbob->xim->height);
-        if (!xcbob->xim->data) 
-          {
-             xcb_image_destroy(xcbob->xim);
-             free(xcbob);
-             return NULL;
-          }
-     }
-   xcbob->bpl = xcbob->xim->stride;
-   xcbob->psize = (xcbob->bpl * xcbob->h);
-   return xcbob;
-}
-
-void 
-evas_software_xcb_output_buffer_free(Xcb_Output_Buffer *xcbob, Eina_Bool sync) 
-{
-   if (xcbob->shm_info) 
-     {
-        if (sync) _xcbob_sync(xcbob->connection);
-        xcb_shm_detach(xcbob->connection, xcbob->shm_info->shmseg);
-        xcb_image_destroy(xcbob->xim);
-        shmdt(xcbob->shm_info->shmaddr);
-        shmctl(xcbob->shm_info->shmid, IPC_RMID, 0);
-        free(xcbob->shm_info);
-     }
-   else 
-     {
-        if (xcbob->data) xcbob->xim->data = NULL;
-//        free(xcbob->xim->data);
-        xcb_image_destroy(xcbob->xim);
-     }
-   free(xcbob);
-}
-
-void 
-evas_software_xcb_output_buffer_paste(Xcb_Output_Buffer *xcbob, xcb_drawable_t drawable, xcb_gcontext_t gc, int x, int y, Eina_Bool sync) 
-{
-   if (xcbob->shm_info) 
-     {
-        xcb_image_shm_put(xcbob->connection, drawable, gc, xcbob->xim, 
-                          *xcbob->shm_info, 0, 0, x, y, xcbob->w, xcbob->h, 0);
-        if (sync) _xcbob_sync(xcbob->connection);
-     }
-   else 
-     xcb_image_put(xcbob->connection, drawable, gc, xcbob->xim, x, y, 0);
-}
-
-DATA8 *
-evas_software_xcb_output_buffer_data(Xcb_Output_Buffer *xcbob, int *bpl_ret) 
-{
-   if (bpl_ret) *bpl_ret = xcbob->xim->stride;
-   return (DATA8 *)xcbob->xim->data;
-}
-
-int 
-evas_software_xcb_output_buffer_depth(Xcb_Output_Buffer *xcbob) 
-{
-   return xcbob->xim->bpp;
-}
-
-int 
-evas_software_xcb_output_buffer_byte_order(Xcb_Output_Buffer *xcbob) 
-{
-   return xcbob->xim->byte_order;
-}
-
-int 
-evas_software_xcb_output_buffer_bit_order(Xcb_Output_Buffer *xcbob) 
-{
-   return xcbob->xim->bit_order;
-}
-
-/* local functions */
-static void 
-_xcbob_sync(xcb_connection_t *conn) 
-{
-   free(xcb_get_input_focus_reply(conn, 
-                                  xcb_get_input_focus_unchecked(conn), NULL));
-}
-
-static xcb_image_t *
-_xcbob_create_native(xcb_connection_t *conn, int w, int h, xcb_image_format_t format, uint8_t depth, void *base, uint32_t bytes, uint8_t *data) 
-{
-   static uint8_t dpth = 0;
-   static xcb_format_t *fmt = NULL;
-   const xcb_setup_t *setup;
-   xcb_image_format_t xif;
-
-   /* NB: We cannot use xcb_image_create_native as it only creates images 
-    * using MSB_FIRST, so this routine recreates that function and uses 
-    * the endian-ness of the server setup */
-   setup = xcb_get_setup(conn);
-   xif = format;
-
-   if ((xif == XCB_IMAGE_FORMAT_Z_PIXMAP) && (depth == 1))
-     xif = XCB_IMAGE_FORMAT_XY_PIXMAP;
-
-   if (dpth != depth) 
-     {
-        dpth = depth;
-        fmt = _xcbob_find_format(setup, depth);
-        if (!fmt) return 0;
-     }
-
-   switch (xif) 
-     {
-      case XCB_IMAGE_FORMAT_XY_BITMAP:
-        if (depth != 1) return 0;
-      case XCB_IMAGE_FORMAT_XY_PIXMAP:
-      case XCB_IMAGE_FORMAT_Z_PIXMAP:
-        return xcb_image_create(w, h, xif, 
-                                fmt->scanline_pad, 
-                                fmt->depth, fmt->bits_per_pixel, 
-                                setup->bitmap_format_scanline_unit, 
-                                setup->image_byte_order, 
-                                setup->bitmap_format_bit_order, 
-                                base, bytes, data);
-      default:
-        break;
-     }
-
-   return 0;
-}
-
-static xcb_format_t *
-_xcbob_find_format(const xcb_setup_t *setup, uint8_t depth) 
-{
-   xcb_format_t *fmt, *fmtend;
-
-   fmt = xcb_setup_pixmap_formats(setup);
-   fmtend = fmt + xcb_setup_pixmap_formats_length(setup);
-   for (; fmt != fmtend; ++fmt)
-     if (fmt->depth == depth) 
-       return fmt;
-
-   return 0;
-}
-
-static xcb_visualtype_t *
-_xcbob_find_visual_by_id(xcb_screen_t *screen, xcb_visualid_t id) 
-{
-   xcb_depth_iterator_t diter;
-   xcb_visualtype_iterator_t viter;
-
-   diter = xcb_screen_allowed_depths_iterator(screen);
-   for (; diter.rem; xcb_depth_next(&diter)) 
-     {
-        viter = xcb_depth_visuals_iterator(diter.data);
-        for (; viter.rem; xcb_visualtype_next(&viter)) 
-          {
-             if (viter.data->visual_id == id)
-               return viter.data;
-          }
-     }
-
-   return 0;
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_buffer.h b/libraries/evas/src/modules/engines/software_x11/evas_xcb_buffer.h
deleted file mode 100644
index dc1f0b4..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_buffer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef EVAS_XCB_BUFFER_H
-# define EVAS_XCB_BUFFER_H
-
-# include "evas_engine.h"
-
-typedef struct _Xcb_Output_Buffer Xcb_Output_Buffer;
-struct _Xcb_Output_Buffer 
-{
-   xcb_connection_t *connection;
-   xcb_visualtype_t *visual;
-   xcb_image_t *xim;
-   xcb_shm_segment_info_t *shm_info;
-   unsigned char *data;
-   int w, h, bpl, psize;
-};
-
-void evas_software_xcb_write_mask_line(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int w, int y);
-void evas_software_xcb_write_mask_line_rev(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int w, int y);
-void evas_software_xcb_write_mask_line_vert(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int h, int y, int w);
-void evas_software_xcb_write_mask_line_vert_rev(Outbuf *buf, Xcb_Output_Buffer *xcbob, DATA32 *src, int h, int y, int w);
-Eina_Bool evas_software_xcb_can_do_shm(xcb_connection_t *conn, xcb_screen_t *screen);
-Xcb_Output_Buffer *evas_software_xcb_output_buffer_new(xcb_connection_t *conn, xcb_visualtype_t *vis, int depth, int w, int h, int try_shm, unsigned char *data);
-void evas_software_xcb_output_buffer_free(Xcb_Output_Buffer *xcbob, Eina_Bool sync);
-void evas_software_xcb_output_buffer_paste(Xcb_Output_Buffer *xcbob, xcb_drawable_t drawable, xcb_gcontext_t gc, int x, int y, Eina_Bool sync);
-DATA8 *evas_software_xcb_output_buffer_data(Xcb_Output_Buffer *xcbob, int *bpl_ret);
-int evas_software_xcb_output_buffer_depth(Xcb_Output_Buffer *xcbob);
-int evas_software_xcb_output_buffer_byte_order(Xcb_Output_Buffer *xcbob);
-int evas_software_xcb_output_buffer_bit_order(Xcb_Output_Buffer *xcbob);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_color.c b/libraries/evas/src/modules/engines/software_x11/evas_xcb_color.c
deleted file mode 100644
index 3ed6037..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_color.c
+++ /dev/null
@@ -1,424 +0,0 @@
-#include "evas_common.h"
-
-#include "evas_engine.h"
-
-typedef struct _Convert_Pal_Priv Convert_Pal_Priv;
-
-struct _Convert_Pal_Priv
-{
-   xcb_connection_t *conn;
-   xcb_colormap_t    cmap;
-   xcb_visualtype_t *vis;
-};
-
-typedef DATA8 * (*Xcb_Func_Alloc_Colors) (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-
-static Xcb_Func_Alloc_Colors x_color_alloc[PAL_MODE_LAST + 1];
-static int                   x_color_count[PAL_MODE_LAST + 1];
-static Eina_List            *palettes = NULL;
-
-static DATA8 * x_color_alloc_rgb(int nr, int ng, int nb, xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_gray(int ng, xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-
-static DATA8 * x_color_alloc_rgb_332  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_rgb_666  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_rgb_232  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_rgb_222  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_rgb_221  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_rgb_121  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_rgb_111  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_gray_256 (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_gray_64  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_gray_16  (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_gray_4   (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-static DATA8 * x_color_alloc_mono     (xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *v);
-
-static DATA8 *
-x_color_alloc_rgb(int               nr,
-                  int               ng,
-                  int               nb,
-                  xcb_connection_t *conn,
-                  xcb_colormap_t    cmap,
-                  xcb_visualtype_t *v)
-{
-   int    r, g, b, i;
-   DATA8 *color_lut;
-   int    sig_mask = 0;
-   int    delt = 0;
-
-   for (i = 0; i < v->bits_per_rgb_value; i++) sig_mask |= (0x1 << i);
-   sig_mask <<= (16 - v->bits_per_rgb_value);
-   i = 0;
-   color_lut = malloc((nr) * (ng) * (nb));
-   if (!color_lut) return NULL;
-   delt = 0x0101 * 3;
-   /* FIXME: remove the round-trip ? */
-   for (r = 0; r < (nr); r++)
-     {
-        for (g = 0; g < (ng); g++)
-          {
-             for (b = 0; b < (nb); b++)
-               {
-                  xcb_coloritem_t          xcl;
-                  xcb_coloritem_t          xcl_in;
-                  xcb_alloc_color_reply_t *rep;
-                  int                      val;
-                  int                      dr, dg, db;
-
-                  val = (int)((((double)r) / ((nr) - 1)) * 255);
-                  val = (val << 8) | val;
-                  xcl.red = (uint16_t)(val);
-                  val = (int)((((double)g) / ((ng) - 1)) * 255);
-                  val = (val << 8) | val;
-                  xcl.green = (uint16_t)(val);
-                  val = (int)((((double)b) / ((nb) - 1)) * 255);
-                  val = (val << 8) | val;
-                  xcl.blue = (uint16_t)(val);
-                  xcl_in = xcl;
-                  rep = xcb_alloc_color_reply(conn,
-                                              xcb_alloc_color_unchecked(conn,
-                                                                        cmap,
-                                                                        xcl.red,
-                                                                        xcl.green,
-                                                                        xcl.blue),
-                                              0);
-                  dr = (int)xcl_in.red - (int)xcl.red;
-                  if (dr < 0) dr = -dr;
-                  dg = (int)xcl_in.green - (int)xcl.green;
-                  if (dg < 0) dg = -dg;
-                  db = (int)xcl_in.blue - (int)xcl.blue;
-                  if (db < 0) db = -db;
-/*
-                 printf("ASK [%i]: %04x %04x %04x = %04x %04x %04x | dif = %04x / %04x\n",
-                        ret,
-                        xcl_in.red, xcl_in.green, xcl_in.blue,
-                        xcl.red, xcl.green, xcl.blue,
-                        (dr + dg +db), delt);
- */
-
-                  /* TODO: XAllocColor tries to approach the color */
-                  /* in case the allocation fails */
-                  /* XCB does not that (i think). It should be done */
-                  /* So if rep == NULL, the other following tests */
-                  /* should be always satisfied */
-                  if ((!rep) ||
-                      ((dr + dg + db) > delt)
-                      /*
-                      ((xcl_in.red   & sig_mask) != (xcl.red   & sig_mask)) ||
-                      ((xcl_in.green & sig_mask) != (xcl.green & sig_mask)) ||
-                      ((xcl_in.blue  & sig_mask) != (xcl.blue  & sig_mask))
-                      */
-                      )
-                    {
-                       uint32_t pixels[256];
-                       int      j;
-
-                       if (i > 0)
-                         {
-                            for (j = 0; j < i; j++)
-                              pixels[j] = (uint32_t)color_lut[j];
-                            xcb_free_colors(conn, cmap, 0, i, pixels);
-                         }
-                       free(color_lut);
-                       return NULL;
-                    }
-                  color_lut[i] = rep->pixel;
-                  i++;
-                  free(rep);
-               }
-          }
-     }
-   return color_lut;
-}
-
-static DATA8 *
-x_color_alloc_gray(int               ng,
-                   xcb_connection_t *conn,
-                   xcb_colormap_t    cmap,
-                   xcb_visualtype_t *v)
-{
-   int g, i;
-   DATA8 *color_lut;
-   int sig_mask = 0;
-
-   for (i = 0; i < v->bits_per_rgb_value; i++) sig_mask |= (0x1 << i);
-   sig_mask <<= (16 - v->bits_per_rgb_value);
-   i = 0;
-   color_lut = malloc(ng);
-   if (!color_lut) return NULL;
-   /* FIXME: remove the round-trip ? */
-   for (g = 0; g < (ng); g++)
-     {
-        xcb_coloritem_t          xcl;
-        xcb_coloritem_t          xcl_in;
-        int                      val;
-        xcb_alloc_color_reply_t *rep;
-
-        val = (int)((((double)g) / ((ng) - 1)) * 255);
-        val = (val << 8) | val;
-        xcl.red = (uint16_t)(val);
-        xcl.green = (uint16_t)(val);
-        xcl.blue = (uint16_t)(val);
-        xcl_in = xcl;
-        rep = xcb_alloc_color_reply(conn,
-                                    xcb_alloc_color_unchecked(conn,
-                                                              cmap,
-                                                              xcl.red,
-                                                              xcl.green,
-                                                              xcl.blue),
-                                    0);
-        /* FIXME: XAllocColor tries to approach the color */
-        /* in case the allocation fails */
-        /* XCB does not that (i think). It should be done */
-        /* So if rep == NULL, the other following tests */
-        /* should be always satisfied */
-        if ((!rep) ||
-            ((xcl_in.red   & sig_mask) != (xcl.red   & sig_mask)) ||
-            ((xcl_in.green & sig_mask) != (xcl.green & sig_mask)) ||
-            ((xcl_in.blue  & sig_mask) != (xcl.blue  & sig_mask)))
-          {
-             uint32_t pixels[256];
-             int      j;
-
-             if (i > 0)
-               {
-                  for (j = 0; j < i; j++)
-                    pixels[j] = (uint32_t) color_lut[j];
-                  xcb_free_colors(conn, cmap, 0, i, pixels);
-               }
-             free(color_lut);
-             return NULL;
-          }
-        color_lut[i] = rep->pixel;
-        i++;
-        free(rep);
-     }
-   return color_lut;
-}
-
-static DATA8 *
-x_color_alloc_rgb_332(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(8, 8, 4, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_666(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(6, 6, 6, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_232(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(4, 8, 4, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_222(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(4, 4, 4, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_221(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(4, 4, 2, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_121(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(2, 4, 2, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_111(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_rgb(2, 2, 2, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_256(xcb_connection_t *conn,
-                       xcb_colormap_t    cmap,
-                       xcb_visualtype_t *v)
-{
-   return x_color_alloc_gray(256, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_64(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_gray(64, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_16(xcb_connection_t *conn,
-                      xcb_colormap_t    cmap,
-                      xcb_visualtype_t *v)
-{
-   return x_color_alloc_gray(32, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_4(xcb_connection_t *conn,
-                     xcb_colormap_t    cmap,
-                     xcb_visualtype_t *v)
-{
-   return x_color_alloc_gray(16, conn, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_mono(xcb_connection_t *conn,
-                   xcb_colormap_t    cmap,
-                   xcb_visualtype_t *v)
-{
-   return x_color_alloc_gray(2, conn, cmap, v);
-}
-
-void
-evas_software_xcb_color_init(void)
-{
-   static int initialised = 0;
-
-   if (initialised) return;
-   x_color_alloc[PAL_MODE_NONE]    = NULL;
-   x_color_count[PAL_MODE_NONE]    = 0;
-
-   x_color_alloc[PAL_MODE_MONO]    = x_color_alloc_mono;
-   x_color_count[PAL_MODE_MONO]    = 2;
-
-   x_color_alloc[PAL_MODE_GRAY4]   = x_color_alloc_gray_4;
-   x_color_count[PAL_MODE_GRAY4]   = 4;
-
-   x_color_alloc[PAL_MODE_GRAY16]  = x_color_alloc_gray_16;
-   x_color_count[PAL_MODE_GRAY16]  = 16;
-
-   x_color_alloc[PAL_MODE_GRAY64]  = x_color_alloc_gray_64;
-   x_color_count[PAL_MODE_GRAY64]  = 64;
-
-   x_color_alloc[PAL_MODE_GRAY256] = x_color_alloc_gray_256;
-   x_color_count[PAL_MODE_GRAY256] = 256;
-
-   x_color_alloc[PAL_MODE_RGB111]  = x_color_alloc_rgb_111;
-   x_color_count[PAL_MODE_RGB111]  = 2 * 2 * 2;
-
-   x_color_alloc[PAL_MODE_RGB121]  = x_color_alloc_rgb_121;
-   x_color_count[PAL_MODE_RGB121]  = 2 * 4 * 2;
-
-   x_color_alloc[PAL_MODE_RGB221]  = x_color_alloc_rgb_221;
-   x_color_count[PAL_MODE_RGB221]  = 4 * 4 * 2;
-
-   x_color_alloc[PAL_MODE_RGB222]  = x_color_alloc_rgb_222;
-   x_color_count[PAL_MODE_RGB222]  = 4 * 4 * 4;
-
-   x_color_alloc[PAL_MODE_RGB232]  = x_color_alloc_rgb_232;
-   x_color_count[PAL_MODE_RGB232]  = 4 * 8 * 4;
-
-   x_color_alloc[PAL_MODE_RGB666]  = x_color_alloc_rgb_666;
-   x_color_count[PAL_MODE_RGB666]  = 6 * 6 * 6;
-
-   x_color_alloc[PAL_MODE_RGB332]  = x_color_alloc_rgb_332;
-   x_color_count[PAL_MODE_RGB332]  = 8 * 8 * 4;
-
-   x_color_alloc[PAL_MODE_LAST]    = NULL;
-   x_color_count[PAL_MODE_LAST]    = 0;
-   initialised = 1;
-}
-
-Convert_Pal *
-evas_software_xcb_color_allocate(xcb_connection_t   *conn,
-                                   xcb_colormap_t      cmap,
-                                   xcb_visualtype_t   *vis,
-                                   Convert_Pal_Mode    colors)
-{
-   Convert_Pal_Priv *palpriv;
-   Convert_Pal      *pal;
-   Convert_Pal_Mode  c;
-   Eina_List        *l;
-
-/*   printf("ALLOC cmap=%i vis=%p\n", cmap, vis);*/
-   EINA_LIST_FOREACH(palettes, l, pal)
-     {
-        palpriv = pal->data;
-        if ((conn == palpriv->conn) &&
-            (vis  == palpriv->vis)  &&
-            (cmap == palpriv->cmap))
-          {
-             pal->references++;
-             return pal;
-          }
-     }
-   pal = calloc(1, sizeof(struct _Convert_Pal));
-   if (!pal) return NULL;
-   for (c = colors; c > PAL_MODE_NONE; c--)
-     {
-        if (x_color_alloc[c])
-          {
-/*          printf("TRY PAL %i\n", c);*/
-             pal->lookup = (x_color_alloc[c])(conn, cmap, vis);
-             if (pal->lookup) break;
-          }
-     }
-   pal->references = 1;
-   pal->colors = c;
-   pal->count = x_color_count[c];
-   palpriv = calloc(1, sizeof(Convert_Pal_Priv));
-   pal->data = palpriv;
-   if (!palpriv)
-     {
-        if (pal->lookup) free(pal->lookup);
-        free(pal);
-        return NULL;
-     }
-   palpriv->conn = conn;
-   palpriv->vis = vis;
-   palpriv->cmap = cmap;
-   if (pal->colors == PAL_MODE_NONE)
-     {
-        if (pal->lookup) free(pal->lookup);
-        free(pal);
-        return NULL;
-     }
-   palettes = eina_list_append(palettes, pal);
-   return pal;
-}
-
-void
-evas_software_xcb_color_deallocate(xcb_connection_t *conn,
-                                     xcb_colormap_t    cmap,
-                                     xcb_visualtype_t *vis __UNUSED__,
-                                     Convert_Pal      *pal)
-{
-   uint32_t pixels[256];
-   int      j;
-
-   pal->references--;
-   if (pal->references > 0) return;
-   if (pal->lookup)
-     {
-        for(j = 0; j < pal->count; j++)
-          pixels[j] = (uint32_t) pal->lookup[j];
-        xcb_free_colors(conn, cmap, 0, pal->count, pixels);
-        free(pal->lookup);
-     }
-   free(pal->data);
-   palettes = eina_list_remove(palettes, pal);
-   free(pal);
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_color.h b/libraries/evas/src/modules/engines/software_x11/evas_xcb_color.h
deleted file mode 100644
index 7dcaeaf..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_color.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef EVAS_XCB_COLOR_H
-# define EVAS_XCB_COLOR_H
-
-# include "evas_engine.h"
-
-void evas_software_xcb_color_init(void);
-Convert_Pal *evas_software_xcb_color_allocate(xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *vis, Convert_Pal_Mode colors);
-void evas_software_xcb_color_deallocate(xcb_connection_t *conn, xcb_colormap_t cmap, xcb_visualtype_t *vis, Convert_Pal *pal);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_main.c b/libraries/evas/src/modules/engines/software_x11/evas_xcb_main.c
deleted file mode 100644
index d187016..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_main.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-void 
-evas_software_xcb_init(void) 
-{
-
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c b/libraries/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c
deleted file mode 100644
index 71759be..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c
+++ /dev/null
@@ -1,1092 +0,0 @@
-#include "evas_common.h"
-#include "evas_macros.h"
-#include "evas_xcb_outbuf.h"
-#include "evas_xcb_buffer.h"
-#include "evas_xcb_color.h"
-#include <pixman.h>
-
-/* local structures */
-typedef struct _Outbuf_Region Outbuf_Region;
-struct _Outbuf_Region 
-{
-   Xcb_Output_Buffer *xcbob, *mask;
-   int x, y, w, h;
-};
-
-/* local function prototypes */
-static Xcb_Output_Buffer *_find_xcbob(xcb_connection_t *conn, xcb_visualtype_t *vis, int depth, int w, int h, Eina_Bool shm, void *data);
-static void _unfind_xcbob(Xcb_Output_Buffer *xcbob, Eina_Bool sync);
-static void _clear_xcbob(Eina_Bool sync);
-static void _xcbob_sync(xcb_connection_t *conn);
-
-/* local variables */
-static Eina_List *_shmpool = NULL;
-static int _shmsize = 0;
-static int _shmlimit = (10 * 1024 * 1024);
-static const unsigned int _shmcountlimit = 32;
-
-#ifdef EVAS_FRAME_QUEUING
-static LK(lock_shmpool);
-# define SHMPOOL_LOCK() LKL(lock_shmpool);
-# define SHMPOOL_UNLOCK() LKU(lock_shmpool);
-#else
-# define SHMPOOL_LOCK()
-# define SHMPOOL_UNLOCK()
-#endif
-
-void 
-evas_software_xcb_outbuf_init(void) 
-{
-#ifdef EVAS_FRAME_QUEUING
-   LKI(lock_shmpool);
-#endif
-}
-
-void 
-evas_software_xcb_outbuf_free(Outbuf *buf) 
-{
-#ifdef EVAS_FRAME_QUEUING
-   LKL(buf->priv.lock);
-#endif
-   while (buf->priv.pending_writes) 
-     {
-        RGBA_Image *im = NULL;
-        Outbuf_Region *obr = NULL;
-
-        im = buf->priv.pending_writes->data;
-        buf->priv.pending_writes = 
-          eina_list_remove_list(buf->priv.pending_writes, 
-                                buf->priv.pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop(&im->cache_entry);
-        if (obr->xcbob) _unfind_xcbob(obr->xcbob, EINA_FALSE);
-        if (obr->mask) _unfind_xcbob(obr->mask, EINA_FALSE);
-        free(obr);
-     }
-#ifdef EVAS_FRAME_QUEUING
-   LKU(buf->priv.lock);
-#endif
-   evas_software_xcb_outbuf_idle_flush(buf);
-   evas_software_xcb_outbuf_flush(buf);
-   if (buf->priv.x11.xcb.gc)
-     xcb_free_gc(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.gc);
-   if (buf->priv.x11.xcb.gcm)
-     xcb_free_gc(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.gcm);
-   if (buf->priv.pal)
-     evas_software_xcb_color_deallocate(buf->priv.x11.xcb.conn, 
-                                        buf->priv.x11.xcb.cmap, 
-                                        buf->priv.x11.xcb.visual, 
-                                        buf->priv.pal);
-#ifdef EVAS_FRAME_QUEUING
-   LKD(buf->priv.lock);
-#endif
-   free(buf);
-   _clear_xcbob(EINA_FALSE);
-}
-
-Outbuf *
-evas_software_xcb_outbuf_setup(int w, int h, int rot, Outbuf_Depth depth, xcb_connection_t *conn, xcb_screen_t *screen, xcb_drawable_t draw, xcb_visualtype_t *vis, xcb_colormap_t cmap, int xdepth, Eina_Bool grayscale, int max_colors, xcb_drawable_t mask, Eina_Bool shape_dither, Eina_Bool alpha) 
-{
-   Outbuf *buf = NULL;
-   Gfx_Func_Convert func_conv= NULL;
-   const xcb_setup_t *setup;
-
-   if (!(buf = calloc(1, sizeof(Outbuf)))) 
-     return NULL;
-
-   setup = xcb_get_setup(conn);
-
-   buf->w = w;
-   buf->h = h;
-   buf->depth = depth;
-   buf->rot = rot;
-   buf->priv.x11.xcb.conn = conn;
-   buf->priv.x11.xcb.screen = screen;
-   buf->priv.x11.xcb.visual = vis;
-   buf->priv.x11.xcb.cmap = cmap;
-   buf->priv.x11.xcb.depth = xdepth;
-   buf->priv.mask_dither = shape_dither;
-   buf->priv.destination_alpha = alpha;
-   buf->priv.x11.xcb.shm = evas_software_xcb_can_do_shm(conn, screen);
-
-#ifdef WORDS_BIGENDIAN
-   if (setup->image_byte_order == XCB_IMAGE_ORDER_LSB_FIRST)
-     buf->priv.x11.xcb.swap = EINA_TRUE;
-#else
-   if (setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST)
-     buf->priv.x11.xcb.swap = EINA_TRUE;
-#endif
-   if (setup->bitmap_format_bit_order == XCB_IMAGE_ORDER_MSB_FIRST)
-     buf->priv.x11.xcb.bit_swap = EINA_TRUE;
-
-   if (((vis->_class == XCB_VISUAL_CLASS_TRUE_COLOR) || 
-        (vis->_class == XCB_VISUAL_CLASS_DIRECT_COLOR)) && (xdepth > 8)) 
-     {
-        buf->priv.mask.r = (DATA32)vis->red_mask;
-        buf->priv.mask.g = (DATA32)vis->green_mask;
-        buf->priv.mask.b = (DATA32)vis->blue_mask;
-        if (buf->priv.x11.xcb.swap) 
-          {
-             SWAP32(buf->priv.mask.r);
-             SWAP32(buf->priv.mask.g);
-             SWAP32(buf->priv.mask.b);
-          }
-     }
-   else if ((vis->_class == XCB_VISUAL_CLASS_PSEUDO_COLOR) || 
-            (vis->_class == XCB_VISUAL_CLASS_STATIC_COLOR) || 
-            (vis->_class == XCB_VISUAL_CLASS_GRAY_SCALE) || 
-            (vis->_class == XCB_VISUAL_CLASS_STATIC_GRAY) || 
-            (xdepth <= 8)) 
-     {
-        Convert_Pal_Mode pm = PAL_MODE_RGB332;
-
-        if ((vis->_class == XCB_VISUAL_CLASS_GRAY_SCALE) || 
-            (vis->_class == XCB_VISUAL_CLASS_STATIC_GRAY))
-          grayscale = EINA_TRUE;
-        if (grayscale) 
-          {
-             if (max_colors >= 256)
-               pm = PAL_MODE_GRAY256;
-             else if (max_colors >= 64)
-               pm = PAL_MODE_GRAY64;
-             else if (max_colors >= 16)
-               pm = PAL_MODE_GRAY16;
-             else if (max_colors >= 4)
-               pm = PAL_MODE_GRAY4;
-             else
-               pm = PAL_MODE_MONO;
-          }
-        else 
-          {
-             if (max_colors >= 256)
-               pm = PAL_MODE_RGB332;
-             else if (max_colors >= 216)
-               pm = PAL_MODE_RGB666;
-             else if (max_colors >= 128)
-               pm = PAL_MODE_RGB232;
-             else if (max_colors >= 64)
-               pm = PAL_MODE_RGB222;
-             else if (max_colors >= 32)
-               pm = PAL_MODE_RGB221;
-             else if (max_colors >= 16)
-               pm = PAL_MODE_RGB121;
-             else if (max_colors >= 8)
-               pm = PAL_MODE_RGB111;
-             else if (max_colors >= 4)
-               pm = PAL_MODE_GRAY4;
-             else
-               pm = PAL_MODE_MONO;
-          }
-        /* FIXME: Only allocate once per display & colormap */
-        buf->priv.pal = 
-          evas_software_xcb_color_allocate(conn, cmap, vis, pm);
-        if (!buf->priv.pal) 
-          {
-             free(buf);
-             return NULL;
-          }
-     }
-   if ((buf->rot == 0) || (buf->rot == 180))
-     {
-        w = buf->w;
-        h = buf->h;
-     }
-   else if ((buf->rot == 90) || (buf->rot == 270)) 
-     {
-        w = buf->h;
-        h = buf->w;
-     }
-
-   if (buf->priv.pal) 
-     {
-        func_conv = 
-          evas_common_convert_func_get(0, w, h, xdepth, 
-                                       buf->priv.mask.r, 
-                                       buf->priv.mask.g, 
-                                       buf->priv.mask.b, 
-                                       buf->priv.pal->colors, buf->rot);
-     }
-   else 
-     {
-        func_conv = 
-          evas_common_convert_func_get(0, w, h, xdepth, 
-                                       buf->priv.mask.r, 
-                                       buf->priv.mask.g, 
-                                       buf->priv.mask.b, 
-                                       PAL_MODE_NONE, buf->rot);
-     }
-   if (!func_conv) 
-     {
-        ERR("XCB Engine"
-            " {"
-            "  At depth         %i:"
-            "  RGB format mask: %08x, %08x, %08x"
-            "  Palette mode:    %i"
-            "  Not supported by any compiled in converters!"
-            " }", buf->priv.x11.xcb.depth, buf->priv.mask.r,
-            buf->priv.mask.g, buf->priv.mask.b,
-            buf->priv.pal ? (int)buf->priv.pal->colors : -1);
-     }
-
-   evas_software_xcb_outbuf_drawable_set(buf, draw);
-   evas_software_xcb_outbuf_mask_set(buf, mask);
-
-#ifdef EVAS_FRAME_QUEUING
-   LKI(buf->priv.lock);
-#endif
-
-   return buf;
-}
-
-RGBA_Image *
-evas_software_xcb_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) 
-{
-   RGBA_Image *im = NULL;
-   Outbuf_Region *obr = NULL;
-   Eina_Bool use_shm = EINA_TRUE;
-   Eina_Bool alpha = EINA_FALSE;
-   int bpl = 0;
-
-   if ((buf->onebuf) && (buf->priv.x11.xcb.shm)) 
-     {
-        Eina_Rectangle *rect;
-
-        RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, buf->w, buf->h);
-
-        if (!(obr = calloc(1, sizeof(Outbuf_Region))))
-          return NULL;
-
-        if (!(rect = eina_rectangle_new(x, y, w, h))) 
-          {
-             free(obr);
-             return NULL;
-          }
-
-        buf->priv.onebuf_regions = 
-          eina_list_append(buf->priv.onebuf_regions, rect);
-        if (buf->priv.onebuf) 
-          {
-             if (cx) *cx = x;
-             if (cy) *cy = y;
-             if (cw) *cw = w;
-             if (ch) *ch = h;
-             if (!buf->priv.synced) 
-               {
-                  _xcbob_sync(buf->priv.x11.xcb.conn);
-                  buf->priv.synced = EINA_TRUE;
-               }
-             return buf->priv.onebuf;
-          }
-        obr->x = 0;
-        obr->y = 0;
-        obr->w = buf->w;
-        obr->h = buf->h;
-        if (cx) *cx = x;
-        if (cy) *cy = y;
-        if (cw) *cw = w;
-        if (ch) *ch = h;
-
-        alpha = ((buf->priv.x11.xcb.mask) || (buf->priv.destination_alpha));
-        use_shm = buf->priv.x11.xcb.shm;
-
-        if ((buf->rot == 0) && (buf->priv.mask.r == 0xff0000) && 
-            (buf->priv.mask.g == 0x00ff00) && (buf->priv.mask.b == 0x0000ff)) 
-          {
-             obr->xcbob = 
-               evas_software_xcb_output_buffer_new(buf->priv.x11.xcb.conn, 
-                                                   buf->priv.x11.xcb.visual, 
-                                                   buf->priv.x11.xcb.depth, 
-                                                   buf->w, buf->h, use_shm, 
-                                                   NULL);
-             if (!obr->xcbob) 
-               {
-                  free(obr);
-                  return NULL;
-               }
-             im = 
-               (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), 
-                                                   buf->w, buf->h, 
-                                                   (DATA32 *)evas_software_xcb_output_buffer_data(obr->xcbob, &bpl), 
-                                                   alpha, EVAS_COLORSPACE_ARGB8888);
-             if (!im) 
-               {
-                  evas_software_xcb_output_buffer_free(obr->xcbob, EINA_FALSE);
-                  free(obr);
-                  return NULL;
-               }
-             im->extended_info = obr;
-             if (buf->priv.x11.xcb.mask) 
-               {
-                  obr->mask = 
-                    evas_software_xcb_output_buffer_new(buf->priv.x11.xcb.conn, 
-                                                        buf->priv.x11.xcb.visual, 
-                                                        1, buf->w, buf->h, 
-                                                        use_shm, NULL);
-               }
-          }
-        else 
-          {
-             int bw = 0, bh = 0;
-
-             im = 
-               (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-             if (!im) 
-               {
-                  free(obr);
-                  return NULL;
-               }
-             im->cache_entry.flags.alpha |= (alpha ? 1 : 0);
-             evas_cache_image_surface_alloc(&im->cache_entry, buf->w, buf->h);
-             im->extended_info = obr;
-             if ((buf->rot == 0) || (buf->rot == 180)) 
-               {
-                  bw = buf->w;
-                  bh = buf->h;
-               }
-             else if ((buf->rot == 90) || (buf->rot == 270)) 
-               {
-                  bw = buf->h;
-                  bh = buf->w;
-               }
-             obr->xcbob = 
-               evas_software_xcb_output_buffer_new(buf->priv.x11.xcb.conn, 
-                                                   buf->priv.x11.xcb.visual, 
-                                                   buf->priv.x11.xcb.depth, 
-                                                   bw, bh, use_shm, NULL);
-             if (!obr->xcbob) 
-               {
-                  evas_cache_image_drop(&im->cache_entry);
-                  free(obr);
-                  return NULL;
-               }
-             if (buf->priv.x11.xcb.mask) 
-               {
-                  obr->mask = 
-                    evas_software_xcb_output_buffer_new(buf->priv.x11.xcb.conn, 
-                                                        buf->priv.x11.xcb.visual, 
-                                                        1, bw, bh, use_shm, 
-                                                        NULL);
-               }
-          }
-        /* FIXME: We should be able to remove this memset. */
-        if ((alpha) && (im->image.data)) 
-          {
-             /* FIXME: Faster memset */
-//             memset(im->image.data, 0, (w * h * sizeof(DATA32)));
-          }
-        buf->priv.onebuf = im;
-        return im;
-     }
-
-   if (!(obr = calloc(1, sizeof(Outbuf_Region))))
-     return NULL;
-
-   obr->x = x;
-   obr->y = y;
-   obr->w = w;
-   obr->h = h;
-   if (cx) *cx = 0;
-   if (cy) *cy = 0;
-   if (cw) *cw = w;
-   if (ch) *ch = h;
-
-   use_shm = buf->priv.x11.xcb.shm;
-   alpha = ((buf->priv.x11.xcb.mask) || (buf->priv.destination_alpha));
-   if ((buf->rot == 0) && (buf->priv.mask.r == 0xff0000) && 
-       (buf->priv.mask.g == 0x00ff00) && (buf->priv.mask.b == 0x0000ff)) 
-     {
-        obr->xcbob = 
-          _find_xcbob(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.visual, 
-                      buf->priv.x11.xcb.depth, w, h, use_shm, NULL);
-        if (!obr->xcbob) 
-          {
-             free(obr);
-             return NULL;
-          }
-        im = 
-          (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), 
-                                              w, h, 
-                                              (DATA32 *)evas_software_xcb_output_buffer_data(obr->xcbob, &bpl), 
-                                              alpha, EVAS_COLORSPACE_ARGB8888);
-        if (!im) 
-          {
-             _unfind_xcbob(obr->xcbob, EINA_FALSE);
-             free(obr);
-             return NULL;
-          }
-        im->extended_info = obr;
-        if (buf->priv.x11.xcb.mask) 
-          {
-             obr->mask = 
-               _find_xcbob(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.visual, 
-                           1, w, h, use_shm, NULL);
-          }
-     }
-   else 
-     {
-        int bw = 0, bh = 0;
-
-        im = 
-          (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        if (!im) 
-          {
-             free(obr);
-             return NULL;
-          }
-        im->cache_entry.flags.alpha |= (alpha ? 1 : 0);
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-        im->extended_info = obr;
-        if ((buf->rot == 0) || (buf->rot == 180)) 
-          {
-             bw = w;
-             bh = h;
-          }
-        else if ((buf->rot == 90) || (buf->rot == 270)) 
-          {
-             bw = h;
-             bh = w;
-          }
-        obr->xcbob = 
-          _find_xcbob(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.visual, 
-                      buf->priv.x11.xcb.depth, bw, bh, use_shm, NULL);
-        if (!obr->xcbob) 
-          {
-             evas_cache_image_drop(&im->cache_entry);
-             free(obr);
-             return NULL;
-          }
-        if (buf->priv.x11.xcb.mask) 
-          {
-             obr->mask = 
-               _find_xcbob(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.visual, 1, 
-                           bw, bh, use_shm, NULL);
-          }
-     }
-   /* FIXME: We should be able to remove this memset. */
-   if (((buf->priv.x11.xcb.mask) || (buf->priv.destination_alpha)) && 
-       (im->image.data)) 
-     {
-        /* FIXME: Faster memset */
-//        memset(im->image.data, 0, (w * h * sizeof(DATA32)));
-     }
-
-#ifdef EVAS_FRAME_QUEUING
-   if (!evas_common_frameq_enabled())
-#endif
-     buf->priv.pending_writes = eina_list_append(buf->priv.pending_writes, im);
-
-   return im;
-}
-
-void 
-evas_software_xcb_outbuf_free_region_for_update(Outbuf *buf __UNUSED__, RGBA_Image *update __UNUSED__) 
-{
-   /* NOOP: Cleaned up on flush */
-}
-
-void 
-evas_software_xcb_outbuf_flush(Outbuf *buf) 
-{
-   Eina_List *l = NULL;
-   RGBA_Image *im = NULL;
-   Outbuf_Region *obr = NULL;
-
-   if ((buf->priv.onebuf) && (buf->priv.onebuf_regions)) 
-     {
-        pixman_region16_t tmpr;
-
-        im = buf->priv.onebuf;
-        obr = im->extended_info;
-        pixman_region_init(&tmpr);
-        while (buf->priv.onebuf_regions) 
-          {
-             Eina_Rectangle *rect, xr = { 0, 0, 0, 0 };
-
-             rect = buf->priv.onebuf_regions->data;
-             buf->priv.onebuf_regions = 
-               eina_list_remove_list(buf->priv.onebuf_regions, 
-                                     buf->priv.onebuf_regions);
-             if (buf->rot == 0)
-               {
-                  xr.x = rect->x;
-                  xr.y = rect->y;
-                  xr.w = rect->w;
-                  xr.h = rect->h;
-               }
-             else if (buf->rot == 90)
-               {
-                  xr.x = rect->y;
-                  xr.y = buf->w - rect->x - rect->w;
-                  xr.w = rect->h;
-                  xr.h = rect->w;
-               }
-             else if (buf->rot == 180)
-               {
-                  xr.x = buf->w - rect->x - rect->w;
-                  xr.y = buf->h - rect->y - rect->h;
-                  xr.w = rect->w;
-                  xr.h = rect->h;
-               }
-             else if (buf->rot == 270)
-               {
-                  xr.x = buf->h - rect->y - rect->h;
-                  xr.y = rect->x;
-                  xr.w = rect->h;
-                  xr.h = rect->w;
-               }
-             pixman_region_union_rect(&tmpr, &tmpr, xr.x, xr.y, xr.w, xr.h);
-             if (buf->priv.debug)
-               evas_software_xcb_outbuf_debug_show(buf, buf->priv.x11.xcb.win, 
-                                                   xr.x, xr.y, xr.w, xr.h);
-             eina_rectangle_free(rect);
-          }
-        xcb_set_clip_rectangles(buf->priv.x11.xcb.conn, 
-                                XCB_CLIP_ORDERING_YX_BANDED, 
-                                buf->priv.x11.xcb.gc, 0, 0, 
-                                pixman_region_n_rects(&tmpr), 
-                                (const xcb_rectangle_t *)pixman_region_rectangles(&tmpr, NULL));
-        if (obr->xcbob)
-          evas_software_xcb_output_buffer_paste(obr->xcbob, 
-                                                buf->priv.x11.xcb.win, 
-                                                buf->priv.x11.xcb.gc, 0, 0, 0);
-        if (obr->mask) 
-          {
-             xcb_set_clip_rectangles(buf->priv.x11.xcb.conn, 
-                                     XCB_CLIP_ORDERING_YX_BANDED, 
-                                     buf->priv.x11.xcb.gcm, 0, 0, 
-                                     pixman_region_n_rects(&tmpr), 
-                                     (const xcb_rectangle_t *)pixman_region_rectangles(&tmpr, NULL));
-             evas_software_xcb_output_buffer_paste(obr->mask, 
-                                                   buf->priv.x11.xcb.mask, 
-                                                   buf->priv.x11.xcb.gcm, 
-                                                   0, 0, 0);
-          }
-        pixman_region_fini(&tmpr);
-        buf->priv.synced = EINA_FALSE;
-     }
-   else 
-     {
-#if 1
-        _xcbob_sync(buf->priv.x11.xcb.conn);
-        EINA_LIST_FOREACH(buf->priv.pending_writes, l, im) 
-          {
-             obr = im->extended_info;
-             if (buf->priv.debug)
-               evas_software_xcb_outbuf_debug_show(buf, buf->priv.x11.xcb.win, 
-                                                   obr->x, obr->y, obr->w, obr->h);
-             if (obr->xcbob)
-               evas_software_xcb_output_buffer_paste(obr->xcbob, 
-                                                     buf->priv.x11.xcb.win, 
-                                                     buf->priv.x11.xcb.gc, 
-                                                     obr->x, obr->y, 0);
-             if (obr->mask)
-               evas_software_xcb_output_buffer_paste(obr->mask, 
-                                                     buf->priv.x11.xcb.mask, 
-                                                     buf->priv.x11.xcb.gcm, 
-                                                     obr->x, obr->y, 0);
-          }
-# ifdef EVAS_FRAME_QUEUING
-        LKL(buf->priv.lock);
-# endif
-        while (buf->priv.prev_pending_writes) 
-          {
-             im = buf->priv.prev_pending_writes->data;
-             buf->priv.prev_pending_writes = 
-               eina_list_remove_list(buf->priv.prev_pending_writes, 
-                                     buf->priv.prev_pending_writes);
-             obr = im->extended_info;
-             evas_cache_image_drop(&im->cache_entry);
-             if (obr->xcbob) _unfind_xcbob(obr->xcbob, EINA_FALSE);
-             if (obr->mask) _unfind_xcbob(obr->mask, EINA_FALSE);
-             free(obr);
-          }
-        buf->priv.prev_pending_writes = buf->priv.pending_writes;
-# ifdef EVAS_FRAME_QUEUING
-        LKU(buf->priv.lock);
-# endif
-        buf->priv.pending_writes = NULL;
-        xcb_flush(buf->priv.x11.xcb.conn);
-#else
-        /* FIXME: Async Push Disabled */
-
-        _xcbob_sync(buf->priv.x11.xcb.conn);
-        while (buf->priv.pending_writes) 
-          {
-             im = eina_list_data_get(buf->priv.pending_writes);
-             buf->priv.pending_writes = 
-               eina_list_remove_list(buf->priv.pending_writes, 
-                                     buf->priv.pending_writes);
-             obr = im->extended_info;
-             evas_cache_image_drop(&im->cache_entry);
-             if (obr->xcbob) _unfind_xcbob(obr->xcbob, EINA_FALSE);
-             if (obr->mask) _unfind_xcbob(obr->mask, EINA_FALSE);
-             free(obr);
-             evas_cache_image_drop(&im->cache_entry);
-          }
-#endif
-     }
-   evas_common_cpu_end_opt();
-}
-
-void 
-evas_software_xcb_outbuf_idle_flush(Outbuf *buf) 
-{
-   if (buf->priv.onebuf) 
-     {
-        RGBA_Image *im;
-        Outbuf_Region *obr;
-
-        im = buf->priv.onebuf;
-        buf->priv.onebuf = NULL;
-        obr = im->extended_info;
-        if (obr->xcbob) 
-          evas_software_xcb_output_buffer_free(obr->xcbob, EINA_FALSE);
-        if (obr->mask) 
-          evas_software_xcb_output_buffer_free(obr->mask, EINA_FALSE);
-        free(obr);
-        evas_cache_image_drop(&im->cache_entry);
-     }
-   else 
-     {
-#ifdef EVAS_FRAME_QUEUING
-        LKL(buf->priv.lock);
-#endif
-        if (buf->priv.prev_pending_writes)
-          _xcbob_sync(buf->priv.x11.xcb.conn);
-        while (buf->priv.prev_pending_writes) 
-          {
-             RGBA_Image *im;
-             Outbuf_Region *obr;
-
-             im = buf->priv.prev_pending_writes->data;
-             buf->priv.prev_pending_writes = 
-               eina_list_remove_list(buf->priv.prev_pending_writes, 
-                                     buf->priv.prev_pending_writes);
-             obr = im->extended_info;
-             evas_cache_image_drop(&im->cache_entry);
-             if (obr->xcbob) _unfind_xcbob(obr->xcbob, EINA_FALSE);
-             if (obr->mask) _unfind_xcbob(obr->mask, EINA_FALSE);
-             free(obr);
-          }
-#ifdef EVAS_FRAME_QUEUING
-        LKU(buf->priv.lock);
-#endif
-        _clear_xcbob(EINA_FALSE);
-     }
-}
-
-void 
-evas_software_xcb_outbuf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) 
-{
-   Gfx_Func_Convert func_conv = NULL;
-   Outbuf_Region *obr = NULL;
-   DATA32 *src_data = NULL;
-   unsigned char *data = NULL;
-   int bpl = 0, yy = 0;
-   int bw = 0, bh = 0;
-
-   obr = update->extended_info;
-   if (!obr->xcbob) return;
-
-   if ((buf->rot == 0) || (buf->rot == 180)) 
-     {
-        bw = w;
-        bh = h;
-     }
-   else if ((buf->rot == 90) || (buf->rot == 270)) 
-     {
-        bw = h;
-        bh = w;
-     }
-   if (buf->priv.pal) 
-     {
-        func_conv = 
-          evas_common_convert_func_get(0, bw, bh, buf->depth, buf->priv.mask.r, 
-                                       buf->priv.mask.g, buf->priv.mask.b, 
-                                       buf->priv.pal->colors, buf->rot);
-     }
-   else 
-     {
-        func_conv = 
-          evas_common_convert_func_get(0, bw, bh, buf->depth, buf->priv.mask.r, 
-                                       buf->priv.mask.g, buf->priv.mask.b, 
-                                       PAL_MODE_NONE, buf->rot);
-     }
-   if (!func_conv) return;
-
-   if (!(data = evas_software_xcb_output_buffer_data(obr->xcbob, &bpl)))
-     return;
-   if (!(src_data = update->image.data)) return;
-   if (buf->rot == 0) 
-     {
-        obr->x = x;
-        obr->y = y;
-        obr->w = w;
-        obr->h = h;
-     }
-   else if (buf->rot == 90) 
-     {
-        obr->x = y;
-        obr->y = (buf->w - x - w);
-        obr->w = h;
-        obr->h = w;
-     }
-   else if (buf->rot == 180) 
-     {
-        obr->x = (buf->w - x - w);
-        obr->y = (buf->h - y - h);
-        obr->w = w;
-        obr->h = h;
-     }
-   else if (buf->rot == 270) 
-     {
-        obr->x = (buf->h - y - h);
-        obr->y = x;
-        obr->w = h;
-        obr->h = w;
-     }
-   if (buf->onebuf)
-     {
-        src_data += x + (y * update->cache_entry.w);
-        data += (bpl * obr->y) + (obr->x * (buf->depth / 8));
-     }
-   if (data != (unsigned char *)src_data) 
-     {
-        if (buf->priv.pal)
-          func_conv(src_data, data, update->cache_entry.w - w, 
-                    (bpl / (buf->depth / 8)) - obr->w, 
-                    obr->w, obr->h, x, y, buf->priv.pal->lookup);
-        else
-          func_conv(src_data, data, update->cache_entry.w - w, 
-                    (bpl / (buf->depth / 8)) - obr->w, 
-                    obr->w, obr->h, x, y, NULL);
-     }
-#if 1
-#else
-   /* Async Push */
-   if (!((buf->priv.onebuf) && (buf->priv.onebuf_regions))) 
-     {
-        if (buf->priv.debug)
-          evas_software_xcb_outbuf_debug_show(buf, buf->priv.x11.xcb.win, 
-                                              obr->x, obr->y, obr->w, obr->h);
-        if (obr->xcbob)
-          evas_software_xcb_output_buffer_paste(obr->xcbob, 
-                                                buf->priv.x11.xcb.win, 
-                                                buf->priv.x11.xcb.gc, 
-                                                obr->x, obr->y, 0);
-     }
-#endif
-   if (obr->mask) 
-     {
-        if (buf->rot == 0) 
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xcb_write_mask_line(buf, obr->mask, 
-                                                 src_data + (yy * obr->w), 
-                                                 obr->w, yy);
-          }
-        else if (buf->rot == 90) 
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xcb_write_mask_line_vert(buf, obr->mask, 
-                                                      src_data + yy, 
-                                                      h, (obr->h - yy - 1), w);
-          }
-        else if (buf->rot == 180) 
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xcb_write_mask_line_rev(buf, obr->mask, 
-                                                     src_data + (yy * obr->w), 
-                                                     obr->w, (obr->h - yy - 1));
-          }
-        else if (buf->rot == 270) 
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xcb_write_mask_line_vert_rev(buf, obr->mask, 
-                                                          src_data + yy, 
-                                                          h, yy, w);
-          }
-#if 1
-#else
-        /* Async Push */
-        if (!((buf->priv.onebuf) && (buf->priv.onebuf_regions))) 
-          evas_software_xcb_output_buffer_paste(obr->mask, 
-                                                buf->priv.x11.xcb.mask, 
-                                                buf->priv.x11.xcb.gcm, 
-                                                obr->x, obr->y, 0);
-#endif
-     }
-#if 1
-#else
-   xcb_flush(buf->priv.x11.xcb.conn);
-#endif
-}
-
-void 
-evas_software_xcb_outbuf_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) 
-{
-   if ((w == buf->w) && (h == buf->h) && (rot == buf->rot) && 
-       (depth == buf->depth)) return;
-   buf->w = w;
-   buf->h = h;
-   buf->rot = rot;
-   evas_software_xcb_outbuf_idle_flush(buf);
-}
-
-int 
-evas_software_xcb_outbuf_width_get(Outbuf *buf) 
-{
-   return buf->w;
-}
-
-int 
-evas_software_xcb_outbuf_height_get(Outbuf *buf) 
-{
-   return buf->h;
-}
-
-Outbuf_Depth 
-evas_software_xcb_outbuf_depth_get(Outbuf *buf) 
-{
-   return buf->depth;
-}
-
-void 
-evas_software_xcb_outbuf_drawable_set(Outbuf *buf, xcb_drawable_t drawable) 
-{
-   if (buf->priv.x11.xcb.win == drawable) return;
-   if (buf->priv.x11.xcb.gc) 
-     {
-        xcb_free_gc(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.gc);
-        buf->priv.x11.xcb.gc = 0;
-     }
-   buf->priv.x11.xcb.win = drawable;
-   buf->priv.x11.xcb.gc = xcb_generate_id(buf->priv.x11.xcb.conn);
-   xcb_create_gc(buf->priv.x11.xcb.conn, 
-                 buf->priv.x11.xcb.gc, buf->priv.x11.xcb.win, 0, NULL);
-}
-
-void 
-evas_software_xcb_outbuf_mask_set(Outbuf *buf, xcb_drawable_t mask) 
-{
-   if (buf->priv.x11.xcb.mask == mask) return;
-   if (buf->priv.x11.xcb.gcm) 
-     {
-        xcb_free_gc(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.gcm);
-        buf->priv.x11.xcb.gcm = 0;
-     }
-   buf->priv.x11.xcb.mask = mask;
-   if (buf->priv.x11.xcb.mask) 
-     {
-        buf->priv.x11.xcb.gcm = xcb_generate_id(buf->priv.x11.xcb.conn);
-        xcb_create_gc(buf->priv.x11.xcb.conn, 
-                      buf->priv.x11.xcb.gcm, buf->priv.x11.xcb.mask, 0, NULL);
-     }
-}
-
-int 
-evas_software_xcb_outbuf_rotation_get(Outbuf *buf) 
-{
-   return buf->rot;
-}
-
-void 
-evas_software_xcb_outbuf_rotation_set(Outbuf *buf, int rotation) 
-{
-   buf->rot = rotation;
-}
-
-Eina_Bool 
-evas_software_xcb_outbuf_alpha_get(Outbuf *buf) 
-{
-   return buf->priv.x11.xcb.mask;
-}
-
-void 
-evas_software_xcb_outbuf_debug_set(Outbuf *buf, Eina_Bool debug) 
-{
-   buf->priv.debug = debug;
-}
-
-void 
-evas_software_xcb_outbuf_debug_show(Outbuf *buf, xcb_drawable_t drawable, int x, int y, int w, int h) 
-{
-   int i;
-   xcb_screen_t *screen = NULL;
-   xcb_get_geometry_reply_t *geom;
-   xcb_drawable_t root;
-   xcb_screen_iterator_t si;
-
-   geom = 
-     xcb_get_geometry_reply(buf->priv.x11.xcb.conn, 
-                            xcb_get_geometry_unchecked(buf->priv.x11.xcb.conn, 
-                                                       drawable), 0);
-   root = geom->root;
-   free(geom);
-   geom = 
-     xcb_get_geometry_reply(buf->priv.x11.xcb.conn, 
-                            xcb_get_geometry_unchecked(buf->priv.x11.xcb.conn, 
-                                                       root), 0);
-
-   si = xcb_setup_roots_iterator((xcb_setup_t *)xcb_get_setup(buf->priv.x11.xcb.conn));
-   for (; si.rem; xcb_screen_next(&si))
-     {
-        if (si.data->root == geom->root)
-          {
-             screen = si.data;
-             break;
-          }
-     }
-   free(geom);
-
-   for (i = 0; i < 20; i++)
-     {
-        xcb_rectangle_t rect = { x, y, w, h};
-        uint32_t mask;
-        uint32_t value[2];
-
-        mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES;
-        value[0] = screen->black_pixel;
-        value[1] = XCB_EXPOSURES_NOT_ALLOWED;
-        xcb_change_gc(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.gc, 
-                      mask, value);
-        xcb_poly_fill_rectangle(buf->priv.x11.xcb.conn, drawable, 
-                                buf->priv.x11.xcb.gc, 1, &rect);
-        _xcbob_sync(buf->priv.x11.xcb.conn);
-        _xcbob_sync(buf->priv.x11.xcb.conn);
-
-        mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES;
-        value[0] = screen->white_pixel;
-        value[1] = XCB_EXPOSURES_NOT_ALLOWED;
-        xcb_change_gc(buf->priv.x11.xcb.conn, buf->priv.x11.xcb.gc, 
-                      mask, value);
-        xcb_poly_fill_rectangle(buf->priv.x11.xcb.conn, drawable, 
-                                buf->priv.x11.xcb.gc, 1, &rect);
-        _xcbob_sync(buf->priv.x11.xcb.conn);
-        _xcbob_sync(buf->priv.x11.xcb.conn);
-     }
-}
-
-#ifdef EVAS_FRAME_QUEUING
-void 
-evas_software_xcb_outbuf_priv_set(Outbuf *buf, void *cur, void *prev __UNUSED__) 
-{
-   buf->priv.pending_writes = (Eina_List *)cur;
-}
-#endif
-
-/* local functions */
-static Xcb_Output_Buffer *
-_find_xcbob(xcb_connection_t *conn, xcb_visualtype_t *vis, int depth, int w, int h, Eina_Bool shm, void *data) 
-{
-   Eina_List *l = NULL, *xl = NULL;
-   Xcb_Output_Buffer *xcbob = NULL, *xcbob2 = NULL;
-   int lbytes = 0, bpp = 0, sz = 0;
-   int fitness = 0x7fffffff;
-
-   if (!shm)
-     return evas_software_xcb_output_buffer_new(conn, vis, depth, w, h, 
-                                                shm, data);
-
-   lbytes = (((w + 31) / 32) * 4);
-   if (depth > 1) 
-     {
-        bpp = (depth / 8);
-        if (bpp == 3) bpp = 4;
-        lbytes = ((((w * bpp) + 3) / 4) * 4);
-     }
-
-   sz = (lbytes * h);
-   SHMPOOL_LOCK();
-   EINA_LIST_FOREACH(_shmpool, l, xcbob2) 
-     {
-        int szdif = 0;
-
-        if ((xcbob2->xim->depth != depth) || (xcbob2->visual != vis) || 
-            (xcbob2->connection != conn)) continue;
-        szdif = (xcbob2->psize - sz);
-        if (szdif < 0) continue;
-        if (szdif == 0) 
-          {
-             xcbob = xcbob2;
-             xl = l;
-             goto have_xcbob;
-          }
-        if (szdif < fitness) 
-          {
-             xcbob = xcbob2;
-             xl = l;
-             fitness = szdif;
-          }
-     }
-   if ((fitness > (100 * 100)) || (!xcbob)) 
-     {
-        SHMPOOL_UNLOCK();
-        return evas_software_xcb_output_buffer_new(conn, vis, depth, 
-                                                   w, h, shm, data);
-     }
-
-have_xcbob:
-   _shmpool = eina_list_remove_list(_shmpool, xl);
-   xcbob->w = w;
-   xcbob->h = h;
-   xcbob->bpl = lbytes;
-   xcbob->xim->width = xcbob->w;
-   xcbob->xim->height = xcbob->h;
-   xcbob->xim->stride = xcbob->bpl;
-   _shmsize -= (xcbob->psize * (xcbob->xim->depth / 8));
-   SHMPOOL_UNLOCK();
-   return xcbob;
-}
-
-static void 
-_unfind_xcbob(Xcb_Output_Buffer *xcbob, Eina_Bool sync) 
-{
-   if (xcbob->shm_info) 
-     {
-        SHMPOOL_LOCK();
-        _shmpool = eina_list_prepend(_shmpool, xcbob);
-        _shmsize += xcbob->psize * xcbob->xim->depth / 8;
-        while ((_shmsize > _shmlimit) || 
-               (eina_list_count(_shmpool) > _shmcountlimit))
-          {
-             Eina_List *xl = NULL;
-
-             if (!(xl = eina_list_last(_shmpool))) 
-               {
-                  _shmsize = 0;
-                  break;
-               }
-             xcbob = xl->data;
-             _shmpool = eina_list_remove_list(_shmpool, xl);
-             _shmsize -= xcbob->psize * xcbob->xim->depth / 8;
-             evas_software_xcb_output_buffer_free(xcbob, sync);
-          }
-        SHMPOOL_UNLOCK();
-     }
-   else
-     evas_software_xcb_output_buffer_free(xcbob, sync);
-}
-
-static void 
-_clear_xcbob(Eina_Bool sync) 
-{
-   SHMPOOL_LOCK();
-   while (_shmpool) 
-     {
-        Xcb_Output_Buffer *xcbob;
- 
-        xcbob = _shmpool->data;
-        _shmpool = eina_list_remove_list(_shmpool, _shmpool);
-        evas_software_xcb_output_buffer_free(xcbob, sync);
-     }
-   _shmsize = 0;
-   SHMPOOL_UNLOCK();
-}
-
-static void 
-_xcbob_sync(xcb_connection_t *conn) 
-{
-   free(xcb_get_input_focus_reply(conn, 
-                                  xcb_get_input_focus_unchecked(conn), NULL));
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_outbuf.h b/libraries/evas/src/modules/engines/software_x11/evas_xcb_outbuf.h
deleted file mode 100644
index b711848..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_outbuf.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef EVAS_XCB_OUTBUF_H
-# define EVAS_XCB_OUTBUF_H
-
-# include "evas_engine.h"
-
-void evas_software_xcb_outbuf_init(void);
-void evas_software_xcb_outbuf_free(Outbuf *buf);
-Outbuf *evas_software_xcb_outbuf_setup(int w, int h, int rot, Outbuf_Depth depth, xcb_connection_t *conn, xcb_screen_t *screen, xcb_drawable_t draw, xcb_visualtype_t *vis, xcb_colormap_t cmap, int xdepth, Eina_Bool grayscale, int max_colors, xcb_drawable_t mask, Eina_Bool shape_dither, Eina_Bool alpha);
-RGBA_Image *evas_software_xcb_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
-void evas_software_xcb_outbuf_free_region_for_update(Outbuf *buf, RGBA_Image *update);
-void evas_software_xcb_outbuf_flush(Outbuf *buf);
-void evas_software_xcb_outbuf_idle_flush(Outbuf *buf);
-void evas_software_xcb_outbuf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h);
-void evas_software_xcb_outbuf_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth);
-int evas_software_xcb_outbuf_width_get(Outbuf *buf);
-int evas_software_xcb_outbuf_height_get(Outbuf *buf);
-Outbuf_Depth evas_software_xcb_outbuf_depth_get(Outbuf *buf);
-void evas_software_xcb_outbuf_drawable_set(Outbuf *buf, xcb_drawable_t drawable);
-void evas_software_xcb_outbuf_mask_set(Outbuf *buf, xcb_drawable_t mask);
-int evas_software_xcb_outbuf_rotation_get(Outbuf *buf);
-void evas_software_xcb_outbuf_rotation_set(Outbuf *buf, int rotation);
-Eina_Bool evas_software_xcb_outbuf_alpha_get(Outbuf *buf);
-void evas_software_xcb_outbuf_debug_set(Outbuf *buf, Eina_Bool debug);
-void evas_software_xcb_outbuf_debug_show(Outbuf *buf, xcb_drawable_t drawable, int x, int y, int w, int h);
-
-# ifdef EVAS_FRAME_QUEUING
-void evas_software_xcb_outbuf_priv_set(Outbuf *buf, void *cur, void *prev);
-# endif
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.c b/libraries/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.c
deleted file mode 100644
index 3a0bda5..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "evas_common.h"
-#include "evas_xcb_xdefaults.h"
-#include <fnmatch.h>
-
-/* local function prototypes */
-static Eina_Bool _evas_xcb_xdefaults_glob_match(const char *str, const char *glob);
-
-/* local variables */
-static Eina_File *_evas_xcb_xdefaults_file = NULL;
-static char *_evas_xcb_xdefaults_data = NULL;
-
-void 
-_evas_xcb_xdefaults_init(void) 
-{
-   char buff[PATH_MAX];
-
-   snprintf(buff, sizeof(buff), "%s/.Xdefaults", getenv("HOME"));
-   if ((_evas_xcb_xdefaults_file = eina_file_open(buff, EINA_FALSE)))
-     {
-        eina_mmap_safety_enabled_set(EINA_TRUE);
-
-        _evas_xcb_xdefaults_data = 
-          eina_file_map_all(_evas_xcb_xdefaults_file, EINA_FILE_SEQUENTIAL);
-     }
-}
-
-void 
-_evas_xcb_xdefaults_shutdown(void) 
-{
-   if (!_evas_xcb_xdefaults_file) return;
-   if (_evas_xcb_xdefaults_data) 
-     eina_file_map_free(_evas_xcb_xdefaults_file, _evas_xcb_xdefaults_data);
-   if (_evas_xcb_xdefaults_file) eina_file_close(_evas_xcb_xdefaults_file);
-}
-
-char *
-_evas_xcb_xdefaults_string_get(const char *prog, const char *param) 
-{
-   char buff[1024], ret[1024];
-   char *str = NULL;
-   char **ea = NULL;
-   unsigned int count = 0, i = 0;
-
-   if ((!_evas_xcb_xdefaults_data) || (!_evas_xcb_xdefaults_file))
-     return NULL;
-
-   snprintf(buff, sizeof(buff), "*%s*.*%s*", prog, param);
-
-   str = _evas_xcb_xdefaults_data;
-   ea = eina_str_split_full(str, "\n", -1, &count);
-   for (i = 0; i < count; i++) 
-     {
-        if (_evas_xcb_xdefaults_glob_match(ea[i], buff)) 
-          sscanf(ea[i], "%*[^:]:%*[ ]%s", ret);
-     }
-   if ((ea) && (ea[0]))
-     {
-        free(ea[0]);
-        free(ea);
-     }
-
-   return strdup(ret);
-}
-
-int 
-_evas_xcb_xdefaults_int_get(const char *prog, const char *param) 
-{
-   char buff[1024];
-   char *str = NULL;
-   char **ea = NULL;
-   unsigned int count = 0, i = 0;
-   int ret = -1;
-
-   if ((!_evas_xcb_xdefaults_data) || (!_evas_xcb_xdefaults_file))
-     return 0;
-
-   snprintf(buff, sizeof(buff), "*%s*.*%s*", prog, param);
-
-   str = _evas_xcb_xdefaults_data;
-   ea = eina_str_split_full(str, "\n", -1, &count);
-   for (i = 0; i < count; i++) 
-     {
-        if (_evas_xcb_xdefaults_glob_match(ea[i], buff)) 
-          sscanf(ea[i], "%*[^:]:%*[ ]%d", &ret);
-     }
-   if ((ea) && (ea[0]))
-     {
-        free(ea[0]);
-        free(ea);
-     }
-
-   return ret;
-}
-
-/* local functions */
-static Eina_Bool 
-_evas_xcb_xdefaults_glob_match(const char *str, const char *glob) 
-{
-   if ((!str) || (!glob)) return EINA_FALSE;
-   if (glob[0] == 0) 
-     {
-        if (str[0] == 0) return EINA_TRUE;
-        return EINA_FALSE;
-     }
-   if (!strcmp(glob, "*")) return EINA_TRUE;
-   if (!fnmatch(glob, str, 0)) return EINA_TRUE;
-   return EINA_FALSE;
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.h b/libraries/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.h
deleted file mode 100644
index c5f4ab8..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef EVAS_XCB_XDEFAULTS_H
-# define EVAS_XCB_XDEFAULTS_H
-
-# include "evas_engine.h"
-
-void _evas_xcb_xdefaults_init(void);
-void _evas_xcb_xdefaults_shutdown(void);
-char *_evas_xcb_xdefaults_string_get(const char *prog, const char *param);
-int _evas_xcb_xdefaults_int_get(const char *prog, const char *param);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_buffer.c b/libraries/evas/src/modules/engines/software_x11/evas_xlib_buffer.c
deleted file mode 100644
index 594041c..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_buffer.c
+++ /dev/null
@@ -1,428 +0,0 @@
-#include "evas_common.h"
-
-#include "evas_xlib_buffer.h"
-
-static int _x_err = 0;
-
-void
-evas_software_xlib_x_write_mask_line(Outbuf *buf, X_Output_Buffer *xob, DATA32 *src, int w, int y)
-{
-   int x;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-   int bpl = 0;
-
-   src_ptr = src;
-   dst_ptr = evas_software_xlib_x_output_buffer_data(xob, &bpl);
-   dst_ptr = dst_ptr + (bpl * y);
-   w -= 7;
-   if (buf->priv.x11.xlib.bit_swap)
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[1])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[2])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[3])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[4])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[5])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[6])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[7])) >> 7) << 0);
-             src_ptr += 8;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[1])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[2])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[3])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[4])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[5])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[6])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[7])) >> 7) << 7);
-             src_ptr += 8;
-             dst_ptr++;
-          }
-     }
-   w += 7;
-   for (; x < w; x ++)
-     {
-        XPutPixel(xob->xim, x, y, A_VAL(src_ptr) >> 7);
-        src_ptr++;
-     }
-}
-
-void
-evas_software_xlib_x_write_mask_line_rev(Outbuf *buf, X_Output_Buffer *xob, DATA32 *src, int w, int y)
-{
-   int x;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-   int bpl = 0;
-
-   src_ptr = src + w - 1;
-   dst_ptr = evas_software_xlib_x_output_buffer_data(xob, &bpl);
-   dst_ptr = dst_ptr + (bpl * y);
-   w -= 7;
-   if (buf->priv.x11.xlib.bit_swap)
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[-1])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-2])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-3])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-4])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-5])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-6])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-7])) >> 7) << 0);
-             src_ptr -= 8;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (x = 0; x < w; x += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[-1])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-2])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-3])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-4])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-5])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-6])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-7])) >> 7) << 7);
-             src_ptr -= 8;
-             dst_ptr++;
-          }
-     }
-   w += 7;
-   for (; x < w; x ++)
-     {
-        XPutPixel(xob->xim, x, y, A_VAL(src_ptr) >> 7);
-        src_ptr--;
-     }
-}
-
-void
-evas_software_xlib_x_write_mask_line_vert(Outbuf *buf, X_Output_Buffer *xob, 
-                                          DATA32 *src, 
-                                          int h, int ym, int w)
-{
-   int y;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-   int bpl = 0;
-
-   src_ptr = src;
-   dst_ptr = evas_software_xlib_x_output_buffer_data(xob, &bpl);
-   dst_ptr = dst_ptr + (bpl * ym);
-   h -= 7;
-   if (buf->priv.x11.xlib.bit_swap)
-     {
-        for (y = 0; y < h; y += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0 * w])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[1 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[2 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[3 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[4 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[5 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[6 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[7 * w])) >> 7) << 0);
-             src_ptr += 8 * w;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (y = 0; y < h; y += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[0 * w])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[1 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[2 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[3 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[4 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[5 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[6 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[7 * w])) >> 7) << 7);
-             src_ptr += 8 * w;
-             dst_ptr++;
-          }
-     }
-   h += 7;
-   for (; y < h; y ++)
-     {
-        XPutPixel(xob->xim, y, ym, A_VAL(src_ptr) >> 7);
-        src_ptr += w;
-     }
-}
-
-void
-evas_software_xlib_x_write_mask_line_vert_rev(Outbuf *buf, X_Output_Buffer *xob, 
-                                              DATA32 *src, 
-                                              int h, int ym, int w)
-{
-   int y;
-   DATA32 *src_ptr;
-   DATA8 *dst_ptr;
-   int bpl = 0;
-
-   src_ptr = src + ((h - 1) * w);
-   dst_ptr = evas_software_xlib_x_output_buffer_data(xob, &bpl);
-   dst_ptr = dst_ptr + (bpl * ym);
-   h -= 7;
-   if (buf->priv.x11.xlib.bit_swap)
-     {
-        for (y = 0; y < h; y += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0 * w])) >> 7) << 7) |
-               ((A_VAL(&(src_ptr[-1 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-2 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-3 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-4 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-5 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-6 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-7 * w])) >> 7) << 0);
-             src_ptr -= 8 * w;
-             dst_ptr++;
-          }
-     }
-   else
-     {
-        for (y = 0; y < h; y += 8)
-          {
-             *dst_ptr =
-               ((A_VAL(&(src_ptr[ 0 * w])) >> 7) << 0) |
-               ((A_VAL(&(src_ptr[-1 * w])) >> 7) << 1) |
-               ((A_VAL(&(src_ptr[-2 * w])) >> 7) << 2) |
-               ((A_VAL(&(src_ptr[-3 * w])) >> 7) << 3) |
-               ((A_VAL(&(src_ptr[-4 * w])) >> 7) << 4) |
-               ((A_VAL(&(src_ptr[-5 * w])) >> 7) << 5) |
-               ((A_VAL(&(src_ptr[-6 * w])) >> 7) << 6) |
-               ((A_VAL(&(src_ptr[-7 * w])) >> 7) << 7);
-             src_ptr -= 8 * w;
-             dst_ptr++;
-          }
-     }
-   h += 7;
-   for (; y < h; y ++)
-     {
-        XPutPixel(xob->xim, y, ym, A_VAL(src_ptr) >> 7);
-        src_ptr -= w;
-     }
-}
-
-int
-evas_software_xlib_x_can_do_shm(Display *d)
-{
-   static Display *cached_d = NULL;
-   static int cached_result = 0;
-   
-   if (d == cached_d) return cached_result;
-   cached_d = d;
-   if (XShmQueryExtension(d))
-     {
-        X_Output_Buffer *xob;
-
-        xob = evas_software_xlib_x_output_buffer_new
-          (d, DefaultVisual(d, DefaultScreen(d)),
-           DefaultDepth(d, DefaultScreen(d)), 16, 16, 2, NULL);
-        if (!xob)
-          {
-             cached_result = 0;
-             return 0;
-          }
-        evas_software_xlib_x_output_buffer_free(xob, 1);
-        cached_result = 1;
-        return 1;
-     }
-   cached_result = 0;
-   return 0;
-}
-
-static void
-x_output_tmp_x_err(Display *d __UNUSED__, XErrorEvent *ev __UNUSED__)
-{
-   _x_err = 1;
-   return;
-}
-
-//static int creates = 0;
-
-X_Output_Buffer *
-evas_software_xlib_x_output_buffer_new(Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data)
-{
-   X_Output_Buffer *xob;
-
-   xob = calloc(1, sizeof(X_Output_Buffer));
-   if (!xob) return NULL;
-
-   xob->display = d;
-   xob->visual = v;
-   xob->xim = NULL;
-   xob->shm_info = NULL;
-   xob->w = w;
-   xob->h = h;
-
-   if (try_shm > 0)
-     {
-        xob->shm_info = malloc(sizeof(XShmSegmentInfo));
-        if (xob->shm_info)
-          {
-             xob->xim = XShmCreateImage(d, v, depth, ZPixmap, NULL,
-                                        xob->shm_info, w, h);
-             if (xob->xim)
-               {
-                  xob->shm_info->shmid = shmget(IPC_PRIVATE,
-                                                xob->xim->bytes_per_line *
-                                                xob->xim->height,
-                                                IPC_CREAT | 0777);
-                  if (xob->shm_info->shmid >= 0)
-                    {
-                       xob->shm_info->readOnly = False;
-                       xob->shm_info->shmaddr = xob->xim->data =
-                         shmat(xob->shm_info->shmid, 0, 0);
-                       if (xob->shm_info->shmaddr != ((void *)-1))
-                         {
-                            XErrorHandler ph;
-                            
-                            if (try_shm == 2) // only needed during testing
-                              {
-                                 XSync(d, False);
-                                 _x_err = 0;
-                                 ph = XSetErrorHandler((XErrorHandler)
-                                                       x_output_tmp_x_err);
-                              }
-#if defined(EVAS_FRAME_QUEUING) && defined(LIBXEXT_VERSION_LOW)
-                    /* workaround for libXext of lower then 1.1.1 */
-                    if (evas_common_frameq_enabled())
-                       XLockDisplay(d);
-#endif
-                            XShmAttach(d, xob->shm_info);
-#if defined(EVAS_FRAME_QUEUING) && defined(LIBXEXT_VERSION_LOW)
-                    /* workaround for libXext of lower then 1.1.1 */
-                    if (evas_common_frameq_enabled())
-                       XUnlockDisplay(d);
-#endif
-
-                            if (try_shm == 2) // only needed during testing
-                              {
-                                 XSync(d, False); 
-                                 XSetErrorHandler((XErrorHandler)ph);
-                              }
-                            if (!_x_err)
-                              {
-                                 xob->bpl = xob->xim->bytes_per_line;
-                                 xob->psize = xob->bpl * xob->h;
-                                 return xob;
-                              }
-                         }
-                       shmdt(xob->shm_info->shmaddr);
-                       shmctl(xob->shm_info->shmid, IPC_RMID, 0);
-                    }
-                  if (xob->xim) XDestroyImage(xob->xim);
-                  xob->xim = NULL;
-               }
-             if (xob->shm_info) free(xob->shm_info);
-             xob->shm_info = NULL;
-          }
-     }
-
-   if (try_shm > 1) return NULL;
-
-   xob->xim = XCreateImage(d, v, depth, ZPixmap, 0, data, w, h, 32, 0);
-   if (!xob->xim)
-     {
-        free(xob);
-        return NULL;
-     }
-
-   xob->data = data;
-
-   if (!xob->xim->data)
-     {
-        xob->xim->data = malloc(xob->xim->bytes_per_line * xob->xim->height);
-        if (!xob->xim->data)
-          {
-             XDestroyImage(xob->xim);
-             free(xob);
-             return NULL;
-          }
-     }
-   xob->bpl = xob->xim->bytes_per_line;
-   xob->psize = xob->bpl * xob->h;
-   return xob;
-}
-
-void
-evas_software_xlib_x_output_buffer_free(X_Output_Buffer *xob, int psync)
-{
-   if (xob->shm_info)
-     {
-        if (psync) XSync(xob->display, False);
-        XShmDetach(xob->display, xob->shm_info);
-        XDestroyImage(xob->xim);
-        shmdt(xob->shm_info->shmaddr);
-        shmctl(xob->shm_info->shmid, IPC_RMID, 0);
-        free(xob->shm_info);
-     }
-   else
-     {
-        if (xob->data) xob->xim->data = NULL;
-        XDestroyImage(xob->xim);
-     }
-   free(xob);
-}
-
-void
-evas_software_xlib_x_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int psync)
-{
-   if (xob->shm_info)
-     {
-        XShmPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y,
-                     xob->w, xob->h, False);
-        if (psync) XSync(xob->display, False);
-     }
-   else
-     {
-        XPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y,
-                  xob->w, xob->h);
-     }
-}
-
-DATA8 *
-evas_software_xlib_x_output_buffer_data(X_Output_Buffer *xob, int *bytes_per_line_ret)
-{
-   if (bytes_per_line_ret) *bytes_per_line_ret = xob->xim->bytes_per_line;
-   return (DATA8 *)xob->xim->data;
-}
-
-int
-evas_software_xlib_x_output_buffer_depth(X_Output_Buffer *xob)
-{
-   return xob->xim->bits_per_pixel;
-}
-
-int
-evas_software_xlib_x_output_buffer_byte_order(X_Output_Buffer *xob)
-{
-   return xob->xim->byte_order;
-}
-
-int
-evas_software_xlib_x_output_buffer_bit_order(X_Output_Buffer *xob)
-{
-   return xob->xim->bitmap_bit_order;
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_buffer.h b/libraries/evas/src/modules/engines/software_x11/evas_xlib_buffer.h
deleted file mode 100644
index 01c4db0..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_buffer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef EVAS_XLIB_BUFFER_H
-#define EVAS_XLIB_BUFFER_H
-
-
-#include "evas_engine.h"
-
-
-typedef struct _X_Output_Buffer X_Output_Buffer;
-
-struct _X_Output_Buffer
-{
-   Display         *display;
-   XImage          *xim;
-   XShmSegmentInfo *shm_info;
-   Visual          *visual;
-   void            *data;
-   int              w;
-   int              h;
-   int              bpl;
-   int              psize;
-};
-
-void evas_software_xlib_x_write_mask_line               (Outbuf *buf, X_Output_Buffer *xob, DATA32 *src, int w, int y);
-void evas_software_xlib_x_write_mask_line_rev           (Outbuf *buf, X_Output_Buffer *xob, DATA32 *src, int w, int y);
-void evas_software_xlib_x_write_mask_line_vert          (Outbuf *buf, X_Output_Buffer *xob, DATA32 *src, int h, int ym, int w);
-void evas_software_xlib_x_write_mask_line_vert_rev      (Outbuf *buf, X_Output_Buffer *xob, DATA32 *src, int h, int ym, int w);
-
-int evas_software_xlib_x_can_do_shm                     (Display *d);
-
-X_Output_Buffer *evas_software_xlib_x_output_buffer_new (Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data);
-
-void evas_software_xlib_x_output_buffer_free            (X_Output_Buffer *xob, int sync);
-
-void evas_software_xlib_x_output_buffer_paste           (X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int sync);
-
-DATA8 *evas_software_xlib_x_output_buffer_data          (X_Output_Buffer *xob, int *bytes_per_line_ret);
-
-int evas_software_xlib_x_output_buffer_depth            (X_Output_Buffer *xob);
-
-int evas_software_xlib_x_output_buffer_byte_order       (X_Output_Buffer *xob);
-
-int evas_software_xlib_x_output_buffer_bit_order        (X_Output_Buffer *xob);
-
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_color.c b/libraries/evas/src/modules/engines/software_x11/evas_xlib_color.c
deleted file mode 100644
index 1df0406..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_color.c
+++ /dev/null
@@ -1,368 +0,0 @@
-#include "evas_common.h"
-
-#include "evas_engine.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-typedef struct _Convert_Pal_Priv Convert_Pal_Priv;
-
-struct _Convert_Pal_Priv
-{
-   Display *disp;
-   Colormap cmap;
-   Visual  *vis;
-};
-
-typedef DATA8 * (*X_Func_Alloc_Colors) (Display *d, Colormap cmap, Visual *v);
-
-static X_Func_Alloc_Colors x_color_alloc[PAL_MODE_LAST + 1];
-static int                 x_color_count[PAL_MODE_LAST + 1];
-static Eina_List          *palettes = NULL;
-
-static DATA8 * x_color_alloc_rgb(int nr, int ng, int nb, Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_gray(int ng, Display *d, Colormap cmap, Visual *v);
-
-static DATA8 * x_color_alloc_rgb_332(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_rgb_666(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_rgb_232(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_rgb_222(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_rgb_221(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_rgb_121(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_rgb_111(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_gray_256(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_gray_64(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_gray_16(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_gray_4(Display *d, Colormap cmap, Visual *v);
-static DATA8 * x_color_alloc_mono(Display *d, Colormap cmap, Visual *v);
-
-static DATA8 *
-x_color_alloc_rgb(int nr, int ng, int nb, Display *d, Colormap cmap, Visual *v)
-{
-   int r, g, b, i;
-   DATA8 *color_lut;
-   int sig_mask = 0, delt = 0;
-
-   for (i = 0; i < v->bits_per_rgb; i++) sig_mask |= (0x1 << i);
-   sig_mask <<= (16 - v->bits_per_rgb);
-   i = 0;
-   color_lut = malloc((nr) * (ng) * (nb));
-   if (!color_lut) return NULL;
-   delt = 0x0101 * 3;
-   for (r = 0; r < (nr); r++)
-     {
-        for (g = 0; g < (ng); g++)
-          {
-             for (b = 0; b < (nb); b++)
-               {
-                  XColor xcl;
-                  XColor xcl_in;
-                  int val;
-                  Status ret;
-                  int dr, dg, db;
-
-                  val = (int)((((double)r) / ((nr) - 1)) * 255);
-                  val = (val << 8) | val;
-                  xcl.red = (unsigned short)(val);
-                  val = (int)((((double)g) / ((ng) - 1)) * 255);
-                  val = (val << 8) | val;
-                  xcl.green = (unsigned short)(val);
-                  val = (int)((((double)b) / ((nb) - 1)) * 255);
-                  val = (val << 8) | val;
-                  xcl.blue = (unsigned short)(val);
-                  xcl_in = xcl;
-                  ret = XAllocColor(d, cmap, &xcl);
-                  dr = (int)xcl_in.red - (int)xcl.red;
-                  if (dr < 0) dr = -dr;
-                  dg = (int)xcl_in.green - (int)xcl.green;
-                  if (dg < 0) dg = -dg;
-                  db = (int)xcl_in.blue - (int)xcl.blue;
-                  if (db < 0) db = -db;
-/*
-                  printf("ASK [%i]: %04x %04x %04x = %04x %04x %04x | dif = %04x / %04x\n",
-                         ret,
-                         xcl_in.red, xcl_in.green, xcl_in.blue,
-                         xcl.red, xcl.green, xcl.blue,
-                         (dr + dg +db), delt);
- */
-                  if ((ret == 0) ||
-                      ((dr + dg + db) > delt)
-/*
-                      ||
-                      ((xcl_in.red & sig_mask) != (xcl.red & sig_mask)) ||
-                      ((xcl_in.green & sig_mask) != (xcl.green & sig_mask)) ||
-                      ((xcl_in.blue & sig_mask) != (xcl.blue & sig_mask))
- */
-                      )
-                    {
-                       unsigned long pixels[256];
-                       int j;
-
-                       if (i > 0)
-                         {
-                            for (j = 0; j < i; j++)
-                              pixels[j] = (unsigned long) color_lut[j];
-                            XFreeColors(d, cmap, pixels, i, 0);
-                         }
-                       free(color_lut);
-                       return NULL;
-                    }
-                  color_lut[i] = xcl.pixel;
-                  i++;
-               }
-          }
-     }
-   return color_lut;
-}
-
-static DATA8 *
-x_color_alloc_gray(int ng, Display *d, Colormap cmap, Visual *v)
-{
-   int g, i;
-   DATA8 *color_lut;
-   int sig_mask = 0;
-
-   for (i = 0; i < v->bits_per_rgb; i++) sig_mask |= (0x1 << i);
-   sig_mask <<= (16 - v->bits_per_rgb);
-   i = 0;
-   color_lut = malloc(ng);
-   if (!color_lut) return NULL;
-   for (g = 0; g < (ng); g++)
-     {
-        XColor xcl;
-        XColor xcl_in;
-        int val;
-        Status ret;
-
-        val = (int)((((double)g) / ((ng) - 1)) * 255);
-        val = (val << 8) | val;
-        xcl.red = (unsigned short)(val);
-        xcl.green = (unsigned short)(val);
-        xcl.blue = (unsigned short)(val);
-        xcl_in = xcl;
-        ret = XAllocColor(d, cmap, &xcl);
-        if ((ret == 0) ||
-            ((xcl_in.red & sig_mask) != (xcl.red & sig_mask)) ||
-            ((xcl_in.green & sig_mask) != (xcl.green & sig_mask)) ||
-            ((xcl_in.blue & sig_mask) != (xcl.blue & sig_mask)))
-          {
-             unsigned long pixels[256];
-             int j;
-
-             if (i > 0)
-               {
-                  for (j = 0; j < i; j++)
-                    pixels[j] = (unsigned long) color_lut[j];
-                  XFreeColors(d, cmap, pixels, i, 0);
-               }
-             free(color_lut);
-             return NULL;
-          }
-        color_lut[i] = xcl.pixel;
-        i++;
-     }
-   return color_lut;
-}
-
-static DATA8 *
-x_color_alloc_rgb_332(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(8, 8, 4, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_666(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(6, 6, 6, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_232(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(4, 8, 4, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_222(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(4, 4, 4, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_221(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(4, 4, 2, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_121(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(2, 4, 2, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_rgb_111(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_rgb(2, 2, 2, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_256(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_gray(256, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_64(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_gray(64, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_16(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_gray(32, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_gray_4(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_gray(16, d, cmap, v);
-}
-
-static DATA8 *
-x_color_alloc_mono(Display *d, Colormap cmap, Visual *v)
-{
-   return x_color_alloc_gray(2, d, cmap, v);
-}
-
-void
-evas_software_xlib_x_color_init(void)
-{
-   static int initialised = 0;
-
-   if (initialised) return;
-   x_color_alloc[PAL_MODE_NONE]    = NULL;
-   x_color_count[PAL_MODE_NONE]    = 0;
-
-   x_color_alloc[PAL_MODE_MONO]    = x_color_alloc_mono;
-   x_color_count[PAL_MODE_MONO]    = 2;
-
-   x_color_alloc[PAL_MODE_GRAY4]   = x_color_alloc_gray_4;
-   x_color_count[PAL_MODE_GRAY4]   = 4;
-
-   x_color_alloc[PAL_MODE_GRAY16]  = x_color_alloc_gray_16;
-   x_color_count[PAL_MODE_GRAY16]  = 16;
-
-   x_color_alloc[PAL_MODE_GRAY64]  = x_color_alloc_gray_64;
-   x_color_count[PAL_MODE_GRAY64]  = 64;
-
-   x_color_alloc[PAL_MODE_GRAY256] = x_color_alloc_gray_256;
-   x_color_count[PAL_MODE_GRAY256] = 256;
-
-   x_color_alloc[PAL_MODE_RGB111]  = x_color_alloc_rgb_111;
-   x_color_count[PAL_MODE_RGB111]  = 2 * 2 * 2;
-
-   x_color_alloc[PAL_MODE_RGB121]  = x_color_alloc_rgb_121;
-   x_color_count[PAL_MODE_RGB121]  = 2 * 4 * 2;
-
-   x_color_alloc[PAL_MODE_RGB221]  = x_color_alloc_rgb_221;
-   x_color_count[PAL_MODE_RGB221]  = 4 * 4 * 2;
-
-   x_color_alloc[PAL_MODE_RGB222]  = x_color_alloc_rgb_222;
-   x_color_count[PAL_MODE_RGB222]  = 4 * 4 * 4;
-
-   x_color_alloc[PAL_MODE_RGB232]  = x_color_alloc_rgb_232;
-   x_color_count[PAL_MODE_RGB232]  = 4 * 8 * 4;
-
-   x_color_alloc[PAL_MODE_RGB666]  = x_color_alloc_rgb_666;
-   x_color_count[PAL_MODE_RGB666]  = 6 * 6 * 6;
-
-   x_color_alloc[PAL_MODE_RGB332]  = x_color_alloc_rgb_332;
-   x_color_count[PAL_MODE_RGB332]  = 8 * 8 * 4;
-
-   x_color_alloc[PAL_MODE_LAST]    = NULL;
-   x_color_count[PAL_MODE_LAST]    = 0;
-   initialised = 1;
-}
-
-Convert_Pal *
-evas_software_xlib_x_color_allocate(Display         *disp,
-                                    Colormap         cmap,
-                                    Visual          *vis,
-                                    Convert_Pal_Mode colors)
-{
-   Convert_Pal_Priv *palpriv;
-   Convert_Pal      *pal;
-   Convert_Pal_Mode  c;
-   Eina_List        *l;
-
-/*   printf("ALLOC cmap=%i vis=%p\n", cmap, vis);*/
-   EINA_LIST_FOREACH(palettes, l, pal)
-     {
-        palpriv = pal->data;
-        if ((disp == palpriv->disp) &&
-            (vis == palpriv->vis) &&
-            (cmap == palpriv->cmap))
-          {
-             pal->references++;
-             return pal;
-          }
-     }
-   pal = calloc(1, sizeof(struct _Convert_Pal));
-   if (!pal) return NULL;
-   for (c = colors; c > PAL_MODE_NONE; c--)
-     {
-        if (x_color_alloc[c])
-          {
-/*           printf("TRY PAL %i\n", c);*/
-             pal->lookup = (x_color_alloc[c])(disp, cmap, vis);
-             if (pal->lookup) break;
-          }
-     }
-   pal->references = 1;
-   pal->colors = c;
-   pal->count = x_color_count[c];
-   palpriv = calloc(1, sizeof(Convert_Pal_Priv));
-   pal->data = palpriv;
-   if (!palpriv)
-     {
-        if (pal->lookup) free(pal->lookup);
-        free(pal);
-        return NULL;
-     }
-   palpriv->disp = disp;
-   palpriv->vis = vis;
-   palpriv->cmap = cmap;
-   if (pal->colors == PAL_MODE_NONE)
-     {
-        if (pal->lookup) free(pal->lookup);
-        free(pal);
-        return NULL;
-     }
-   palettes = eina_list_append(palettes, pal);
-   return pal;
-}
-
-void
-evas_software_xlib_x_color_deallocate(Display     *disp,
-                                      Colormap     cmap,
-                                      Visual      *vis __UNUSED__,
-                                      Convert_Pal *pal)
-{
-   unsigned long pixels[256];
-   int j;
-
-   pal->references--;
-   if (pal->references > 0) return;
-   if (pal->lookup)
-     {
-        for(j = 0; j < pal->count; j++)
-          pixels[j] = (unsigned long) pal->lookup[j];
-        XFreeColors(disp, cmap, pixels, pal->count, 0);
-        free(pal->lookup);
-     }
-   free(pal->data);
-   palettes = eina_list_remove(palettes, pal);
-   free(pal);
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_color.h b/libraries/evas/src/modules/engines/software_x11/evas_xlib_color.h
deleted file mode 100644
index e9f8afb..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_color.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef EVAS_XLIB_COLOR_H
-#define EVAS_XLIB_COLOR_H
-
-void evas_software_xlib_x_color_init (void);
-
-Convert_Pal *evas_software_xlib_x_color_allocate (Display         *disp,
-                                                  Colormap         cmap,
-                                                  Visual          *vis,
-                                                  Convert_Pal_Mode colors);
-
-void evas_software_xlib_x_color_deallocate (Display     *disp,
-                                            Colormap     cmap,
-                                            Visual      *vis,
-                                            Convert_Pal *pal);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_main.c b/libraries/evas/src/modules/engines/software_x11/evas_xlib_main.c
deleted file mode 100644
index 3c153e1..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-void
-evas_software_xlib_x_init(void)
-{
-}
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c b/libraries/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c
deleted file mode 100644
index 24c45df..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c
+++ /dev/null
@@ -1,1137 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/time.h>
-#include <sys/utsname.h>
-
-#include "evas_common.h"
-#include "evas_macros.h"
-#include "evas_xlib_outbuf.h"
-#include "evas_xlib_buffer.h"
-#include "evas_xlib_color.h"
-
-
-typedef struct _Outbuf_Region   Outbuf_Region;
-
-struct _Outbuf_Region
-{
-   X_Output_Buffer *xob;
-   X_Output_Buffer *mxob;
-   int              x;
-   int              y;
-   int              w;
-   int              h;
-};
-
-static Eina_List *shmpool = NULL;
-static int shmsize = 0;
-static int shmmemlimit = 10 * 1024 * 1024;
-static const unsigned int shmcountlimit = 32;
-
-#ifdef EVAS_FRAME_QUEUING
-static LK(lock_shmpool);
-#define SHMPOOL_LOCK()          LKL(lock_shmpool)
-#define SHMPOOL_UNLOCK()        LKU(lock_shmpool)
-#else
-#define SHMPOOL_LOCK()
-#define SHMPOOL_UNLOCK()
-#endif
-
-static X_Output_Buffer *
-_find_xob(Display *d, Visual *v, int depth, int w, int h, int shm, void *data)
-{
-   Eina_List *l, *xl = NULL;
-   X_Output_Buffer *xob = NULL;
-   X_Output_Buffer *xob2;
-   int fitness = 0x7fffffff;
-   int sz, lbytes, bpp;
-
-   if (!shm)
-     return evas_software_xlib_x_output_buffer_new(d, v, depth, w, h, shm, data);
-   if (depth > 1)
-     {
-        bpp = depth / 8;
-        if (bpp == 3) bpp = 4;
-        lbytes = (((w * bpp) + 3) / 4) * 4;
-     }
-   else
-     lbytes = ((w + 31) / 32) * 4;
-   sz = lbytes * h;
-   SHMPOOL_LOCK();
-   EINA_LIST_FOREACH(shmpool, l, xob2)
-     {
-        int szdif;
-
-        if ((xob2->xim->depth != depth) || (xob2->visual != v) ||
-            (xob2->display != d))
-          continue;
-        szdif = xob2->psize - sz;
-        if (szdif < 0) continue;
-        if (szdif == 0)
-          {
-             xob = xob2;
-             xl = l;
-             goto have_xob;
-          }
-        if (szdif < fitness)
-          {
-             fitness = szdif;
-             xob = xob2;
-             xl = l;
-          }
-     }
-   if ((fitness > (100 * 100)) || (!xob))
-     {
-        SHMPOOL_UNLOCK();
-        xob = evas_software_xlib_x_output_buffer_new(d, v, depth, w, h, shm, data);
-        return xob;
-     }
-   
-   have_xob:
-   shmpool = eina_list_remove_list(shmpool, xl);
-   xob->w = w;
-   xob->h = h;
-   xob->bpl = lbytes;
-   xob->xim->width = xob->w;
-   xob->xim->height = xob->h;
-   xob->xim->bytes_per_line = xob->bpl;
-   shmsize -= xob->psize * (xob->xim->depth / 8);
-   SHMPOOL_UNLOCK();
-   return xob;
-}
-
-static void
-_unfind_xob(X_Output_Buffer *xob, int psync)
-{
-   if (xob->shm_info)
-     {
-        SHMPOOL_LOCK();
-        shmpool = eina_list_prepend(shmpool, xob);
-        shmsize += xob->psize * xob->xim->depth / 8;
-        while ((shmsize > (shmmemlimit)) ||
-               (eina_list_count(shmpool) > shmcountlimit))
-          {
-             Eina_List *xl;
-
-             xl = eina_list_last(shmpool);
-             if (!xl)
-               {
-                  shmsize = 0;
-                  break;
-               }
-             xob = xl->data;
-             shmpool = eina_list_remove_list(shmpool, xl);
-             shmsize -= xob->psize * xob->xim->depth / 8;
-             evas_software_xlib_x_output_buffer_free(xob, psync);
-          }
-        SHMPOOL_UNLOCK();
-     }
-   else
-     evas_software_xlib_x_output_buffer_free(xob, psync);
-}
-
-static void
-_clear_xob(int psync)
-{
-   SHMPOOL_LOCK();
-   while (shmpool)
-     {
-        X_Output_Buffer *xob;
-
-        xob = shmpool->data;
-        shmpool = eina_list_remove_list(shmpool, shmpool);
-        evas_software_xlib_x_output_buffer_free(xob, psync);
-     }
-   shmsize = 0;
-   SHMPOOL_UNLOCK();
-}
-
-void
-evas_software_xlib_outbuf_init(void)
-{
-#ifdef EVAS_FRAME_QUEUING
-   LKI(lock_shmpool);
-#endif
-}
-
-void
-evas_software_xlib_outbuf_free(Outbuf *buf)
-{
-#ifdef EVAS_FRAME_QUEUING
-   LKL(buf->priv.lock);
-#endif
-   while (buf->priv.pending_writes)
-     {
-        RGBA_Image *im;
-        Outbuf_Region *obr;
-
-        im = buf->priv.pending_writes->data;
-        buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes);
-        obr = im->extended_info;
-        evas_cache_image_drop(&im->cache_entry);
-        if (obr->xob) _unfind_xob(obr->xob, 0);
-        if (obr->mxob) _unfind_xob(obr->mxob, 0);
-        free(obr);
-     }
-#ifdef EVAS_FRAME_QUEUING
-   LKU(buf->priv.lock);
-#endif
-   evas_software_xlib_outbuf_idle_flush(buf);
-   evas_software_xlib_outbuf_flush(buf);
-   if (buf->priv.x11.xlib.gc)
-      XFreeGC(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gc);
-   if (buf->priv.x11.xlib.gcm)
-      XFreeGC(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gcm);
-   if (buf->priv.pal)
-      evas_software_xlib_x_color_deallocate(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.cmap,
-                                           buf->priv.x11.xlib.vis, buf->priv.pal);
-#ifdef EVAS_FRAME_QUEUING
-   LKD(buf->priv.lock);
-#endif
-   free(buf);
-   _clear_xob(0);
-}
-
-Outbuf *
-evas_software_xlib_outbuf_setup_x(int w, int h, int rot, Outbuf_Depth depth,
-                                 Display *disp, Drawable draw, Visual *vis,
-                                 Colormap cmap, int x_depth,
-                                 int grayscale, int max_colors, Pixmap mask,
-                                 int shape_dither, int destination_alpha)
-{
-   Outbuf             *buf;
-
-   buf = calloc(1, sizeof(Outbuf));
-   if (!buf)
-      return NULL;
-
-   buf->w = w;
-   buf->h = h;
-   buf->depth = depth;
-   buf->rot = rot;
-
-   buf->priv.x11.xlib.disp = disp;
-   buf->priv.x11.xlib.vis = vis;
-   buf->priv.x11.xlib.cmap = cmap;
-   buf->priv.x11.xlib.depth = x_depth;
-
-   buf->priv.mask_dither = shape_dither;
-   buf->priv.destination_alpha = destination_alpha;
-
-   {
-      Gfx_Func_Convert    conv_func;
-      X_Output_Buffer    *xob;
-
-      buf->priv.x11.xlib.shm = evas_software_xlib_x_can_do_shm(buf->priv.x11.xlib.disp);
-      xob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                  buf->priv.x11.xlib.vis,
-                                                  buf->priv.x11.xlib.depth,
-                                                  1, 1, buf->priv.x11.xlib.shm, NULL);
-
-      conv_func = NULL;
-      if (xob)
-        {
-#ifdef WORDS_BIGENDIAN
-           if (evas_software_xlib_x_output_buffer_byte_order(xob) == LSBFirst)
-             buf->priv.x11.xlib.swap = 1;
-           if (evas_software_xlib_x_output_buffer_bit_order(xob) == MSBFirst)
-             buf->priv.x11.xlib.bit_swap = 1;
-#else
-           if (evas_software_xlib_x_output_buffer_byte_order(xob) == MSBFirst)
-             buf->priv.x11.xlib.swap = 1;
-           if (evas_software_xlib_x_output_buffer_bit_order(xob) == MSBFirst)
-             buf->priv.x11.xlib.bit_swap = 1;
-#endif
-           if (((vis->class == TrueColor) || (vis->class == DirectColor)) &&
-               (x_depth > 8))
-             {
-                buf->priv.mask.r = (DATA32) vis->red_mask;
-                buf->priv.mask.g = (DATA32) vis->green_mask;
-                buf->priv.mask.b = (DATA32) vis->blue_mask;
-                if (buf->priv.x11.xlib.swap)
-                  {
-                     SWAP32(buf->priv.mask.r);
-                     SWAP32(buf->priv.mask.g);
-                     SWAP32(buf->priv.mask.b);
-                  }
-             }
-           else if ((vis->class == PseudoColor) ||
-                    (vis->class == StaticColor) ||
-                    (vis->class == GrayScale) ||
-                    (vis->class == StaticGray) ||
-                    (x_depth <= 8))
-             {
-                Convert_Pal_Mode    pm = PAL_MODE_RGB332;
-
-                if ((vis->class == GrayScale) || (vis->class == StaticGray))
-                   grayscale = 1;
-                if (grayscale)
-                  {
-                     if (max_colors >= 256)
-                        pm = PAL_MODE_GRAY256;
-                     else if (max_colors >= 64)
-                        pm = PAL_MODE_GRAY64;
-                     else if (max_colors >= 16)
-                        pm = PAL_MODE_GRAY16;
-                     else if (max_colors >= 4)
-                        pm = PAL_MODE_GRAY4;
-                     else
-                        pm = PAL_MODE_MONO;
-                  }
-                else
-                  {
-                     if (max_colors >= 256)
-                        pm = PAL_MODE_RGB332;
-                     else if (max_colors >= 216)
-                        pm = PAL_MODE_RGB666;
-                     else if (max_colors >= 128)
-                        pm = PAL_MODE_RGB232;
-                     else if (max_colors >= 64)
-                        pm = PAL_MODE_RGB222;
-                     else if (max_colors >= 32)
-                        pm = PAL_MODE_RGB221;
-                     else if (max_colors >= 16)
-                        pm = PAL_MODE_RGB121;
-                     else if (max_colors >= 8)
-                        pm = PAL_MODE_RGB111;
-                     else if (max_colors >= 4)
-                        pm = PAL_MODE_GRAY4;
-                     else
-                        pm = PAL_MODE_MONO;
-                  }
-                /* FIXME: only alloc once per display+cmap */
-                buf->priv.pal = evas_software_xlib_x_color_allocate(disp, cmap, vis,
-                                                                    pm);
-                if (!buf->priv.pal)
-                  {
-                     free(buf);
-                     return NULL;
-                  }
-             }
-           if (buf->priv.pal)
-             {
-                if (buf->rot == 0 || buf->rot == 180)
-                   conv_func = evas_common_convert_func_get(0, buf->w, buf->h,
-                                                            evas_software_xlib_x_output_buffer_depth
-                                                            (xob), buf->priv.mask.r,
-                                                            buf->priv.mask.g,
-                                                            buf->priv.mask.b,
-                                                            buf->priv.pal->colors,
-                                                            buf->rot);
-                else if (buf->rot == 90 || buf->rot == 270)
-                   conv_func = evas_common_convert_func_get(0, buf->h, buf->w,
-                                                            evas_software_xlib_x_output_buffer_depth
-                                                            (xob), buf->priv.mask.r,
-                                                            buf->priv.mask.g,
-                                                            buf->priv.mask.b,
-                                                            buf->priv.pal->colors,
-                                                            buf->rot);
-             }
-           else
-             {
-                if (buf->rot == 0 || buf->rot == 180)
-                   conv_func = evas_common_convert_func_get(0, buf->w, buf->h,
-                                                            evas_software_xlib_x_output_buffer_depth
-                                                            (xob), buf->priv.mask.r,
-                                                            buf->priv.mask.g,
-                                                            buf->priv.mask.b, PAL_MODE_NONE,
-                                                            buf->rot);
-                else if (buf->rot == 90 || buf->rot == 270)
-                   conv_func = evas_common_convert_func_get(0, buf->h, buf->w,
-                                                            evas_software_xlib_x_output_buffer_depth
-                                                            (xob), buf->priv.mask.r,
-                                                            buf->priv.mask.g,
-                                                            buf->priv.mask.b, PAL_MODE_NONE,
-                                                            buf->rot);
-             }
-           evas_software_xlib_x_output_buffer_free(xob, 1);
-           if (!conv_func)
-             {
-                ERR("At depth: %i, RGB format mask: %08x %08x %08x, "
-                    "Palette mode: %i. "
-                    "Not supported by compiled in converters!",
-                    buf->priv.x11.xlib.depth,
-                    buf->priv.mask.r,
-                    buf->priv.mask.g,
-                    buf->priv.mask.b,
-                    buf->priv.pal ? (int)buf->priv.pal->colors : -1);
-             }
-        }
-      evas_software_xlib_outbuf_drawable_set(buf, draw);
-      evas_software_xlib_outbuf_mask_set(buf, mask);
-   }
-#ifdef EVAS_FRAME_QUEUING
-   LKI(buf->priv.lock);
-#endif
-   return buf;
-}
-
-RGBA_Image *
-evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch)
-{
-   RGBA_Image         *im;
-   Outbuf_Region      *obr;
-   int                 bpl = 0;
-   int                 use_shm = 1;
-   int                 alpha;
-
-   if ((buf->onebuf) && (buf->priv.x11.xlib.shm))
-     {
-        Eina_Rectangle *rect;
-
-        RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, buf->w, buf->h);
-        obr = calloc(1, sizeof(Outbuf_Region));
-        if (!obr) return NULL;
-        rect = eina_rectangle_new(x, y, w, h);
-        if (!rect)
-          {
-             free(obr);
-             return NULL;
-          }
-
-        buf->priv.onebuf_regions = eina_list_append(buf->priv.onebuf_regions, rect);
-        if (buf->priv.onebuf)
-          {
-             *cx = x;
-             *cy = y;
-             *cw = w;
-             *ch = h;
-             if (!buf->priv.synced)
-               {
-                  XSync(buf->priv.x11.xlib.disp, False);
-                  buf->priv.synced = 1;
-               }
-             return buf->priv.onebuf;
-          }
-        obr->x = 0;
-        obr->y = 0;
-        obr->w = buf->w;
-        obr->h = buf->h;
-        *cx = x;
-        *cy = y;
-        *cw = w;
-        *ch = h;
-
-        alpha = ((buf->priv.x11.xlib.mask) || (buf->priv.destination_alpha));
-
-        use_shm = buf->priv.x11.xlib.shm;
-        if ((buf->rot == 0) &&
-            (buf->priv.mask.r == 0xff0000) &&
-            (buf->priv.mask.g == 0x00ff00) &&
-            (buf->priv.mask.b == 0x0000ff))
-          {
-             obr->xob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                              buf->priv.x11.xlib.vis,
-                                                              buf->priv.x11.xlib.depth,
-                                                              buf->w, buf->h,
-                                                              use_shm,
-                                                              NULL);
-             if (!obr->xob)
-               {
-                  free(obr);
-                  return NULL;
-               }
-             im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
-                                                      buf->w, buf->h,
-                                                      (DATA32 *) evas_software_xlib_x_output_buffer_data(obr->xob, &bpl),
-                                                      alpha, EVAS_COLORSPACE_ARGB8888);
-             if (!im)
-               {
-                  evas_software_xlib_x_output_buffer_free(obr->xob, 0);
-                  free(obr);
-                  return NULL;
-               }
-             im->extended_info = obr;
-             if (buf->priv.x11.xlib.mask)
-                obr->mxob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                                   buf->priv.x11.xlib.vis,
-                                                                   1,
-                                                                   buf->w, buf->h,
-                                                                   use_shm,
-                                                                   NULL);
-          }
-        else
-          {
-             im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-             if (!im)
-               {
-                  free(obr);
-                  return NULL;
-               }
-             im->cache_entry.flags.alpha |= alpha ? 1 : 0;
-             evas_cache_image_surface_alloc(&im->cache_entry, buf->w, buf->h);
-             im->extended_info = obr;
-             if ((buf->rot == 0) || (buf->rot == 180))
-               {
-                  obr->xob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                                    buf->priv.x11.xlib.vis,
-                                                                    buf->priv.x11.xlib.depth,
-                                                                    buf->w, buf->h,
-                                                                    use_shm,
-                                                                    NULL);
-                  if (!obr->xob)
-                    {
-                       evas_cache_image_drop(&im->cache_entry);
-                       free(obr);
-                       return NULL;
-                    }
-                  if (buf->priv.x11.xlib.mask)
-                     obr->mxob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                                        buf->priv.x11.xlib.vis,
-                                                                        1, buf->w, buf->h,
-                                                                        use_shm,
-                                                                        NULL);
-               }
-             else if ((buf->rot == 90) || (buf->rot == 270))
-               {
-                  obr->xob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                                    buf->priv.x11.xlib.vis,
-                                                                    buf->priv.x11.xlib.depth,
-                                                                    buf->h, buf->w,
-                                                                    use_shm,
-                                                                    NULL);
-                  if (!obr->xob)
-                    {
-                       evas_cache_image_drop(&im->cache_entry);
-                       free(obr);
-                       return NULL;
-                    }
-                  if (buf->priv.x11.xlib.mask)
-                    obr->mxob = evas_software_xlib_x_output_buffer_new(buf->priv.x11.xlib.disp,
-                                                                       buf->priv.x11.xlib.vis,
-                                                                       1, buf->h, buf->w,
-                                                                       use_shm,
-                                                                       NULL);
-               }
-          }
-        /* FIXME: We should be able to remove this memset, but somewhere in the process
-           we copy too much to the destination surface and some area are not cleaned before copy. */
-        if ((alpha) && (im->image.data))
-          {
-             /* FIXME: faster memset! */
-//             memset(im->image.data, 0, w * h * sizeof(DATA32));
-          }
-
-        buf->priv.onebuf = im;
-        return im;
-     }
-
-   obr = calloc(1, sizeof(Outbuf_Region));
-   if (!obr) return NULL;
-   obr->x = x;
-   obr->y = y;
-   obr->w = w;
-   obr->h = h;
-   *cx = 0;
-   *cy = 0;
-   *cw = w;
-   *ch = h;
-
-   use_shm = buf->priv.x11.xlib.shm;
-   /* FIXME: magic - i found if shm regions are smaller than 200x200 its
-    * faster to use ximages over unix sockets - trial and error
-    */
-//   use_shm = 0; /* 630 -> 1006 fps */
-//   if ((w * h) < (200 * 200)) use_shm = 0; /* 630 -> 962 fps */
-
-   alpha = ((buf->priv.x11.xlib.mask) || (buf->priv.destination_alpha));
-
-   if ((buf->rot == 0) &&
-       (buf->priv.mask.r == 0xff0000) &&
-       (buf->priv.mask.g == 0x00ff00) &&
-       (buf->priv.mask.b == 0x0000ff))
-     {
-        obr->xob = _find_xob(buf->priv.x11.xlib.disp,
-                             buf->priv.x11.xlib.vis,
-                             buf->priv.x11.xlib.depth,
-                             w, h,
-                             use_shm,
-                             NULL);
-        if (!obr->xob)
-          {
-             free(obr);
-             return NULL;
-          }
-        im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
-                                                 w, h,
-                                                 (DATA32 *) evas_software_xlib_x_output_buffer_data(obr->xob, &bpl),
-                                                 alpha, EVAS_COLORSPACE_ARGB8888);
-        if (!im)
-          {
-             _unfind_xob(obr->xob, 0);
-             free(obr);
-             return NULL;
-          }
-        im->extended_info = obr;
-        if (buf->priv.x11.xlib.mask)
-          obr->mxob = _find_xob(buf->priv.x11.xlib.disp,
-                                buf->priv.x11.xlib.vis,
-                                1, w, h,
-                                use_shm,
-                                NULL);
-     }
-   else
-     {
-        im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        if (!im)
-          {
-             free(obr);
-             return NULL;
-          }
-        im->cache_entry.w = w;
-        im->cache_entry.h = h;
-        im->cache_entry.flags.alpha |= alpha ? 1 : 0;
-        evas_cache_image_surface_alloc(&im->cache_entry, w, h);
-        im->extended_info = obr;
-        if ((buf->rot == 0) || (buf->rot == 180))
-          {
-             obr->xob = _find_xob(buf->priv.x11.xlib.disp,
-                                  buf->priv.x11.xlib.vis,
-                                  buf->priv.x11.xlib.depth,
-                                  w, h,
-                                  use_shm,
-                                  NULL);
-             if (!obr->xob)
-               {
-                  evas_cache_image_drop(&im->cache_entry);
-                  free(obr);
-                  return NULL;
-               }
-             if (buf->priv.x11.xlib.mask)
-               obr->mxob = _find_xob(buf->priv.x11.xlib.disp,
-                                     buf->priv.x11.xlib.vis,
-                                     1, w, h,
-                                     use_shm,
-                                     NULL);
-          }
-        else if ((buf->rot == 90) || (buf->rot == 270))
-          {
-             obr->xob = _find_xob(buf->priv.x11.xlib.disp,
-                                  buf->priv.x11.xlib.vis,
-                                  buf->priv.x11.xlib.depth,
-                                  h, w,
-                                  use_shm,
-                                  NULL);
-             if (!obr->xob)
-               {
-                  evas_cache_image_drop(&im->cache_entry);
-                  free(obr);
-                  return NULL;
-               }
-             if (buf->priv.x11.xlib.mask)
-               obr->mxob = _find_xob(buf->priv.x11.xlib.disp,
-                                     buf->priv.x11.xlib.vis,
-                                     1, h, w,
-                                     use_shm,
-                                     NULL);
-          }
-     }
-   /* FIXME: We should be able to remove this memset, but somewhere in the process
-      we copy too much to the destination surface and some area are not cleaned before copy. */
-   if (((buf->priv.x11.xlib.mask) || (buf->priv.destination_alpha)) &&
-       (im->image.data))
-     {
-        /* FIXME: faster memset! */
-//        memset(im->image.data, 0, w * h * sizeof(DATA32));
-     }
-
-#ifdef EVAS_FRAME_QUEUING
-   if (!evas_common_frameq_enabled())
-#endif
-      buf->priv.pending_writes = eina_list_append(buf->priv.pending_writes, im);
-   return im;
-}
-
-void
-evas_software_xlib_outbuf_free_region_for_update(Outbuf *buf __UNUSED__, RGBA_Image *update __UNUSED__)
-{
-   /* no need to do anything - they are cleaned up on flush */
-}
-
-void
-evas_software_xlib_outbuf_flush(Outbuf *buf)
-{
-   Eina_List *l;
-   RGBA_Image *im;
-   Outbuf_Region *obr;
-
-   if ((buf->priv.onebuf) && (buf->priv.onebuf_regions))
-     {
-        Region tmpr;
-
-        im = buf->priv.onebuf;
-        obr = im->extended_info;
-        tmpr = XCreateRegion();
-        while (buf->priv.onebuf_regions)
-          {
-             Eina_Rectangle *rect;
-             XRectangle xr;
-
-             rect = buf->priv.onebuf_regions->data;
-             buf->priv.onebuf_regions = eina_list_remove_list(buf->priv.onebuf_regions, buf->priv.onebuf_regions);
-             if (buf->rot == 0)
-               {
-                  xr.x = rect->x;
-                  xr.y = rect->y;
-                  xr.width = rect->w;
-                  xr.height = rect->h;
-               }
-             else if (buf->rot == 90)
-               {
-                  xr.x = rect->y;
-                  xr.y = buf->w - rect->x - rect->w;
-                  xr.width = rect->h;
-                  xr.height = rect->w;
-               }
-             else if (buf->rot == 180)
-               {
-                  xr.x = buf->w - rect->x - rect->w;
-                  xr.y = buf->h - rect->y - rect->h;
-                  xr.width = rect->w;
-                  xr.height = rect->h;
-               }
-             else if (buf->rot == 270)
-               {
-                  xr.x = buf->h - rect->y - rect->h;
-                  xr.y = rect->x;
-                  xr.width = rect->h;
-                  xr.height = rect->w;
-               }
-             XUnionRectWithRegion(&xr, tmpr, tmpr);
-             if (buf->priv.debug)
-                evas_software_xlib_outbuf_debug_show(buf, buf->priv.x11.xlib.win,
-                                                     xr.x, xr.y, xr.width, xr.height);
-             eina_rectangle_free(rect);
-          }
-        XSetRegion(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gc, tmpr);
-        if (obr->xob)
-           evas_software_xlib_x_output_buffer_paste(obr->xob, buf->priv.x11.xlib.win,
-                                                    buf->priv.x11.xlib.gc,
-                                                    0, 0, 0);
-        if (obr->mxob)
-          {
-             XSetRegion(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gcm, tmpr);
-             evas_software_xlib_x_output_buffer_paste(obr->mxob,
-                                                      buf->priv.x11.xlib.mask,
-                                                      buf->priv.x11.xlib.gcm,
-                                                      0, 0, 0);
-          }
-        XDestroyRegion(tmpr);
-        buf->priv.synced = 0;
-     }
-   else
-     {
-#if 1
-        XSync(buf->priv.x11.xlib.disp, False);
-        EINA_LIST_FOREACH(buf->priv.pending_writes, l, im)
-          {
-             obr = im->extended_info;
-             if (buf->priv.debug)
-               evas_software_xlib_outbuf_debug_show(buf, buf->priv.x11.xlib.win,
-                                                   obr->x, obr->y, obr->w, obr->h);
-             if (obr->xob)
-                evas_software_xlib_x_output_buffer_paste(obr->xob, buf->priv.x11.xlib.win,
-                                                         buf->priv.x11.xlib.gc,
-                                                         obr->x, obr->y, 0);
-             if (obr->mxob)
-               evas_software_xlib_x_output_buffer_paste(obr->mxob,
-                                                       buf->priv.x11.xlib.mask,
-                                                       buf->priv.x11.xlib.gcm,
-                                                       obr->x, obr->y, 0);
-          }
-#ifdef EVAS_FRAME_QUEUING
-        LKL(buf->priv.lock);
-#endif
-        while (buf->priv.prev_pending_writes)
-          {
-             im = buf->priv.prev_pending_writes->data;
-             buf->priv.prev_pending_writes =
-                eina_list_remove_list(buf->priv.prev_pending_writes,
-                                      buf->priv.prev_pending_writes);
-             obr = im->extended_info;
-             evas_cache_image_drop(&im->cache_entry);
-             if (obr->xob) _unfind_xob(obr->xob, 0);
-             if (obr->mxob) _unfind_xob(obr->mxob, 0);
-             free(obr);
-          }
-        buf->priv.prev_pending_writes = buf->priv.pending_writes;
-#ifdef EVAS_FRAME_QUEUING
-        LKU(buf->priv.lock);
-#endif
-        buf->priv.pending_writes = NULL;
-        XFlush(buf->priv.x11.xlib.disp);
-#else
-        /* XX async push - disable */
-        /*
-        EINA_LIST_FOREACH(buf->priv.pending_writes, l, im)
-          {
-             obr = im->extended_info;
-             if (buf->priv.debug)
-               evas_software_xlib_outbuf_debug_show(buf, buf->priv.x11.xlib.win,
-                                                   obr->x, obr->y, obr->w, obr->h);
-             evas_software_xlib_x_output_buffer_paste(obr->xob, buf->priv.x11.xlib.win,
-                                                     buf->priv.x11.xlib.gc,
-                                                     obr->x, obr->y, 0);
-             if (obr->mxob)
-               evas_software_xlib_x_output_buffer_paste(obr->mxob,
-                                                       buf->priv.x11.xlib.mask,
-                                                       buf->priv.x11.xlib.gcm,
-                                                       obr->x, obr->y, 0);
-          }
-         */
-        XSync(buf->priv.x11.xlib.disp, False);
-
-        while (buf->priv.pending_writes)
-          {
-             RGBA_Image *im;
-             Outbuf_Region *obr;
-             
-             im = eina_list_data_get(buf->priv.pending_writes);
-             buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes);
-             obr = im->extended_info;
-             evas_cache_image_drop(&im->cache_entry);
-             if (obr->xob) _unfind_xob(obr->xob, 0);
-             if (obr->mxob) _unfind_xob(obr->mxob, 0);
-             free(obr);
-             evas_cache_image_drop(&im->cache_entry);
-          }
-#endif
-     }
-   evas_common_cpu_end_opt();
-}
-
-void
-evas_software_xlib_outbuf_idle_flush(Outbuf *buf)
-{
-   if (buf->priv.onebuf)
-     {
-        RGBA_Image *im;
-        Outbuf_Region *obr;
-
-        im = buf->priv.onebuf;
-        buf->priv.onebuf = NULL;
-        obr = im->extended_info;
-        if (obr->xob) evas_software_xlib_x_output_buffer_free(obr->xob, 0);
-        if (obr->mxob) evas_software_xlib_x_output_buffer_free(obr->mxob, 0);
-        free(obr);
-        evas_cache_image_drop(&im->cache_entry);
-     }
-   else
-     {
-#ifdef EVAS_FRAME_QUEUING
-        LKL(buf->priv.lock);
-#endif
-        if (buf->priv.prev_pending_writes) XSync(buf->priv.x11.xlib.disp, False);
-        while (buf->priv.prev_pending_writes)
-          {
-             RGBA_Image *im;
-             Outbuf_Region *obr;
-             
-             im = buf->priv.prev_pending_writes->data;
-             buf->priv.prev_pending_writes =
-                eina_list_remove_list(buf->priv.prev_pending_writes,
-                                      buf->priv.prev_pending_writes);
-             obr = im->extended_info;
-             evas_cache_image_drop(&im->cache_entry);
-             if (obr->xob) _unfind_xob(obr->xob, 0);
-             if (obr->mxob) _unfind_xob(obr->mxob, 0);
-             free(obr);
-          }
-#ifdef EVAS_FRAME_QUEUING
-        LKU(buf->priv.lock);
-#endif
-        _clear_xob(0);
-     }
-}
-
-void
-evas_software_xlib_outbuf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h)
-{
-   Gfx_Func_Convert    conv_func = NULL;
-   Outbuf_Region      *obr;
-   DATA32             *src_data;
-   unsigned char      *data;
-   int                 bpl = 0, yy;
-
-   obr = update->extended_info;
-   if (buf->priv.pal)
-     {
-        if ((buf->rot == 0) || (buf->rot == 180))
-          conv_func = evas_common_convert_func_get(0, w, h,
-                                                   evas_software_xlib_x_output_buffer_depth
-                                                   (obr->xob), buf->priv.mask.r,
-                                                   buf->priv.mask.g, buf->priv.mask.b,
-                                                   buf->priv.pal->colors, buf->rot);
-        else if ((buf->rot == 90) || (buf->rot == 270))
-          conv_func = evas_common_convert_func_get(0, h, w,
-                                                   evas_software_xlib_x_output_buffer_depth
-                                                   (obr->xob), buf->priv.mask.r,
-                                                   buf->priv.mask.g, buf->priv.mask.b,
-                                                   buf->priv.pal->colors, buf->rot);
-     }
-   else
-     {
-        if ((buf->rot == 0) || (buf->rot == 180))
-          conv_func = evas_common_convert_func_get(0, w, h,
-                                                   evas_software_xlib_x_output_buffer_depth
-                                                   (obr->xob), buf->priv.mask.r,
-                                                   buf->priv.mask.g, buf->priv.mask.b,
-                                                   PAL_MODE_NONE, buf->rot);
-        else if ((buf->rot == 90) || (buf->rot == 270))
-          conv_func = evas_common_convert_func_get(0, h, w,
-                                                   evas_software_xlib_x_output_buffer_depth
-                                                   (obr->xob), buf->priv.mask.r,
-                                                   buf->priv.mask.g, buf->priv.mask.b,
-                                                   PAL_MODE_NONE, buf->rot);
-     }
-   if (!conv_func) return;
-
-   if (!obr->xob) return;
-   data = evas_software_xlib_x_output_buffer_data(obr->xob, &bpl);
-   if (!data) return;
-   src_data = update->image.data;
-   if (!src_data) return;
-   if (buf->rot == 0)
-     {
-        obr->x = x;
-        obr->y = y;
-     }
-   else if (buf->rot == 90)
-     {
-        obr->x = y;
-        obr->y = buf->w - x - w;
-     }
-   else if (buf->rot == 180)
-     {
-        obr->x = buf->w - x - w;
-        obr->y = buf->h - y - h;
-     }
-   else if (buf->rot == 270)
-     {
-        obr->x = buf->h - y - h;
-        obr->y = x;
-     }
-   if ((buf->rot == 0) || (buf->rot == 180))
-     {
-        obr->w = w;
-        obr->h = h;
-     }
-   else if ((buf->rot == 90) || (buf->rot == 270))
-     {
-        obr->w = h;
-        obr->h = w;
-     }
-   if (buf->onebuf)
-     {
-        src_data += x + (y * update->cache_entry.w);
-        data += (bpl * obr->y) + 
-           (obr->x * (evas_software_xlib_x_output_buffer_depth(obr->xob) / 8));
-     }
-   if (buf->priv.pal)
-     {
-        if (data != (unsigned char *)src_data)
-          conv_func(src_data, data,
-                    update->cache_entry.w - w,
-                    bpl /
-                    ((evas_software_xlib_x_output_buffer_depth(obr->xob) /
-                      8)) - obr->w, obr->w, obr->h, x, y,
-                    buf->priv.pal->lookup);
-     }
-   else
-     {
-        if (data != (unsigned char *)src_data)
-          conv_func(src_data, data,
-                    update->cache_entry.w - w,
-                    bpl /
-                    ((evas_software_xlib_x_output_buffer_depth(obr->xob) /
-                      8)) - obr->w, obr->w, obr->h, x, y, NULL);
-     }
-#if 1
-#else
-   /* XX async push */
-   if (!((buf->priv.onebuf) && (buf->priv.onebuf_regions)))
-     {
-        if (buf->priv.debug)
-          evas_software_xlib_outbuf_debug_show(buf, buf->priv.x11.xlib.win,
-                                               obr->x, obr->y, obr->w, obr->h);
-        if (obr->xob)
-           evas_software_xlib_x_output_buffer_paste(obr->xob, buf->priv.x11.xlib.win,
-                                                    buf->priv.x11.xlib.gc,
-                                                    obr->x, obr->y, 0);
-     }
-#endif
-   if (obr->mxob)
-     {
-        if (buf->rot == 0)
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xlib_x_write_mask_line(buf, obr->mxob,
-                                                    src_data +
-                                                    (yy * obr->w), obr->w, yy);
-          }
-        else if (buf->rot == 90)
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xlib_x_write_mask_line_vert(buf, obr->mxob,
-                                                         src_data + yy, 
-                                                         h,  // h
-                                                         obr->h - yy - 1, // ym
-                                                         w); // w
-          }
-        else if (buf->rot == 180)
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               {
-                  evas_software_xlib_x_write_mask_line_rev(buf, obr->mxob,
-                                                           src_data +
-                                                           (yy * obr->w), 
-                                                           obr->w, obr->h - yy - 1);
-               }
-          }
-        else if (buf->rot == 270)
-          {
-             for (yy = 0; yy < obr->h; yy++)
-               evas_software_xlib_x_write_mask_line_vert_rev(buf, obr->mxob,
-                                                             src_data + yy,
-                                                             h,  // h
-                                                             yy, // ym
-                                                             w); // w
-          }
-#if 1
-#else
-        /* XX async push */
-        if (!((buf->priv.onebuf) && (buf->priv.onebuf_regions)))
-          evas_software_xlib_x_output_buffer_paste(obr->mxob,
-                                                  buf->priv.x11.xlib.mask,
-                                                  buf->priv.x11.xlib.gcm,
-                                                  obr->x, obr->y, 0);
-#endif
-     }
-#if 1
-#else
-   XFlush(buf->priv.x11.xlib.disp);
-#endif
-}
-
-void
-evas_software_xlib_outbuf_reconfigure(Outbuf * buf, int w, int h, int rot,
-                                     Outbuf_Depth depth)
-{
-   if ((w == buf->w) &&
-       (h == buf->h) &&
-       (rot == buf->rot) &&
-       (depth == buf->depth)) return;
-   buf->w = w;
-   buf->h = h;
-   buf->rot = rot;
-   evas_software_xlib_outbuf_idle_flush(buf);
-}
-
-int
-evas_software_xlib_outbuf_get_width(Outbuf * buf)
-{
-   return buf->w;
-}
-
-int
-evas_software_xlib_outbuf_get_height(Outbuf * buf)
-{
-   return buf->h;
-}
-
-Outbuf_Depth
-evas_software_xlib_outbuf_get_depth(Outbuf * buf)
-{
-   return buf->depth;
-}
-
-int
-evas_software_xlib_outbuf_get_rot(Outbuf * buf)
-{
-   return buf->rot;
-}
-
-void
-evas_software_xlib_outbuf_drawable_set(Outbuf * buf, Drawable draw)
-{
-   XGCValues           gcv;
-
-   if (buf->priv.x11.xlib.win == draw) return;
-   if (buf->priv.x11.xlib.gc)
-     {
-        XFreeGC(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gc);
-        buf->priv.x11.xlib.gc = NULL;
-     }
-   buf->priv.x11.xlib.win = draw;
-   buf->priv.x11.xlib.gc = XCreateGC(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.win, 0, &gcv);
-}
-
-void
-evas_software_xlib_outbuf_mask_set(Outbuf * buf, Pixmap mask)
-{
-   XGCValues           gcv;
-
-   if (buf->priv.x11.xlib.mask == mask) return;
-   if (buf->priv.x11.xlib.gcm)
-     {
-        XFreeGC(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gcm);
-        buf->priv.x11.xlib.gcm = NULL;
-     }
-   buf->priv.x11.xlib.mask = mask;
-   if (buf->priv.x11.xlib.mask)
-     buf->priv.x11.xlib.gcm = XCreateGC(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.mask, 0, &gcv);
-}
-
-void
-evas_software_xlib_outbuf_debug_set(Outbuf * buf, int debug)
-{
-   buf->priv.debug = debug;
-}
-
-void
-evas_software_xlib_outbuf_debug_show(Outbuf * buf, Drawable draw, int x, int y, int w,
-                               int h)
-{
-   int                 i;
-   int                 screen_num = 0;
-
-     {
-        int                 wx, wy;
-        unsigned int        ww, wh, bd, dp;
-        Window              wdum, root;
-        XWindowAttributes   wattr;
-
-        XGetGeometry(buf->priv.x11.xlib.disp, draw, &root, &wx, &wy, &ww, &wh, &bd, &dp);
-        XGetGeometry(buf->priv.x11.xlib.disp, root, &wdum, &wx, &wy, &ww, &wh, &bd, &dp);
-        XGetWindowAttributes(buf->priv.x11.xlib.disp, root, &wattr);
-        screen_num = XScreenNumberOfScreen(wattr.screen);
-     }
-   for (i = 0; i < 20; i++)
-     {
-        XSetForeground(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gc,
-                       BlackPixel(buf->priv.x11.xlib.disp, screen_num));
-        XFillRectangle(buf->priv.x11.xlib.disp, draw, buf->priv.x11.xlib.gc, x, y, w, h);
-        XSync(buf->priv.x11.xlib.disp, False);
-        XSync(buf->priv.x11.xlib.disp, False);
-        XSetForeground(buf->priv.x11.xlib.disp, buf->priv.x11.xlib.gc,
-                       WhitePixel(buf->priv.x11.xlib.disp, screen_num));
-        XFillRectangle(buf->priv.x11.xlib.disp, draw, buf->priv.x11.xlib.gc, x, y, w, h);
-        XSync(buf->priv.x11.xlib.disp, False);
-        XSync(buf->priv.x11.xlib.disp, False);
-     }
-}
-
-Eina_Bool
-evas_software_xlib_outbuf_alpha_get(Outbuf *buf)
-{
-   return buf->priv.x11.xlib.mask;
-}
-
-#ifdef EVAS_FRAME_QUEUING
-void
-evas_software_xlib_outbuf_set_priv(Outbuf *buf, void *cur, void *prev __UNUSED__)
-{
-   buf->priv.pending_writes = (Eina_List *)cur;
-}
-#endif
diff --git a/libraries/evas/src/modules/engines/software_x11/evas_xlib_outbuf.h b/libraries/evas/src/modules/engines/software_x11/evas_xlib_outbuf.h
deleted file mode 100644
index d70eb8d..0000000
--- a/libraries/evas/src/modules/engines/software_x11/evas_xlib_outbuf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef EVAS_XLIB_OUTBUF_H
-#define EVAS_XLIB_OUTBUF_H
-
-
-#include "evas_engine.h"
-
-
-void         evas_software_xlib_outbuf_init (void);
-
-void         evas_software_xlib_outbuf_free (Outbuf *buf);
-
-Outbuf      *evas_software_xlib_outbuf_setup_x (int          w,
-                                                int          h,
-                                                int          rot,
-                                                Outbuf_Depth depth,
-                                                Display     *disp,
-                                                Drawable     draw,
-                                                Visual      *vis,
-                                                Colormap     cmap,
-                                                int          x_depth,
-                                                int          grayscale,
-                                                int          max_colors,
-                                                Pixmap       mask,
-                                                int          shape_dither,
-                                                int          destination_alpha);
-
-
-RGBA_Image  *evas_software_xlib_outbuf_new_region_for_update (Outbuf *buf,
-                                                              int     x,
-                                                              int     y,
-                                                              int     w,
-                                                              int     h,
-                                                              int    *cx,
-                                                              int    *cy,
-                                                              int    *cw,
-                                                              int    *ch);
-
-void         evas_software_xlib_outbuf_free_region_for_update (Outbuf     *buf,
-                                                               RGBA_Image *update);
-
-void         evas_software_xlib_outbuf_flush (Outbuf *buf);
-
-void         evas_software_xlib_outbuf_idle_flush (Outbuf *buf);
-
-void         evas_software_xlib_outbuf_push_updated_region (Outbuf     *buf,
-                                                            RGBA_Image *update,
-                                                            int         x,
-                                                            int         y,
-                                                            int         w,
-                                                            int         h);
-
-void         evas_software_xlib_outbuf_reconfigure (Outbuf      *buf,
-                                                    int          w,
-                                                    int          h,
-                                                    int          rot,
-                                                    Outbuf_Depth depth);
-
-int          evas_software_xlib_outbuf_get_width (Outbuf *buf);
-
-int          evas_software_xlib_outbuf_get_height (Outbuf *buf);
-
-Outbuf_Depth evas_software_xlib_outbuf_get_depth (Outbuf *buf);
-
-int          evas_software_xlib_outbuf_get_rot (Outbuf *buf);
-
-void         evas_software_xlib_outbuf_drawable_set (Outbuf  *buf,
-                                                     Drawable draw);
-
-void         evas_software_xlib_outbuf_mask_set (Outbuf *buf,
-                                                 Pixmap mask);
-
-void         evas_software_xlib_outbuf_rotation_set (Outbuf *buf,
-                                                     int     rot);
-
-void         evas_software_xlib_outbuf_debug_set (Outbuf *buf,
-                                                  int     debug);
-
-void         evas_software_xlib_outbuf_debug_show (Outbuf  *buf,
-                                                   Drawable draw,
-                                                   int      x,
-                                                   int      y,
-                                                   int      w,
-                                                   int      h);
-
-Eina_Bool    evas_software_xlib_outbuf_alpha_get (Outbuf *buf);
-#ifdef EVAS_FRAME_QUEUING
-void         evas_software_xlib_outbuf_set_priv (Outbuf *buf,
-                                                  void *cur,
-                                                  void *prev);
-#endif
-
-#endif
diff --git a/libraries/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h b/libraries/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
deleted file mode 100644
index 92ffe25..0000000
--- a/libraries/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _EVAS_ENGINE_WAYLAND_EGL_H
-#define _EVAS_ENGINE_WAYLAND_EGL_H
-
-#include <wayland-client.h>
-
-typedef struct _Evas_Engine_Info_Wayland_Egl Evas_Engine_Info_Wayland_Egl;
-
-struct _Evas_Engine_Info_Wayland_Egl
-{
-   /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
-   /* at you and make nasty noises */
-   Evas_Engine_Info magic;
-
-   /* engine specific data & parameters it needs to set up */
-   struct {
-      struct wl_display *display;
-      struct wl_surface *surface;
-      int          depth;
-      int          screen;
-      int          rotation;
-      unsigned int destination_alpha  : 1;
-   } info;
-   /* engine specific function calls to query stuff about the destination */
-   /* engine (what visual & colormap & depth to use, performance info etc. */
-   struct {
-      int       (*best_depth_get)    (Evas_Engine_Info_Wayland_Egl *einfo);
-   } func;
-
-   struct {
-      void      (*pre_swap)          (void *data, Evas *e);
-      void      (*post_swap)         (void *data, Evas *e);
-
-      void       *data; // data for callback calls
-   } callback;
-
-   /* non-blocking or blocking mode */
-   Evas_Engine_Render_Mode render_mode;
-
-   unsigned char vsync : 1; // does nothing right now
-   unsigned char indirect : 1; // use indirect rendering
-};
-#endif
diff --git a/libraries/evas/src/modules/engines/wayland_egl/Makefile.am b/libraries/evas/src/modules/engines/wayland_egl/Makefile.am
deleted file mode 100644
index 9234b33..0000000
--- a/libraries/evas/src/modules/engines/wayland_egl/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@evas_engine_wayland_egl_cflags@
-
-if BUILD_ENGINE_WAYLAND_EGL
-
-WAYLAND_EGL_SOURCES  = \
-evas_engine.c \
-evas_wl_main.c
-
-WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-
-includes_HEADERS = Evas_Engine_Wayland_Egl.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_WAYLAND_EGL
-
-pkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
-module_la_LIBADD = $(WAYLAND_EGL_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_wayland_egl.la
-
-libevas_engine_wayland_egl_la_SOURCES = $(WAYLAND_EGL_SOURCES)
-libevas_engine_wayland_egl_la_LIBADD = $(WAYLAND_EGL_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = evas_engine.h
diff --git a/libraries/evas/src/modules/engines/wayland_egl/Makefile.in b/libraries/evas/src/modules/engines/wayland_egl/Makefile.in
deleted file mode 100644
index 90aa36b..0000000
--- a/libraries/evas/src/modules/engines/wayland_egl/Makefile.in
+++ /dev/null
@@ -1,816 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/wayland_egl
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_TRUE@libevas_engine_wayland_egl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_wayland_egl_la_SOURCES_DIST = evas_engine.c \
-        evas_wl_main.c
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@ evas_wl_main.lo
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_TRUE@am_libevas_engine_wayland_egl_la_OBJECTS = $(am__objects_1)
-libevas_engine_wayland_egl_la_OBJECTS =  \
-        $(am_libevas_engine_wayland_egl_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_TRUE@am_libevas_engine_wayland_egl_la_rpath =
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@    $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_wl_main.c
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@ module_la-evas_engine.lo \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@ module_la-evas_wl_main.lo
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@    $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_wayland_egl_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_wayland_egl_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Wayland_Egl.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines/gl_common \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GL_EET_CFLAGS@ \
-@evas_engine_wayland_egl_cflags@
-
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@WAYLAND_EGL_SOURCES = \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@evas_engine.c \
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@evas_wl_main.c
-
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@includes_HEADERS = Evas_Engine_Wayland_Egl.h
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@pkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@module_la_LIBADD = $(WAYLAND_EGL_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_TRUE@noinst_LTLIBRARIES = libevas_engine_wayland_egl.la
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_TRUE@libevas_engine_wayland_egl_la_SOURCES = $(WAYLAND_EGL_SOURCES)
-@BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_TRUE@libevas_engine_wayland_egl_la_LIBADD = $(WAYLAND_EGL_LIBADD)
-EXTRA_DIST = evas_engine.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/wayland_egl/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/wayland_egl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_wayland_egl.la: $(libevas_engine_wayland_egl_la_OBJECTS) $(libevas_engine_wayland_egl_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_wayland_egl_la_rpath) $(libevas_engine_wayland_egl_la_OBJECTS) $(libevas_engine_wayland_egl_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_wl_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_wl_main.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_wl_main.lo: evas_wl_main.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wl_main.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wl_main.Tpo -c -o module_la-evas_wl_main.lo `test -f 'evas_wl_main.c' || echo '$(srcdir)/'`evas_wl_main.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wl_main.Tpo $(DEPDIR)/module_la-evas_wl_main.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_wl_main.c' object='module_la-evas_wl_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wl_main.lo `test -f 'evas_wl_main.c' || echo '$(srcdir)/'`evas_wl_main.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c b/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c
deleted file mode 100644
index 4f5102e..0000000
--- a/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c
+++ /dev/null
@@ -1,3032 +0,0 @@
-#include "evas_common.h" /* Also includes international specific stuff */
-#include "evas_engine.h"
-
-#ifdef HAVE_DLSYM
-# include <dlfcn.h>      /* dlopen,dlclose,etc */
-#else
-# error gl_x11 should not get compiled if dlsym is not found on the system!
-#endif
-
-#define EVAS_GL_NO_GL_H_CHECK 1
-#include "Evas_GL.h"
-
-typedef struct _Render_Engine               Render_Engine;
-typedef struct _Render_Engine_GL_Surface    Render_Engine_GL_Surface;
-typedef struct _Render_Engine_GL_Context    Render_Engine_GL_Context;
-typedef struct _Render_Engine_GL_Resource   Render_Engine_GL_Resource;
-typedef struct _Extension_Entry             Extension_Entry;
-
-struct _Render_Engine
-{
-   Evas_GL_Wl_Window      *win;
-   Evas_Engine_Info_Wayland_Egl *info;
-   Evas                    *evas;
-   Tilebuf                 *tb;
-   int                      end;
-   int w, h;
-   int vsync;
-};
-
-struct _Render_Engine_GL_Surface
-{
-   int      initialized;
-   int      fbo_attached;
-   int      w, h;
-   int      depth_bits;
-   int      stencil_bits;
-
-   // Render target texture/buffers
-   GLuint   rt_tex;
-   GLint    rt_internal_fmt;
-   GLenum   rt_fmt;
-   GLuint   rb_depth;
-   GLenum   rb_depth_fmt;
-   GLuint   rb_stencil;
-   GLenum   rb_stencil_fmt;
-
-   Render_Engine_GL_Context   *current_ctx;
-};
-
-struct _Render_Engine_GL_Context
-{
-   int         initialized;
-   EGLContext  context;
-   GLuint      context_fbo;
-   GLuint      current_fbo;
-
-   Render_Engine_GL_Surface   *current_sfc;
-};
-
-// Resources used per thread
-struct _Render_Engine_GL_Resource
-{
-   // Resource context/surface per Thread in TLS for evasgl use 
-   EGLContext context;
-   EGLSurface surface;
-};
-
-// Extension Handling
-struct _Extension_Entry
-{
-   const char *name;
-   const char *real_name;
-   int supported;
-};
-
-static int initted = 0;
-static int gl_wins = 0;
-static Render_Engine_GL_Context *current_evgl_ctx;
-static Render_Engine *current_engine;
-
-static char _gl_ext_string[1024];
-static char _evasgl_ext_string[1024];
-
-// Resource context/surface per Thread in TLS for evasgl use 
-static Eina_TLS   resource_key;
-static Eina_List *resource_list;
-LK(resource_lock);
-
-typedef void            (*_eng_fn) (void);
-typedef _eng_fn         (*glsym_func_eng_fn) ();
-typedef void            (*glsym_func_void) ();
-typedef void           *(*glsym_func_void_ptr) ();
-typedef int             (*glsym_func_int) ();
-typedef unsigned int    (*glsym_func_uint) ();
-typedef unsigned char   (*glsym_func_uchar) ();
-typedef unsigned char  *(*glsym_func_uchar_ptr) ();
-typedef const char     *(*glsym_func_const_char_ptr) ();
-
-#ifndef EGL_NATIVE_PIXMAP_KHR
-# define EGL_NATIVE_PIXMAP_KHR 0x30b0
-#endif
-_eng_fn  (*glsym_eglGetProcAddress)            (const char *a) = NULL;
-void     (*glsym_eglBindTexImage)              (EGLDisplay a, EGLSurface b, int c) = NULL;
-void     (*glsym_eglReleaseTexImage)           (EGLDisplay a, EGLSurface b, int c) = NULL;
-void    *(*glsym_eglCreateImage)               (EGLDisplay a, EGLContext b, EGLenum c, EGLClientBuffer d, const int *e) = NULL;
-void     (*glsym_eglDestroyImage)              (EGLDisplay a, void *b) = NULL;
-void     (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b)  = NULL;
-void     (*glsym_glEGLImageTargetRenderbufferStorageOES) (int a, void *b)  = NULL;
-void          *(*glsym_eglMapImageSEC)         (void *a, void *b) = NULL;
-unsigned int   (*glsym_eglUnmapImageSEC)       (void *a, void *b) = NULL;
-const char    *(*glsym_eglQueryString)         (EGLDisplay a, int name) = NULL;
-
-unsigned int   (*glsym_eglLockSurface)          (EGLDisplay a, EGLSurface b, const int *attrib_list) = NULL;
-unsigned int   (*glsym_eglUnlockSurface)        (EGLDisplay a, EGLSurface b) = NULL;
-
-// GLES2 Extensions
-void    (*glsym_glGetProgramBinaryOES) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary) = NULL;
-void    (*glsym_glProgramBinaryOES) (GLuint program, GLenum binaryFormat, const void *binary, GLint length) = NULL;
-void*   (*glsym_glMapBufferOES) (GLenum target, GLenum access) = NULL;
-unsigned char   (*glsym_glUnmapBufferOES) (GLenum target) = NULL;
-void    (*glsym_glGetBufferPointervOES) (GLenum target, GLenum pname, void** params) = NULL;
-void    (*glsym_glTexImage3DOES) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels) = NULL;
-void    (*glsym_glTexSubImage3DOES) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels) = NULL;
-void    (*glsym_glCopyTexSubImage3DOES) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
-void    (*glsym_glCompressedTexImage3DOES) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data) = NULL;
-void    (*glsym_glCompressedTexSubImage3DOES) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data) = NULL;
-void    (*glsym_glFramebufferTexture3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) = NULL;
-void    (*glsym_glGetPerfMonitorGroupsAMD) (GLint* numGroups, GLsizei groupsSize, GLuint* groups) = NULL;
-void    (*glsym_glGetPerfMonitorCountersAMD) (GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters) = NULL;
-void    (*glsym_glGetPerfMonitorGroupStringAMD) (GLuint group, GLsizei bufSize, GLsizei* length, char* groupString) = NULL;
-void    (*glsym_glGetPerfMonitorCounterStringAMD) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, char* counterString) = NULL;
-void    (*glsym_glGetPerfMonitorCounterInfoAMD) (GLuint group, GLuint counter, GLenum pname, void* data) = NULL;
-void    (*glsym_glGenPerfMonitorsAMD) (GLsizei n, GLuint* monitors) = NULL;
-void    (*glsym_glDeletePerfMonitorsAMD) (GLsizei n, GLuint* monitors) = NULL;
-void    (*glsym_glSelectPerfMonitorCountersAMD) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* countersList) = NULL;
-void    (*glsym_glBeginPerfMonitorAMD) (GLuint monitor) = NULL;
-void    (*glsym_glEndPerfMonitorAMD) (GLuint monitor) = NULL;
-void    (*glsym_glGetPerfMonitorCounterDataAMD) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint* bytesWritten) = NULL;
-void    (*glsym_glDiscardFramebufferEXT) (GLenum target, GLsizei numAttachments, const GLenum* attachments) = NULL;
-void    (*glsym_glMultiDrawArraysEXT) (GLenum mode, GLint* first, GLsizei* count, GLsizei primcount) = NULL;
-void    (*glsym_glMultiDrawElementsEXT) (GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount) = NULL;
-void    (*glsym_glDeleteFencesNV) (GLsizei n, const GLuint* fences) = NULL;
-void    (*glsym_glGenFencesNV) (GLsizei n, GLuint* fences) = NULL;
-unsigned char   (*glsym_glIsFenceNV) (GLuint fence) = NULL;
-unsigned char   (*glsym_glTestFenceNV) (GLuint fence) = NULL;
-void    (*glsym_glGetFenceivNV) (GLuint fence, GLenum pname, GLint* params) = NULL;
-void    (*glsym_glFinishFenceNV) (GLuint fence) = NULL;
-void    (*glsym_glSetFenceNV) (GLuint, GLenum) = NULL;
-void    (*glsym_glGetDriverControlsQCOM) (GLint* num, GLsizei size, GLuint* driverControls) = NULL;
-void    (*glsym_glGetDriverControlStringQCOM) (GLuint driverControl, GLsizei bufSize, GLsizei* length, char* driverControlString) = NULL;
-void    (*glsym_glEnableDriverControlQCOM) (GLuint driverControl) = NULL;
-void    (*glsym_glDisableDriverControlQCOM) (GLuint driverControl) = NULL;
-void    (*glsym_glExtGetTexturesQCOM) (GLuint* textures, GLint maxTextures, GLint* numTextures) = NULL;
-void    (*glsym_glExtGetBuffersQCOM) (GLuint* buffers, GLint maxBuffers, GLint* numBuffers) = NULL;
-void    (*glsym_glExtGetRenderbuffersQCOM) (GLuint* renderbuffers, GLint maxRenderbuffers, GLint* numRenderbuffers) = NULL;
-void    (*glsym_glExtGetFramebuffersQCOM) (GLuint* framebuffers, GLint maxFramebuffers, GLint* numFramebuffers) = NULL;
-void    (*glsym_glExtGetTexLevelParameterivQCOM) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint* params) = NULL;
-void    (*glsym_glExtTexObjectStateOverrideiQCOM) (GLenum target, GLenum pname, GLint param) = NULL;
-void    (*glsym_glExtGetTexSubImageQCOM) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void* texels) = NULL;
-void    (*glsym_glExtGetBufferPointervQCOM) (GLenum target, void** params) = NULL;
-void    (*glsym_glExtGetShadersQCOM) (GLuint* shaders, GLint maxShaders, GLint* numShaders) = NULL;
-void    (*glsym_glExtGetProgramsQCOM) (GLuint* programs, GLint maxPrograms, GLint* numPrograms) = NULL;
-unsigned char   (*glsym_glExtIsProgramBinaryQCOM) (GLuint program) = NULL;
-void    (*glsym_glExtGetProgramBinarySourceQCOM) (GLuint program, GLenum shadertype, char* source, GLint* length) = NULL;
-
-
-//------ GLES 2.0 Extensions supported in EvasGL -----//
-static Extension_Entry _gl_ext_entries[] = {
-       //--- Function Extensions ---//
-       { "GL_OES_get_program_binary", "get_program_binary", 0 },
-       { "GL_OES_mapbuffer", "mapbuffer", 0 },
-       { "GL_OES_texture_3D", "texture_3D", 0 },
-       { "AMD_performance_monitor", "AMD_performance_monitor", 0 },
-       { "GL_EXT_discard_framebuffer", "discard_framebuffer", 0 },
-       { "GL_EXT_multi_draw_arrays", "multi_draw_arrays", 0 },
-       { "GL_NV_fence", "NV_fence", 0 },
-       { "GL_QCOM_driver_control", "QCOM_driver_control", 0 },
-       { "GL_QCOM_extended_get", "QCOM_extended_get", 0 },
-       { "GL_QCOM_extended_get2", "QCOM_extended_get2", 0 },
-
-       //--- Define Extensions ---//
-       { "GL_OES_compressed_ETC1_RGB8_texture", "compressed_ETC1_RGB8_texture", 0 },
-       { "GL_OES_compressed_paletted_texture", "compressed_paletted_texture", 0 },
-       { "GL_OES_depth24", "depth24", 0 },
-       { "GL_OES_depth32", "depth32", 0 },
-       { "GL_OES_EvasGL_image", "EGL_image", 0 },
-       { "GL_OES_packed_depth_stencil", "packed_depth_stencil", 0 },
-       { "GL_OES_rgb8_rgba8", "rgb8_rgba8", 0 },
-       { "GL_OES_standard_derivatives", "standard_derivatives", 0 },
-       { "GL_OES_stencil1", "stencil1", 0 },
-       { "GL_OES_stencil4", "stencil4", 0 },
-       { "GL_OES_texture_float", "texture_float", 0 },
-       { "GL_OES_texture_half_float", "texture_half_float", 0 },
-       { "GL_OES_texture_half_float_linear", "texture_half_float_linear", 0 },
-       { "GL_OES_texture_npot", "texture_npot", 0 },
-       { "GL_OES_vertex_half_float", "vertex_half_float", 0 },
-       { "GL_OES_vertex_type_10_10_10_2", "vertex_type_10_10_10_2", 0 },
-       { "GL_AMD_compressed_3DC_texture", "compressed_3DC_texture", 0 },
-       { "GL_AMD_compressed_ATC_texture", "compressed_ATC_texture", 0 },
-       { "GL_AMD_program_binary_Z400", "program_binary_Z400", 0 },
-       { "GL_EXT_blend_minmax", "blend_minmax", 0 },
-       { "GL_EXT_read_format_bgra", "read_format_bgra", 0 },
-       { "GL_EXT_texture_filter_anisotropic", "texture_filter_anisotrophic", 0 },
-       { "GL_EXT_texture_format_BGRA8888", "texture_format_BGRA8888", 0 },
-       { "GL_EXT_texture_type_2_10_10_10_REV", "texture_type_2_10_10_10_rev", 0 },
-       { "GL_IMG_program_binary", "IMG_program_binary", 0 },
-       { "GL_IMG_read_format", "IMG_read_format", 0 },
-       { "GL_IMG_shader_binary", "IMG_shader_binary", 0 },
-       { "GL_IMG_texture_compression_pvrtc", "IMG_texture_compression_pvrtc", 0 },
-       { "GL_QCOM_perfmon_global_mode", "QCOM_perfmon_global_mode", 0 },
-       { "GL_QCOM_writeonly_rendering", "QCOM_writeonly_rendering", 0 },
-       { NULL, NULL, 0}
-};
-
-//------ Extensions supported in EvasGL -----//
-static Extension_Entry _evasgl_ext_entries[] = {
-       { "EvasGL_KHR_image", "EGL_KHR_image", 0 },
-       { "EvasGL_KHR_vg_parent_image", "EGL_KHR_vg_parent_image", 0 },
-       { "EvasGL_KHR_gl_texture_2D_image", "EGL_KHR_gl_texture_2D_image", 0 },
-       { "EvasGL_KHR_gl_texture_cubemap_image", "EGL_KHR_gl_texture_cubemap_image", 0 },
-       { "EvasGL_KHR_gl_texture_3D_image", "EGL_KHR_gl_texture_3D_image", 0 },
-       { "EvasGL_KHR_gl_renderbuffer_image", "EGL_KHR_gl_renderbuffer_image", 0 },
-       { NULL, NULL, 0 }
-};
-
-static void
-_sym_init(void)
-{
-   static int done = 0;
-
-   if (done) return;
-
-#define FINDSYM(dst, sym, typ) \
-   if ((!dst) && (glsym_eglGetProcAddress)) dst = (typ)glsym_eglGetProcAddress(sym); \
-   if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
-
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB", glsym_func_eng_fn);
-   FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressKHR", glsym_func_eng_fn);
-
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImage", glsym_func_void);
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImageEXT", glsym_func_void);
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImageARB", glsym_func_void);
-   FINDSYM(glsym_eglBindTexImage, "eglBindTexImageKHR", glsym_func_void);
-
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImage", glsym_func_void);
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImageEXT", glsym_func_void);
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImageARB", glsym_func_void);
-   FINDSYM(glsym_eglReleaseTexImage, "eglReleaseTexImageKHR", glsym_func_void);
-
-   FINDSYM(glsym_eglCreateImage, "eglCreateImage", glsym_func_void_ptr);
-   FINDSYM(glsym_eglCreateImage, "eglCreateImageEXT", glsym_func_void_ptr);
-   FINDSYM(glsym_eglCreateImage, "eglCreateImageARB", glsym_func_void_ptr);
-   FINDSYM(glsym_eglCreateImage, "eglCreateImageKHR", glsym_func_void_ptr);
-
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImage", glsym_func_void);
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImageEXT", glsym_func_void);
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImageARB", glsym_func_void);
-   FINDSYM(glsym_eglDestroyImage, "eglDestroyImageKHR", glsym_func_void);
-
-   FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", glsym_func_void);
-
-   FINDSYM(glsym_glEGLImageTargetRenderbufferStorageOES, "glEGLImageTargetRenderbufferStorageOES", glsym_func_void);
-
-   FINDSYM(glsym_eglMapImageSEC, "eglMapImageSEC", glsym_func_void_ptr);
-   FINDSYM(glsym_eglUnmapImageSEC, "eglUnmapImageSEC", glsym_func_uint);
-
-   FINDSYM(glsym_eglQueryString, "eglQueryString", glsym_func_const_char_ptr);
-
-   FINDSYM(glsym_eglLockSurface, "eglLockSurface", glsym_func_uint);
-   FINDSYM(glsym_eglLockSurface, "eglLockSurfaceEXT", glsym_func_uint);
-   FINDSYM(glsym_eglLockSurface, "eglLockSurfaceARB", glsym_func_uint);
-   FINDSYM(glsym_eglLockSurface, "eglLockSurfaceKHR", glsym_func_uint);
-
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurface", glsym_func_uint);
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurfaceEXT", glsym_func_uint);
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurfaceARB", glsym_func_uint);
-   FINDSYM(glsym_eglUnlockSurface, "eglUnlockSurfaceKHR", glsym_func_uint);
-
-   //----------- GLES 2.0 Extensions ------------//
-   // If the symbol's not found, they get set to NULL
-   // If one of the functions in the extension exists, the extension in supported
-   /* GL_OES_get_program_binary */
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glGetProgramBinaryOES, "glGetProgramBinaryOES", glsym_func_void);
-
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinary", glsym_func_void);
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinaryEXT", glsym_func_void);
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinaryARB", glsym_func_void);
-   FINDSYM(glsym_glProgramBinaryOES, "glProgramBinaryOES", glsym_func_void);
-
-   // Check the first function to see if the extension is supported...
-   if (glsym_glGetProgramBinaryOES) _gl_ext_entries[0].supported = 1;
-
-   /* GL_OES_mapbuffer */
-   FINDSYM(glsym_glMapBufferOES, "glMapBuffer", glsym_func_void_ptr);
-   FINDSYM(glsym_glMapBufferOES, "glMapBufferEXT", glsym_func_void_ptr);
-   FINDSYM(glsym_glMapBufferOES, "glMapBufferARB", glsym_func_void_ptr);
-   FINDSYM(glsym_glMapBufferOES, "glMapBufferOES", glsym_func_void_ptr);
-
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBuffer", glsym_func_uchar);
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBufferEXT", glsym_func_uchar);
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBufferARB", glsym_func_uchar);
-   FINDSYM(glsym_glUnmapBufferOES, "glUnmapBufferOES", glsym_func_uchar);
-
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointerv", glsym_func_void);
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointervEXT", glsym_func_void);
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointervARB", glsym_func_void);
-   FINDSYM(glsym_glGetBufferPointervOES, "glGetBufferPointervOES", glsym_func_void);
-
-   if (glsym_glMapBufferOES) _gl_ext_entries[1].supported = 1;
-
-   /* GL_OES_texture_3D */
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3D", glsym_func_void);
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glTexImage3DOES, "glTexImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3D", glsym_func_void);
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glTexSubImage3DOES, "glTexSubImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3D", glsym_func_void);
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glCopyTexSubImage3DOES, "glCopyTexSubImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3D", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexImage3DOES, "glCompressedTexImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3D", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3DARB", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3DEXT", glsym_func_void);
-   FINDSYM(glsym_glCompressedTexSubImage3DOES, "glCompressedTexSubImage3DOES", glsym_func_void);
-
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3D", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3DARB", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3DEXT", glsym_func_void);
-   FINDSYM(glsym_glFramebufferTexture3DOES, "glFramebufferTexture3DOES", glsym_func_void);
-
-   if (glsym_glTexSubImage3DOES) _gl_ext_entries[2].supported = 1;
-
-   /* AMD_performance_monitor */
-   FINDSYM(glsym_glGetPerfMonitorGroupsAMD, "glGetPerfMonitorGroupsAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCountersAMD, "glGetPerfMonitorCountersAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorGroupStringAMD, "glGetPerfMonitorGroupStringAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCounterStringAMD, "glGetPerfMonitorCounterStringAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCounterInfoAMD, "glGetPerfMonitorCounterInfoAMD", glsym_func_void);
-   FINDSYM(glsym_glGenPerfMonitorsAMD, "glGenPerfMonitorsAMD", glsym_func_void);
-   FINDSYM(glsym_glDeletePerfMonitorsAMD, "glDeletePerfMonitorsAMD", glsym_func_void);
-   FINDSYM(glsym_glSelectPerfMonitorCountersAMD, "glSelectPerfMonitorCountersAMD", glsym_func_void);
-   FINDSYM(glsym_glBeginPerfMonitorAMD, "glBeginPerfMonitorAMD", glsym_func_void);
-   FINDSYM(glsym_glEndPerfMonitorAMD, "glEndPerfMonitorAMD", glsym_func_void);
-   FINDSYM(glsym_glGetPerfMonitorCounterDataAMD, "glGetPerfMonitorCounterDataAMD", glsym_func_void);
-
-   if (glsym_glGetPerfMonitorGroupsAMD) _gl_ext_entries[3].supported = 1;
-
-   /* GL_EXT_discard_framebuffer */
-   FINDSYM(glsym_glDiscardFramebufferEXT, "glDiscardFramebuffer", glsym_func_void);
-   FINDSYM(glsym_glDiscardFramebufferEXT, "glDiscardFramebufferARB", glsym_func_void);
-   FINDSYM(glsym_glDiscardFramebufferEXT, "glDiscardFramebufferEXT", glsym_func_void);
-
-   if (glsym_glDiscardFramebufferEXT) _gl_ext_entries[4].supported = 1;
-
-   /* GL_EXT_multi_draw_arrays */
-   FINDSYM(glsym_glMultiDrawArraysEXT, "glMultiDrawArrays", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawArraysEXT, "glMultiDrawArraysARB", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawArraysEXT, "glMultiDrawArraysEXT", glsym_func_void);
-
-   FINDSYM(glsym_glMultiDrawElementsEXT, "glMultiDrawElements", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawElementsEXT, "glMultiDrawElementsARB", glsym_func_void);
-   FINDSYM(glsym_glMultiDrawElementsEXT, "glMultiDrawElementsEXT", glsym_func_void);
-
-   if (glsym_glMultiDrawArraysEXT) _gl_ext_entries[5].supported = 1;
-
-   /* GL_NV_fence */
-   FINDSYM(glsym_glDeleteFencesNV, "glDeleteFencesNV", glsym_func_void);
-   FINDSYM(glsym_glGenFencesNV, "glGenFencesNV", glsym_func_void);
-   FINDSYM(glsym_glIsFenceNV, "glIsFenceNV", glsym_func_uchar);
-   FINDSYM(glsym_glTestFenceNV, "glTestFenceNV", glsym_func_uchar);
-   FINDSYM(glsym_glGetFenceivNV, "glGetFenceivNV", glsym_func_void);
-   FINDSYM(glsym_glFinishFenceNV, "glFinishFenceNV", glsym_func_void);
-   FINDSYM(glsym_glSetFenceNV, "glSetFenceNV", glsym_func_void);
-
-   if (glsym_glDeleteFencesNV) _gl_ext_entries[6].supported = 1;
-
-   /* GL_QCOM_driver_control */
-   FINDSYM(glsym_glGetDriverControlsQCOM, "glGetDriverControlsQCOM", glsym_func_void);
-   FINDSYM(glsym_glGetDriverControlStringQCOM, "glGetDriverControlStringQCOM", glsym_func_void);
-   FINDSYM(glsym_glEnableDriverControlQCOM, "glEnableDriverControlQCOM", glsym_func_void);
-   FINDSYM(glsym_glDisableDriverControlQCOM, "glDisableDriverControlQCOM", glsym_func_void);
-
-   if (glsym_glGetDriverControlsQCOM) _gl_ext_entries[7].supported = 1;
-
-   /* GL_QCOM_extended_get */
-   FINDSYM(glsym_glExtGetTexturesQCOM, "glExtGetTexturesQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetBuffersQCOM, "glExtGetBuffersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetRenderbuffersQCOM, "glExtGetRenderbuffersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetFramebuffersQCOM, "glExtGetFramebuffersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetTexLevelParameterivQCOM, "glExtGetTexLevelParameterivQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtTexObjectStateOverrideiQCOM, "glExtTexObjectStateOverrideiQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetTexSubImageQCOM, "glExtGetTexSubImageQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetBufferPointervQCOM, "glExtGetBufferPointervQCOM", glsym_func_void);
-
-   if (glsym_glExtGetTexturesQCOM) _gl_ext_entries[8].supported = 1;
-
-   /* GL_QCOM_extended_get2 */
-   FINDSYM(glsym_glExtGetShadersQCOM, "glExtGetShadersQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtGetProgramsQCOM, "glExtGetProgramsQCOM", glsym_func_void);
-   FINDSYM(glsym_glExtIsProgramBinaryQCOM, "glExtIsProgramBinaryQCOM", glsym_func_uchar);
-   FINDSYM(glsym_glExtGetProgramBinarySourceQCOM, "glExtGetProgramBinarySourceQCOM", glsym_func_void);
-
-   if (glsym_glExtGetShadersQCOM) _gl_ext_entries[9].supported = 1;
-}
-
-static void
-_extensions_init(Render_Engine *re)
-{
-   int i;
-   const char *glexts, *evasglexts;
-
-   memset(_gl_ext_string, 0, 1024);
-   memset(_evasgl_ext_string, 0, 1024);
-
-   // GLES 2.0 Extensions
-   glexts = (const char*)glGetString(GL_EXTENSIONS);
-
-   DBG("--------GLES 2.0 Extensions--------");
-   for (i = 0; _gl_ext_entries[i].name != NULL; i++)
-     {
-        if ( (strstr(glexts, _gl_ext_entries[i].name) != NULL) ||
-             (strstr(glexts, _gl_ext_entries[i].real_name) != NULL) )
-          {
-             _gl_ext_entries[i].supported = 1;
-             strcat(_gl_ext_string, _gl_ext_entries[i].name);
-             strcat(_gl_ext_string, " ");
-             DBG("\t%s", _gl_ext_entries[i].name);
-          }
-
-     }
-   DBG(" ");
-
-   // EGL Extensions
-   evasglexts = glsym_eglQueryString(re->win->egl_disp, EGL_EXTENSIONS);
-
-   DBG("--------EvasGL Extensions----------");
-   for (i = 0; _evasgl_ext_entries[i].name != NULL; i++)
-     {
-        if ( (strstr(evasglexts, _evasgl_ext_entries[i].name) != NULL) ||
-             (strstr(evasglexts, _evasgl_ext_entries[i].real_name) != NULL) )
-          {
-             _evasgl_ext_entries[i].supported = 1;
-             strcat(_evasgl_ext_string, _evasgl_ext_entries[i].name);
-             strcat(_evasgl_ext_string, " ");
-             DBG("\t%s", _evasgl_ext_entries[i].name);
-          }
-     }
-   DBG(" ");
-}
-
-int _evas_engine_wl_egl_log_dom = -1;
-
-/* function tables - filled in later (func and parent func) */
-static Evas_Func func, pfunc;
-
-/* Function table for GL APIs */
-static Evas_GL_API gl_funcs;
-
-static void *
-eng_info(Evas *e)
-{
-   Evas_Engine_Info_Wayland_Egl *info;
-
-   info = calloc(1, sizeof(Evas_Engine_Info_Wayland_Egl));
-   info->magic.magic = rand();
-   info->func.best_depth_get = eng_best_depth_get;
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-   return info;
-   e = NULL;
-}
-
-static void
-eng_info_free(Evas *e __UNUSED__, void *info)
-{
-   Evas_Engine_Info_Wayland_Egl *in;
-// dont free! why bother? its not worth it
-//   eina_log_domain_unregister(_evas_engine_GL_X11_log_dom);
-   in = (Evas_Engine_Info_Wayland_Egl *)info;
-   free(in);
-}
-
-static int
-_re_wincheck(Render_Engine *re)
-{
-   if (!re) return 0;
-   if (re->win->surf) return 1;
-   eng_window_resurf(re->win);
-   if (!re->win->surf)
-     {
-        ERR("GL engine can't re-create window surface!");
-     }
-   return 0;
-}
-
-static void
-_re_winfree(Render_Engine *re)
-{
-   if (!re->win->surf) return;
-   eng_window_unsurf(re->win);
-}
-
-static Render_Engine_GL_Resource *
-_create_internal_glue_resources(void *data)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Resource *rsc;
-
-   if (!(re = (Render_Engine *)data)) return NULL;
-
-   rsc = calloc(1, sizeof(Render_Engine_GL_Resource));
-   if (!rsc) return NULL;
-
-   // EGL
-   int context_attrs[3];
-   context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
-   context_attrs[1] = 2;
-   context_attrs[2] = EGL_NONE;
-
-   // Create resource surface for EGL
-   rsc->surface = 
-     eglCreateWindowSurface(re->win->egl_disp, re->win->egl_config,
-                            (EGLNativeWindowType)re->win->win, NULL);
-   if (!rsc->surface)
-     {
-        ERR("Creating internal resource surface failed.");
-        free(rsc);
-        return NULL;
-     }
-
-   // Create a resource context for EGL
-   rsc->context = 
-     eglCreateContext(re->win->egl_disp, re->win->egl_config,
-                      re->win->egl_context[0], context_attrs);
-   if (!rsc->context)
-     {
-        ERR("Internal Resource Context Creations Failed.");
-        free(rsc);
-        return NULL;
-     }
-
-   // Add to the resource resource list for cleanup
-   LKL(resource_lock);
-   resource_list = eina_list_prepend(resource_list, rsc);
-   LKU(resource_lock);
-
-   // Set the resource in TLS
-   if (eina_tls_set(resource_key, (void*)rsc) == EINA_FALSE)
-     {
-        ERR("Failed setting TLS Resource");
-        free(rsc);
-        return NULL;
-     }
-
-   return rsc;
-}
-
-static int
-_destroy_internal_glue_resources(void *data)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   Eina_List *l;
-   Render_Engine_GL_Resource *rsc;
-
-   // EGL
-   // Delete the Resources
-   LKL(resource_lock);
-   EINA_LIST_FOREACH(resource_list, l, rsc)
-     {
-        if (rsc->surface) eglDestroySurface(re->win->egl_disp, rsc->surface);
-        if (rsc->context) eglDestroyContext(re->win->egl_disp, rsc->context);
-        free(rsc);
-     }
-   eina_list_free(resource_list);
-   LKU(resource_lock);
-
-   // Destroy TLS
-   eina_tls_free(resource_key);
-
-   return 1;
-}
-
-static int
-eng_setup(Evas *e, void *in)
-{
-   Render_Engine *re;
-   Evas_Engine_Info_Wayland_Egl *info;
-
-   info = (Evas_Engine_Info_Wayland_Egl *)in;
-   if (!e->engine.data.output)
-     {
-        re = calloc(1, sizeof(Render_Engine));
-        if (!re) return 0;
-        re->info = info;
-        re->evas = e;
-        e->engine.data.output = re;
-        re->w = e->output.w;
-        re->h = e->output.h;
-
-        re->win = eng_window_new(re->info->info.display, 
-                                 re->info->info.surface, 
-                                 re->info->info.screen,
-                                 re->info->info.depth, re->w, re->h,
-                                 re->info->indirect,
-                                 re->info->info.destination_alpha,
-                                 re->info->info.rotation);
-        if (!re->win)
-          {
-             free(re);
-             e->engine.data.output = NULL;
-             return 0;
-          }
-
-        gl_wins++;
-        if (!initted)
-          {
-             evas_common_cpu_init();
-             evas_common_blend_init();
-             evas_common_image_init();
-             evas_common_convert_init();
-             evas_common_scale_init();
-             evas_common_rectangle_init();
-             evas_common_polygon_init();
-             evas_common_line_init();
-             evas_common_font_init();
-             evas_common_draw_init();
-             evas_common_tilebuf_init();
-
-             // Initialize TLS
-             if (eina_tls_new(&resource_key) == EINA_FALSE)
-               ERR("Error creating tls key");
-
-             DBG("TLS KEY create... %d", resource_key);
-
-             initted = 1;
-          }
-     }
-   else
-     {
-        if (!(re = e->engine.data.output)) return 0;
-        if (_re_wincheck(re))
-          {
-             if ((re->info->info.display != re->win->disp) ||
-                 (re->info->info.surface != re->win->surface) ||
-                 (re->info->info.screen != re->win->screen) ||
-                 (re->info->info.depth != re->win->depth) ||
-                 (re->info->info.destination_alpha != re->win->alpha) ||
-                 (re->info->info.rotation != re->win->rot))
-               {
-                  int inc = 0;
-
-                  /* if we already have a window surface, check for NULL input surface.
-                   * this will mean we are hiding the window and should destroy 
-                   * things properly */
-                  if ((re->win->surface) && (re->info->info.surface = NULL))
-                    {
-                       if (re->win)
-                         {
-                            eng_window_free(re->win);
-                            gl_wins--;
-                         }
-                       free(re);
-                       e->engine.data.output = NULL;
-                       return 0;
-                    }
-
-                  if (re->win)
-                    {
-                       re->win->gl_context->references++;
-                       eng_window_free(re->win);
-                       inc = 1;
-                       gl_wins--;
-                    }
-                  re->w = e->output.w;
-                  re->h = e->output.h;
-                  re->win = eng_window_new(re->info->info.display,
-                                           re->info->info.surface,
-                                           re->info->info.screen,
-                                           re->info->info.depth,
-                                           re->w, re->h,
-                                           re->info->indirect,
-                                           re->info->info.destination_alpha,
-                                           re->info->info.rotation);
-                  eng_window_use(re->win);
-                  if (re->win) gl_wins++;
-                  if ((re->win) && (inc))
-                     re->win->gl_context->references--;
-               }
-             else if ((re->win->w != e->output.w) ||
-                      (re->win->h != e->output.h))
-               {
-                  re->w = e->output.w;
-                  re->h = e->output.h;
-                  re->win->w = e->output.w;
-                  re->win->h = e->output.h;
-                  eng_window_use(re->win);
-                  evas_gl_common_context_resize(re->win->gl_context, 
-                                                re->win->w, re->win->h, 
-                                                re->win->rot);
-               }
-          }
-     }
-
-   if (!re->win)
-     {
-        free(re);
-        e->engine.data.output = NULL;
-        return 0;
-     }
-
-   if (!e->engine.data.output)
-     {
-        if (re->win)
-          {
-             eng_window_free(re->win);
-             gl_wins--;
-          }
-        free(re);
-        e->engine.data.output = NULL;
-        return 0;
-     }
-   re->tb = evas_common_tilebuf_new(re->win->w, re->win->h);
-   if (!re->tb)
-     {
-        if (re->win)
-          {
-             eng_window_free(re->win);
-             gl_wins--;
-          }
-        free(re);
-        e->engine.data.output = NULL;
-        return 0;
-     }
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-
-   if (!e->engine.data.context)
-     {
-        e->engine.data.context =
-          e->engine.func->context_new(e->engine.data.output);
-     }
-
-   eng_window_use(re->win);
-
-   re->vsync = 0;
-   _sym_init();
-   _extensions_init(re);
-
-   // This is used in extensions.  Not pretty but can't get display otherwise.
-   current_engine = re;
-
-   return 1;
-}
-
-static void
-eng_output_free(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-
-   if (re)
-     {
-#if 0
-        // Destroy the resource surface
-        // Only required for EGL case
-        if (re->surface)
-           eglDestroySurface(re->win->egl_disp, re->surface);
-
-        // Destroy the resource context
-        _destroy_internal_context(re, context);
-#endif
-        if (re->win)
-          {
-             if ((initted == 1) && (gl_wins == 1))
-               _destroy_internal_glue_resources(re);
-             eng_window_free(re->win);
-             gl_wins--;
-          }
-        evas_common_tilebuf_free(re->tb);
-        free(re);
-     }
-   if ((initted == 1) && (gl_wins == 0))
-     {
-        evas_common_image_shutdown();
-        evas_common_font_shutdown();
-        initted = 0;
-     }
-}
-
-static void
-eng_output_resize(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   re->win->w = w;
-   re->win->h = h;
-   eng_window_use(re->win);
-
-   if (re->win->win)
-     wl_egl_window_resize(re->win->win, w, h, 0, 0);
-
-   evas_gl_common_context_resize(re->win->gl_context, w, h, re->win->rot);
-   evas_common_tilebuf_free(re->tb);
-   re->tb = evas_common_tilebuf_new(w, h);
-   if (re->tb)
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void
-eng_output_tile_size_set(void *data, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_resize(re->win->gl_context, re->win->w, re->win->h, re->win->rot);
-   evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-
-   RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, re->win->w, re->win->h);
-   if ((w <= 0) || (h <= 0)) return;
-   if (!re->win->draw.redraw)
-     {
-#if 1
-        re->win->draw.x1 = x;
-        re->win->draw.y1 = y;
-        re->win->draw.x2 = x + w - 1;
-        re->win->draw.y2 = y + h - 1;
-#else
-        re->win->draw.x1 = 0;
-        re->win->draw.y1 = 0;
-        re->win->draw.x2 = re->win->w - 1;
-        re->win->draw.y2 = re->win->h - 1;
-#endif
-     }
-   else
-     {
-        if (x < re->win->draw.x1) re->win->draw.x1 = x;
-        if (y < re->win->draw.y1) re->win->draw.y1 = y;
-        if ((x + w - 1) > re->win->draw.x2) re->win->draw.x2 = x + w - 1;
-        if ((y + h - 1) > re->win->draw.y2) re->win->draw.y2 = y + h - 1;
-     }
-   re->win->draw.redraw = 1;
-}
-
-static void
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void
-eng_output_redraws_clear(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_tilebuf_clear(re->tb);
-/*   re->win->draw.redraw = 0;*/
-//   INF("GL: finish update cycle!");
-}
-
-/* vsync games - not for now though */
-#define VSYNC_TO_SCREEN 1
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch)
-{
-   Render_Engine *re;
-   Tilebuf_Rect *rects;
-
-   re = (Render_Engine *)data;
-   /* get the upate rect surface - return engine data as dummy */
-   rects = evas_common_tilebuf_get_render_rects(re->tb);
-   if (rects)
-     {
-        evas_common_tilebuf_free_render_rects(rects);
-        evas_common_tilebuf_clear(re->tb);
-        eng_window_use(re->win);
-        if (!_re_wincheck(re)) return NULL;
-        evas_gl_common_context_flush(re->win->gl_context);
-        evas_gl_common_context_newframe(re->win->gl_context);
-        if (x) *x = 0;
-        if (y) *y = 0;
-        if (w) *w = re->win->w;
-        if (h) *h = re->win->h;
-        if (cx) *cx = 0;
-        if (cy) *cy = 0;
-        if (cw) *cw = re->win->w;
-        if (ch) *ch = re->win->h;
-        return re->win->gl_context->def_surface;
-     }
-   return NULL;
-}
-
-//#define FRAMECOUNT 1
-
-#ifdef FRAMECOUNT
-static double
-get_time(void)
-{
-   struct timeval timev;
-
-   gettimeofday(&timev, NULL);
-   return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000);
-}
-#endif
-
-static int safe_native = -1;
-
-static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
-{
-   Render_Engine *re;
-#ifdef FRAMECOUNT
-   static double pt = 0.0;
-   double ta, tb;
-#endif
-
-   re = (Render_Engine *)data;
-   /* put back update surface.. in this case just unflag redraw */
-   if (!_re_wincheck(re)) return;
-   re->win->draw.redraw = 0;
-   re->win->draw.drew = 1;
-   evas_gl_common_context_flush(re->win->gl_context);
-   if (safe_native == -1)
-     {
-        const char *s;
-
-        s = getenv("EVAS_GL_SAFE_NATIVE");
-        safe_native = 0;
-        if (s) 
-          safe_native = atoi(s);
-        else
-          {
-             s = (const char *)glGetString(GL_RENDERER);
-             if (s)
-               {
-                  if (strstr(s, "PowerVR SGX 540") || strstr(s, "Mali-400 MP"))
-                    safe_native = 1;
-               }
-          }
-     }
-   // this is needed to make sure all previous rendering is flushed to
-   // buffers/surfaces
-# ifdef FRAMECOUNT
-   double t0 = get_time();
-   ta = t0 - pt;
-   pt = t0;
-# endif
-   // previous rendering should be done and swapped
-   if (!safe_native) eglWaitNative(EGL_CORE_NATIVE_ENGINE);
-# ifdef FRAMECOUNT
-   double t1 = get_time();
-   tb = t1 - t0;
-   printf("... %1.5f -> %1.5f | ", ta, tb);
-# endif
-   if (eglGetError() != EGL_SUCCESS)
-     {
-        printf("Error:  eglWaitNative(EGL_CORE_NATIVE_ENGINE) fail.\n");
-     }
-}
-
-static void
-eng_output_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!_re_wincheck(re)) return;
-   if (!re->win->draw.drew) return;
-//x//   printf("frame -> flush\n");
-   re->win->draw.drew = 0;
-   eng_window_use(re->win);
-
-# ifdef FRAMECOUNT
-   double t0 = get_time();
-# endif
-
-   if (!re->vsync)
-     {
-        if (re->info->vsync) eglSwapInterval(re->win->egl_disp, 1);
-        else eglSwapInterval(re->win->egl_disp, 0);
-        re->vsync = 1;
-     }
-
-   if (re->info->callback.pre_swap)
-     re->info->callback.pre_swap(re->info->callback.data, re->evas);
-
-   eglSwapBuffers(re->win->egl_disp, re->win->egl_surface[0]);
-   if (!safe_native) eglWaitGL();
-
-   if (re->info->callback.post_swap)
-     re->info->callback.post_swap(re->info->callback.data, re->evas);
-
-   if (eglGetError() != EGL_SUCCESS)
-     printf("Error:  eglSwapBuffers() fail.\n");
-
-# ifdef FRAMECOUNT
-   double t1 = get_time();
-   printf("%1.5f\n", t1 - t0);
-# endif
-}
-
-static void
-eng_output_idle_flush(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-}
-
-static void
-eng_output_dump(void *data)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_image_image_all_unload();
-   evas_common_font_font_all_unload();
-   evas_gl_common_image_all_unload(re->win->gl_context);
-   _re_winfree(re);
-}
-
-static void
-eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-//   re->win->gl_context->dc = context;
-   evas_common_draw_context_add_cutout(context, x, y, w, h);
-}
-
-static void
-eng_context_cutout_clear(void *data __UNUSED__, void *context)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-//   re->win->gl_context->dc = context;
-   evas_common_draw_context_clear_cutouts(context);
-}
-
-static void
-eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_rect_draw(re->win->gl_context, x, y, w, h);
-}
-
-static void
-eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_line_draw(re->win->gl_context, x1, y1, x2, y2);
-}
-
-static void *
-eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_point_add(polygon, x, y);
-}
-
-static void *
-eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_poly_points_clear(polygon);
-}
-
-static void
-eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_poly_draw(re->win->gl_context, polygon, x, y);
-}
-
-static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return 1;
-   im = image;
-   return im->alpha;
-}
-
-static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return EVAS_COLORSPACE_ARGB8888;
-   im = image;
-   return im->cs.space;
-}
-
-static void
-eng_image_mask_create(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return;
-   im = image;
-   if (!im->im->image.data)
-      evas_cache_image_load_data(&im->im->cache_entry);
-   if (!im->tex)
-      im->tex = evas_gl_common_texture_new(im->gc, im->im);
-}
-
-
-static void *
-eng_image_alpha_set(void *data, void *image, int has_alpha)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->alpha == has_alpha) return image;
-   if (im->native.data)
-     {
-        im->alpha = has_alpha;
-        return image;
-     }
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        im->alpha = has_alpha;
-        im->tex->alpha = im->alpha;
-        return image;
-     }
-   /* FIXME: can move to gl_common */
-   if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
-   if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image;
-   else if ((!has_alpha) && (!im->im->cache_entry.flags.alpha)) return image;
-   if (im->references > 1)
-     {
-        Evas_GL_Image *im_new;
-
-        im_new = evas_gl_common_image_new_from_copied_data
-           (im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
-               im->im->image.data,
-               eng_image_alpha_get(data, image),
-               eng_image_colorspace_get(data, image));
-        if (!im_new) return im;
-        evas_gl_common_image_free(im);
-        im = im_new;
-     }
-   else
-     evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-   return evas_gl_common_image_alpha_set(im, has_alpha ? 1 : 0);
-//   im->im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
-//   return image;
-}
-
-static void *
-eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-   return image;
-}
-
-static void
-eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
-{
-//   Render_Engine *re;
-//
-//   re = (Render_Engine *)data;
-}
-
-static char *
-eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (!im->im) return NULL;
-   return im->im->info.comment;
-}
-
-static char *
-eng_image_format_get(void *data __UNUSED__, void *image)
-{
-//   Render_Engine *re;
-   Evas_GL_Image *im;
-
-//   re = (Render_Engine *)data;
-   im = image;
-   return NULL;
-}
-
-static void
-eng_image_colorspace_set(void *data, void *image, int cspace)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   im = image;
-   if (im->native.data) return;
-   /* FIXME: can move to gl_common */
-   if (im->cs.space == cspace) return;
-   eng_window_use(re->win);
-   evas_cache_image_colorspace(&im->im->cache_entry, cspace);
-   switch (cspace)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (im->cs.data)
-           {
-              if (!im->cs.no_free) free(im->cs.data);
-              im->cs.data = NULL;
-              im->cs.no_free = 0;
-           }
-         break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         if (im->tex) evas_gl_common_texture_free(im->tex);
-         im->tex = NULL;
-         if (im->cs.data)
-           {
-              if (!im->cs.no_free) free(im->cs.data);
-           }
-         if (im->im->cache_entry.h > 0)
-           im->cs.data =
-              calloc(1, im->im->cache_entry.h * sizeof(unsigned char *) * 2);
-         else
-           im->cs.data = NULL;
-         im->cs.no_free = 0;
-         break;
-      default:
-         abort();
-         break;
-     }
-   im->cs.space = cspace;
-}
-
-/////////////////////////////////////////////////////////////////////////
-//
-//
-typedef struct _Native Native;
-
-struct _Native
-{
-   Evas_Native_Surface ns;
-   struct wl_egl_pixmap *pixmap;
-
-   void *egl_surface;
-};
-
-// FIXME: this is enabled so updates happen - but its SLOOOOOOOOOOOOOOOW
-// (i am sure this is the reason)  not to mention seemingly superfluous. but
-// i need to enable it for it to work on fglrx at least. havent tried nvidia.
-//
-// why is this the case? does anyone know? has anyone tried it on other gfx
-// drivers?
-//
-//#define GLX_TEX_PIXMAP_RECREATE 1
-
-static void *
-eng_image_native_set(void *data, void *image, void *native)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   Evas_Native_Surface *ns = native;
-   Evas_GL_Image *im = image, *im2 = NULL;
-   Native *n = NULL;
-
-  if (!im)
-    {
-       if ((!ns) && (ns->type == EVAS_NATIVE_SURFACE_OPENGL))
-         {
-            im = evas_gl_common_image_new_from_data(re->win->gl_context,
-                                                    ns->data.opengl.w,
-                                                    ns->data.opengl.h,
-                                                    NULL, 1,
-                                                    EVAS_COLORSPACE_ARGB8888);
-         }
-       else
-           return NULL;
-    }
-
-  if (ns)
-    {
-       if (im->native.data) return im;
-    }
-  if ((!ns) && (!im->native.data)) return im;
-
-  eng_window_use(re->win);
-
-  if (im->native.data)
-    {
-      if (im->native.func.free)
-        im->native.func.free(im->native.func.data, im);
-      evas_gl_common_image_native_disable(im);
-    }
-
-  if (!ns) return im;
-
-   if (im2 == im) return im;
-   if (im2)
-     {
-        n = im2->native.data;
-        if (n)
-          {
-             evas_gl_common_image_ref(im2);
-             evas_gl_common_image_free(im);
-             return im2;
-          }
-     }
-
-   im2 = evas_gl_common_image_new_from_data(re->win->gl_context,
-                                            im->w, im->h, NULL, im->alpha,
-                                            EVAS_COLORSPACE_ARGB8888);
-   evas_gl_common_image_free(im);
-   im = im2;
-
-   return im;
-}
-
-static void *
-eng_image_native_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-   Native *n;
-
-   if (!(im = image)) return NULL;
-   if (!(n = im->native.data)) return NULL;
-   return &(n->ns);
-}
-
-#if 0 // filtering disabled
-static void
-eng_image_draw_filtered(void *data, void *context, void *surface,
-                        void *image, Evas_Filter_Info *filter)
-{
-   Render_Engine *re = data;
-
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-
-   evas_gl_common_filter_draw(re->win->gl_context, image, filter);
-}
-
-static Filtered_Image *
-eng_image_filtered_get(void *im, uint8_t *key, size_t keylen)
-{
-   return evas_gl_common_image_filtered_get(im, key, keylen);
-}
-
-static Filtered_Image *
-eng_image_filtered_save(void *im, void *fim, uint8_t *key, size_t keylen)
-{
-   return evas_gl_common_image_filtered_save(im, fim, key, keylen);
-}
-
-static void
-eng_image_filtered_free(void *im, Filtered_Image *fim)
-{
-   evas_gl_common_image_filtered_free(im, fim);
-}
-#endif
-
-static void *
-eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   *error = EVAS_LOAD_ERROR_NONE;
-   eng_window_use(re->win);
-   return evas_gl_common_image_load(re->win->gl_context, file, key, lo, error);
-}
-
-static void *
-eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   return evas_gl_common_image_new_from_data(re->win->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void *
-eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data, int alpha, int cspace)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   return evas_gl_common_image_new_from_copied_data(re->win->gl_context, w, h, image_data, alpha, cspace);
-}
-
-static void
-eng_image_free(void *data, void *image)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_image_free(image);
-}
-
-static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
-{
-   if (!image)
-     {
-        *w = 0;
-        *h = 0;
-        return;
-     }
-   if (w) *w = ((Evas_GL_Image *)image)->w;
-   if (h) *h = ((Evas_GL_Image *)image)->h;
-}
-
-static void *
-eng_image_size_set(void *data, void *image, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-   Evas_GL_Image *im_old;
-
-   re = (Render_Engine *)data;
-   if (!im) return NULL;
-   if (im->native.data)
-     {
-        im->w = w;
-        im->h = h;
-        return image;
-     }
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     {
-        evas_gl_common_texture_free(im->tex);
-        im->tex = NULL;
-        im->w = w;
-        im->h = h;
-        im->tex = evas_gl_common_texture_dynamic_new(im->gc, im);
-        return image;
-     }
-   im_old = image;
-
-   switch (eng_image_colorspace_get(data, image))
-     {
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         w &= ~0x1;
-         break;
-     }
-
-   if ((im_old) &&
-       ((int)im_old->im->cache_entry.w == w) &&
-       ((int)im_old->im->cache_entry.h == h))
-     return image;
-   if (im_old)
-     {
-        im = evas_gl_common_image_new(re->win->gl_context, w, h,
-                                      eng_image_alpha_get(data, image),
-                                      eng_image_colorspace_get(data, image));
-        /*
-        evas_common_load_image_data_from_file(im_old->im);
-        if (im_old->im->image->data)
-          {
-             evas_common_blit_rectangle(im_old->im, im->im, 0, 0, w, h, 0, 0);
-             evas_common_cpu_end_opt();
-          }
-         */
-        evas_gl_common_image_free(im_old);
-     }
-   else
-     im = evas_gl_common_image_new(re->win->gl_context, w, h, 1, EVAS_COLORSPACE_ARGB8888);
-   return im;
-}
-
-static void *
-eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im = image;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   if (im->native.data) return image;
-   eng_window_use(re->win);
-   evas_gl_common_image_dirty(image, x, y, w, h);
-   return image;
-}
-
-static void *
-eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, int *err)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im;
-   int error;
-
-   re = (Render_Engine *)data;
-   if (!image)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_GENERIC;
-        return NULL;
-     }
-   im = image;
-   if (im->native.data)
-     {
-        *image_data = NULL;
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-
-   eng_window_use(re->win);
-
-   if ((im->tex) && (im->tex->pt) && (im->tex->pt->dyn.img) && (im->cs.space == EVAS_COLORSPACE_ARGB8888))
-     {
-        if (im->tex->pt->dyn.checked_out > 0)
-          {
-             im->tex->pt->dyn.checked_out++;
-             *image_data = im->tex->pt->dyn.data;
-             if (err) *err = EVAS_LOAD_ERROR_NONE;
-             return im;
-          }
-        *image_data = im->tex->pt->dyn.data = glsym_eglMapImageSEC(re->win->egl_disp, im->tex->pt->dyn.img);
-
-        if (!im->tex->pt->dyn.data)
-          {
-             if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-             GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-             return im;
-          }
-        im->tex->pt->dyn.checked_out++;
-
-        if (err) *err = EVAS_LOAD_ERROR_NONE;
-        return im;
-     }
-
-   /* Engine can fail to create texture after cache drop like eng_image_content_hint_set function,
-    so it is need to add code which check im->im's NULL value*/
-
-   if (!im->im)
-    {
-       *image_data = NULL;
-       if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       return NULL;
-    }
-
-   error = evas_cache_image_load_data(&im->im->cache_entry);
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (to_write)
-           {
-              if (im->references > 1)
-                {
-                   Evas_GL_Image *im_new;
-
-                   im_new = evas_gl_common_image_new_from_copied_data
-                      (im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
-                       im->im->image.data,
-                       eng_image_alpha_get(data, image),
-                       eng_image_colorspace_get(data, image));
-                   if (!im_new)
-                     {
-                        *image_data = NULL;
-                        if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-                        return NULL;
-                     }
-                   evas_gl_common_image_free(im);
-                   im = im_new;
-                }
-              else
-                evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-           }
-         *image_data = im->im->image.data;
-         break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         *image_data = im->cs.data;
-         break;
-      default:
-         abort();
-         break;
-     }
-   if (err) *err = error;
-   return im;
-}
-
-static void *
-eng_image_data_put(void *data, void *image, DATA32 *image_data)
-{
-   Render_Engine *re;
-   Evas_GL_Image *im, *im2;
-
-   re = (Render_Engine *)data;
-   if (!image) return NULL;
-   im = image;
-   if (im->native.data) return image;
-   eng_window_use(re->win);
-   if ((im->tex) && (im->tex->pt)
-       && (im->tex->pt->dyn.data)
-       && (im->cs.space == EVAS_COLORSPACE_ARGB8888))
-     {
-        int w, h;
-
-        if (im->tex->pt->dyn.data == image_data)
-          {
-             im->tex->pt->dyn.checked_out--;
-             if (im->tex->pt->dyn.checked_out == 0)
-               glsym_eglUnmapImageSEC(re->win->egl_disp, im->tex->pt->dyn.img);
-             return image;
-          }
-
-        w = im->im->cache_entry.w;
-        h = im->im->cache_entry.h;
-        im2 = eng_image_new_from_data(data, w, h, image_data,
-                                      eng_image_alpha_get(data, image),
-                                      eng_image_colorspace_get(data, image));
-        if (!im2) return im;
-        evas_gl_common_image_free(im);
-        im = im2;
-        evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-        return im;
-     }
-   switch (im->cs.space)
-     {
-      case EVAS_COLORSPACE_ARGB8888:
-         if (image_data != im->im->image.data)
-           {
-              int w, h;
-
-              w = im->im->cache_entry.w;
-              h = im->im->cache_entry.h;
-              im2 = eng_image_new_from_data(data, w, h, image_data,
-                                            eng_image_alpha_get(data, image),
-                                            eng_image_colorspace_get(data, image));
-              if (!im2) return im;
-              evas_gl_common_image_free(im);
-              im = im2;
-           }
-         break;
-      case EVAS_COLORSPACE_YCBCR422P601_PL:
-      case EVAS_COLORSPACE_YCBCR422P709_PL:
-      case EVAS_COLORSPACE_YCBCR422601_PL:
-      case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-      case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-         if (image_data != im->cs.data)
-           {
-              if (im->cs.data)
-                {
-                   if (!im->cs.no_free) free(im->cs.data);
-                }
-              im->cs.data = image_data;
-           }
-         evas_gl_common_image_dirty(im, 0, 0, 0, 0);
-         break;
-      default:
-         abort();
-         break;
-     }
-   return im;
-}
-
-static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_data(&im->cache_entry, target);
-}
-
-static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
-{
-   Evas_GL_Image *gim = image;
-   RGBA_Image *im;
-
-   if (!gim) return;
-   if (gim->native.data) return;
-   im = (RGBA_Image *)gim->im;
-   if (!im) return;
-   evas_cache_image_preload_cancel(&im->cache_entry, target);
-}
-
-static void
-eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   evas_gl_common_image_draw(re->win->gl_context, image,
-                             src_x, src_y, src_w, src_h,
-                             dst_x, dst_y, dst_w, dst_h,
-                             smooth);
-}
-
-static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   if (image) evas_gl_common_image_scale_hint_set(image, hint);
-}
-
-static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE;
-   return gim->scale_hint;
-}
-
-static void
-eng_image_map_draw(void *data, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
-{
-   Evas_GL_Image *gim = image;
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   if (!image) return;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-   if (npoints != 4)
-     {
-        // FIXME: nash - you didn't fix this
-        abort();
-     }
-   if ((p[0].x == p[3].x) &&
-       (p[1].x == p[2].x) &&
-       (p[0].y == p[1].y) &&
-       (p[3].y == p[2].y) &&
-       (p[0].x <= p[1].x) &&
-       (p[0].y <= p[2].y) &&
-       (p[0].u == 0) &&
-       (p[0].v == 0) &&
-       (p[1].u == (gim->w << FP)) &&
-       (p[1].v == 0) &&
-       (p[2].u == (gim->w << FP)) &&
-       (p[2].v == (gim->h << FP)) &&
-       (p[3].u == 0) &&
-       (p[3].v == (gim->h << FP)) &&
-       (p[0].col == 0xffffffff) &&
-       (p[1].col == 0xffffffff) &&
-       (p[2].col == 0xffffffff) &&
-       (p[3].col == 0xffffffff))
-     {
-        int dx, dy, dw, dh;
-
-        dx = p[0].x >> FP;
-        dy = p[0].y >> FP;
-        dw = (p[2].x >> FP) - dx;
-        dh = (p[2].y >> FP) - dy;
-        eng_image_draw(data, context, surface, image,
-                       0, 0, gim->w, gim->h, dx, dy, dw, dh, smooth);
-     }
-   else
-     {
-        evas_gl_common_image_map_draw(re->win->gl_context, image, npoints, p,
-                                      smooth, level);
-     }
-}
-
-static void *
-eng_image_map_surface_new(void *data, int w, int h, int alpha)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   return evas_gl_common_image_surface_new(re->win->gl_context, w, h, alpha);
-}
-
-static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
-{
-   evas_gl_common_image_free(surface);
-}
-
-static void
-eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint)
-{
-   if (image) evas_gl_common_image_content_hint_set(image, hint);
-}
-
-static int
-eng_image_content_hint_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE;
-   return gim->content_hint;
-}
-
-static void
-eng_image_cache_flush(void *data)
-{
-   Render_Engine *re;
-   int tmp_size;
-
-   re = (Render_Engine *)data;
-
-   tmp_size = evas_common_image_get_cache();
-   evas_common_image_set_cache(0);
-   evas_common_rgba_image_scalecache_flush();
-   evas_gl_common_image_cache_flush(re->win->gl_context);
-   evas_common_image_set_cache(tmp_size);
-}
-
-static void
-eng_image_cache_set(void *data, int bytes)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   evas_common_image_set_cache(bytes);
-   evas_common_rgba_image_scalecache_size_set(bytes);
-   evas_gl_common_image_cache_flush(re->win->gl_context);
-}
-
-static int
-eng_image_cache_get(void *data __UNUSED__)
-{
-   return evas_common_image_get_cache();
-}
-
-static void
-eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
-{
-   Evas_GL_Image *im = image;
-
-   if ((im->tex) && (im->tex->pt->dyn.img))
-     *stride = im->tex->pt->dyn.stride;
-   else
-     *stride = im->w * 4;
-}
-
-static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
-{
-   Render_Engine *re;
-
-   re = (Render_Engine *)data;
-   eng_window_use(re->win);
-   evas_gl_common_context_target_surface_set(re->win->gl_context, surface);
-   re->win->gl_context->dc = context;
-     {
-        // FIXME: put im into context so we can free it
-        static RGBA_Image *im = NULL;
-
-        if (!im)
-          im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        im->cache_entry.w = re->win->w;
-        im->cache_entry.h = re->win->h;
-        evas_common_draw_context_font_ext_set(context,
-                                              re->win->gl_context,
-                                              evas_gl_font_texture_new,
-                                              evas_gl_font_texture_free,
-                                              evas_gl_font_texture_draw);
-        evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
-                              intl_props);
-        evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
-     }
-}
-
-static Eina_Bool
-eng_canvas_alpha_get(void *data, void *info __UNUSED__)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   return re->win->alpha;
-}
-
-static int
-_set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg)
-{
-   // Also initialize pixel format here as well...
-   switch(cfg->color_format)
-     {
-      case EVAS_GL_RGB_888:
-         sfc->rt_fmt          = GL_RGB;
-         sfc->rt_internal_fmt = GL_RGB;
-         break;
-      case EVAS_GL_RGBA_8888:
-         sfc->rt_fmt          = GL_RGBA;
-         sfc->rt_internal_fmt = GL_RGBA;
-         break;
-      default:
-         ERR("Invalid Color Format!");
-         return 0;
-     }
-
-   switch(cfg->depth_bits)
-     {
-      case EVAS_GL_DEPTH_NONE:
-         break;
-      case EVAS_GL_DEPTH_BIT_8:
-      case EVAS_GL_DEPTH_BIT_16:
-      case EVAS_GL_DEPTH_BIT_24:
-         // 24 bit doesn't work... just cover it with 16 for now..
-         sfc->rb_depth_fmt = GL_DEPTH_COMPONENT16;
-         break;
-      case EVAS_GL_DEPTH_BIT_32:
-      default:
-         ERR("Unsupported Depth Bits Format!");
-         return 0;
-     }
-
-   switch(cfg->stencil_bits)
-     {
-      case EVAS_GL_STENCIL_NONE:
-         break;
-      case EVAS_GL_STENCIL_BIT_1:
-      case EVAS_GL_STENCIL_BIT_2:
-      case EVAS_GL_STENCIL_BIT_4:
-      case EVAS_GL_STENCIL_BIT_8:
-         sfc->rb_stencil_fmt = GL_STENCIL_INDEX8;
-         break;
-      case EVAS_GL_STENCIL_BIT_16:
-      default:
-         ERR("Unsupported Stencil Bits Format!");
-         return 0;
-     }
-
-   // Do Packed Depth24_Stencil8 Later...
-
-   return 1;
-}
-
-static int
-_create_rt_buffers(Render_Engine *data __UNUSED__,
-                   Render_Engine_GL_Surface *sfc)
-{
-   // Render Target texture
-   glGenTextures(1, &sfc->rt_tex );
-
-   // Depth RenderBuffer - Create storage here...
-   if (sfc->depth_bits != EVAS_GL_DEPTH_NONE)
-      glGenRenderbuffers(1, &sfc->rb_depth);
-
-   // Stencil RenderBuffer - Create Storage here...
-   if (sfc->stencil_bits != EVAS_GL_STENCIL_NONE)
-      glGenRenderbuffers(1, &sfc->rb_stencil);
-
-   return 1;
-}
-
-static int
-_attach_fbo_surface(Render_Engine *data __UNUSED__,
-                    Render_Engine_GL_Surface *sfc,
-                    Render_Engine_GL_Context *ctx)
-{
-   int fb_status;
-
-   // Initialize Texture
-   glBindTexture(GL_TEXTURE_2D, sfc->rt_tex );
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, sfc->w, sfc->h, 0,
-                GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-   glBindTexture(GL_TEXTURE_2D, 0);
-
-
-   // Attach texture to FBO
-   glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo);
-   glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                          GL_TEXTURE_2D, sfc->rt_tex, 0);
-
-   // Depth RenderBuffer - Attach it to FBO
-   if (sfc->depth_bits != EVAS_GL_DEPTH_NONE)
-     {
-        glBindRenderbuffer(GL_RENDERBUFFER, sfc->rb_depth);
-        glRenderbufferStorage(GL_RENDERBUFFER, sfc->rb_depth_fmt,
-                              sfc->w, sfc->h);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                  GL_RENDERBUFFER, sfc->rb_depth);
-        glBindRenderbuffer(GL_RENDERBUFFER, 0);
-     }
-
-   // Stencil RenderBuffer - Attach it to FBO
-   if (sfc->stencil_bits != EVAS_GL_STENCIL_NONE)
-     {
-        glBindRenderbuffer(GL_RENDERBUFFER, sfc->rb_stencil);
-        glRenderbufferStorage(GL_RENDERBUFFER, sfc->rb_stencil_fmt,
-                              sfc->w, sfc->h);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                  GL_RENDERBUFFER, sfc->rb_stencil);
-        glBindRenderbuffer(GL_RENDERBUFFER, 0);
-     }
-
-   // Check FBO for completeness
-   fb_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-   if (fb_status != GL_FRAMEBUFFER_COMPLETE)
-     {
-        ERR("FBO not complete!");
-        return 0;
-     }
-
-   return 1;
-}
-
-
-static void *
-eng_gl_surface_create(void *data, void *config, int w, int h)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Resource *rsc;
-   Evas_GL_Config *cfg;
-   int ret;
-
-   sfc = calloc(1, sizeof(Render_Engine_GL_Surface));
-   if (!sfc) return NULL;
-
-   re  = (Render_Engine *)data;
-   cfg = (Evas_GL_Config *)config;
-
-   sfc->initialized  = 0;
-   sfc->fbo_attached = 0;
-   sfc->w            = w;
-   sfc->h            = h;
-   sfc->depth_bits   = cfg->depth_bits;
-   sfc->stencil_bits = cfg->stencil_bits;
-   sfc->rt_tex       = 0;
-   sfc->rb_depth     = 0;
-   sfc->rb_stencil   = 0;
-
-   // Set the internal format based on the config
-   if (!_set_internal_config(sfc, cfg))
-     {
-        ERR("Unsupported Format!");
-        free(sfc);
-        return NULL;
-     }
-
-   // Create internal resource context if it hasn't been created already
-   if ((rsc = eina_tls_get(resource_key)) == NULL)
-     {
-        if ((rsc = _create_internal_glue_resources(re)) == NULL)
-          {
-             ERR("Error creating internal resources.");
-             free(sfc);
-             return NULL;
-          }
-     }
-
-   // I'm using evas's original context to create the render target texture
-   // This is to prevent awkwardness in using native_surface_get() function
-   // If the rt texture creation is deferred till the context is created and
-   // make_current called, the user can't call native_surface_get() right
-   // after the surface is created. hence this is done here using evas' context.
-   ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, rsc->surface, rsc->context);
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        free(sfc);
-        return NULL;
-     }
-
-   // Create Render texture
-   if (!_create_rt_buffers(re, sfc))
-     {
-        ERR("_create_rt_buffers() failed.");
-        free(sfc);
-        return NULL;
-     }
-
-   ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        free(sfc);
-        return NULL;
-     }
-
-   return sfc;
-}
-
-static int
-eng_gl_surface_destroy(void *data, void *surface)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Resource *rsc;
-   int ret;
-
-   re  = (Render_Engine *)data;
-   sfc = (Render_Engine_GL_Surface*)surface;
-
-   if (!sfc) return 0;
-
-   if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0;
-
-   ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, rsc->surface, rsc->context);
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        return 0;
-     }
-
-   // Delete FBO/RBO and Texture here
-   if (sfc->rt_tex)
-      glDeleteTextures(1, &sfc->rt_tex);
-
-   if (sfc->rb_depth)
-      glDeleteRenderbuffers(1, &sfc->rb_depth);
-
-   if (sfc->rb_stencil)
-      glDeleteRenderbuffers(1, &sfc->rb_stencil);
-
-   ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        free(sfc);
-        return 0;
-     }
-
-   free(sfc);
-   surface = NULL;
-
-   return 1;
-}
-
-static void *
-eng_gl_context_create(void *data, void *share_context)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Context *ctx;
-   Render_Engine_GL_Context *share_ctx;
-   int context_attrs[3];
-
-   ctx = calloc(1, sizeof(Render_Engine_GL_Context));
-
-   if (!ctx) return NULL;
-
-   re = (Render_Engine *)data;
-   share_ctx = (Render_Engine_GL_Context *)share_context;
-
-   // Set the share context to Evas' GL context if share_context is NULL.
-   // Otherwise set it to the given share_context.
-
-   // EGL
-   context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
-   context_attrs[1] = 2;
-   context_attrs[2] = EGL_NONE;
-
-   if (share_ctx)
-     {
-        ctx->context = eglCreateContext(re->win->egl_disp,
-                                        re->win->egl_config,
-                                        share_ctx->context,      // Share Context
-                                        context_attrs);
-     }
-   else
-     {
-        ctx->context = eglCreateContext(re->win->egl_disp,
-                                        re->win->egl_config,
-                                        re->win->egl_context[0], // Evas' GL Context
-                                        context_attrs);
-     }
-
-   if (!ctx->context)
-     {
-        ERR("eglCreateContext() fail. code=%#x", eglGetError());
-        return NULL;
-     }
-
-   ctx->initialized = 0;
-   ctx->context_fbo = 0;
-   ctx->current_sfc = NULL;
-
-   return ctx;
-}
-
-static int
-eng_gl_context_destroy(void *data, void *context)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Context *ctx;
-   Render_Engine_GL_Resource *rsc;
-   int ret;
-
-   re  = (Render_Engine *)data;
-   ctx = (Render_Engine_GL_Context*)context;
-
-   if (!ctx) return 0;
-
-   if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0;
-
-   // 1. Do a make current with the given context
-   ret = eglMakeCurrent(re->win->egl_disp, rsc->surface,
-                        rsc->surface, ctx->context);
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        return 0;
-     }
-
-   // 2. Delete the FBO
-   if (ctx->context_fbo)
-        glDeleteFramebuffers(1, &ctx->context_fbo);
-
-   // 3. Destroy the Context
-   eglDestroyContext(re->win->egl_disp, ctx->context);
-
-   ctx->context = EGL_NO_CONTEXT;
-
-   ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE,
-                        EGL_NO_SURFACE, EGL_NO_CONTEXT);
-   if (!ret)
-     {
-        ERR("xxxMakeCurrent() failed!");
-        return 0;
-     }
-
-   free(ctx);
-   context = NULL;
-
-   return 1;
-}
-
-static int
-eng_gl_make_current(void *data __UNUSED__, void *surface, void *context)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Render_Engine_GL_Context *ctx;
-   int ret = 0;
-   Render_Engine_GL_Resource *rsc;
-
-   re  = (Render_Engine *)data;
-   sfc = (Render_Engine_GL_Surface*)surface;
-   ctx = (Render_Engine_GL_Context*)context;
-
-   // Unset surface/context
-   if ((!sfc) || (!ctx))
-     {
-        ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE,
-                             EGL_NO_SURFACE, EGL_NO_CONTEXT);
-        if (!ret)
-          {
-             ERR("xxxMakeCurrent() failed!");
-             return 0;
-          }
-
-        if (ctx) ctx->current_sfc = NULL;
-        if (sfc) sfc->current_ctx = NULL;
-        current_evgl_ctx = NULL;
-        return 1;
-     }
-
-   // Do a make current only if it's not already current
-   if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0;
-
-   if ((eglGetCurrentContext() != ctx->context) ||
-       (eglGetCurrentSurface(EGL_READ) != rsc->surface) ||
-       (eglGetCurrentSurface(EGL_DRAW) != rsc->surface) )
-     {
-        // Flush remainder of what's in Evas' pipeline
-        if (re->win) eng_window_use(NULL);
-
-        // Do a make current
-        ret = eglMakeCurrent(re->win->egl_disp, rsc->surface,
-                             rsc->surface, ctx->context);
-        if (!ret)
-          {
-             ERR("xxxMakeCurrent() failed!");
-             return 0;
-          }
-     }
-
-   // Create FBO if not already created
-   if (!ctx->initialized)
-     {
-        glGenFramebuffers(1, &ctx->context_fbo);
-        ctx->initialized = 1;
-     }
-
-   // Attach FBO if it hasn't been attached or if surface changed
-   if ((!sfc->fbo_attached) || (ctx->current_sfc != sfc))
-     {
-        if (!_attach_fbo_surface(re, sfc, ctx))
-          {
-             ERR("_attach_fbo_surface() failed.");
-             return 0;
-          }
-
-        if (ctx->current_fbo)
-           // Bind to the previously bound buffer
-           glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo);
-        else
-           // Bind FBO
-           glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo);
-
-        sfc->fbo_attached = 1;
-     }
-
-   // Set the current surface/context
-   ctx->current_sfc = sfc;
-   sfc->current_ctx = ctx;
-   current_evgl_ctx = ctx;
-
-   return 1;
-}
-
-static void *
-eng_gl_string_query(void *data __UNUSED__, int name)
-{
-   switch(name)
-     {
-      case EVAS_GL_EXTENSIONS:
-         return (void*)_evasgl_ext_string;
-      default:
-         return NULL;
-     };
-}
-
-static void *
-eng_gl_proc_address_get(void *data __UNUSED__, const char *name)
-{
-   if (glsym_eglGetProcAddress) return glsym_eglGetProcAddress(name);
-   return dlsym(RTLD_DEFAULT, name);
-}
-
-static int
-eng_gl_native_surface_get(void *data, void *surface, void *native_surface)
-{
-   Render_Engine *re;
-   Render_Engine_GL_Surface *sfc;
-   Evas_Native_Surface *ns;
-
-   re  = (Render_Engine *)data;
-   sfc = (Render_Engine_GL_Surface*)surface;
-   ns  = (Evas_Native_Surface*)native_surface;
-
-   ns->type = EVAS_NATIVE_SURFACE_OPENGL;
-   ns->version = EVAS_NATIVE_SURFACE_VERSION;
-   ns->data.opengl.texture_id = sfc->rt_tex;
-   ns->data.opengl.x = 0;
-   ns->data.opengl.y = 0;
-   ns->data.opengl.w = sfc->w;
-   ns->data.opengl.h = sfc->h;
-
-   return 1;
-}
-
-
-static const GLubyte *
-evgl_glGetString(GLenum name)
-{
-   if (name == GL_EXTENSIONS)
-      return (GLubyte *)_gl_ext_string; //glGetString(GL_EXTENSIONS); 
-   else
-      return glGetString(name);
-}
-
-static void
-evgl_glBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-   Render_Engine_GL_Context *ctx = current_evgl_ctx;
-
-   // Take care of BindFramebuffer 0 issue
-   if (framebuffer==0)
-     {
-        if (ctx)
-          {
-             glBindFramebuffer(target, ctx->context_fbo);
-             ctx->current_fbo = 0;
-          }
-     }
-   else
-     {
-        glBindFramebuffer(target, framebuffer);
-
-        // Save this for restore when doing make current
-        if (ctx)
-           ctx->current_fbo = framebuffer;
-     }
-}
-
-static void
-evgl_glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-   // Add logic to take care when renderbuffer=0
-   // On a second thought we don't need this
-   glBindRenderbuffer(target, renderbuffer);
-}
-
-static void
-evgl_glClearDepthf(GLclampf depth)
-{
-   glClearDepthf(depth);
-}
-
-static void
-evgl_glDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-   glDepthRangef(zNear, zFar);
-}
-
-static void
-evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
-   glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-}
-
-static void
-evgl_glReleaseShaderCompiler(void)
-{
-   glReleaseShaderCompiler();
-}
-
-static void
-evgl_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length)
-{
-   glShaderBinary(n, shaders, binaryformat, binary, length);
-}
-
-//--------------------------------//
-//#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
-// EGL Extensions
-static void *
-evgl_evasglCreateImage(int target, void* buffer, int *attrib_list)
-{
-   if (current_engine)
-     {
-        return glsym_eglCreateImage(current_engine->win->egl_disp,
-                                    EGL_NO_CONTEXT,
-                                    target,
-                                    buffer,
-                                    attrib_list);
-     }
-   else
-     {
-        ERR("Invalid Engine... (Can't acccess EGL Display)\n");
-        return NULL;
-     }
-}
-
-static void
-evgl_evasglDestroyImage(EvasGLImage image)
-{
-   if (current_engine)
-     glsym_eglDestroyImage(current_engine->win->egl_disp, image);
-   else
-     ERR("Invalid Engine... (Can't acccess EGL Display)\n");
-}
-
-static void
-evgl_glEvasGLImageTargetTexture2DOES(GLenum target, EvasGLImage image)
-{
-   glsym_glEGLImageTargetTexture2DOES(target, image);
-}
-
-static void
-evgl_glEvasGLImageTargetRenderbufferStorageOES(GLenum target, EvasGLImage image)
-{
-   glsym_glEGLImageTargetTexture2DOES(target, image);
-}
-
-//--------------------------------//
-
-
-static void *
-eng_gl_api_get(void *data)
-{
-   Render_Engine *re;
-
-   re  = (Render_Engine *)data;
-
-   gl_funcs.version = EVAS_GL_API_VERSION;
-
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, )
-   // GLES 2.0
-   ORD(glActiveTexture);
-   ORD(glAttachShader);
-   ORD(glBindAttribLocation);
-   ORD(glBindBuffer);
-   ORD(glBindTexture);
-   ORD(glBlendColor);
-   ORD(glBlendEquation);
-   ORD(glBlendEquationSeparate);
-   ORD(glBlendFunc);
-   ORD(glBlendFuncSeparate);
-   ORD(glBufferData);
-   ORD(glBufferSubData);
-   ORD(glCheckFramebufferStatus);
-   ORD(glClear);
-   ORD(glClearColor);
-//   ORD(glClearDepthf);
-   ORD(glClearStencil);
-   ORD(glColorMask);
-   ORD(glCompileShader);
-   ORD(glCompressedTexImage2D);
-   ORD(glCompressedTexSubImage2D);
-   ORD(glCopyTexImage2D);
-   ORD(glCopyTexSubImage2D);
-   ORD(glCreateProgram);
-   ORD(glCreateShader);
-   ORD(glCullFace);
-   ORD(glDeleteBuffers);
-   ORD(glDeleteFramebuffers);
-   ORD(glDeleteProgram);
-   ORD(glDeleteRenderbuffers);
-   ORD(glDeleteShader);
-   ORD(glDeleteTextures);
-   ORD(glDepthFunc);
-   ORD(glDepthMask);
-//   ORD(glDepthRangef);
-   ORD(glDetachShader);
-   ORD(glDisable);
-   ORD(glDisableVertexAttribArray);
-   ORD(glDrawArrays);
-   ORD(glDrawElements);
-   ORD(glEnable);
-   ORD(glEnableVertexAttribArray);
-   ORD(glFinish);
-   ORD(glFlush);
-   ORD(glFramebufferRenderbuffer);
-   ORD(glFramebufferTexture2D);
-   ORD(glFrontFace);
-   ORD(glGenBuffers);
-   ORD(glGenerateMipmap);
-   ORD(glGenFramebuffers);
-   ORD(glGenRenderbuffers);
-   ORD(glGenTextures);
-   ORD(glGetActiveAttrib);
-   ORD(glGetActiveUniform);
-   ORD(glGetAttachedShaders);
-   ORD(glGetAttribLocation);
-   ORD(glGetBooleanv);
-   ORD(glGetBufferParameteriv);
-   ORD(glGetError);
-   ORD(glGetFloatv);
-   ORD(glGetFramebufferAttachmentParameteriv);
-   ORD(glGetIntegerv);
-   ORD(glGetProgramiv);
-   ORD(glGetProgramInfoLog);
-   ORD(glGetRenderbufferParameteriv);
-   ORD(glGetShaderiv);
-   ORD(glGetShaderInfoLog);
-//   ORD(glGetShaderPrecisionFormat);
-   ORD(glGetShaderSource);
-//   ORD(glGetString);
-   ORD(glGetTexParameterfv);
-   ORD(glGetTexParameteriv);
-   ORD(glGetUniformfv);
-   ORD(glGetUniformiv);
-   ORD(glGetUniformLocation);
-   ORD(glGetVertexAttribfv);
-   ORD(glGetVertexAttribiv);
-   ORD(glGetVertexAttribPointerv);
-   ORD(glHint);
-   ORD(glIsBuffer);
-   ORD(glIsEnabled);
-   ORD(glIsFramebuffer);
-   ORD(glIsProgram);
-   ORD(glIsRenderbuffer);
-   ORD(glIsShader);
-   ORD(glIsTexture);
-   ORD(glLineWidth);
-   ORD(glLinkProgram);
-   ORD(glPixelStorei);
-   ORD(glPolygonOffset);
-   ORD(glReadPixels);
-//   ORD(glReleaseShaderCompiler);
-   ORD(glRenderbufferStorage);
-   ORD(glSampleCoverage);
-   ORD(glScissor);
-//   ORD(glShaderBinary);
-   ORD(glShaderSource);
-   ORD(glStencilFunc);
-   ORD(glStencilFuncSeparate);
-   ORD(glStencilMask);
-   ORD(glStencilMaskSeparate);
-   ORD(glStencilOp);
-   ORD(glStencilOpSeparate);
-   ORD(glTexImage2D);
-   ORD(glTexParameterf);
-   ORD(glTexParameterfv);
-   ORD(glTexParameteri);
-   ORD(glTexParameteriv);
-   ORD(glTexSubImage2D);
-   ORD(glUniform1f);
-   ORD(glUniform1fv);
-   ORD(glUniform1i);
-   ORD(glUniform1iv);
-   ORD(glUniform2f);
-   ORD(glUniform2fv);
-   ORD(glUniform2i);
-   ORD(glUniform2iv);
-   ORD(glUniform3f);
-   ORD(glUniform3fv);
-   ORD(glUniform3i);
-   ORD(glUniform3iv);
-   ORD(glUniform4f);
-   ORD(glUniform4fv);
-   ORD(glUniform4i);
-   ORD(glUniform4iv);
-   ORD(glUniformMatrix2fv);
-   ORD(glUniformMatrix3fv);
-   ORD(glUniformMatrix4fv);
-   ORD(glUseProgram);
-   ORD(glValidateProgram);
-   ORD(glVertexAttrib1f);
-   ORD(glVertexAttrib1fv);
-   ORD(glVertexAttrib2f);
-   ORD(glVertexAttrib2fv);
-   ORD(glVertexAttrib3f);
-   ORD(glVertexAttrib3fv);
-   ORD(glVertexAttrib4f);
-   ORD(glVertexAttrib4fv);
-   ORD(glVertexAttribPointer);
-   ORD(glViewport);
-#undef ORD
-
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, glsym_)
-   // Extensions
-   ORD(glGetProgramBinaryOES);
-   ORD(glProgramBinaryOES);
-   ORD(glMapBufferOES);
-   ORD(glUnmapBufferOES);
-   ORD(glGetBufferPointervOES);
-   ORD(glTexImage3DOES);
-   ORD(glTexSubImage3DOES);
-   ORD(glCopyTexSubImage3DOES);
-   ORD(glCompressedTexImage3DOES);
-   ORD(glCompressedTexSubImage3DOES);
-   ORD(glFramebufferTexture3DOES);
-   ORD(glGetPerfMonitorGroupsAMD);
-   ORD(glGetPerfMonitorCountersAMD);
-   ORD(glGetPerfMonitorGroupStringAMD);
-   ORD(glGetPerfMonitorCounterStringAMD);
-   ORD(glGetPerfMonitorCounterInfoAMD);
-   ORD(glGenPerfMonitorsAMD);
-   ORD(glDeletePerfMonitorsAMD);
-   ORD(glSelectPerfMonitorCountersAMD);
-   ORD(glBeginPerfMonitorAMD);
-   ORD(glEndPerfMonitorAMD);
-   ORD(glGetPerfMonitorCounterDataAMD);
-   ORD(glDiscardFramebufferEXT);
-   ORD(glMultiDrawArraysEXT);
-   ORD(glMultiDrawElementsEXT);
-   ORD(glDeleteFencesNV);
-   ORD(glGenFencesNV);
-   ORD(glIsFenceNV);
-   ORD(glTestFenceNV);
-   ORD(glGetFenceivNV);
-   ORD(glFinishFenceNV);
-   ORD(glSetFenceNV);
-   ORD(glGetDriverControlsQCOM);
-   ORD(glGetDriverControlStringQCOM);
-   ORD(glEnableDriverControlQCOM);
-   ORD(glDisableDriverControlQCOM);
-   ORD(glExtGetTexturesQCOM);
-   ORD(glExtGetBuffersQCOM);
-   ORD(glExtGetRenderbuffersQCOM);
-   ORD(glExtGetFramebuffersQCOM);
-   ORD(glExtGetTexLevelParameterivQCOM);
-   ORD(glExtTexObjectStateOverrideiQCOM);
-   ORD(glExtGetTexSubImageQCOM);
-   ORD(glExtGetBufferPointervQCOM);
-   ORD(glExtGetShadersQCOM);
-   ORD(glExtGetProgramsQCOM);
-   ORD(glExtIsProgramBinaryQCOM);
-   ORD(glExtGetProgramBinarySourceQCOM);
-#undef ORD
-
-// Override functions wrapped by Evas_GL
-#define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, evgl_)
-   ORD(glBindFramebuffer);
-   ORD(glBindRenderbuffer);
-
-   // GLES2.0 API compat on top of desktop gl
-   ORD(glClearDepthf);
-   ORD(glDepthRangef);
-   ORD(glGetShaderPrecisionFormat);
-   ORD(glReleaseShaderCompiler);
-   ORD(glShaderBinary);
-
-   ORD(glGetString);
-
-   // GLES 2.0 Extensions that needs wrapping
-   ORD(evasglCreateImage);
-   ORD(evasglDestroyImage);
-   ORD(glEvasGLImageTargetTexture2DOES);
-   ORD(glEvasGLImageTargetRenderbufferStorageOES);
-
-#undef ORD
-
-   return &gl_funcs;
-}
-
-static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return EVAS_LOAD_ERROR_NONE;
-   im = image;
-   return im->im->cache_entry.load_error;
-}
-
-static Eina_Bool
-eng_image_animated_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return EINA_FALSE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EINA_FALSE;
-
-   return im->flags.animated;
-}
-
-static int
-eng_image_animated_frame_count_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return -1;
-   im = (Image_Entry *)gim->im;
-   if (!im) return -1;
-
-   if (!im->flags.animated) return -1;
-   return im->frame_count;
-}
-
-static Evas_Image_Animated_Loop_Hint
-eng_image_animated_loop_type_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-
-   if (!im->flags.animated) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   return im->loop_hint;
-}
-
-static int
-eng_image_animated_loop_count_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return -1;
-   im = (Image_Entry *)gim->im;
-   if (!im) return -1;
-
-   if (!im->flags.animated) return -1;
-   return im->loop_count;
-}
-
-static double
-eng_image_animated_frame_duration_get(void *data __UNUSED__, void *image, int start_frame, int frame_num)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return -1;
-   im = (Image_Entry *)gim->im;
-   if (!im) return -1;
-
-   if (!im->flags.animated) return -1;
-   return evas_common_load_rgba_image_frame_duration_from_file(im, start_frame, frame_num);
-}
-
-static Eina_Bool
-eng_image_animated_frame_set(void *data __UNUSED__, void *image, int frame_index)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-
-   if (!gim) return EINA_FALSE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EINA_FALSE;
-
-   if (!im->flags.animated) return EINA_FALSE;
-   if (im->cur_frame == frame_index) return EINA_FALSE;
-
-   im->cur_frame = frame_index;
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-eng_image_can_region_get(void *data __UNUSED__, void *image)
-{
-   Evas_GL_Image *gim = image;
-   Image_Entry *im;
-   if (!gim) return EINA_FALSE;
-   im = (Image_Entry *)gim->im;
-   if (!im) return EINA_FALSE;
-   return ((Evas_Image_Load_Func*) im->info.loader)->do_region;
-}
-
-
-static void
-eng_image_max_size_get(void *data, int *maxw, int *maxh)
-{
-   Render_Engine *re = (Render_Engine *)data;
-   if (maxw) *maxw = re->win->gl_context->shared->info.max_texture_size;
-   if (maxh) *maxh = re->win->gl_context->shared->info.max_texture_size;
-}
-
-static int
-module_open(Evas_Module *em)
-{
-   static Eina_Bool xrm_inited = EINA_FALSE;
-   if (!xrm_inited)
-     {
-        xrm_inited = EINA_TRUE;
-        XrmInitialize();
-     }
-
-   if (!em) return 0;
-   if (!evas_gl_common_module_open()) return 0;
-   /* get whatever engine module we inherit from */
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
-   if (_evas_engine_wl_egl_log_dom < 0)
-     {
-        _evas_engine_wl_egl_log_dom = 
-          eina_log_domain_register("evas-gl_x11", EVAS_DEFAULT_LOG_COLOR);
-     }
-
-   if (_evas_engine_wl_egl_log_dom < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        return 0;
-     }
-   /* store it for later use */
-   func = pfunc;
-   /* now to override methods */
-   #define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(context_cutout_add);
-   ORD(context_cutout_clear);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-   ORD(output_dump);
-   ORD(rectangle_draw);
-   ORD(line_draw);
-   ORD(polygon_point_add);
-   ORD(polygon_points_clear);
-   ORD(polygon_draw);
-
-   ORD(image_load);
-   ORD(image_new_from_data);
-   ORD(image_new_from_copied_data);
-   ORD(image_free);
-   ORD(image_size_get);
-   ORD(image_size_set);
-   ORD(image_dirty_region);
-   ORD(image_data_get);
-   ORD(image_data_put);
-   ORD(image_data_preload_request);
-   ORD(image_data_preload_cancel);
-   ORD(image_alpha_set);
-   ORD(image_alpha_get);
-   ORD(image_border_set);
-   ORD(image_border_get);
-   ORD(image_draw);
-   ORD(image_comment_get);
-   ORD(image_format_get);
-   ORD(image_colorspace_set);
-   ORD(image_colorspace_get);
-   ORD(image_can_region_get);
-   ORD(image_mask_create);
-   ORD(image_native_set);
-   ORD(image_native_get);
-#if 0 // filtering disabled
-   ORD(image_draw_filtered);
-   ORD(image_filtered_get);
-   ORD(image_filtered_save);
-   ORD(image_filtered_free);
-#endif
-
-   ORD(font_draw);
-
-   ORD(image_scale_hint_set);
-   ORD(image_scale_hint_get);
-   ORD(image_stride_get);
-
-   ORD(image_map_draw);
-   ORD(image_map_surface_new);
-   ORD(image_map_surface_free);
-
-   ORD(image_content_hint_set);
-   ORD(image_content_hint_get);
-
-   ORD(image_cache_flush);
-   ORD(image_cache_set);
-   ORD(image_cache_get);
-
-   ORD(gl_surface_create);
-   ORD(gl_surface_destroy);
-   ORD(gl_context_create);
-   ORD(gl_context_destroy);
-   ORD(gl_make_current);
-   ORD(gl_string_query);
-   ORD(gl_proc_address_get);
-   ORD(gl_native_surface_get);
-   ORD(gl_api_get);
-
-   ORD(image_load_error_get);
-
-   /* now advertise out own api */
-   ORD(image_animated_get);
-   ORD(image_animated_frame_count_get);
-   ORD(image_animated_loop_type_get);
-   ORD(image_animated_loop_count_get);
-   ORD(image_animated_frame_duration_get);
-   ORD(image_animated_frame_set);
-
-   ORD(image_max_size_get);
-
-   /* now advertise out own api */
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-    eina_log_domain_unregister(_evas_engine_wl_egl_log_dom);
-    evas_gl_common_module_close();
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION, "wayland_egl", "none", {module_open, module_close}
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_x11);
-
-#ifndef EVAS_STATIC_BUILD_GL_XLIB
-EVAS_EINA_MODULE_DEFINE(engine, gl_x11);
-#endif
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/libraries/evas/src/modules/engines/wayland_egl/evas_engine.h b/libraries/evas/src/modules/engines/wayland_egl/evas_engine.h
deleted file mode 100644
index 204d793..0000000
--- a/libraries/evas/src/modules/engines/wayland_egl/evas_engine.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef EVAS_ENGINE_H
-#define EVAS_ENGINE_H
-
-#include "config.h"
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_gl_common.h"
-#include "Evas.h"
-#include "Evas_Engine_Wayland_Egl.h"
-
-#define GL_GLEXT_PROTOTYPES
-
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <wayland-egl.h>
-
-extern int _evas_engine_wl_egl_log_dom;
-#ifdef ERR
-# undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-# undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
-
-#ifdef INF
-# undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-# undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
-
-#ifdef CRIT
-# undef CRIT
-#endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
-
-typedef struct _Evas_GL_Wl_Window Evas_GL_Wl_Window;
-
-struct _Evas_GL_Wl_Window
-{
-   struct wl_display *disp;
-   struct wl_egl_window *win;
-   struct wl_surface *surface;
-   int              w, h;
-   int              screen;
-//   XVisualInfo     *visualinfo;
-//   Visual          *visual;
-//   Colormap         colormap;
-   int              depth;
-   int              alpha;
-   int              rot;
-   Evas_Engine_GL_Context *gl_context;
-   struct {
-      int              redraw : 1;
-      int              drew : 1;
-      int              x1, y1, x2, y2;
-   } draw;
-   EGLContext       egl_context[1];
-   EGLSurface       egl_surface[1];
-   EGLConfig        egl_config;
-   EGLDisplay       egl_disp;
-   int             surf : 1;
-};
-
-Evas_GL_Wl_Window *eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen,
-                                   int depth, int w, int h, int indirect,
-                                   int alpha, int rot);
-void      eng_window_free(Evas_GL_Wl_Window *gw);
-void      eng_window_use(Evas_GL_Wl_Window *gw);
-void      eng_window_unsurf(Evas_GL_Wl_Window *gw);
-void      eng_window_resurf(Evas_GL_Wl_Window *gw);
-
-int       eng_best_depth_get(Evas_Engine_Info_Wayland_Egl *einfo);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c b/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c
deleted file mode 100644
index 60a2371..0000000
--- a/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c
+++ /dev/null
@@ -1,325 +0,0 @@
-#include "evas_engine.h"
-
-static Evas_GL_Wl_Window *_evas_gl_wl_window = NULL;
-
-static EGLContext context = EGL_NO_CONTEXT;
-
-// fixme: something is up/wrong here - dont know what tho...
-//#define NEWGL 1
-
-static int win_count = 0;
-
-Evas_GL_Wl_Window *
-eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen,
-               int depth, int w, int h, int indirect, int alpha, int rot)
-{
-   Evas_GL_Wl_Window *gw;
-   int context_attrs[3];
-   int config_attrs[40];
-   int major_version, minor_version;
-   int num_config, n = 0;
-   const GLubyte *vendor, *renderer, *version;
-
-   gw = calloc(1, sizeof(Evas_GL_Wl_Window));
-   if (!gw) return NULL;
-
-   win_count++;
-   gw->disp = disp;
-   gw->surface = surface;
-   gw->screen = screen;
-   gw->depth = depth;
-   gw->alpha = alpha;
-   gw->w = w;
-   gw->h = h;
-   gw->rot = rot;
-
-// EGL / GLES
-   context_attrs[0] = EGL_CONTEXT_CLIENT_VERSION;
-   context_attrs[1] = 2;
-   context_attrs[2] = EGL_NONE;
-
-#if defined(GLES_VARIETY_S3C6410)
-   if (gw->visualinfo->depth == 16) // 16bpp
-     {
-        config_attrs[n++] = EGL_SURFACE_TYPE;
-        config_attrs[n++] = EGL_WINDOW_BIT;
-        config_attrs[n++] = EGL_RENDERABLE_TYPE;
-        config_attrs[n++] = EGL_OPENGL_ES2_BIT;
-        config_attrs[n++] = EGL_RED_SIZE;
-        config_attrs[n++] = 5;
-        config_attrs[n++] = EGL_GREEN_SIZE;
-        config_attrs[n++] = 6;
-        config_attrs[n++] = EGL_BLUE_SIZE;
-        config_attrs[n++] = 5;
-        config_attrs[n++] = EGL_DEPTH_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_STENCIL_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_NONE;
-     }
-   else // 24/32bit. no one does 8bpp anymore. and 15bpp... dead
-     {
-        config_attrs[n++] = EGL_SURFACE_TYPE;
-        config_attrs[n++] = EGL_WINDOW_BIT;
-        config_attrs[n++] = EGL_RENDERABLE_TYPE;
-        config_attrs[n++] = EGL_OPENGL_ES2_BIT;
-        config_attrs[n++] = EGL_RED_SIZE;
-        config_attrs[n++] = 8;
-        config_attrs[n++] = EGL_GREEN_SIZE;
-        config_attrs[n++] = 8;
-        config_attrs[n++] = EGL_BLUE_SIZE;
-        config_attrs[n++] = 8;
-        config_attrs[n++] = EGL_DEPTH_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_STENCIL_SIZE;
-        config_attrs[n++] = 0;
-        config_attrs[n++] = EGL_NONE;
-     }
-#elif defined(GLES_VARIETY_SGX)
-   config_attrs[n++] = EGL_SURFACE_TYPE;
-   config_attrs[n++] = EGL_WINDOW_BIT;
-   config_attrs[n++] = EGL_RENDERABLE_TYPE;
-   config_attrs[n++] = EGL_OPENGL_ES2_BIT;
-# if 0
-// FIXME: n900 - omap3 sgx libs break here
-   config_attrs[n++] = EGL_RED_SIZE;
-   config_attrs[n++] = 1;
-   config_attrs[n++] = EGL_GREEN_SIZE;
-   config_attrs[n++] = 1;
-   config_attrs[n++] = EGL_BLUE_SIZE;
-   config_attrs[n++] = 1;
-// FIXME: end n900 breakage
-# endif
-   if (gw->alpha)
-     {
-        config_attrs[n++] = EGL_ALPHA_SIZE;
-        config_attrs[n++] = 1;
-     }
-   else
-     {
-        config_attrs[n++] = EGL_ALPHA_SIZE;
-        config_attrs[n++] = 0;
-     }
-   config_attrs[n++] = EGL_DEPTH_SIZE;
-   config_attrs[n++] = 0;
-   config_attrs[n++] = EGL_STENCIL_SIZE;
-   config_attrs[n++] = 0;
-   config_attrs[n++] = EGL_NONE;
-#endif
-   
-   gw->egl_disp = eglGetDisplay((EGLNativeDisplayType)(gw->disp));
-   if (!gw->egl_disp)
-     {
-        ERR("eglGetDisplay() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   if (!eglInitialize(gw->egl_disp, &major_version, &minor_version))
-     {
-        ERR("eglInitialize() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-   eglBindAPI(EGL_OPENGL_ES_API);
-   if (eglGetError() != EGL_SUCCESS)
-     {
-        ERR("eglBindAPI() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   num_config = 0;
-   if (!eglChooseConfig(gw->egl_disp, config_attrs, &gw->egl_config,
-                        1, &num_config) || (num_config != 1))
-     {
-        ERR("eglChooseConfig() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   gw->win = wl_egl_window_create(gw->surface, gw->w, gw->h);
-
-   gw->egl_surface[0] = eglCreateWindowSurface(gw->egl_disp, gw->egl_config,
-                                               (EGLNativeWindowType)gw->win,
-                                               NULL);
-   if (gw->egl_surface[0] == EGL_NO_SURFACE)
-     {
-        ERR("eglCreateWindowSurface() fail for %#x. code=%#x",
-            (unsigned int)gw->win, eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   if (context == EGL_NO_CONTEXT)
-     context = eglCreateContext(gw->egl_disp, gw->egl_config, NULL,
-                                context_attrs);
-   gw->egl_context[0] = context;
-   if (gw->egl_context[0] == EGL_NO_CONTEXT)
-     {
-        ERR("eglCreateContext() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   if (eglMakeCurrent(gw->egl_disp, gw->egl_surface[0], gw->egl_surface[0],
-                      gw->egl_context[0]) == EGL_FALSE)
-     {
-        ERR("eglMakeCurrent() fail. code=%#x", eglGetError());
-        eng_window_free(gw);
-        return NULL;
-     }
-
-   vendor = glGetString(GL_VENDOR);
-   renderer = glGetString(GL_RENDERER);
-   version = glGetString(GL_VERSION);
-   if (!vendor) vendor   = (unsigned char *)"-UNKNOWN-";
-   if (!renderer) renderer = (unsigned char *)"-UNKNOWN-";
-   if (!version) version  = (unsigned char *)"-UNKNOWN-";
-   if (getenv("EVAS_GL_INFO"))
-     {
-        fprintf(stderr, "vendor: %s\n", vendor);
-        fprintf(stderr, "renderer: %s\n", renderer);
-        fprintf(stderr, "version: %s\n", version);
-     }
-
-   gw->gl_context = evas_gl_common_context_new();
-   if (!gw->gl_context)
-     {
-        eng_window_free(gw);
-        return NULL;
-     }
-   gw->gl_context->egldisp = gw->egl_disp;
-   eng_window_use(gw);
-   evas_gl_common_context_resize(gw->gl_context, w, h, rot);
-   gw->surf = 1;
-   return gw;
-   indirect = 0;
-}
-
-void
-eng_window_free(Evas_GL_Wl_Window *gw)
-{
-   int ref = 0;
-
-   win_count--;
-   eng_window_use(gw);
-   if (gw == _evas_gl_wl_window) _evas_gl_wl_window = NULL;
-//   if (gw->win) wl_egl_window_destroy(gw->win);
-   if (gw->gl_context)
-     {
-        ref = gw->gl_context->references - 1;
-        evas_gl_common_context_free(gw->gl_context);
-     }
-   if (gw->egl_surface[0] != EGL_NO_SURFACE)
-      eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
-   eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-   if (ref == 0)
-     {
-        if (context) eglDestroyContext(gw->egl_disp, context);
-        context = EGL_NO_CONTEXT;
-        /* NB: This is causing an unknown hang when we run elm apps as 
-         * wayland clients inside the weston compositor */
-        /* eglTerminate(gw->egl_disp); */
-        eglReleaseThread();
-     }
-   free(gw);
-}
-
-void
-eng_window_use(Evas_GL_Wl_Window *gw)
-{
-   Eina_Bool force_use = EINA_FALSE;
-
-   if (_evas_gl_wl_window)
-     {
-        if ((eglGetCurrentContext() !=
-             _evas_gl_wl_window->egl_context[0]) ||
-            (eglGetCurrentSurface(EGL_READ) !=
-                _evas_gl_wl_window->egl_surface[0]) ||
-            (eglGetCurrentSurface(EGL_DRAW) !=
-                _evas_gl_wl_window->egl_surface[0]))
-           force_use = EINA_TRUE;
-     }
-   if ((_evas_gl_wl_window != gw) || (force_use))
-     {
-        if (_evas_gl_wl_window)
-          {
-             evas_gl_common_context_use(_evas_gl_wl_window->gl_context);
-             evas_gl_common_context_flush(_evas_gl_wl_window->gl_context);
-          }
-        _evas_gl_wl_window = gw;
-        if (gw)
-          {
-             // EGL / GLES
-             if (gw->egl_surface[0] != EGL_NO_SURFACE)
-               {
-                  if (eglMakeCurrent(gw->egl_disp, gw->egl_surface[0],
-                                     gw->egl_surface[0],
-                                     gw->egl_context[0]) == EGL_FALSE)
-                    {
-                       ERR("eglMakeCurrent() failed!");
-                    }
-               }
-          }
-     }
-   if (gw) evas_gl_common_context_use(gw->gl_context);
-}
-
-void
-eng_window_unsurf(Evas_GL_Wl_Window *gw)
-{
-   if (!gw->surf) return;
-   if (!getenv("EVAS_GL_WIN_RESURF")) return;
-   if (getenv("EVAS_GL_INFO")) printf("unsurf %p\n", gw);
-
-   if (_evas_gl_wl_window)
-      evas_gl_common_context_flush(_evas_gl_wl_window->gl_context);
-   if (_evas_gl_wl_window == gw)
-     {
-        eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-        if (gw->egl_surface[0] != EGL_NO_SURFACE)
-           eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
-        gw->egl_surface[0] = EGL_NO_SURFACE;
-        _evas_gl_wl_window = NULL;
-     }
-   gw->surf = 0;
-}
-
-void
-eng_window_resurf(Evas_GL_Wl_Window *gw)
-{
-   if (gw->surf) return;
-   if (getenv("EVAS_GL_INFO")) printf("resurf %p\n", gw);
-
-   gw->egl_surface[0] = 
-     eglCreateWindowSurface(gw->egl_disp, gw->egl_config,
-                            (EGLNativeWindowType)gw->win, NULL);
-
-   if (gw->egl_surface[0] == EGL_NO_SURFACE)
-     {
-        ERR("eglCreateWindowSurface() fail for %#x. code=%#x",
-            (unsigned int)gw->win, eglGetError());
-        return;
-     }
-   if (eglMakeCurrent(gw->egl_disp, gw->egl_surface[0], gw->egl_surface[0],
-                      gw->egl_context[0]) == EGL_FALSE)
-     {
-        ERR("eglMakeCurrent() failed!");
-     }
-   gw->surf = 1;
-}
-
-int
-eng_best_depth_get(Evas_Engine_Info_Wayland_Egl *einfo)
-{
-   if (!einfo) return 0;
-   if (!einfo->info.display) return 0;
-   return 32;
-   /* if (!_evas_gl_x11_vi) eng_best_visual_get(einfo); */
-   /* if (!_evas_gl_x11_vi) return 0; */
-   /* if (einfo->info.destination_alpha) */
-   /*   { */
-   /*      if (_evas_gl_x11_rgba_vi) return _evas_gl_x11_rgba_vi->depth; */
-   /*   } */
-   /* return _evas_gl_x11_vi->depth; */
-}
diff --git a/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h b/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
deleted file mode 100644
index 2b5c2c7..0000000
--- a/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _EVAS_ENGINE_WAYLAND_SHM_H
-# define _EVAS_ENGINE_WAYLAND_SHM_H
-
-typedef struct _Evas_Engine_Info_Wayland_Shm Evas_Engine_Info_Wayland_Shm;
-struct _Evas_Engine_Info_Wayland_Shm 
-{
-   Evas_Engine_Info magic;
-
-   struct 
-     {
-        void *dest;
-        int rotation;
-
-        Eina_Bool destination_alpha : 1;
-        Eina_Bool debug : 1;
-     } info;
-
-   Evas_Engine_Render_Mode render_mode;
-};
-
-#endif
diff --git a/libraries/evas/src/modules/engines/wayland_shm/Makefile.am b/libraries/evas/src/modules/engines/wayland_shm/Makefile.am
deleted file mode 100644
index 2a5901f..0000000
--- a/libraries/evas/src/modules/engines/wayland_shm/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_wayland_shm_cflags@
-
-if BUILD_ENGINE_WAYLAND_SHM
-
-WAYLAND_SHM_SOURCES = \
-evas_engine.c \
-evas_outbuf.c
-
-WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@
-
-includes_HEADERS = Evas_Engine_Wayland_Shm.h
-includesdir = $(includedir)/evas-@VMAJ@
-
-if !EVAS_STATIC_BUILD_WAYLAND_SHM
-
-pkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
-module_la_LIBADD = $(WAYLAND_SHM_LIBADD) $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-else
-
-noinst_LTLIBRARIES = libevas_engine_wayland_shm.la
-
-libevas_engine_wayland_shm_la_SOURCES = $(WAYLAND_SHM_SOURCES)
-libevas_engine_wayland_shm_la_LIBADD = $(WAYLAND_SHM_LIBADD)
-
-endif
-endif
-
-EXTRA_DIST = \
-evas_engine.h
diff --git a/libraries/evas/src/modules/engines/wayland_shm/Makefile.in b/libraries/evas/src/modules/engines/wayland_shm/Makefile.in
deleted file mode 100644
index e70210b..0000000
--- a/libraries/evas/src/modules/engines/wayland_shm/Makefile.in
+++ /dev/null
@@ -1,817 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/modules/engines/wayland_shm
-DIST_COMMON = $(am__includes_HEADERS_DIST) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_TRUE@libevas_engine_wayland_shm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libevas_engine_wayland_shm_la_SOURCES_DIST = evas_engine.c \
-        evas_outbuf.c
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@am__objects_1 = evas_engine.lo \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@ evas_outbuf.lo
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_TRUE@am_libevas_engine_wayland_shm_la_OBJECTS = $(am__objects_1)
-libevas_engine_wayland_shm_la_OBJECTS =  \
-        $(am_libevas_engine_wayland_shm_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_TRUE@am_libevas_engine_wayland_shm_la_rpath =
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@module_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@    $(top_builddir)/src/lib/libevas.la
-am__module_la_SOURCES_DIST = evas_engine.c evas_outbuf.c
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@am__objects_2 =  \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@ module_la-evas_engine.lo \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@ module_la-evas_outbuf.lo
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@am_module_la_OBJECTS = $(am__objects_2)
-module_la_OBJECTS = $(am_module_la_OBJECTS)
-module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(module_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@am_module_la_rpath = -rpath \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@    $(pkgdir)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_engine_wayland_shm_la_SOURCES) \
-        $(module_la_SOURCES)
-DIST_SOURCES = $(am__libevas_engine_wayland_shm_la_SOURCES_DIST) \
-        $(am__module_la_SOURCES_DIST)
-am__includes_HEADERS_DIST = Evas_Engine_Wayland_Shm.h
-HEADERS = $(includes_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/modules/engines \
-@FREETYPE_CFLAGS@ \
-@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
-@evas_engine_wayland_shm_cflags@
-
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@WAYLAND_SHM_SOURCES = \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@evas_engine.c \
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@evas_outbuf.c
-
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@includes_HEADERS = Evas_Engine_Wayland_Shm.h
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@includesdir = $(includedir)/evas-@VMAJ@
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@pkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@pkg_LTLIBRARIES = module.la
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@module_la_LIBADD = $(WAYLAND_SHM_LIBADD) $(top_builddir)/src/lib/libevas.la
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_TRUE@noinst_LTLIBRARIES = libevas_engine_wayland_shm.la
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_TRUE@libevas_engine_wayland_shm_la_SOURCES = $(WAYLAND_SHM_SOURCES)
-@BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_TRUE@libevas_engine_wayland_shm_la_LIBADD = $(WAYLAND_SHM_LIBADD)
-EXTRA_DIST = \
-evas_engine.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/engines/wayland_shm/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/modules/engines/wayland_shm/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        list2=; for p in $$list; do \
-          if test -f $$p; then \
-            list2="$$list2 $$p"; \
-          else :; fi; \
-        done; \
-        test -z "$$list2" || { \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
-        }
-
-uninstall-pkgLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
-        for p in $$list; do \
-          $(am__strip_dir) \
-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
-        done
-
-clean-pkgLTLIBRARIES:
-        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
-        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_engine_wayland_shm.la: $(libevas_engine_wayland_shm_la_OBJECTS) $(libevas_engine_wayland_shm_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK) $(am_libevas_engine_wayland_shm_la_rpath) $(libevas_engine_wayland_shm_la_OBJECTS) $(libevas_engine_wayland_shm_la_LIBADD) $(LIBS)
-module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(module_la_LINK) $(am_module_la_rpath) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_outbuf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_engine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_la-evas_outbuf.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-module_la-evas_engine.lo: evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c
-
-module_la-evas_outbuf.lo: evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_outbuf.lo -MD -MP -MF $(DEPDIR)/module_la-evas_outbuf.Tpo -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_outbuf.Tpo $(DEPDIR)/module_la-evas_outbuf.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='evas_outbuf.c' object='module_la-evas_outbuf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_outbuf.lo `test -f 'evas_outbuf.c' || echo '$(srcdir)/'`evas_outbuf.c
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-install-includesHEADERS: $(includes_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-        done
-
-uninstall-includesHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        test -n "$$files" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(includesdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-        for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(includesdir)"; do \
-          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-        done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-        clean-pkgLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includesHEADERS install-pkgLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includesHEADERS uninstall-pkgLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-noinstLTLIBRARIES clean-pkgLTLIBRARIES \
-        ctags distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am \
-        install-includesHEADERS install-info install-info-am \
-        install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-includesHEADERS \
-        uninstall-pkgLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c
deleted file mode 100644
index 17b17bf..0000000
--- a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c
+++ /dev/null
@@ -1,372 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_engine.h"
-#include "Evas_Engine_Wayland_Shm.h"
-
-/* local structures */
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine 
-{
-   Tilebuf *tb;
-   Tilebuf_Rect *rects;
-   Outbuf *ob;
-   Eina_Inlist *cur_rect;
-
-   Eina_Bool end : 1;
-
-   void (*outbuf_free)(Outbuf *ob);
-   void (*outbuf_resize)(Outbuf *ob, int w, int h);
-   RGBA_Image *(*outbuf_new_region_for_update)(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
-   void (*outbuf_push_updated_region)(Outbuf *ob, RGBA_Image *surface, int x, int y, int w, int h);
-   void (*outbuf_free_region_for_update)(Outbuf *ob, RGBA_Image *update);
-};
-
-/* local variables */
-static Evas_Func func, pfunc;
-
-/* external variables */
-int _evas_engine_way_shm_log_dom = -1;
-
-/* local function prototypes */
-static void *_output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest);
-
-/* engine function prototypes */
-static void *eng_info(Evas *evas __UNUSED__);
-static void eng_info_free(Evas *evas __UNUSED__, void *info);
-static int eng_setup(Evas *evas, void *info);
-static void eng_output_free(void *data);
-static void eng_output_resize(void *data, int w, int h);
-static void eng_output_tile_size_set(void *data, int w, int h);
-static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h);
-static void eng_output_redraws_clear(void *data);
-static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch);
-static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h);
-static void eng_output_flush(void *data);
-static void eng_output_idle_flush(void *data);
-static Eina_Bool eng_canvas_alpha_get(void *data, void *context __UNUSED__);
-
-/* local functions */
-static void *
-_output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest) 
-{
-   Render_Engine *re = NULL;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
-
-   if (!(re->ob = evas_outbuf_setup(w, h, rotation, alpha, dest))) 
-     {
-        free(re);
-        return NULL;
-     }
-
-   if (!(re->tb = evas_common_tilebuf_new(w, h))) 
-     {
-        evas_outbuf_free(re->ob);
-        free(re);
-        return NULL;
-     }
-
-   evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-   return re;
-}
-
-/* engine functions */
-static void *
-eng_info(Evas *evas __UNUSED__) 
-{
-   Evas_Engine_Info_Wayland_Shm *info;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(info = calloc(1, sizeof(Evas_Engine_Info_Wayland_Shm))))
-     return NULL;
-
-   info->magic.magic = rand();
-   info->info.debug = EINA_FALSE;
-   info->render_mode = EVAS_RENDER_MODE_BLOCKING;
-
-   return info;
-}
-
-static void 
-eng_info_free(Evas *evas __UNUSED__, void *info) 
-{
-   Evas_Engine_Info_Wayland_Shm *in;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(in = (Evas_Engine_Info_Wayland_Shm *)info)) return;
-   free(in);
-}
-
-static int 
-eng_setup(Evas *evas, void *info) 
-{
-   Evas_Engine_Info_Wayland_Shm *in;
-   Render_Engine *re = NULL;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(in = (Evas_Engine_Info_Wayland_Shm *)info)) return 0;
-
-   if (!evas->engine.data.output) 
-     {
-        evas_common_cpu_init();
-        evas_common_blend_init();
-        evas_common_image_init();
-        evas_common_convert_init();
-        evas_common_scale_init();
-        evas_common_rectangle_init();
-        evas_common_polygon_init();
-        evas_common_line_init();
-        evas_common_font_init();
-        evas_common_draw_init();
-        evas_common_tilebuf_init();
-
-        re = _output_setup(evas->output.w, evas->output.h, 
-                           in->info.rotation, in->info.destination_alpha, 
-                           in->info.dest);
-        if (!re) return 0;
-
-        re->outbuf_free = evas_outbuf_free;
-        re->outbuf_resize = evas_outbuf_resize;
-        re->outbuf_new_region_for_update = evas_outbuf_new_region_for_update;
-        re->outbuf_push_updated_region = evas_outbuf_push_updated_region;
-        re->outbuf_free_region_for_update = evas_outbuf_free_region_for_update;
-     }
-   else 
-     {
-        if (!(re = evas->engine.data.output)) return 0;
-        if (re->ob) re->outbuf_free(re->ob);
-        re->ob = evas_outbuf_setup(evas->output.w, evas->output.h, 
-                                   in->info.rotation, 
-                                   in->info.destination_alpha, in->info.dest);
-        if (re->tb) evas_common_tilebuf_free(re->tb);
-        if ((re->tb = evas_common_tilebuf_new(evas->output.w, evas->output.h)))
-          evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-     }
-
-   evas->engine.data.output = re;
-
-   if (!evas->engine.data.context) 
-     {
-        evas->engine.data.context = 
-          evas->engine.func->context_new(evas->engine.data.output);
-     }
-
-   return 1;
-}
-
-static void 
-eng_output_free(void *data) 
-{
-   Render_Engine *re = NULL;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if ((re = (Render_Engine *)data)) 
-     {
-        if (re->ob) re->outbuf_free(re->ob);
-        if (re->tb) evas_common_tilebuf_free(re->tb);
-        if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
-        free(re);
-     }
-   evas_common_font_shutdown();
-   evas_common_image_shutdown();
-}
-
-static void 
-eng_output_resize(void *data, int w, int h) 
-{
-   Render_Engine *re = NULL;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!(re = (Render_Engine *)data)) return;
-
-   if (re->ob) re->outbuf_resize(re->ob, w, h);
-   if (re->tb) evas_common_tilebuf_free(re->tb);
-   if ((re->tb = evas_common_tilebuf_new(w, h)))
-     evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
-}
-
-static void 
-eng_output_tile_size_set(void *data, int w, int h) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-   if (re->tb) evas_common_tilebuf_set_tile_size(re->tb, w, h);
-}
-
-static void 
-eng_output_redraws_rect_add(void *data, int x, int y, int w, int h) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-   if (re->tb) evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
-}
-
-static void 
-eng_output_redraws_rect_del(void *data, int x, int y, int w, int h) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-   if (re->tb) evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
-}
-
-static void 
-eng_output_redraws_clear(void *data) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-   if (re->tb) evas_common_tilebuf_clear(re->tb);
-}
-
-static void *
-eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch) 
-{
-   Render_Engine *re = NULL;
-   RGBA_Image *surface;
-   Tilebuf_Rect *rect;
-   int ux = 0, uy = 0, uw = 0, uh = 0;
-
-   if (!(re = (Render_Engine *)data)) return NULL;
-   if (re->end) 
-     {
-        re->end = EINA_FALSE;
-        return NULL;
-     }
-   if (!re->rects) 
-     {
-        re->rects = evas_common_tilebuf_get_render_rects(re->tb);
-        re->cur_rect = EINA_INLIST_GET(re->rects);
-     }
-   if (!re->cur_rect) return NULL;
-   rect = (Tilebuf_Rect *)re->cur_rect;
-   ux = rect->x;
-   uy = rect->y;
-   uw = rect->w;
-   uh = rect->h;
-   re->cur_rect = re->cur_rect->next;
-   if (!re->cur_rect) 
-     {
-        evas_common_tilebuf_free_render_rects(re->rects);
-        re->rects = NULL;
-        re->end = EINA_TRUE;
-     }
-   if ((ux + uw) > re->ob->w) uw = re->ob->w - ux;
-   if ((uy + uh) > re->ob->h) uh = re->ob->h - uy;
-   if ((uw <= 0) || (uh <= 0)) return NULL;
-   surface = 
-     re->outbuf_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch);
-   if (x) *x = ux;
-   if (y) *y = uy;
-   if (w) *w = uw;
-   if (h) *h = uh;
-   return surface;
-}
-
-static void 
-eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-#ifdef BUILD_PIPE_RENDER
-   evas_common_pipe_map_begin(surface);
-#endif
-   if (re->ob) 
-     {
-        re->outbuf_push_updated_region(re->ob, surface, x, y, w, h);
-        re->outbuf_free_region_for_update(re->ob, surface);
-     }
-   evas_common_cpu_end_opt();
-}
-
-static void 
-eng_output_flush(void *data) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-}
-
-static void 
-eng_output_idle_flush(void *data) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return;
-}
-
-static Eina_Bool 
-eng_canvas_alpha_get(void *data, void *context __UNUSED__) 
-{
-   Render_Engine *re = NULL;
-
-   if (!(re = (Render_Engine *)data)) return EINA_FALSE;
-   return EINA_TRUE;
-}
-
-/* module functions */
-static int 
-module_open(Evas_Module *em) 
-{
-   if (!em) return 0;
-
-   if (!_evas_module_engine_inherit(&pfunc, "software_generic"))
-     return 0;
-
-   _evas_engine_way_shm_log_dom = 
-     eina_log_domain_register("evas-wayland_shm", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_engine_way_shm_log_dom < 0) 
-     {
-        EINA_LOG_ERR("Could not create a module log domain.");
-        return 0;
-     }
-
-   func = pfunc;
-
-#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
-   ORD(info);
-   ORD(info_free);
-   ORD(setup);
-   ORD(canvas_alpha_get);
-   ORD(output_free);
-   ORD(output_resize);
-   ORD(output_tile_size_set);
-   ORD(output_redraws_rect_add);
-   ORD(output_redraws_rect_del);
-   ORD(output_redraws_clear);
-   ORD(output_redraws_next_update_get);
-   ORD(output_redraws_next_update_push);
-   ORD(output_flush);
-   ORD(output_idle_flush);
-
-   em->functions = (void *)(&func);
-   return 1;
-}
-
-static void 
-module_close(Evas_Module *em __UNUSED__) 
-{
-   eina_log_domain_unregister(_evas_engine_way_shm_log_dom);
-}
-
-static Evas_Module_Api evas_modapi = 
-{
-   EVAS_MODULE_API_VERSION, "wayland_shm", "none", {module_open, module_close}
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, wayland_shm);
-
-#ifndef EVAS_STATIC_BUILD_WAYLAND_SHM
-EVAS_EINA_MODULE_DEFINE(engine, wayland_shm);
-#endif
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h
deleted file mode 100644
index 1869d16..0000000
--- a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _EVAS_ENGINE_H
-# define _EVAS_ENGINE_H
-
-//# define LOGFNS 1
-
-# ifdef LOGFNS
-#  include <stdio.h>
-#  define LOGFN(fl, ln, fn) printf("-EVAS-WL: %25s: %5i - %s\n", fl, ln, fn);
-# else
-#  define LOGFN(fl, ln, fn)
-# endif
-
-extern int _evas_engine_way_shm_log_dom;
-
-# ifdef ERR
-#  undef ERR
-# endif
-# define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_way_shm_log_dom, __VA_ARGS__)
-
-# ifdef DBG
-#  undef DBG
-# endif
-# define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_way_shm_log_dom, __VA_ARGS__)
-
-# ifdef INF
-#  undef INF
-# endif
-# define INF(...) EINA_LOG_DOM_INFO(_evas_engine_way_shm_log_dom, __VA_ARGS__)
-
-# ifdef WRN
-#  undef WRN
-# endif
-# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_way_shm_log_dom, __VA_ARGS__)
-
-# ifdef CRIT
-#  undef CRIT
-# endif
-# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_way_shm_log_dom, __VA_ARGS__)
-
-typedef struct _Outbuf Outbuf;
-struct _Outbuf 
-{
-   int w, h;
-   int rotation;
-
-   struct 
-     {
-        void *dest;
-        RGBA_Image *buffer;
-        Eina_Bool destination_alpha : 1;
-     } priv;
-};
-
-void evas_outbuf_free(Outbuf *ob);
-void evas_outbuf_resize(Outbuf *ob, int w, int h);
-Outbuf *evas_outbuf_setup(int w, int h, int rot, Eina_Bool alpha, void *dest);
-RGBA_Image *evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
-void evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x __UNUSED__, int y, int w, int h);
-void evas_outbuf_free_region_for_update(Outbuf *ob, RGBA_Image *update);
-
-#endif
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c b/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c
deleted file mode 100644
index 4dee9a2..0000000
--- a/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "evas_common.h"
-#include "evas_engine.h"
-
-void 
-evas_outbuf_free(Outbuf *ob) 
-{
-   if (!ob) return;
-   if (ob->priv.buffer) evas_cache_image_drop(&ob->priv.buffer->cache_entry);
-   free(ob);
-}
-
-void 
-evas_outbuf_resize(Outbuf *ob, int w, int h) 
-{
-   if (!ob) return;
-   if ((ob->w == w) && (ob->h == h)) return;
-   ob->w = w;
-   ob->h = h;
-   if (ob->priv.buffer) evas_cache_image_drop(&ob->priv.buffer->cache_entry);
-   ob->priv.buffer = NULL;
-}
-
-Outbuf *
-evas_outbuf_setup(int w, int h, int rot, Eina_Bool alpha, void *dest) 
-{
-   Outbuf *ob = NULL;
-
-   if (!(ob = calloc(1, sizeof(Outbuf)))) return NULL;
-
-   ob->w = w;
-   ob->h = h;
-   ob->rotation = rot;
-   ob->priv.dest = dest;
-   ob->priv.destination_alpha = alpha;
-
-   ob->priv.buffer = 
-     (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), 
-                                         w, h, ob->priv.dest, 
-                                         1, EVAS_COLORSPACE_ARGB8888);
-
-   return ob;
-}
-
-RGBA_Image *
-evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) 
-{
-   if (ob->priv.buffer)
-     {
-        *cx = x; *cy = y; *cw = w; *ch = h;
-        return ob->priv.buffer;
-     }
-   else
-     {
-        RGBA_Image *im;
-
-        *cx = 0; *cy = 0; *cw = w; *ch = h;
-        im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
-        if (im) 
-          {
-             im->cache_entry.flags.alpha = ob->priv.destination_alpha;
-             im = (RGBA_Image *)evas_cache_image_size_set(&im->cache_entry, w, h);
-          }
-
-        return im;
-     }
-
-   return NULL;
-}
-
-void 
-evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x __UNUSED__, int y, int w, int h) 
-{
-   if (!ob->priv.dest) return;
-   if (!ob->priv.buffer) 
-     {
-        Gfx_Func_Copy func;
-
-        func = evas_common_draw_func_copy_get(w, 0);
-        if (func) 
-          {
-             DATA32 *dst, *src;
-             int yy = 0, bytes = 0;
-
-             bytes = ((w * sizeof(int)) * h);
-             for (yy = 0; yy < h; yy++) 
-               {
-                  src = update->image.data + (yy * update->cache_entry.w);
-                  dst = (DATA32 *)((DATA8 *)(ob->priv.dest) + 
-                                   ((y + yy) * bytes));
-                  func(src, dst, w);
-               }
-          }
-     }
-}
-
-void 
-evas_outbuf_free_region_for_update(Outbuf *ob, RGBA_Image *update) 
-{
-   if (!ob) return;
-   if (update != ob->priv.buffer) evas_cache_image_drop(&update->cache_entry);
-}