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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b0a46702bf3402ce8301b2eec3e978f48b05aed..cccee6a0f05bbdb78ac8dfebd6fbd62a3a4e305b 100644 (file)
--- 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 1fc100d5aba1bf97fc2a19ebd1c315c97c8aa769..e2b0454b312cc18fc49ba32a6ad13450a297d14a 100644 (file)
--- 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 5f22b90cb42ff3b4ad1aec4d50f71c60e8d8c33b..78951d4725e544ccb90545a7d8a2a9be9e9ca84c 100644 (file)
--- 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 8686e78a5dcf42782215cd0d634a42a6f3f7f07b..0b4ce12c0433f8ab7875f430d59dd519e6922145 100644 (file)
--- 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 6aaec09fb4f5d7db8f90fe42fbdd378eae961045..bfb4969bdfdbcd03543db9bc3af57d2314362869 100644 (file)
--- 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 58dd90c23b775031d9954e11a3cbeb6a5e03d9d4..93a4fc59284aaf204e8cb71ac6c7b0e0e651f00b 100644 (file)
--- 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 2a8c437e7b427535e64c6b2aadfbbe30f21d9704..80dc4b5c46ce00b9c59e3fb6b0dce89c223eea28 100644 (file)
--- 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 c320b75f7873e51bb535334325b01b33f415b012..3a5fb090591bceabaa0d55022943e7c823aecc02 100644 (file)
--- 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 3f3476b2b47bf06012e4c790a820ab678c3fe50a..234b3fa3fac98e4d94f52841c11a73e86e982589 100644 (file)
--- 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 3d77366d3c689d1a132e849f12b2ebacd0fc56ee..eecc4d885e03306916807c965cbec74b4338280a 100644 (file)
--- 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 1dfe48668fb690dc3a91bbc7667cbc4ec5012ac0..434911f62c7321e8dee0a9b77f7c3351193d41ed 100644 (file)
--- 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 acada111482a4bfc8ceafcef7c66a76fb65bee74..d3e6e17ab60a4290f0853872d41dff47c76f25fc 100644 (file)
--- 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)