diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2018-08-21 15:41:51 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-08-21 15:41:51 +0000 |
commit | a060755f30e5c89882b160e7f284eee003a960ec (patch) | |
tree | 1765b9bdae5258808f30b421b3c95b9b15e69eef /service/meson.build | |
parent | e960b50696b95f4b035787e9cbceaa549c172c91 (diff) | |
parent | 8d76d4881f14af8a78029a89b43ce99cc558a65f (diff) | |
download | dconf-a060755f30e5c89882b160e7f284eee003a960ec.tar.gz |
Merge branch '1454-gvdb-corruption' into 'master'
service: Allow opening corrupt GVDB files when writing
See merge request GNOME/dconf!8
Diffstat (limited to 'service/meson.build')
-rw-r--r-- | service/meson.build | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/service/meson.build b/service/meson.build index 618cbd5..35ee23a 100644 --- a/service/meson.build +++ b/service/meson.build @@ -11,35 +11,45 @@ configure_file( install_dir: dbus_session_service_dir, ) -sources = [ +lib_sources = [ 'dconf-blame.c', 'dconf-gvdb-utils.c', 'dconf-keyfile-writer.c', 'dconf-service.c', 'dconf-shm-writer.c', 'dconf-writer.c', +] +sources = [ 'main.c', ] -sources += gnome.gdbus_codegen( +lib_sources += gnome.gdbus_codegen( 'dconf-generated', dconf_namespace + '.xml', interface_prefix: dconf_namespace + '.', namespace: 'DConfDBus', ) -service_deps = [ - gio_unix_dep, - libdconf_common_dep, - libdconf_shm_dep, - libgvdb_dep, -] +libdconf_service = static_library( + 'dconf-service', + sources: lib_sources, + include_directories: top_inc, + c_args: dconf_c_args, + dependencies: gio_unix_dep, + link_with: [ + libdconf_common, + libdconf_shm, + libgvdb, + ], +) executable( 'dconf-service', sources, include_directories: top_inc, - dependencies: service_deps, + c_args: dconf_c_args, + dependencies: gio_unix_dep, + link_with: libdconf_service, install: true, install_dir: dconf_libexecdir, ) |