[dconf/patch/engine-check: 1/5] move dconf-gvdb-utils from service into common

[Daniel Playfair Cal <danielplayfaircal src gnome org>]

commit 28dd79b2604358d1f6d1034377735eb046621f7e
Author: Daniel Playfair Cal <daniel playfair cal gmail com>
Date:   Mon Jan 6 12:29:12 2020 +1100

    move dconf-gvdb-utils from service into common

 {service => common}/dconf-gvdb-utils.c | 2 +-
 {service => common}/dconf-gvdb-utils.h | 2 +-
 common/meson.build                     | 9 +++++----
 service/dconf-writer.c                 | 2 +-
 service/meson.build                    | 7 +++----
 5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/service/dconf-gvdb-utils.c b/common/dconf-gvdb-utils.c
similarity index 99%
rename from service/dconf-gvdb-utils.c
rename to common/dconf-gvdb-utils.c
index d77ae97..e70e2dc 100644
--- a/service/dconf-gvdb-utils.c
+++ b/common/dconf-gvdb-utils.c
@@ -22,7 +22,7 @@
 
 #include "dconf-gvdb-utils.h"
 
-#include "../common/dconf-paths.h"
+#include "./dconf-paths.h"
 #include "../gvdb/gvdb-builder.h"
 #include "../gvdb/gvdb-reader.h"
 
diff --git a/service/dconf-gvdb-utils.h b/common/dconf-gvdb-utils.h
similarity index 97%
rename from service/dconf-gvdb-utils.h
rename to common/dconf-gvdb-utils.h
index 7076781..8d73133 100644
--- a/service/dconf-gvdb-utils.h
+++ b/common/dconf-gvdb-utils.h
@@ -21,7 +21,7 @@
 #ifndef __dconf_gvdb_utils_h__
 #define __dconf_gvdb_utils_h__
 
-#include "../common/dconf-changeset.h"
+#include "./dconf-changeset.h"
 
 DConfChangeset *                dconf_gvdb_utils_read_and_back_up_file  (const gchar     *filename,
                                                                          gboolean        *file_missing,
diff --git a/common/meson.build b/common/meson.build
index 58e0fa8..d876ce0 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -15,19 +15,20 @@ sources = files(
   'dconf-changeset.c',
   'dconf-error.c',
   'dconf-paths.c',
+  'dconf-gvdb-utils.c',
 )
 
 libdconf_common = static_library(
   'dconf-common',
   sources: sources,
   include_directories: top_inc,
-  dependencies: glib_dep,
+  dependencies: [glib_dep, libgvdb_dep],
   c_args: dconf_c_args,
   pic: true,
 )
 
 libdconf_common_dep = declare_dependency(
-  dependencies: glib_dep,
+  dependencies: [glib_dep, libgvdb_dep],
   link_whole: libdconf_common,
 )
 
@@ -35,12 +36,12 @@ libdconf_common_hidden = static_library(
   'dconf-common-hidden',
   sources: sources,
   include_directories: top_inc,
-  dependencies: glib_dep,
+  dependencies: [glib_dep, libgvdb_dep],
   c_args: dconf_c_args + cc.get_supported_arguments('-fvisibility=hidden'),
   pic: true,
 )
 
 libdconf_common_hidden_dep = declare_dependency(
-  dependencies: glib_dep,
+  dependencies: [glib_dep, libgvdb_dep],
   link_with: libdconf_common_hidden,
 )
diff --git a/service/dconf-writer.c b/service/dconf-writer.c
index 4d054c8..438c77b 100644
--- a/service/dconf-writer.c
+++ b/service/dconf-writer.c
@@ -23,7 +23,7 @@
 #include "dconf-writer.h"
 
 #include "../shm/dconf-shm.h"
-#include "dconf-gvdb-utils.h"
+#include "../common/dconf-gvdb-utils.h"
 #include "dconf-generated.h"
 #include "dconf-blame.h"
 
diff --git a/service/meson.build b/service/meson.build
index 19fe670..1490b33 100644
--- a/service/meson.build
+++ b/service/meson.build
@@ -12,7 +12,6 @@ configure_file(
 
 lib_sources = [
   'dconf-blame.c',
-  'dconf-gvdb-utils.c',
   'dconf-keyfile-writer.c',
   'dconf-service.c',
   'dconf-shm-writer.c',
@@ -36,7 +35,7 @@ libdconf_service = static_library(
   sources: lib_sources,
   include_directories: top_inc,
   c_args: dconf_c_args,
-  dependencies: gio_unix_dep,
+  dependencies: [gio_unix_dep, libdconf_common_hidden_dep],
   link_with: [
     libdconf_common,
     libdconf_shm,
@@ -46,7 +45,7 @@ libdconf_service = static_library(
 
 libdconf_service_dep = declare_dependency(
   link_with: libdconf_service,
-  dependencies: gio_unix_dep,
+  dependencies: [gio_unix_dep, libdconf_common_hidden_dep],
   sources: dconf_generated,
 )
 
@@ -55,7 +54,7 @@ dconf_service = executable(
   sources,
   include_directories: top_inc,
   c_args: dconf_c_args,
-  dependencies: gio_unix_dep,
+  dependencies: [gio_unix_dep, libdconf_common_hidden_dep],
   link_with: libdconf_service,
   install: true,
   install_dir: dconf_libexecdir,