diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-13 16:10:30 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-13 16:31:40 +0100 |
| commit | 5a09f7759860f4f2a9bb01471ca8099cd705bc10 (patch) | |
| tree | 3a9cffc9622d53c9196771a1c7924bceb754f118 /introspection/meson.build | |
| parent | 25691220fd27093630cf244e219b2f4f1f4e749e (diff) | |
| parent | ca847639aab94434daed120c874e1100c3d75dcf (diff) | |
Merge remote-tracking branch 'salsa/debian/master'
Diffstat (limited to 'introspection/meson.build')
| -rw-r--r-- | introspection/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/introspection/meson.build b/introspection/meson.build index 631432a7..3f8a1b15 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" @@ -76,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 @@ -85,13 +86,14 @@ 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 install_data( ifaces_xmls, - install_dir: dbus_ifaces_dir, + install_dir: dbus_interfaces_dir, ) libnmdbus = static_library( @@ -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, ) |