4:58 a.m.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/Makefile.am | 24 ------------------------
src/admin/meson.build | 2 ++
src/locking/Makefile.inc.am | 3 ---
src/locking/meson.build | 2 ++
src/lxc/Makefile.inc.am | 9 ---------
src/lxc/meson.build | 2 ++
src/meson.build | 14 ++++++++++++++
src/remote/meson.build | 2 ++
src/rpc/meson.build | 2 ++
9 files changed, 24 insertions(+), 36 deletions(-)
delete mode 100644 src/locking/Makefile.inc.am
delete mode 100644 src/lxc/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 88e44fab2b9..7289f247362 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,14 +20,9 @@
# here. List them against the individual XXX_la_CFLAGS targets
# that actually use them.
-if WITH_DTRACE_PROBES
-tapset_DATA =
-endif WITH_DTRACE_PROBES
RPC_PROBE_FILES =
-include locking/Makefile.inc.am
include admin/Makefile.inc.am
-include lxc/Makefile.inc.am
# Keep this list synced with RPC_PROBE_FILES
@@ -87,22 +82,3 @@ endif !WITH_REMOTE
check-local: check-protocol \
check-admin
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
-
-
-if WITH_DTRACE_PROBES
-
-tapset_DATA += libvirt_functions.stp
-
-# Keep this list synced with PROTOCOL_STRUCTS
-RPC_PROBE_FILES += $(srcdir)/rpc/virnetprotocol.x \
- $(srcdir)/rpc/virkeepaliveprotocol.x \
- $(srcdir)/remote/remote_protocol.x \
- $(srcdir)/remote/lxc_protocol.x \
- $(srcdir)/remote/qemu_protocol.x \
- $(srcdir)/admin/admin_protocol.x
-
-libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemtap.py
- $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/gensystemtap.py \
- $(RPC_PROBE_FILES) > $@
-
-endif WITH_DTRACE_PROBES
diff --git a/src/admin/meson.build b/src/admin/meson.build
index c9dff4d92a0..330fe2f98d1 100644
--- a/src/admin/meson.build
+++ b/src/admin/meson.build
@@ -5,6 +5,8 @@ admin_driver_sources = [
admin_driver_protocol = files('admin_protocol.x')
+rpc_probe_files += admin_driver_protocol
+
admin_driver_generated = []
admin_driver_generated += custom_target(
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
deleted file mode 100644
index 285e73a6bf4..00000000000
--- a/src/locking/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x
diff --git a/src/locking/meson.build b/src/locking/meson.build
index dbff78ca1bb..5c49bc641f8 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -1,5 +1,7 @@
lock_protocol = 'lock_protocol.x'
+rpc_probe_files += files(lock_protocol)
+
lock_driver_sources = [
'lock_manager.c',
'lock_driver_nop.c',
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
deleted file mode 100644
index 564b3519bcb..00000000000
--- a/src/lxc/Makefile.inc.am
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim: filetype=automake
-
-if WITH_LXC
-
-if WITH_DTRACE_PROBES
-RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
-endif
-
-endif WITH_LXC
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 8b51093a387..0999e1c96b8 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -13,6 +13,8 @@ lxc_driver_sources = [
lxc_monitor_protocol = files('lxc_monitor_protocol.x')
+rpc_probe_files += lxc_monitor_protocol
+
lxc_monitor_protocol_generated = []
lxc_monitor_protocol_generated += custom_target(
diff --git a/src/meson.build b/src/meson.build
index 9b4c26e32ea..7965c5fb18a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -75,6 +75,8 @@ if conf.has('WITH_DTRACE_PROBES')
)
endif
+rpc_probe_files = []
+
# symbol files
@@ -802,6 +804,18 @@ foreach sysconf : sysconf_files
)
endforeach
+if conf.has('WITH_DTRACE_PROBES')
+ custom_target(
+ 'libvirt_functions.stp',
+ input: rpc_probe_files,
+ output: 'libvirt_functions.stp',
+ command: [ meson_python_prog, gensystemtap_prog, '@INPUT@' ],
+ capture: true,
+ install: true,
+ install_dir: systemtap_dir,
+ )
+endif
+
# Install empty directories
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 055857ae360..fa7ce7ce5be 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -37,6 +37,8 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
genprotocol_prog, rpcgen_prog, '-c', '@INPUT@',
'@OUTPUT@',
],
)
+
+ rpc_probe_files += files(protocol_x)
endforeach
remote_daemon_sources = files(
diff --git a/src/rpc/meson.build b/src/rpc/meson.build
index 8f4372bb3e2..d759fa21aec 100644
--- a/src/rpc/meson.build
+++ b/src/rpc/meson.build
@@ -45,6 +45,8 @@ foreach name : [ 'virnet', 'virkeepalive' ]
genprotocol_prog, rpcgen_prog, '-c', '@INPUT@',
'@OUTPUT@',
],
)
+
+ rpc_probe_files += protocol_file
endforeach
rpc_server_sources = [
--
2.26.2