diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2018-08-11 21:37:08 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-08-11 21:37:08 +0000 |
commit | 20223ed7dab543caeb075ec9f2b7cfbda5e0bec0 (patch) | |
tree | 76605a5e2110b6966702db6e3533ef15dff4db32 /gsettings | |
parent | 159757dbd00c43cc3df091d2656a85c2c4e5ff3a (diff) | |
parent | 6fcde2e56fa71421dcd9cbee98eb90e45f5d2244 (diff) | |
download | dconf-20223ed7dab543caeb075ec9f2b7cfbda5e0bec0.tar.gz |
Merge branch 'meson' into 'master'
Various meson related improvements
See merge request GNOME/dconf!11
Diffstat (limited to 'gsettings')
-rw-r--r-- | gsettings/meson.build | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/gsettings/meson.build b/gsettings/meson.build index a1d0207..aca21f0 100644 --- a/gsettings/meson.build +++ b/gsettings/meson.build @@ -1,22 +1,16 @@ -sources = files('dconfsettingsbackend.c') - -cflags = '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()) +deps = [ + libdconf_common_hidden_dep, + libdconf_gdbus_thread_dep, +] libdconf_settings = shared_library( - meson.project_name() + 'settings', - sources: sources, + 'dconfsettings', + sources: 'dconfsettingsbackend.c', include_directories: top_inc, - dependencies: gio_unix_dep, - c_args: cflags, - link_with: [ - libdconf_common_hidden, - libdconf_engine_shared, - libdconf_gdbus_thread_shared, - libdconf_shm_shared, - libgvdb_shared - ], + dependencies: deps, + c_args: '-DG_LOG_DOMAIN="dconf"', install: true, - install_dir: join_paths(dconf_libdir, 'gio', 'modules') + install_dir: gio_module_dir, ) envs = test_env + [ |