From 3833423bd614769107ea6123cc427221af85e3a6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 11 Aug 2018 23:43:51 +0100 Subject: 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 --- engine/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/meson.build b/engine/meson.build index e81d6c1..d578f3f 100644 --- a/engine/meson.build +++ b/engine/meson.build @@ -8,7 +8,7 @@ sources = files( 'dconf-engine-source-system.c', ) -deps = [ +engine_deps = [ libdconf_common_dep, libgvdb_dep, ] @@ -17,12 +17,12 @@ libdconf_engine = static_library( 'dconf-engine', sources: sources, include_directories: top_inc, - dependencies: deps + [libdconf_shm_dep], + dependencies: engine_deps + [libdconf_shm_dep], c_args: '-DG_LOG_DOMAIN="dconf"', pic: true, ) libdconf_engine_dep = declare_dependency( - dependencies: deps, + dependencies: engine_deps, link_with: libdconf_engine, ) -- cgit v1.2.1