diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2018-08-11 23:43:51 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-08-11 23:52:56 +0100 |
commit | 3833423bd614769107ea6123cc427221af85e3a6 (patch) | |
tree | 5bc1f1af255a1d53d1f892b9f6551e1fde62b09c | |
parent | 2a7f31b6fb5669e5d41dcbf8ef3d8f3e982932ea (diff) | |
download | dconf-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>
-rw-r--r-- | bin/meson.build | 4 | ||||
-rw-r--r-- | client/meson.build | 5 | ||||
-rw-r--r-- | engine/meson.build | 6 | ||||
-rw-r--r-- | gsettings/meson.build | 4 | ||||
-rw-r--r-- | gvdb/meson.build | 6 | ||||
-rw-r--r-- | service/meson.build | 4 |
6 files changed, 17 insertions, 12 deletions
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, ) diff --git a/client/meson.build b/client/meson.build index 305737b..ce425d2 100644 --- a/client/meson.build +++ b/client/meson.build @@ -14,6 +14,11 @@ sources = files('dconf-client.c') cflags = '-DG_LOG_DOMAIN="dconf"' +deps = [ + libdconf_common_hidden_dep, + libdconf_gdbus_thread_dep, +] + libdconf_client = static_library( 'dconf-client', sources: sources, 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, ) diff --git a/gsettings/meson.build b/gsettings/meson.build index aca21f0..65a1876 100644 --- a/gsettings/meson.build +++ b/gsettings/meson.build @@ -1,4 +1,4 @@ -deps = [ +backend_deps = [ libdconf_common_hidden_dep, libdconf_gdbus_thread_dep, ] @@ -7,7 +7,7 @@ libdconf_settings = shared_library( 'dconfsettings', sources: 'dconfsettingsbackend.c', include_directories: top_inc, - dependencies: deps, + dependencies: backend_deps, c_args: '-DG_LOG_DOMAIN="dconf"', install: true, install_dir: gio_module_dir, 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, ) 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, ) |