[libvirt] [PATCH] build: fix VPATH build with distributed generated files

* daemon/Makefile.am (DAEMON_GENERATED, remote_dispatch_*.h) (qemu_dispatch_*.h): Update to live in srcdir, since they are distributed. Detected by Daniel P. Berrange's autobuilder. --- Pushing under the build-breaker rule. daemon/Makefile.am | 102 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 41 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 114adf3..f734c89 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -3,16 +3,16 @@ CLEANFILES = DAEMON_GENERATED = \ - remote_dispatch_prototypes.h \ - remote_dispatch_table.h \ - remote_dispatch_args.h \ - remote_dispatch_ret.h \ - remote_dispatch_bodies.h \ - qemu_dispatch_prototypes.h \ - qemu_dispatch_table.h \ - qemu_dispatch_args.h \ - qemu_dispatch_ret.h \ - qemu_dispatch_bodies.h + $(srcdir)/remote_dispatch_prototypes.h \ + $(srcdir)/remote_dispatch_table.h \ + $(srcdir)/remote_dispatch_args.h \ + $(srcdir)/remote_dispatch_ret.h \ + $(srcdir)/remote_dispatch_bodies.h \ + $(srcdir)/qemu_dispatch_prototypes.h \ + $(srcdir)/qemu_dispatch_table.h \ + $(srcdir)/qemu_dispatch_args.h \ + $(srcdir)/qemu_dispatch_ret.h \ + $(srcdir)/qemu_dispatch_bodies.h DAEMON_SOURCES = \ libvirtd.c libvirtd.h \ @@ -186,7 +186,7 @@ CLEANFILES += probes.h probes.o endif install-data-local: install-init install-data-sasl install-data-polkit \ - install-logrotate + install-logrotate mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt @@ -213,38 +213,58 @@ remote.h: $(DAEMON_GENERATED) REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x -remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote $(REMOTE_PROTOCOL) > $@ - -remote_dispatch_table.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote $(REMOTE_PROTOCOL) > $@ - -remote_dispatch_args.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote $(REMOTE_PROTOCOL) > $@ - -remote_dispatch_ret.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote $(REMOTE_PROTOCOL) > $@ - -remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote $(REMOTE_PROTOCOL) > $@ - -qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu $(QEMU_PROTOCOL) > $@ - -qemu_dispatch_table.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu $(QEMU_PROTOCOL) > $@ - -qemu_dispatch_args.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu $(QEMU_PROTOCOL) > $@ - -qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu $(QEMU_PROTOCOL) > $@ - -qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL) - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu $(QEMU_PROTOCOL) > $@ +$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \ + $(REMOTE_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \ + $(REMOTE_PROTOCOL) > $@ + +$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \ + $(REMOTE_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \ + $(REMOTE_PROTOCOL) > $@ + +$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \ + $(REMOTE_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \ + $(REMOTE_PROTOCOL) > $@ + +$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \ + $(REMOTE_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \ + $(REMOTE_PROTOCOL) > $@ + +$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \ + $(REMOTE_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \ + $(REMOTE_PROTOCOL) > $@ + +$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \ + $(QEMU_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \ + $(QEMU_PROTOCOL) > $@ + +$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \ + $(QEMU_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \ + $(QEMU_PROTOCOL) > $@ + +$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \ + $(QEMU_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \ + $(QEMU_PROTOCOL) > $@ + +$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \ + $(QEMU_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \ + $(QEMU_PROTOCOL) > $@ + +$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \ + $(QEMU_PROTOCOL) + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \ + $(QEMU_PROTOCOL) > $@ LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ - libvirtd.uml.logrotate libvirtd.logrotate + libvirtd.uml.logrotate libvirtd.logrotate BUILT_SOURCES += $(LOGROTATE_CONFS) -- 1.7.4.4