src: locking: generate source files into build directory

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/.gitignore b/.gitignore
index 85a417112d765c3cebfd97a9d61f314ce26a96bf..ed11b779212fb4b0714c6ebb3acdefe3d4ab6765 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,6 @@ Makefile.in
 # libvirt related ignores
 /build/
 /ci/scratch/
-/src/locking/lock_daemon_dispatch_stubs.h
 /src/logging/log_daemon_dispatch_stubs.h
 /src/lxc/lxc_controller_dispatch.h
 /src/lxc/lxc_monitor_dispatch.h

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index cf60e890d2aea2747ec5897ac91b485540ac6ec7..62fe528c7509ae8479e8f5b87dcf9ad73a1dc741 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1976,7 +1976,7 @@ po_file ?= $(srcdir)/po/POTFILES.in
 generated_files = \
   $(builddir)/src/*.[ch] \
   $(builddir)/src/*/*.[ch] \
-  $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \
+  $(srcdir)/src/*/{remote,qemu,lxc,log}_daemon_dispatch_stubs.h \
   $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \
   $(srcdir)/src/remote/*_client_bodies.h \
   $(srcdir)/gnulib/lib/*.[ch]

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index ba7a9ea2ea9f122e6a632115e38055b92f367ef8..2bfb662016101f4ccba09213593ce68b24177d82 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -280,7 +280,7 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \
                $(srcdir)/rpc/gendispatch.pl Makefile.am
        $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \
            virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \
-           $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h
+           $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h
 
 
 virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status