Move xenstore and libxc public headers to include subdir

Also moves xc_dom.h to include as it is used often by other xen tools.
Use the new include subdirectories to build Xen tools, qemu-xen and
stubdoms.

Add the old libxc include path to the programs that need it to build,
on a case by case basis and commeting that they shouldn't require
internal libxc headers to build.

[ And: update QEMU_TRADITIONAL_REVISION to corresponding qemu patch
   - Ian jackson ]

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 1e96d679b1cc4c9cb23e0519c789a9a631cdfdf6..81f6d5ab91dbd2353b595b7a251f10c338fc66e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -307,12 +307,14 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET)
        mkdir -p libxc-$(XEN_TARGET_ARCH)
        [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \
          ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \
+         ln -sf $(XEN_ROOT)/tools/libxc/include/*.h . && \
          ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \
          ln -sf $(XEN_ROOT)/tools/libxc/Makefile . )
        mkdir -p xenstore
        [ -h xenstore/Makefile ] || ( cd xenstore && \
          ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \
          ln -sf $(XEN_ROOT)/tools/xenstore/*.h . && \
+         ln -sf $(XEN_ROOT)/tools/xenstore/include/*.h . && \
          ln -sf $(XEN_ROOT)/tools/xenstore/Makefile . )
        $(MAKE) DESTDIR= -C $(MINI_OS) links
        touch mk-headers-$(XEN_TARGET_ARCH)

diff --git a/grub/Makefile b/grub/Makefile
index 6bd2c4c9f15e7e85055ed7441b40ef80192e815e..934cc4c73c81e51097a73aed66403bed41bfb3ab 100644 (file)
--- a/grub/Makefile
+++ b/grub/Makefile
@@ -5,7 +5,7 @@ vpath %.c ../grub-upstream
 
 BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o
 
-DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc -I$(XEN_ROOT)/tools/include -I.
+DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include -I.
 DEF_CPPFLAGS += -I../grub-upstream/stage1
 DEF_CPPFLAGS += -I../grub-upstream/stage2
 DEF_CPPFLAGS += -I../grub-upstream/netboot