discomfitor pushed a commit to branch enlightenment-0.22.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f39b482ef14ce8b0fe25083d5d0fab8012329503
commit f39b482ef14ce8b0fe25083d5d0fab8012329503
Author: Marcel Hollerbach <mar...@osg.samsung.com>
Date: Sun Dec 3 13:14:39 2017 +0000
meson: fix build
everything that includes e.h needs deps_e as dependencys, otherwise headers
may not be found
---
src/modules/meson.build | 4 +++-
src/modules/mixer/meson.build | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 65f0b2fb8..974a79ced 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -82,13 +82,15 @@ foreach m: mods
no_icon = false
cargs = ''
data = []
- deps = []
+ deps = deps_e
inc = []
_dir = join_paths(dir_module_e, m)
_dir_bin = join_paths(_dir, module_arch)
opt = '-'.join(m.split('_'))
+
+
if get_option(opt) == true
subdir(m)
else
diff --git a/src/modules/mixer/meson.build b/src/modules/mixer/meson.build
index 57c167de7..a0fe8d6f3 100644
--- a/src/modules/mixer/meson.build
+++ b/src/modules/mixer/meson.build
@@ -18,7 +18,7 @@ if get_option(m) == true
dep_pulse = dependency('libpulse', required: false)
dep_pulse_simple = dependency('libpulse-simple', required: false)
- deps = [ dep_alsa, dep_pulse, dep_pulse_simple ]
+ deps += [ dep_alsa, dep_pulse, dep_pulse_simple ]
inc = [ 'lib' ]
config_h.set('HAVE_ALSA' , dep_alsa.found())
--
