[libvirt] [PATCH] Fix build in separate build directory

[Daniel Veillard]

On Thu, Oct 01, 2009 at 03:31:11PM +0200, Jiri Denemark wrote:
> 
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  cfg.mk                                      |    2 +-
>  examples/domain-events/events-c/Makefile.am |    2 +-
>  examples/hellolibvirt/Makefile.am           |    2 +-
>  tools/Makefile.am                           |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/cfg.mk b/cfg.mk
> index c217332..44cfd17 100644
> --- a/cfg.mk
> +++ b/cfg.mk
> @@ -101,7 +101,7 @@ sc_prohibit_VIR_ERR_NO_MEMORY:
>  	msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY		\
>  	  $(_prohibit_regexp)
>  
> -include Makefile.nonreentrant
> +include $(srcdir)/Makefile.nonreentrant
>  sc_prohibit_nonreentrant:
>  	@fail=0 ; \
>  	for i in $(NON_REENTRANT) ; \
> diff --git a/examples/domain-events/events-c/Makefile.am b/examples/domain-events/events-c/Makefile.am
> index 60b1589..64457c2 100644
> --- a/examples/domain-events/events-c/Makefile.am
> +++ b/examples/domain-events/events-c/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = -I at top_srcdir@/include
> +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
>  noinst_PROGRAMS = event-test
>  event_test_CFLAGS = $(WARN_CFLAGS)
>  event_test_SOURCES = event-test.c
> diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am
> index 6ef2cc8..8d108a7 100644
> --- a/examples/hellolibvirt/Makefile.am
> +++ b/examples/hellolibvirt/Makefile.am
> @@ -1,4 +1,4 @@
> -INCLUDES = -I at top_srcdir@/include
> +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
>  noinst_PROGRAMS = hellolibvirt
>  hellolibvirt_CFLAGS = $(WARN_CFLAGS)
>  hellolibvirt_SOURCES = hellolibvirt.c
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index c48b203..941e93e 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -43,7 +43,7 @@ virsh_LDADD =							\
>  		$(VIRSH_LIBS)
>  virsh_CFLAGS = 							\
>  		-I$(top_srcdir)/gnulib/lib -I../gnulib/lib	\
> -		-I../include					\
> +		-I../include -I$(top_srcdir)/include		\
>  		-I$(top_srcdir)/src				\
>  		-I$(top_srcdir)/src/util			\
>  		-DGETTEXT_PACKAGE=\"$(PACKAGE)\"		\

  Heh, I must admit I never try taht, but yes this was broken and fixes
it, even 'make check' passes !

   Applied, thanks !

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/