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>
This commit is contained in:
Pavel Hrdina 2019-10-24 00:56:14 +02:00
parent b98f90cf91
commit d6be9e7f65
4 changed files with 6 additions and 7 deletions

2
.gitignore vendored
View File

@ -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

View File

@ -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]

View File

@ -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

View File

@ -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