diff options
| author | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2020-01-06 12:29:12 +1100 |
|---|---|---|
| committer | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2020-12-19 12:39:35 +1100 |
| commit | 658af7018a349eb925503f920a3c6b5a948b0cc1 (patch) | |
| tree | 91c9ec8cc96d11a3cad6f4c595ef7ab3a112f9ac | |
| parent | d23b3fddd62cf5310c7f8869663ddb1c54c192dc (diff) | |
| download | dconf-658af7018a349eb925503f920a3c6b5a948b0cc1.tar.gz | |
move dconf-gvdb-utils from service into common
| -rw-r--r-- | common/dconf-gvdb-utils.c (renamed from service/dconf-gvdb-utils.c) | 2 | ||||
| -rw-r--r-- | common/dconf-gvdb-utils.h (renamed from service/dconf-gvdb-utils.h) | 2 | ||||
| -rw-r--r-- | common/meson.build | 5 | ||||
| -rw-r--r-- | service/dconf-writer.c | 2 | ||||
| -rw-r--r-- | service/meson.build | 7 |
5 files changed, 9 insertions, 9 deletions
diff --git a/service/dconf-gvdb-utils.c b/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 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 befa9bc..e736ea8 100644 --- a/common/meson.build +++ b/common/meson.build @@ -15,18 +15,19 @@ 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_with: libdconf_common, ) 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..51e3090 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_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_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_dep], link_with: libdconf_service, install: true, install_dir: dconf_libexecdir, |