[libvirt] [PATCH 1/2] src: Make check-aclrules work again

Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/Makefile.am | 2 +- src/bhyve/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 2 +- src/libxl/Makefile.inc.am | 2 +- src/lxc/Makefile.inc.am | 2 +- src/network/Makefile.inc.am | 2 +- src/node_device/Makefile.inc.am | 2 +- src/nwfilter/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4a0c121a7d..b3a6be04ff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -350,7 +350,7 @@ check-driverimpls: check-aclrules: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \ $(REMOTE_PROTOCOL) \ - $(addprefix $(srcdir)/,$(filter-out /%,$(STATEFUL_DRIVER_SOURCE_FILES))) + $(STATEFUL_DRIVER_SOURCE_FILES) check-aclperms: $(AM_V_GEN)$(PERL) $(srcdir)/check-aclperms.pl \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 1fc100d5ab..e2b0454b31 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -23,7 +23,7 @@ BHYVE_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) EXTRA_DIST += $(BHYVE_DRIVER_SOURCES) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 5f22b90cb4..78951d4725 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -9,7 +9,7 @@ INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) EXTRA_DIST += \ $(INTERFACE_DRIVER_SOURCES) \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 8686e78a5d..0b4ce12c04 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -23,7 +23,7 @@ LIBXL_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) EXTRA_DIST += \ $(LIBXL_DRIVER_SOURCES) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 6aaec09fb4..bfb4969bdf 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -65,7 +65,7 @@ DRIVER_SOURCE_FILES += \ STATEFUL_DRIVER_SOURCE_FILES += \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ - $(LXC_DRIVER_SOURCES) + $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) EXTRA_DIST += \ $(LXC_DRIVER_SOURCES) \ $(LXC_MONITOR_PROTOCOL) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 58dd90c23b..93a4fc5928 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -17,7 +17,7 @@ NETWORK_LEASES_HELPER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) EXTRA_DIST += \ $(NETWORK_DRIVER_SOURCES) \ $(NETWORK_DRIVER_PLATFORM_INC) \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 2a8c437e7b..80dc4b5c46 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -22,7 +22,7 @@ DRIVER_SOURCE_FILES += \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ + $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) EXTRA_DIST += \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index c320b75f78..3a5fb09059 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -19,7 +19,7 @@ NWFILTER_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) if WITH_NWFILTER diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 3f3476b2b4..234b3fa3fa 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -74,7 +74,7 @@ QEMU_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) EXTRA_DIST += $(QEMU_DRIVER_SOURCES) if WITH_QEMU diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 3d77366d3c..eecc4d885e 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -12,7 +12,7 @@ SECRET_UTIL_SOURCES = \ DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 1dfe48668f..434911f62c 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -89,7 +89,7 @@ STORAGE_HELPER_DISK_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) EXTRA_DIST += \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index acada11148..d3e6e17ab6 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -11,7 +11,7 @@ VZ_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) EXTRA_DIST += $(VZ_DRIVER_SOURCES) -- 2.23.0