[libvirt] [PATCH] build: Fix VPATH build with new probes

[Eric Blake]

On 10/11/2011 08:49 AM, Jiri Denemark wrote:
> Note that make check still fails for me in VPATH build because od
> undefined references in libvirt_test.a which I don't really understand
> since src/Makefile.am contains
> libvirt_la_LIBADD += probes.o
> libvirt_test_la_LIBADD = $(libvirt_la_LIBADD)
>
> This is a sample of the erros I get:
>
> ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o):
> In function `virNetClientCallDispatch':
> /home/jirka/work/libvirt/git/upstream/src/rpc/virnetclient.c:690:
> undefined reference to `libvirt_rpc_client_msg_rx_semaphore'
> ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o):
> In function `virNetClientRef':
> /home/jirka/work/libvirt/git/upstream/src/rpc/virnetclient.c:234:
> undefined reference to `libvirt_rpc_client_ref_semaphore'
> ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o):
> ---
>   daemon/Makefile.am |    2 +-
>   tests/Makefile.am  |    2 +-
>   tools/Makefile.am  |    2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index e7821b2..e8c47ae 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -6,7 +6,7 @@
>   INCLUDES = \
>   	-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
>   	-I$(top_srcdir)/include -I$(top_builddir)/include \
> -	-I$(top_srcdir)/src \
> +	-I$(top_srcdir)/src -I../src \

ACK - this says to pick up .h files from both srcdir and builddir, with 
a preference for srcdir.  It makes no difference on in-tree builds, but 
helps VPATH builds where we now generate a .h file, and matches the 
gnulib pattern several lines above (since gnulib also has both srcdir 
and generated builddir .h files).

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org