summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-12-03 13:14:39 +0000
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-12-03 13:14:39 +0000
commitc1177a1c1574c681cab1a0ef744f2eb944f51541 (patch)
treeb311217a5a4d5a7561e0f6f56985f0fe591d03f1
parentc3f630d36ce3d7167ede7856beea1f42b67ccd13 (diff)
downloadenlightenment-c1177a1c1574c681cab1a0ef744f2eb944f51541.tar.gz
meson: fix build
everything that includes e.h needs deps_e as dependencys, otherwise headers may not be found
-rw-r--r--src/modules/meson.build4
-rw-r--r--src/modules/mixer/meson.build2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 65f0b2fb81..974a79ced2 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 57c167de74..a0fe8d6f3c 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())