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

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 2 -- build-aux/syntax-check.mk | 1 - po/POTFILES.in | 3 ++- src/admin/Makefile.inc.am | 7 ++++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8c1078c56c..8989b3e3e3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,8 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/admin/admin_client.h -/src/admin/admin_server_dispatch_stubs.h /src/esx/*.generated.* /src/hyperv/*.generated.* /src/locking/lock_daemon_dispatch_stubs.h diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index b83e98860d..cf60e890d2 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1977,7 +1977,6 @@ generated_files = \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \ - $(srcdir)/src/admin/admin_server_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/po/POTFILES.in b/po/POTFILES.in index 6f4bfeeb3d..ebd86a6cd3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,13 +1,14 @@ @BUILDDIR(a)/src/access/viraccessapicheck.c @BUILDDIR(a)/src/access/viraccessapichecklxc.c @BUILDDIR(a)/src/access/viraccessapicheckqemu.c +@BUILDDIR(a)/src/admin/admin_client.h +@BUILDDIR(a)/src/admin/admin_server_dispatch_stubs.h @SRCDIR(a)/gnulib/lib/gai_strerror.c @SRCDIR(a)/gnulib/lib/regcomp.c @SRCDIR(a)/src/access/viraccessdriverpolkit.c @SRCDIR(a)/src/access/viraccessmanager.c @SRCDIR(a)/src/admin/admin_server.c @SRCDIR(a)/src/admin/admin_server_dispatch.c -@SRCDIR(a)/src/admin/admin_server_dispatch_stubs.h @SRCDIR(a)/src/admin/libvirt-admin.c @SRCDIR(a)/src/bhyve/bhyve_capabilities.c @SRCDIR(a)/src/bhyve/bhyve_command.c diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 94cbed9972..448f7e1203 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -28,8 +28,9 @@ libvirt_driver_admin_la_SOURCES = \ libvirt_driver_admin_la_CFLAGS = \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ - -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/admin \ + -I$(top_builddir)/src/admin \ + -I$(top_srcdir)/src/util \ -I$(top_builddir)/src/rpc \ $(NULL) libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la @@ -123,13 +124,13 @@ admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_client.h + > admin/admin_client.h admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \ admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_server_dispatch_stubs.h + > admin/admin_server_dispatch_stubs.h admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILES) \ $(top_builddir)/config.status -- 2.23.0