From e22609983008e1a669196ad64ba3a59ae8c76e0d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 25 Nov 2019 18:53:53 +0100 Subject: New upstream version 1.20.8 --- introspection/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'introspection/meson.build') diff --git a/introspection/meson.build b/introspection/meson.build index 631432a7..ad9a6db0 100644 --- a/introspection/meson.build +++ b/introspection/meson.build @@ -56,6 +56,7 @@ ifaces = [ ifaces_xmls = [] sources = [] introspection_files = [] +headers = [] # FIXME?: DBUS_INTERFACE_DOCS/docbook files are generated in # "meson.current_build_dir()" instead of "meson.source_root()/docs/api" @@ -85,6 +86,7 @@ foreach iface: ifaces # older versions if meson.version().version_compare('>= 0.46.0') introspection_files += [ [res[2], dbus_iface_xml_path] ] + headers += res[1] endif endforeach @@ -102,9 +104,7 @@ libnmdbus = static_library( ) libnmdbus_dep = declare_dependency( - # FIXME: only headers should be added here to resolve dependencies on - # libNetworkManagerBase and libNetworkManager - #sources: sources, + sources: headers, include_directories: include_directories('.'), link_with: libnmdbus, ) -- cgit 1.3.0-6-gf8a5 From 28028b26b3371756811e95d894f709f4b1207c00 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:29:24 +0100 Subject: New upstream version 1.22.0 --- introspection/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'introspection/meson.build') diff --git a/introspection/meson.build b/introspection/meson.build index ad9a6db0..3f8a1b15 100644 --- a/introspection/meson.build +++ b/introspection/meson.build @@ -77,7 +77,7 @@ foreach iface: ifaces if gio_unix_dep.version().version_compare('>= 2.51.3') dbus_iface_xml_path = join_paths(meson.current_build_dir(), 'dbus-' + iface_xml) else - dbus_iface_xml_path = join_paths(meson.build_root(), 'dbus-' + iface_xml) + dbus_iface_xml_path = join_paths(build_root, 'dbus-' + iface_xml) endif content_files += dbus_iface_xml_path @@ -93,7 +93,7 @@ endforeach install_data( ifaces_xmls, - install_dir: dbus_ifaces_dir, + install_dir: dbus_interfaces_dir, ) libnmdbus = static_library( -- cgit 1.3.0-6-gf8a5