build: add efl-canvasl-wl to efl-one

this is required by e, thank you Ross.

Differential Revision: https://phab.enlightenment.org/D11901

diff --git a/meson.build b/meson.build
index 4a15f87..14bdb9a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -338,7 +338,7 @@ subprojects = [
 ['ethumb'           ,[]                    ,  true,  true,  true, false, false, false,  true, ['eina', 'efl', 'eo'], []],
 ['ethumb_client'    ,[]                    , false,  true,  true, false, false,  true,  true, ['eina', 'efl', 'eo', 'ethumb'], []],
 ['elementary'       ,[]                    ,  true,  true,  true,  true,  true,  true,  true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']],
-['efl_canvas_wl'    ,['wl']                , false,  true,  true, false, false, false, false, ['eina', 'efl', 'eo', 'evas', 'ecore'], []],
+['efl_canvas_wl'    ,['wl']                , false,  true,  true, false, false, false,  true, ['eina', 'efl', 'eo', 'evas', 'ecore'], []],
 ['elua'             ,['elua']              , false,  true,  true, false,  true, false, false, ['eina', 'luajit'], []],
 ['ecore_drm'        ,['drm-deprecated']    , false,  true, false, false, false, false, false, ['eina'], []],
 ['exactness'        ,['exactness']                    , false,  false,  true, false, false, false, false, ['eina, evas, eet'], []],

diff --git a/src/lib/efl_canvas_wl/meson.build b/src/lib/efl_canvas_wl/meson.build
index 3b223ea..5955da6 100644 (file)
--- a/src/lib/efl_canvas_wl/meson.build
+++ b/src/lib/efl_canvas_wl/meson.build
@@ -1,9 +1,10 @@
-efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina, wayland_protocol ]
-efl_canvas_wl_pub_deps = [eo, efl, evas, dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0')]
+efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina]
+efl_canvas_wl_pub_deps = [eo, efl, evas]
+efl_canvas_wl_ext_deps = [dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0'), wayland_protocol]
 
 if (get_option('x11'))
   efl_canvas_wl_deps += [ecore_x]
-  efl_canvas_wl_pub_deps += [dependency('xkbcommon-x11')]
+  efl_canvas_wl_ext_deps += [dependency('xkbcommon-x11')]
 endif
 
 pub_eo_files = [
@@ -25,16 +26,17 @@ foreach eo_file : pub_eo_files
                            '-gchd', '@INPUT@'])
 endforeach
 
-efl_canvas_wl_src = [
+efl_canvas_wl_src = files([
  'dmabuf.c',
  'efl_canvas_wl.c',
-]
+])
+
 efl_canvas_wl_header_src = ['Efl_Canvas_Wl.h']
 eolian_include_directories += ['-I', meson.current_source_dir()]
 
 efl_canvas_wl_lib = library('efl_canvas_wl',
     efl_canvas_wl_src, pub_eo_file_target,
-    dependencies: [m, dl] + efl_canvas_wl_deps + efl_canvas_wl_pub_deps,
+    dependencies: efl_canvas_wl_deps + efl_canvas_wl_pub_deps + efl_canvas_wl_ext_deps,
     include_directories : config_dir + [include_directories(join_paths('..','..'))],
     install: true,
     c_args : package_c_args,