[dconf: 21/21] Merge branch 'meson' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 20223ed7dab543caeb075ec9f2b7cfbda5e0bec0
Merge: 159757d 6fcde2e
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Aug 11 21:37:08 2018 +0000

    Merge branch 'meson' into 'master'
    
    Various meson related improvements
    
    See merge request GNOME/dconf!11

 .gitlab-ci.yml        |  4 +--
 bin/meson.build       | 19 +++++++-------
 client/meson.build    | 53 +++++++++++++++++---------------------
 common/meson.build    | 38 +++++++++++++---------------
 docs/meson.build      | 20 +++++++--------
 engine/meson.build    | 26 +++++++++----------
 gdbus/meson.build     | 48 +++++++++++++----------------------
 gsettings/meson.build | 24 +++++++-----------
 gvdb/meson.build      | 24 ++++++++----------
 meson.build           | 70 +++++++++++++--------------------------------------
 meson_options.txt     |  8 +++---
 meson_post_install.py |  2 +-
 service/meson.build   | 34 ++++++++++---------------
 shm/meson.build       | 21 +++++-----------
 tests/meson.build     | 24 +++++++++---------
 15 files changed, 164 insertions(+), 251 deletions(-)
---