summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_Evas.am
diff options
context:
space:
mode:
authorGwanglim Lee <gl77.lee@samsung.com>2014-08-28 13:36:59 -0400
committerChris Michael <cp.michael@samsung.com>2014-08-28 13:37:28 -0400
commit00382bb6a6e73c021ecfda3c90598777d7f7b084 (patch)
treec496b5c23091d336a4ae9e3b4f08a2a313935077 /src/Makefile_Ecore_Evas.am
parent80c0a33267264b23e2d2e0e0c8fa8771dbb496a2 (diff)
gl-drm: Fix missing link to gbm for ecore_evas_drm and clean up build script
@fix Summary: This fixes following build script problems for ecore_evas_drm engine module. 1. Missing link to gbm for ecore_evas_drm if '--enable-gl-drm' option is given. ecore_evas_drm engine is using gbm function if it builds with that config option. To be more exact, ecore_evas_gl_drm_new_internal function needs gbm. Thus we need to add gbm library linking '-lgbm' to ecore_evas_drm engine module if '--enable-gl-drm' option is given. I've added this build script to m4/ecore_check_module.m4 file. 2. Wrong gbm dependency check code in configure.ac EFL_OPTIONAL_INTERNAL_DEPEND_PKG m4 macro function is designed for checking dependency of efl internal libraries. Thus we should remove gbm pkg name when configuring ecore_evas_drm engine module. It would be better to move dependency check for gbm to m4/ecore_check_module.m4 file. And one more thing want_drm value has to be changed to want_gl_drm in ECORE_EVAS_MODULE([gl-drm]...). 3. BUILD_ECORE_EVAS_OPENGL_DRM macro is always defined in configure.ac. This kind of macro, BUILD_EFL_MODULE_NAME, has to be defined only if given module is enabled. But this macro value was just defined with no test. And it is even useless, we can use BUILD_ECORE_EVAS_GL_DRM macro which is defined by ECORE_EVAS_MODULE([gl-drm], [${want_gl_drm}],...) function. So I've removed that from configure.ac. Test Plan: 1. Configure with --enable-gl-drm: $ ./autogen.sh --enable-drm --enable-gl-drm 2. Build: $ make && make install 3. Check module.so of ecore_evas_drm engine whether it has a library dependency with gbm: $ readelf -a $EFL_GIT/src/modules/ecore_evas/engines/drm/.libs/module.so | grep NEEDED Reviewers: raster, stefan_schmidt, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1379
Diffstat (limited to 'src/Makefile_Ecore_Evas.am')
-rw-r--r--src/Makefile_Ecore_Evas.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index b1c8cd0..a6cf704 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -215,8 +215,10 @@ modules_ecore_evas_engines_drm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/ef
215@ECORE_EVAS_CFLAGS@ \ 215@ECORE_EVAS_CFLAGS@ \
216@ECORE_DRM_CFLAGS@ \ 216@ECORE_DRM_CFLAGS@ \
217-I$(top_srcdir)/src/modules/evas/engines/drm \ 217-I$(top_srcdir)/src/modules/evas/engines/drm \
218-I$(top_srcdir)/src/modules/evas/engines/gl_drm 218-I$(top_srcdir)/src/modules/evas/engines/gl_drm \
219modules_ecore_evas_engines_drm_module_la_LIBADD = @USE_ECORE_EVAS_LIBS@ 219@ecore_evas_engines_gl_drm_cflags@
220modules_ecore_evas_engines_drm_module_la_LIBADD = @USE_ECORE_EVAS_LIBS@ \
221@ecore_evas_engines_gl_drm_libs@
220modules_ecore_evas_engines_drm_module_la_DEPENDENCIES = @USE_ECORE_EVAS_INTERNAL_LIBS@ 222modules_ecore_evas_engines_drm_module_la_DEPENDENCIES = @USE_ECORE_EVAS_INTERNAL_LIBS@
221modules_ecore_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 223modules_ecore_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
222modules_ecore_evas_engines_drm_module_la_LIBTOOLFLAGS = --tag=disable-static 224modules_ecore_evas_engines_drm_module_la_LIBTOOLFLAGS = --tag=disable-static