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 --- bin/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/meson.build b/bin/meson.build index 5c6e6bc..763a10b 100644 --- a/bin/meson.build +++ b/bin/meson.build @@ -5,7 +5,7 @@ sources = gvdb_builder + libdconf_vapi + files( 'gvdb.vapi', ) -deps = [ +bin_deps = [ libdconf_common_dep, libdconf_dep, valac.find_library('posix'), @@ -15,7 +15,7 @@ executable( 'dconf', sources, include_directories: top_inc, - dependencies: deps, + dependencies: bin_deps, install: true, ) -- cgit v1.2.1