From c50f3758d3e5da4f8b244227b211c3c3f454275c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Tue, 10 Apr 2018 22:50:31 +0200 Subject: build: Fix internal dependencies meson is able to generate internal dependencies for handling built libraries. These internal dependencies depend on other dependencies as well, based on the includes exposed by their headers. This have been fixed by using proper internal dependencies for these libraries. --- gdbus/meson.build | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'gdbus/meson.build') diff --git a/gdbus/meson.build b/gdbus/meson.build index c22a81d..1aef9fb 100644 --- a/gdbus/meson.build +++ b/gdbus/meson.build @@ -1,23 +1,33 @@ -sources = files('dconf-gdbus-thread.c') +name = meson.project_name() + '-gdbus-thread' cflags = '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()) libdconf_gdbus_thread = static_library( - meson.project_name() + '-gdbus-thread', - sources: sources, + name, + sources: name + '.c', include_directories: top_inc, - dependencies: gio_unix_dep, + dependencies: libdconf_engine_dep, c_args: cflags, pic: true ) -sources = files('dconf-gdbus-filter.c') +libdconf_gdbus_thread_dep = declare_dependency( + dependencies: libdconf_engine_dep, + link_with: libdconf_gdbus_thread +) + +name = meson.project_name() + '-gdbus-filter' libdconf_gdbus_filter = static_library( - meson.project_name() + '-gdbus-filter', - sources: sources, + name, + sources: name + '.c', include_directories: top_inc, - dependencies: gio_unix_dep, + dependencies: libdconf_engine_dep, c_args: cflags, pic: true ) + +libdconf_gdbus_filter_dep = declare_dependency( + dependencies: libdconf_engine_dep, + link_with: libdconf_gdbus_filter +) -- cgit v1.2.1