[libvirt] [PATCH v4 15/20] [ACKED] src: locking: generate source files into build directory

[Pavel Hrdina]

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

Notes:
    Changes in v2:
        - remove entries from .gitignore
        - modify generated_files for sc_po_check as well

 .gitignore                  | 1 -
 build-aux/syntax-check.mk   | 2 +-
 src/locking/Makefile.inc.am | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85a417112d..ed11b77921 100644
--- 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 cf60e890d2..62fe528c75 100644
--- 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 ba7a9ea2ea..2bfb662016 100644
--- 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
-- 
2.23.0