summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2018-08-11 23:43:51 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2018-08-11 23:52:56 +0100
commit3833423bd614769107ea6123cc427221af85e3a6 (patch)
tree5bc1f1af255a1d53d1f892b9f6551e1fde62b09c /service
parent2a7f31b6fb5669e5d41dcbf8ef3d8f3e982932ea (diff)
downloaddconf-3833423bd614769107ea6123cc427221af85e3a6.tar.gz
Namespace the dependencies variables
The build currently, unintentionally, depends on side effects, namely: that a variable defined in a meson.build file will be valid for any other included meson.build file, until it gets re-defined. We use the same `deps` variable in many places, and we end up depending on the inclusion order when we get to the client library, which depends on the gsettings backend defining the `deps` variable. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
Diffstat (limited to 'service')
-rw-r--r--service/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/meson.build b/service/meson.build
index 342c883..618cbd5 100644
--- a/service/meson.build
+++ b/service/meson.build
@@ -28,7 +28,7 @@ sources += gnome.gdbus_codegen(
namespace: 'DConfDBus',
)
-deps = [
+service_deps = [
gio_unix_dep,
libdconf_common_dep,
libdconf_shm_dep,
@@ -39,7 +39,7 @@ executable(
'dconf-service',
sources,
include_directories: top_inc,
- dependencies: deps,
+ dependencies: service_deps,
install: true,
install_dir: dconf_libexecdir,
)