summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2021-09-02 18:26:48 +0200
committerBastien Nocera <hadess@hadess.net>2021-09-02 18:47:05 +0200
commit3c561dd5dc600755389fe0bffa1f17968a96e2da (patch)
tree9cf62937f4fc4751f13511b0ceb77bedcab5d1e9
parent8fc111b017e718b8e63c17015a4ba70831d25448 (diff)
downloadupower-wip/hadess/remove-autotools.tar.gz
build: Fix race while building generated D-Bus objectswip/hadess/remove-autotools
-rw-r--r--dbus/meson.build9
1 files changed, 3 insertions, 6 deletions
diff --git a/dbus/meson.build b/dbus/meson.build
index 211229b..2225fad 100644
--- a/dbus/meson.build
+++ b/dbus/meson.build
@@ -6,19 +6,16 @@ upowerd_dbus_interfaces = [
[ 'wakeups', 'org.freedesktop.UPower.Wakeups', 'Wakeups' ],
]
-upowerd_dbus_headers = []
upowerd_dbus_sources = []
foreach interface: upowerd_dbus_interfaces
xml = interface[1] + '.xml'
- t = gnome.gdbus_codegen('up-' + interface[0] + '-generated',
+ upowerd_dbus_sources += gnome.gdbus_codegen('up-' + interface[0] + '-generated',
sources: xml,
autocleanup: 'all',
annotations:[ [ interface[1], 'org.gtk.GDBus.C.Name', 'Exported' + interface[2] ] ],
namespace: 'Up',
object_manager: false,
)
- upowerd_dbus_headers += t[0]
- upowerd_dbus_sources += t[1]
install_data(xml,
install_dir: dbusdir / 'interfaces',
@@ -27,13 +24,13 @@ endforeach
upowerd_dbus = static_library('libupower-dbus',
- sources: upowerd_dbus_sources + upowerd_dbus_headers,
+ sources: upowerd_dbus_sources,
dependencies: [ gobject_dep, gio_dep, gio_unix_dep ],
)
upowerd_dbus_dep = declare_dependency(
link_with: upowerd_dbus,
include_directories: [ '.' ],
- sources: upowerd_dbus_headers,
+ sources: upowerd_dbus_sources,
dependencies: [ gio_unix_dep ]
)