aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-02-02 11:12:47 -0500
committerChris Michael <cp.michael@samsung.com>2017-02-07 09:38:33 -0500
commitee56334801b30941720baf589b9233b7fde8710f (patch)
tree440650f8a2afadfbf1ed5965bf5db81adb007c3f
parentelput: Set evas_device on input events (diff)
downloadefl-ee56334801b30941720baf589b9233b7fde8710f.tar.gz
efl: Add Elput as a dependency for Ecore_Evas_Drm engine
Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile_Ecore_Evas.am7
2 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 68cd0c25b3..64acba9005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4445,9 +4445,11 @@ ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}])
ECORE_EVAS_MODULE([ews], [yes])
ECORE_EVAS_MODULE([fb], [${want_fb}])
ECORE_EVAS_MODULE([drm], [${want_drm}],
- [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm2])])
+ [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm2])],
+ [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [elput])])
ECORE_EVAS_MODULE([gl-drm], [${want_gl_drm}],
- [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_gl_drm}], [ecore-drm2])])
+ [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [ecore-drm2])],
+ [EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [${want_drm}], [elput])])
ECORE_EVAS_MODULE([psl1ght], [${have_ps3}])
ECORE_EVAS_MODULE([opengl-cocoa], [${want_ecore_evas_gl_cocoa}])
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 7907a67269..99db70405b 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -271,14 +271,17 @@ modules_ecore_evas_engines_drm_module_la_SOURCES = $(DRMSOURCES)
modules_ecore_evas_engines_drm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
@ECORE_EVAS_CFLAGS@ \
@ECORE_DRM2_CFLAGS@ \
+@ELPUT_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/drm \
-I$(top_srcdir)/src/modules/evas/engines/gl_drm
modules_ecore_evas_engines_drm_module_la_LIBADD = \
@USE_ECORE_EVAS_LIBS@ \
-@USE_ECORE_DRM2_LIBS@
+@USE_ECORE_DRM2_LIBS@ \
+@USE_ELPUT_LIBS@
modules_ecore_evas_engines_drm_module_la_DEPENDENCIES = \
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
-@USE_ECORE_DRM2_INTERNAL_LIBS@
+@USE_ECORE_DRM2_INTERNAL_LIBS@ \
+@USE_ELPUT_INTERNAL_LIBS@
modules_ecore_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_drm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif