[libvirt] [PATCH] locking: Fix VPATH build and distribute generated files

[Daniel P. Berrange]

On Thu, Dec 13, 2012 at 05:06:04PM +0100, Jiri Denemark wrote:
> ---
>  src/Makefile.am | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 7c2d8ed..5a9fb84 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -149,19 +149,22 @@ LOCK_DRIVER_SANLOCK_HELPER_SOURCES = \
>  		locking/sanlock_helper.c
>  
>  LOCK_PROTOCOL_GENERATED = \
> -		locking/lock_protocol.h \
> -		locking/lock_protocol.c \
> +		$(srcdir)/locking/lock_protocol.h \
> +		$(srcdir)/locking/lock_protocol.c \
>  		$(NULL)
>  
> -EXTRA_DIST += locking/lock_protocol.x
> +LOCK_PROTOCOL = $(srcdir)/locking/lock_protocol.x
> +EXTRA_DIST += 	$(LOCK_PROTOCOL) \
> +		$(LOCK_PROTOCOL_GENERATED)
>  BUILT_SOURCES += $(LOCK_PROTOCOL_GENERATED)
>  MAINTAINERCLEANFILES += $(LOCK_PROTOCOL_GENERATED)
>  
>  LOCK_DAEMON_GENERATED = \
> -		locking/lock_daemon_dispatch_stubs.h
> +		$(srcdir)/locking/lock_daemon_dispatch_stubs.h
>  		$(NULL)
>  
>  BUILT_SOURCES += $(LOCK_DAEMON_GENERATED)
> +EXTRA_DIST += $(LOCK_DAEMON_GENERATED)
>  MAINTAINERCLEANFILES += $(LOCK_DAEMON_GENERATED)
>  
>  LOCK_DRIVER_LOCKD_SOURCES = \
> @@ -177,8 +180,11 @@ LOCK_DAEMON_SOURCES = \
>  		locking/lock_daemon_dispatch.h \
>  		$(NULL)
>  
> -$(srcdir)/locking/lock_daemon_dispatch_stubs.h: locking/lock_protocol.x $(srcdir)/rpc/gendispatch.pl Makefile.am
> -	$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl -b virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL $< > $@
> +$(srcdir)/locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \
> +		$(srcdir)/rpc/gendispatch.pl Makefile.am
> +	$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl \
> +	    -b virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \
> +	    $(LOCK_PROTOCOL) > $@
>  
>  
>  NETDEV_CONF_SOURCES =						\

ACK

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|