On 06/22/2011 09:33 AM, Daniel P. Berrange wrote:
> Move the daemon/remote_generator.pl to src/rpc/gendispatch.pl
> and move the src/remote/rpcgen_fix.pl to src/rpc/genprotocol.pl
About time! I have found it quite annoying that we have two generators
in highly disparate locations but parsing/generating related files!
>
> * daemon/Makefile.am: Update for new name/location of generator
> * src/Makefile.am: Update for new name/location of generator
> ---
> cfg.mk | 6 +-
> daemon/Makefile.am | 41 ++++++++++----------
> src/Makefile.am | 28 ++++++++------
> .../remote_generator.pl => src/rpc/gendispatch.pl | 0
> src/{remote/rpcgen_fix.pl => rpc/genprotocol.pl} | 0
> 5 files changed, 39 insertions(+), 36 deletions(-)
> rename daemon/remote_generator.pl => src/rpc/gendispatch.pl (100%)
> rename src/{remote/rpcgen_fix.pl => rpc/genprotocol.pl} (100%)
> mode change 100755 => 100644
Why the mode change? Probably an unintentional reversion when you
rebased on top of 1d8bcb45c.
> +++ b/src/Makefile.am
> @@ -173,14 +173,14 @@ REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x
> QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x
> REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL)
>
> -$(srcdir)/remote/remote_client_bodies.h: $(REMOTE_PROTOCOL) \
> - $(top_srcdir)/daemon/remote_generator.pl
> - $(AM_V_GEN)perl -w $(top_srcdir)/daemon/remote_generator.pl \
> +remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
> + $(REMOTE_PROTOCOL)
This breaks VPATH builds - generated files that are shipped as part of
the tarball should be generated into $(srcdir).
ACK once you add back the '$(srcdir)/' on the rules you changed here.
--
Eric Blake eblake@xxxxxxxxxx +1-801-349-2682
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list