meson: src: build libvirt_functions.stp

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ce424e1b4e51293e7203c1132eb7e3b39e89e37..7289f247362038a1498fcf6455bda9c404f7b4e9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,15 +20,9 @@
 # here. List them against the individual XXX_la_CFLAGS targets
 # that actually use them.
 
-BUILT_SOURCES =
-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
@@ -88,24 +82,3 @@ endif !WITH_REMOTE
 check-local: check-protocol \
        check-admin
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
-
-
-if WITH_DTRACE_PROBES
-
-BUILT_SOURCES += libvirt_functions.stp
-
-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 22ff27f401b70793c367add8777c23d5cb126cd6..419a5c528a239b447605d995cb4593b411b8262a 100644 (file)
--- 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_protocol_h = custom_target(

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
deleted file mode 100644 (file)
index 285e73a..0000000
--- 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 dbff78ca1bbb5904748a5513af413c2762260653..5c49bc641f84a9b9fc2a6e363e7f63a8abd356eb 100644 (file)
--- 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 (file)
index 564b351..0000000
--- 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 22c8341fb056ca22ee9f0228f666ccd7688ae9d3..07ae9230b32e94889a4bb9fcc23fe7656ba332b7 100644 (file)
--- 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 162b09667b48c73039b833a98c11edcbf7e932e4..850a910089c18d2c63bceafc63e540bb11defb91 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -84,6 +84,8 @@ if conf.has('WITH_DTRACE_PROBES')
   )
 endif
 
+rpc_probe_files = []
+
 
 # symbol files
 
@@ -832,6 +834,21 @@ 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, python3_prog.path(), gensystemtap_prog.path(),
+      '@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 53ad3a6173a9285c6ae22510f99f93bb0648b995..ffd1fb14f33586f7fd2b91329107c397ceab9066 100644 (file)
--- 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 8f4372bb3e2c5574641d3665e74be6e398f126f8..d759fa21aec6435762b0df4b046901a21820f5f3 100644 (file)
--- 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 = [