~vcs-imports/dconf/master

« back to all changes in this revision

Viewing changes to engine/meson.build

  • Committer: Emmanuele Bassi
  • Date: 2018-08-11 22:52:56 UTC
  • Revision ID: git-v1:3833423bd614769107ea6123cc427221af85e3a6
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>

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
  'dconf-engine-source-system.c',
9
9
)
10
10
 
11
 
deps = [
 
11
engine_deps = [
12
12
  libdconf_common_dep,
13
13
  libgvdb_dep,
14
14
]
17
17
  'dconf-engine',
18
18
  sources: sources,
19
19
  include_directories: top_inc,
20
 
  dependencies: deps + [libdconf_shm_dep],
 
20
  dependencies: engine_deps + [libdconf_shm_dep],
21
21
  c_args: '-DG_LOG_DOMAIN="dconf"',
22
22
  pic: true,
23
23
)
24
24
 
25
25
libdconf_engine_dep = declare_dependency(
26
 
  dependencies: deps,
 
26
  dependencies: engine_deps,
27
27
  link_with: libdconf_engine,
28
28
)