提交 3bd4c7ba 编写于 作者: J Jiri Denemark 提交者: Daniel Veillard

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.
上级 36e03729
...@@ -101,7 +101,7 @@ sc_prohibit_VIR_ERR_NO_MEMORY: ...@@ -101,7 +101,7 @@ sc_prohibit_VIR_ERR_NO_MEMORY:
msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY \ msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY \
$(_prohibit_regexp) $(_prohibit_regexp)
include Makefile.nonreentrant include $(srcdir)/Makefile.nonreentrant
sc_prohibit_nonreentrant: sc_prohibit_nonreentrant:
@fail=0 ; \ @fail=0 ; \
for i in $(NON_REENTRANT) ; \ for i in $(NON_REENTRANT) ; \
......
INCLUDES = -I@top_srcdir@/include INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_PROGRAMS = event-test noinst_PROGRAMS = event-test
event_test_CFLAGS = $(WARN_CFLAGS) event_test_CFLAGS = $(WARN_CFLAGS)
event_test_SOURCES = event-test.c event_test_SOURCES = event-test.c
......
INCLUDES = -I@top_srcdir@/include INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_PROGRAMS = hellolibvirt noinst_PROGRAMS = hellolibvirt
hellolibvirt_CFLAGS = $(WARN_CFLAGS) hellolibvirt_CFLAGS = $(WARN_CFLAGS)
hellolibvirt_SOURCES = hellolibvirt.c hellolibvirt_SOURCES = hellolibvirt.c
......
...@@ -43,7 +43,7 @@ virsh_LDADD = \ ...@@ -43,7 +43,7 @@ virsh_LDADD = \
$(VIRSH_LIBS) $(VIRSH_LIBS)
virsh_CFLAGS = \ virsh_CFLAGS = \
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
-I../include \ -I../include -I$(top_srcdir)/include \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/util \
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册