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>

diff --git a/src/Makefile.am b/src/Makefile.am
index cccee6a0f05bbdb78ac8dfebd6fbd62a3a4e305b..d7e56aa62e41d0844d7fe18d372b3bf351ebd5c5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \

diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index e2b0454b312cc18fc49ba32a6ad13450a297d14a..2a01a0e5a582be0a4f950fd067dfea78f322c7ec 100644 (file)
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -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)

diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am
index 6b10755b7e4c001a14277d5f45cff8b6070819d6..78b80dfddf2355449316c2051f9b47cd2c43329f 100644 (file)
--- a/src/esx/Makefile.inc.am
+++ b/src/esx/Makefile.inc.am
@@ -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) \

diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am
index b71602c97116f0cc049005282cf18e3d45bfab88..cdd3d9ab482aa7036ae6000cfdfd25751da09dcc 100644 (file)
--- a/src/hyperv/Makefile.inc.am
+++ b/src/hyperv/Makefile.inc.am
@@ -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) \

diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 78951d4725e544ccb90545a7d8a2a9be9e9ca84c..7353bc4c8290dca9901fad8d4802758d406a1ddb 100644 (file)
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -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 += \

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 0b4ce12c0433f8ab7875f430d59dd519e6922145..03b4d2fad48a9e8e2aa63047f58d593ab610c7eb 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -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) \

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index bfb4969bdfdbcd03543db9bc3af57d2314362869..5eb0bb9ad71eba9c5180828c8a11ecd81b5b229c 100644 (file)
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -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) \

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 93a4fc59284aaf204e8cb71ac6c7b0e0e651f00b..354c130f35cf08dc412a8213de591298e19f0734 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -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) \

diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 80dc4b5c46ce00b9c59e3fb6b0dce89c223eea28..58077ebddd91bbdd81982ecb27dd4c1e693f81b4 100644 (file)
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -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 += \

diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 3a5fb090591bceabaa0d55022943e7c823aecc02..7b57df38136962377b88915da2e95204d0e8b4e7 100644 (file)
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -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)
 

diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am
index 93bf3b9c96990022b9cd202cf8f8f63b891e94d1..7ceb4e6095ef3b5354870dd1332aa845677a24c5 100644 (file)
--- a/src/openvz/Makefile.inc.am
+++ b/src/openvz/Makefile.inc.am
@@ -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)
 

diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am
index 315f1c36eee230ebdf7a5507589e0c6b04dfad80..af556e8589477df74a0878a443a26c5c64f97cb6 100644 (file)
--- a/src/phyp/Makefile.inc.am
+++ b/src/phyp/Makefile.inc.am
@@ -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

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 234b3fa3fac98e4d94f52841c11a73e86e982589..54f47c9fba1b6c76661cf3f57a29c8158aa6351c 100644 (file)
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -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)
 

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 881c7562a7c0d059d9c0ef72eed91ee78098ca01..8103cfb96a9b8d547a4d160565c178fcf723f51f 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -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) \

diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index eecc4d885e03306916807c965cbec74b4338280a..1ecea1ed4a7cdebf332db42cb98df307c4073d86 100644 (file)
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -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) \

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 434911f62c7321e8dee0a9b77f7c3351193d41ed..588df60652970303aa303cb118e63393ca58a211 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -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) \

diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am
index c20541a36858f79213b838ce14f7600d934532a6..b84ab520bb672521431e674563c26e29edec4f70 100644 (file)
--- a/src/test/Makefile.inc.am
+++ b/src/test/Makefile.inc.am
@@ -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) \

diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 551189c0f53393b074ab30f6f8b2b522b0901b4c..37da9b0aae5dec52f6c244692f52857885157d13 100644 (file)
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -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 += \

diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am
index 2c8c2d988445bfe2dbce369f2539c8b257cc5d81..10057343a6f945dcd210626cc514b50b12ce3004 100644 (file)
--- a/src/vmware/Makefile.inc.am
+++ b/src/vmware/Makefile.inc.am
@@ -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)
 

diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index d3e6e17ab60a4290f0853872d41dff47c76f25fc..7dd20e80131317bc48d3c2d0c61332fef7297d2d 100644 (file)
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -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)