make check-driverimpls 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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2019-11-11 13:41:34 +01:00
parent 4ae7181376
commit f4eb27a9b4
20 changed files with 23 additions and 26 deletions

View File

@ -342,10 +342,7 @@ EXTRA_DIST += check-drivername.pl
check-driverimpls:
$(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \
$(filter /%,$(DRIVER_SOURCE_FILES)) \
$(filter $(srcdir)/%,$(DRIVER_SOURCE_FILES)) \
$(addprefix $(srcdir)/,$(filter-out $(srcdir)/%, \
$(filter-out /%,$(DRIVER_SOURCE_FILES))))
$(DRIVER_SOURCE_FILES)
check-aclrules:
$(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \

View File

@ -22,7 +22,7 @@ BHYVE_DRIVER_SOURCES = \
bhyve/bhyve_utils.h \
$(NULL)
DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
EXTRA_DIST += $(BHYVE_DRIVER_SOURCES)

View File

@ -48,7 +48,7 @@ ESX_DRIVER_EXTRA_DIST = \
ESX_GENERATED_STAMP = .esx_vi_generator.stamp
DRIVER_SOURCE_FILES += $(ESX_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(ESX_DRIVER_SOURCES))
EXTRA_DIST += \
$(ESX_DRIVER_SOURCES) \

View File

@ -26,7 +26,7 @@ HYPERV_DRIVER_EXTRA_DIST = \
hyperv/hyperv_wmi_generator.py \
$(NULL)
DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(HYPERV_DRIVER_SOURCES))
EXTRA_DIST += \
$(HYPERV_DRIVER_SOURCES) \

View File

@ -8,7 +8,7 @@ INTERFACE_DRIVER_SOURCES = \
INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c
INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c
DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
EXTRA_DIST += \

View File

@ -22,7 +22,7 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_migration.h \
$(NULL)
DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
EXTRA_DIST += \
$(LIBXL_DRIVER_SOURCES) \

View File

@ -61,7 +61,7 @@ LXC_CONTROLLER_SOURCES = \
DRIVER_SOURCE_FILES += \
$(LXC_MONITOR_PROTOCOL_GENERATED) \
$(LXC_MONITOR_GENERATED) \
$(LXC_DRIVER_SOURCES)
$(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += \
$(LXC_MONITOR_PROTOCOL_GENERATED) \
$(LXC_MONITOR_GENERATED) \

View File

@ -16,7 +16,7 @@ NETWORK_LEASES_HELPER_SOURCES = \
network/leaseshelper.c \
$(NULL)
DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
EXTRA_DIST += \
$(NETWORK_DRIVER_SOURCES) \

View File

@ -16,9 +16,9 @@ NODE_DEVICE_DRIVER_UDEV_SOURCES = \
$(NULL)
DRIVER_SOURCE_FILES += \
$(NODE_DEVICE_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \
$(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_HAL_SOURCES)) \
$(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_UDEV_SOURCES)) \
$(NULL)
STATEFUL_DRIVER_SOURCE_FILES += \

View File

@ -18,7 +18,7 @@ NWFILTER_DRIVER_SOURCES = \
nwfilter/nwfilter_learnipaddr.h \
$(NULL)
DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES))
EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES)

View File

@ -9,7 +9,7 @@ OPENVZ_DRIVER_SOURCES = \
openvz/openvz_util.h \
$(NULL)
DRIVER_SOURCE_FILES += $(OPENVZ_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(OPENVZ_DRIVER_SOURCES))
EXTRA_DIST += $(OPENVZ_DRIVER_SOURCES)

View File

@ -5,7 +5,7 @@ PHYP_DRIVER_SOURCES = \
phyp/phyp_driver.h \
$(NULL)
DRIVER_SOURCE_FILES += $(PHYP_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(PHYP_DRIVER_SOURCES))
EXTRA_DIST += $(PHYP_DRIVER_SOURCES)
if WITH_PHYP

View File

@ -73,7 +73,7 @@ QEMU_DRIVER_SOURCES = \
$(NULL)
DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
EXTRA_DIST += $(QEMU_DRIVER_SOURCES)

View File

@ -140,7 +140,7 @@ REMOTE_DRIVER_PROTOCOL = \
DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_GENERATED) \
$(REMOTE_DRIVER_SOURCES)
$(addprefix $(srcdir)/,$(REMOTE_DRIVER_SOURCES))
EXTRA_DIST += \
$(REMOTE_DRIVER_PROTOCOL) \

View File

@ -11,7 +11,7 @@ SECRET_UTIL_SOURCES = \
$(NULL)
DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
EXTRA_DIST += \
$(SECRET_DRIVER_SOURCES) \

View File

@ -88,7 +88,7 @@ STORAGE_HELPER_DISK_SOURCES = \
storage/parthelper.c \
$(NULL)
DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
EXTRA_DIST += \
$(STORAGE_DRIVER_SOURCES) \

View File

@ -6,7 +6,7 @@ TEST_DRIVER_SOURCES = \
$(NULL)
TEST_DRIVER_ASSETS = test/test-screenshot.png
DRIVER_SOURCE_FILES += $(TEST_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES))
EXTRA_DIST += \
$(TEST_DRIVER_SOURCES) \

View File

@ -31,8 +31,8 @@ VBOX_DRIVER_EXTRA_DIST = \
$(NULL)
DRIVER_SOURCE_FILES += \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
$(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \
$(srcdir)/vbox/vbox_tmpl.c \
$(NULL)
EXTRA_DIST += \

View File

@ -7,7 +7,7 @@ VMWARE_DRIVER_SOURCES = \
vmware/vmware_conf.h \
$(NULL)
DRIVER_SOURCE_FILES += $(VMWARE_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES))
EXTRA_DIST += $(VMWARE_DRIVER_SOURCES)

View File

@ -10,7 +10,7 @@ VZ_DRIVER_SOURCES = \
$(NULL)
DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES)
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
EXTRA_DIST += $(VZ_DRIVER_SOURCES)