[libvirt] [PATCH v3 16/20] src: logging: generate source files into build directory

Pavel Hrdina phrdina at redhat.com
Thu Oct 24 13:05:34 UTC 2019


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
Reviewed-by: Ján Tomko <jtomko 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/logging/Makefile.inc.am | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed11b77921..eaad5a1883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,6 @@ Makefile.in
 # libvirt related ignores
 /build/
 /ci/scratch/
-/src/logging/log_daemon_dispatch_stubs.h
 /src/lxc/lxc_controller_dispatch.h
 /src/lxc/lxc_monitor_dispatch.h
 /src/remote/*_client_bodies.h
diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 62fe528c75..a7e87e7a81 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}_daemon_dispatch_stubs.h \
+  $(srcdir)/src/*/{remote,qemu,lxc}_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/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index bb7ea7338d..dbaac2bb0d 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -127,7 +127,7 @@ logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \
 		$(srcdir)/rpc/gendispatch.pl Makefile.am
 	$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \
 	    virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \
-	    $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h
+	    $(LOG_PROTOCOL) > logging/log_daemon_dispatch_stubs.h
 
 virtlogd.8.in: logging/virtlogd.pod
 	$(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
-- 
2.21.0




More information about the libvir-list mailing list