src: admin: 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 8c1078c56cb461b76cc28f724f9c81f2e29fb7a3..8989b3e3e3781545e927d8eb852c577de57b7804 100644 (file)
--- 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 b83e98860d69b92956e0756fab99e896cc4fb653..cf60e890d2aea2747ec5897ac91b485540ac6ec7 100644 (file)
--- 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 6f4bfeeb3d2c4c1b3dba9900d91673eeaf72c8d0..ebd86a6cd3d2ef9852448eda609620ef277e6e50 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,14 @@
 @BUILDDIR@/src/access/viraccessapicheck.c
 @BUILDDIR@/src/access/viraccessapichecklxc.c
 @BUILDDIR@/src/access/viraccessapicheckqemu.c
+@BUILDDIR@/src/admin/admin_client.h
+@BUILDDIR@/src/admin/admin_server_dispatch_stubs.h
 @SRCDIR@/gnulib/lib/gai_strerror.c
 @SRCDIR@/gnulib/lib/regcomp.c
 @SRCDIR@/src/access/viraccessdriverpolkit.c
 @SRCDIR@/src/access/viraccessmanager.c
 @SRCDIR@/src/admin/admin_server.c
 @SRCDIR@/src/admin/admin_server_dispatch.c
-@SRCDIR@/src/admin/admin_server_dispatch_stubs.h
 @SRCDIR@/src/admin/libvirt-admin.c
 @SRCDIR@/src/bhyve/bhyve_capabilities.c
 @SRCDIR@/src/bhyve/bhyve_command.c

diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
index 94cbed99729691adbb4c34152d67bb17c26f026c..448f7e1203cecebccbdba5f766424fc93dc6382e 100644 (file)
--- 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