Fix build in separate build directory

* cfg.mk: use $(srcdir)/ prefix for Makefile.nonreentrant include
* examples/domain-events/events-c/Makefile.am tools/Makefile.am
  examples/hellolibvirt/Makefile.am: extend the include paths to
  use $(top_srcdir)/include too.

diff --git a/cfg.mk b/cfg.mk
index c217332ac21e226d123fb8c40c0e8dcbe25e1d86..44cfd179335405c704eb74c4bae721bfa6ee8c6b 100644 (file)
--- 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 60b15898c61c14eb98787b34ecdaca9851f75b50..64457c2a844065f8552b23362143433fd1b628fc 100644 (file)
--- a/examples/domain-events/events-c/Makefile.am
+++ b/examples/domain-events/events-c/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I@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 6ef2cc822fed155a797cbc22ea8332aaa54ba1b6..8d108a710adddd7928b6b433a7106f741da6fa57 100644 (file)
--- a/examples/hellolibvirt/Makefile.am
+++ b/examples/hellolibvirt/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I@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 c48b203e52c150b53c95c1a4f0ea70a6d8b27722..941e93ec704b90195a69a876972b70ebbfdabab6 100644 (file)
--- 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)\"                \