build: fix VPATH 'make check'

A VPATH build 'make check' was failing with:

  GEN      check-driverimpls
Can't open ../../src/../../src/lxc/lxc_monitor_protocol.h: No such file or directory at ../../src/check-driverimpls.pl line 29, <> line 27153.
Can't open ../../src/../../src/lxc/lxc_monitor_protocol.c: No such file or directory at ../../src/check-driverimpls.pl line 29, <> line 27153.
...
  GEN      check-aclrules
cannot read ../../src/../../src/remote/remote_protocol.x at ../../src/check-aclrules.pl line 128.

because $(srcdir) was being prepended to file names that already
included it.

* src/Makefile.am (check-driverimpls): Don't add srcdir twice.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 84372cb4847b8369972a004e6c07e2f22737c4a2..62e427e63c7e12ba61942755c9358cb4b608e906 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -499,11 +499,13 @@ STATEFUL_DRIVER_SOURCE_FILES = \
 check-driverimpls:
        $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \
                $(filter /%,$(DRIVER_SOURCE_FILES)) \
-               $(addprefix $(srcdir)/,$(filter-out /%,$(DRIVER_SOURCE_FILES)))
+               $(filter $(srcdir)/%,$(DRIVER_SOURCE_FILES)) \
+               $(addprefix $(srcdir)/,$(filter-out $(srcdir)/%, \
+                       $(filter-out /%,$(DRIVER_SOURCE_FILES))))
 
 check-aclrules:
        $(AM_V_GEN)$(PERL) $(srcdir)/check-aclrules.pl \
-               $(addprefix $(srcdir)/,$(filter-out /%,$(REMOTE_PROTOCOL))) \
+               $(REMOTE_PROTOCOL) \
                $(addprefix $(srcdir)/,$(filter-out /%,$(STATEFUL_DRIVER_SOURCE_FILES)))
 
 EXTRA_DIST += check-driverimpls.pl check-aclrules.pl