diff options
| author | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2018-08-27 11:19:20 +1000 |
|---|---|---|
| committer | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2018-08-27 11:19:20 +1000 |
| commit | b799b08ec4e5978ab8db233a9da1532bf7918324 (patch) | |
| tree | 1765b9bdae5258808f30b421b3c95b9b15e69eef | |
| parent | bf103302332603a637f1c33e603c93b82aa1dc0b (diff) | |
| download | dconf-b799b08ec4e5978ab8db233a9da1532bf7918324.tar.gz | |
Revert "Declare libdconf_service as a dependency"
This reverts commit bf103302332603a637f1c33e603c93b82aa1dc0b.
| -rw-r--r-- | service/meson.build | 10 | ||||
| -rw-r--r-- | tests/meson.build | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/service/meson.build b/service/meson.build index 7d54805..35ee23a 100644 --- a/service/meson.build +++ b/service/meson.build @@ -23,15 +23,13 @@ sources = [ 'main.c', ] -dconf_generated = gnome.gdbus_codegen( +lib_sources += 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, @@ -45,12 +43,6 @@ 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 d1471b4..3274059 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_dep], [libdconf_mock]], + ['writer', 'writer.c', '-DSRCDIR="@0@"'.format(test_dir), [glib_dep, dl_dep, m_dep], [libdconf_service, libdconf_mock]], ] foreach unit_test: unit_tests |