Revert "ecore_evas: fix to build tbm configurable."

This reverts commit 406af68abb1f764c87e9e903db088acc7a0d8980.

this break gbs build. :(

Change-Id: I30d2eb70418497e4c4bbda6144341ac7447d2bd3

diff --git a/configure.ac b/configure.ac
index ce42ec9..db45c51 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3994,8 +3994,6 @@ if test "x${have_ecore_ipc}" = "xno" || \
    want_ecore_evas_extn="no"
 fi
 
-build_ecore_evas_tbm="no"
-
 ### Checks for programs
 
 ## Compatibility layers
@@ -4036,16 +4034,6 @@ fi
 AM_CONDITIONAL([BUILD_ECORE_EVAS_SDL],
    [test "${build_ecore_evas_sdl}" = "yes"])
 
-PKG_CHECK_MODULES([TBM], [libtbm >= "1.1.0"],
-                  [have_tbm="yes"],
-                  [have_tbm="no"])
-
-if test "x${have_tbm}" = "xyes" ; then
-   build_ecore_evas_tbm="yes"
-   AC_DEFINE(BUILD_ECORE_EVAS_TBM, 1, [Support for TBM Backend in Ecore_Evas])
-fi
-EFL_ADD_FEATURE([ECORE_EVAS], [tbm], [${build_ecore_evas_tbm}])
-
 ECORE_EVAS_MODULE([wayland-shm], [${want_wayland}])
 ECORE_EVAS_MODULE([wayland-egl], [${want_ecore_evas_wayland_egl}])
 ECORE_EVAS_MODULE([gl-tbm], [${want_ecore_evas_tbm}])
@@ -4137,7 +4125,6 @@ if test "x$have_ecore_evas_software_x11" = "xyes" || \
    build_ecore_evas_x11="yes"
 fi
 AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [test "${build_ecore_evas_x11}" = "yes"])
-AM_CONDITIONAL([BUILD_ECORE_EVAS_TBM], [test "${build_ecore_evas_tbm}" = "yes"])
 
 EFL_EVAL_PKGS([ECORE_EVAS])
 

diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 4164e04..3d13bea 100755 (executable)
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -12,6 +12,8 @@ lib_ecore_evas_libecore_evas_la_SOURCES = \
 lib/ecore_evas/ecore_evas.c \
 lib/ecore_evas/ecore_evas_buffer.c \
 lib/ecore_evas/ecore_evas_buffer.h \
+lib/ecore_evas/ecore_evas_tbm.c \
+lib/ecore_evas/ecore_evas_tbm.h \
 lib/ecore_evas/ecore_evas_deprecated.c \
 lib/ecore_evas/ecore_evas_drm.h \
 lib/ecore_evas/ecore_evas_ews.c \
@@ -24,26 +26,15 @@ lib/ecore_evas/ecore_evas_win32.h \
 lib/ecore_evas/ecore_evas_x11.h \
 lib/ecore_evas/ecore_evas_util.c
 
-if BUILD_ECORE_EVAS_TBM
-lib_ecore_evas_libecore_evas_la_SOURCES += \
-lib/ecore_evas/ecore_evas_tbm.c \
-lib/ecore_evas/ecore_evas_tbm.h
-endif
-
 lib_ecore_evas_libecore_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/modules/evas/engines/buffer \
+-I$(top_srcdir)/src/modules/evas/engines/gl_tbm \
+-I$(top_srcdir)/src/modules/evas/engines/software_tbm \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ecore_evas\" \
 -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 @ECORE_EVAS_CFLAGS@
-
-if BUILD_ECORE_EVAS_TBM
-lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
--I$(top_srcdir)/src/modules/evas/engines/gl_tbm \
--I$(top_srcdir)/src/modules/evas/engines/software_tbm
-endif
-
 lib_ecore_evas_libecore_evas_la_LIBADD = @ECORE_EVAS_LIBS@ @TTRACE_LIBS@
 lib_ecore_evas_libecore_evas_la_DEPENDENCIES = @ECORE_EVAS_INTERNAL_LIBS@
 lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -200,13 +191,8 @@ modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/li
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_WAYLAND_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
--I$(top_srcdir)/src/modules/evas/engines/wayland_egl
-
-if BUILD_ECORE_EVAS_TBM
-modules_ecore_evas_engines_wayland_module_la_CPPFLAGS += \
--I$(top_srcdir)/src/modules/evas/engines/gl_tbm
-endif
-
+-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
+-I$(top_srcdir)/src/modules/evas/engines/gl_tbm \
 @ECORE_WAYLAND_CFLAGS@
 modules_ecore_evas_engines_wayland_module_la_LIBADD = \
 @USE_ECORE_EVAS_LIBS@ \