[Xen-devel] [PATCH 3/3] Use the new include subdirectories to build Xen tools

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

Use them to build qemu-xen.

Add them to the include path of CFLAGS_libxenguest, CFLAGS_libxenctrl
and CFLAGS_libxenstore.

Use CFLAGS_libxenctrl and CFLAGS_libxenstore to build the python tools.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 tools/Makefile        |    6 +++---
 tools/Rules.mk        |    6 +++---
 tools/python/Makefile |    2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index f4aa200..5f32dcc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -188,9 +188,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                --includedir=$(PREFIX)/lib/xen/include \
                --source-path=$$source \
                --extra-cflags="-I$(XEN_ROOT)/tools/include \
-               -I$(XEN_ROOT)/tools/libxc \
-               -I$(XEN_ROOT)/tools/xenstore \
-               -I$(XEN_ROOT)/tools/xenstore/compat \
+               -I$(XEN_ROOT)/tools/libxc/include \
+               -I$(XEN_ROOT)/tools/xenstore/include \
+               -I$(XEN_ROOT)/tools/xenstore/compat/include \
                $(EXTRA_CFLAGS_QEMU_XEN)" \
                --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
                -L$(XEN_ROOT)/tools/xenstore \
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 13d8fc1..249bbbb 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -19,15 +19,15 @@ XEN_LIBVCHAN       = $(XEN_ROOT)/tools/libvchan
 
 CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 
-CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+CFLAGS_libxenctrl = -I$(XEN_LIBXC) -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude)
 LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so
 SHLIB_libxenctrl  = -Wl,-rpath-link=$(XEN_LIBXC)
 
-CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+CFLAGS_libxenguest = -I$(XEN_LIBXC) -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude)
 LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so
 SHLIB_libxenguest  = -Wl,-rpath-link=L$(XEN_LIBXC)
 
-CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
+CFLAGS_libxenstore = -I$(XEN_XENSTORE) -I$(XEN_XENSTORE)/include 
$(CFLAGS_xeninclude)
 LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore.so
 SHLIB_libxenstore  = -Wl,-rpath-link=$(XEN_XENSTORE)
 
diff --git a/tools/python/Makefile b/tools/python/Makefile
index eee746d..7c4b281 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -5,6 +5,8 @@ include $(XEN_ROOT)/tools/Rules.mk
 all: build
 
 XENPATH = "xen/util/path.py"
+CFLAGS += $(CFLAGS_libxenctrl)
+CFLAGS += $(CFLAGS_libxenstore)
 
 genpath-target = $(call buildmakevars2file,$(XENPATH))
 $(eval $(genpath-target))
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel