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

[Jiri Denemark]

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 \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir)/src/conf \
 	-I$(top_srcdir)/src/rpc \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cbbbc6f..7b80d17 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
 	-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src -I../src \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir)/src/conf \
 	$(GETTEXT_CPPFLAGS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 71131e2..8a8be1a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,7 +4,7 @@
 INCLUDES = \
 	-I../include -I$(top_srcdir)/include \
 	-I$(top_srcdir)/gnulib/lib -I../gnulib/lib	\
-	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/src -I../src			\
 	-I$(top_srcdir)/src/util			\
 	-I$(top_srcdir)					\
 	$(GETTEXT_CPPFLAGS)
-- 
1.7.7