summaryrefslogtreecommitdiff
path: root/gvdb
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 /gvdb
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 'gvdb')
-rw-r--r--gvdb/meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/gvdb/meson.build b/gvdb/meson.build
index 3f774dd..1309a5b 100644
--- a/gvdb/meson.build
+++ b/gvdb/meson.build
@@ -2,7 +2,7 @@ gvdb_builder = files('gvdb-builder.c')
sources = gvdb_builder + files('gvdb-reader.c')
-deps = [
+gvdb_deps = [
gio_dep,
glib_dep,
]
@@ -11,12 +11,12 @@ libgvdb = static_library(
'gvdb',
sources: sources,
include_directories: top_inc,
- dependencies: deps,
+ dependencies: gvdb_deps,
c_args: '-DG_LOG_DOMAIN="gvdb (via dconf)"',
pic: true,
)
libgvdb_dep = declare_dependency(
- dependencies: deps,
+ dependencies: gvdb_deps,
link_with: libgvdb,
)