diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2018-08-27 01:39:28 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2018-08-27 01:39:28 +0000 |
| commit | 35bcc8bf4f7e4a0fa6b2e55b702f90141dcddaa4 (patch) | |
| tree | 080adc464ab417ad277ae6a278ef9bb6e0fedb8e | |
| parent | b799b08ec4e5978ab8db233a9da1532bf7918324 (diff) | |
| parent | 92fe9f1a80f7dd6730c66b5fce3ee826f58be6cf (diff) | |
| download | dconf-35bcc8bf4f7e4a0fa6b2e55b702f90141dcddaa4.tar.gz | |
Merge branch 'declare-service-dep' into 'master'
Declare libdconf_service as a dependency
See merge request GNOME/dconf!22
| -rw-r--r-- | service/meson.build | 10 | ||||
| -rw-r--r-- | tests/meson.build | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/service/meson.build b/service/meson.build index 35ee23a..7d54805 100644 --- a/service/meson.build +++ b/service/meson.build @@ -23,13 +23,15 @@ sources = [ 'main.c', ] -lib_sources += gnome.gdbus_codegen( +dconf_generated = gnome.gdbus_codegen( 'dconf-generated', dconf_namespace + '.xml', interface_prefix: dconf_namespace + '.', namespace: 'DConfDBus', ) +lib_sources += dconf_generated + libdconf_service = static_library( 'dconf-service', sources: lib_sources, @@ -43,6 +45,12 @@ libdconf_service = static_library( ], ) +libdconf_service_dep = declare_dependency( + link_with: libdconf_service, + dependencies: gio_unix_dep, + sources: dconf_generated, +) + executable( 'dconf-service', sources, diff --git a/tests/meson.build b/tests/meson.build index 3274059..d1471b4 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -30,7 +30,7 @@ unit_tests = [ ['gdbus-filter', 'dbus.c', '-DDBUS_BACKEND="/gdbus/filter"', libdconf_gdbus_filter_dep, []], ['engine', 'engine.c', '-DSRCDIR="@0@"'.format(test_dir), [dl_dep, libdconf_engine_dep, m_dep], libdconf_mock], ['client', 'client.c', '-DSRCDIR="@0@"'.format(test_dir), [libdconf_client_dep, libdconf_engine_dep], libdconf_mock], - ['writer', 'writer.c', '-DSRCDIR="@0@"'.format(test_dir), [glib_dep, dl_dep, m_dep], [libdconf_service, libdconf_mock]], + ['writer', 'writer.c', '-DSRCDIR="@0@"'.format(test_dir), [glib_dep, dl_dep, m_dep, libdconf_service_dep], [libdconf_mock]], ] foreach unit_test: unit_tests |