Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/Makefile.am | 17 -----------------
src/bhyve/Makefile.inc.am | 3 ---
src/bhyve/meson.build | 1 +
src/interface/Makefile.inc.am | 4 ----
src/interface/meson.build | 1 +
src/libxl/Makefile.inc.am | 3 ---
src/libxl/meson.build | 1 +
src/lxc/Makefile.inc.am | 5 -----
src/lxc/meson.build | 6 ++++++
src/meson.build | 11 +++++++++++
src/network/Makefile.inc.am | 4 ----
src/network/meson.build | 1 +
src/node_device/Makefile.inc.am | 5 -----
src/node_device/meson.build | 2 ++
src/nwfilter/Makefile.inc.am | 4 ----
src/nwfilter/meson.build | 1 +
src/qemu/Makefile.inc.am | 3 ---
src/qemu/meson.build | 1 +
src/secret/Makefile.inc.am | 4 ----
src/secret/meson.build | 1 +
src/storage/Makefile.inc.am | 4 ----
src/storage/meson.build | 1 +
src/vz/Makefile.inc.am | 3 ---
src/vz/meson.build | 1 +
24 files changed, 28 insertions(+), 59 deletions(-)
delete mode 100644 src/bhyve/Makefile.inc.am
delete mode 100644 src/interface/Makefile.inc.am
delete mode 100644 src/libxl/Makefile.inc.am
delete mode 100644 src/network/Makefile.inc.am
delete mode 100644 src/node_device/Makefile.inc.am
delete mode 100644 src/nwfilter/Makefile.inc.am
delete mode 100644 src/qemu/Makefile.inc.am
delete mode 100644 src/secret/Makefile.inc.am
delete mode 100644 src/storage/Makefile.inc.am
delete mode 100644 src/vz/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 54e3ed42974..3b5195f2266 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@
# here. List them against the individual XXX_la_CFLAGS targets
# that actually use them.
-STATEFUL_DRIVER_SOURCE_FILES =
augeas_DATA =
augeastest_DATA =
if WITH_DTRACE_PROBES
@@ -30,17 +29,7 @@ RPC_PROBE_FILES =
include locking/Makefile.inc.am
include admin/Makefile.inc.am
-include qemu/Makefile.inc.am
-include bhyve/Makefile.inc.am
-include libxl/Makefile.inc.am
-include vz/Makefile.inc.am
include lxc/Makefile.inc.am
-include interface/Makefile.inc.am
-include network/Makefile.inc.am
-include nwfilter/Makefile.inc.am
-include node_device/Makefile.inc.am
-include secret/Makefile.inc.am
-include storage/Makefile.inc.am
# Keep this list synced with RPC_PROBE_FILES
@@ -97,18 +86,12 @@ else !WITH_REMOTE
check-protocol:
endif !WITH_REMOTE
-check-aclrules:
- $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \
- $(REMOTE_PROTOCOL) \
- $(STATEFUL_DRIVER_SOURCE_FILES)
-
check-aclperms:
$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclperms.py \
$(srcdir)/access/viraccessperm.h \
$(srcdir)/access/viraccessperm.c
check-local: check-protocol \
- check-aclrules \
check-aclperms check-admin
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
deleted file mode 100644
index 7a9c6a87242..00000000000
--- a/src/bhyve/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build
index 12b933b0b44..6dc8b7d29ff 100644
--- a/src/bhyve/meson.build
+++ b/src/bhyve/meson.build
@@ -11,6 +11,7 @@ bhyve_sources = files(
)
driver_source_files += bhyve_sources
+stateful_driver_source_files += bhyve_sources
if conf.has('WITH_BHYVE')
bhyve_driver_impl = static_library(
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
deleted file mode 100644
index 6cd6dff3b90..00000000000
--- a/src/interface/Makefile.inc.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
diff --git a/src/interface/meson.build b/src/interface/meson.build
index bd04a7f350f..bf9d649282e 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -11,6 +11,7 @@ if conf.has('WITH_UDEV')
endif
driver_source_files += files(interface_driver_sources)
+stateful_driver_source_files += files(interface_driver_sources)
if conf.has('WITH_INTERFACE')
virt_modules += {
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
deleted file mode 100644
index d713f4e75aa..00000000000
--- a/src/libxl/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 6720d826435..b2e9ca07d4a 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -11,6 +11,7 @@ libxl_driver_sources = [
]
driver_source_files += files(libxl_driver_sources)
+stateful_driver_source_files += files(libxl_driver_sources)
if conf.has('WITH_LIBXL')
libxl_driver_imp = static_library(
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 6abd08e333e..564b3519bcb 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(LXC_MONITOR_PROTOCOL_GENERATED) \
- $(LXC_MONITOR_GENERATED) \
- $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES))
-
if WITH_LXC
if WITH_DTRACE_PROBES
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 65dff6a7c4b..8b51093a387 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -46,6 +46,12 @@ driver_source_files += [
lxc_monitor_generated,
]
+stateful_driver_source_files += [
+ files(lxc_driver_sources),
+ lxc_monitor_protocol_generated,
+ lxc_monitor_generated,
+]
+
lxc_controller_sources = files(
'lxc_conf.c',
'lxc_container.c',
diff --git a/src/meson.build b/src/meson.build
index e30bf7e90b6..6747f11a3f3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -211,6 +211,10 @@ virt_install_dirs = []
# driver source files to check
driver_source_files = []
+# stateful_driver_source_files:
+# stateful driver source files to check
+stateful_driver_source_files = []
+
# list subdirectories
@@ -846,3 +850,10 @@ test(
args: [ check_driverimpls_prog.path(), driver_source_files ],
env: runutf8,
)
+
+test(
+ 'check-aclrules',
+ python3_prog,
+ args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), stateful_driver_source_files ],
+ env: runutf8,
+)
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
deleted file mode 100644
index cf5cff4ea88..00000000000
--- a/src/network/Makefile.inc.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
diff --git a/src/network/meson.build b/src/network/meson.build
index c33404dfd96..a3836bb12be 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -4,6 +4,7 @@ network_driver_sources = [
]
driver_source_files += files(network_driver_sources)
+stateful_driver_source_files += files(network_driver_sources)
network_leases_helper_sources = files(
'leaseshelper.c',
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
deleted file mode 100644
index ddd906fa782..00000000000
--- a/src/node_device/Makefile.inc.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \
- $(NULL)
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 0ac2aecf4f1..d833b329da4 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -2,6 +2,8 @@ node_device_driver_sources = [
'node_device_driver.c',
]
+stateful_driver_source_files += files(node_device_driver_sources)
+
if conf.has('WITH_HAL')
node_device_driver_sources += 'node_device_hal.c'
endif
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
deleted file mode 100644
index 68bc42c2edf..00000000000
--- a/src/nwfilter/Makefile.inc.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES))
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index c2c186903d8..6e9734e6a26 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -7,6 +7,7 @@ nwfilter_driver_sources = [
]
driver_source_files += files(nwfilter_driver_sources)
+stateful_driver_source_files += files(nwfilter_driver_sources)
if conf.has('WITH_NWFILTER')
nwfilter_driver_impl = static_library(
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
deleted file mode 100644
index 96265d2893b..00000000000
--- a/src/qemu/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index c74acf9d14b..640ef273ca8 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -38,6 +38,7 @@ qemu_driver_sources = [
]
driver_source_files += files(qemu_driver_sources)
+stateful_driver_source_files += files(qemu_driver_sources)
qemu_dtrace_gen_headers = []
qemu_dtrace_gen_objects = []
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
deleted file mode 100644
index 361305283a5..00000000000
--- a/src/secret/Makefile.inc.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
diff --git a/src/secret/meson.build b/src/secret/meson.build
index bbcd74ce309..1605729f49b 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -3,6 +3,7 @@ secret_driver_sources = [
]
driver_source_files += files(secret_driver_sources)
+stateful_driver_source_files += files(secret_driver_sources)
if conf.has('WITH_SECRETS')
virt_modules += {
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
deleted file mode 100644
index 0834ac43a64..00000000000
--- a/src/storage/Makefile.inc.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += \
- $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
diff --git a/src/storage/meson.build b/src/storage/meson.build
index b14dcf969d9..86abfedbdde 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -9,6 +9,7 @@ storage_driver_sources = [
]
driver_source_files += files(storage_driver_sources)
+stateful_driver_source_files += files(storage_driver_sources)
storage_backend_fs_sources = [
'storage_backend_fs.c',
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
deleted file mode 100644
index eb6721fb135..00000000000
--- a/src/vz/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
diff --git a/src/vz/meson.build b/src/vz/meson.build
index 903e1f1359f..0ab83731071 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -5,6 +5,7 @@ vz_driver_sources = [
]
driver_source_files += files(vz_driver_sources)
+stateful_driver_source_files += files(vz_driver_sources)
if conf.has('WITH_VZ')
vz_driver_impl = static_library(
--
2.26.2
