[Xen-changelog] [xen-unstable] [TOOLS] Fix foreign header build breakage.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1170239112 0
# Node ID daed6ac9d1f78711b19fd35b12319b509c7b0a9f
# Parent  7d3bb465e938575dfa54f362b87337d3ee012f4b
[TOOLS] Fix foreign header build breakage.

Having both the Xen tree and the tools tree recurse into the foreign
headers directory causes headaches in parallel builds and when
building 32-bit tools + 64 bit Xen in the same tree.

Therefore we cause mk-symlinks to symlink in the foreign headers build
bits and generate a local version of the headers and checker tool.

Only libxc needs to do this since the other tools were actually
picking up the libxc version of the headers anyway so the mk-symlinks
calls can be removed from these components.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 tools/Rules.mk          |   12 ++++++------
 tools/blktap/Makefile   |    4 ++--
 tools/security/Makefile |    3 +--
 tools/xenfb/Makefile    |    2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff -r 7d3bb465e938 -r daed6ac9d1f7 tools/Rules.mk
--- a/tools/Rules.mk    Wed Jan 31 10:11:26 2007 +0000
+++ b/tools/Rules.mk    Wed Jan 31 10:25:12 2007 +0000
@@ -32,7 +32,7 @@ CFLAGS += $(CFLAGS-y)
 %.o: %.cc
        $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS) mk-foreign-headers
+.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS)
 
 mk-symlinks-SunOS:
 
@@ -43,7 +43,7 @@ mk-symlinks-Linux:
          ln -sf ../../$(LINUX_ROOT)/include/xen/public/*.h . )
        ( cd xen && rm -f sys && ln -sf linux sys )
 
-mk-symlinks-xen: mk-foreign-headers
+mk-symlinks-xen:
        mkdir -p xen
        ( cd xen && ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . )
        mkdir -p xen/hvm
@@ -53,9 +53,9 @@ mk-symlinks-xen: mk-foreign-headers
        mkdir -p xen/arch-x86
        ( cd xen/arch-x86 && ln -sf 
../../$(XEN_ROOT)/xen/include/public/arch-x86/*.h . )
        mkdir -p xen/foreign
-       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/*.h . )
-
-mk-foreign-headers:
-       make -C $(XEN_ROOT)/xen/include/public/foreign
+       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/Makefile . )
+       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/reference.size . )
+       ( cd xen/foreign && ln -sf 
../../$(XEN_ROOT)/xen/include/public/foreign/*.py . )
+       make -C xen/foreign
 
 mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS)
diff -r 7d3bb465e938 -r daed6ac9d1f7 tools/blktap/Makefile
--- a/tools/blktap/Makefile     Wed Jan 31 10:11:26 2007 +0000
+++ b/tools/blktap/Makefile     Wed Jan 31 10:25:12 2007 +0000
@@ -9,7 +9,7 @@ all: build
 all: build
 
 .PHONY: build
-build: mk-symlinks
+build:
        @set -e; for subdir in $(SUBDIRS-y); do \
        $(MAKE) -C $$subdir all;       \
                done
@@ -22,7 +22,7 @@ install:
 
 .PHONY: clean
 clean:
-       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
+       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS
        @set -e; for subdir in $(SUBDIRS-y); do \
        $(MAKE) -C $$subdir clean;       \
                done
diff -r 7d3bb465e938 -r daed6ac9d1f7 tools/security/Makefile
--- a/tools/security/Makefile   Wed Jan 31 10:11:26 2007 +0000
+++ b/tools/security/Makefile   Wed Jan 31 10:25:12 2007 +0000
@@ -86,7 +86,7 @@ endif
 endif
 
 .PHONY: build
-build: mk-symlinks $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
+build: $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
        python python/setup.py build
        chmod 700 $(ACM_SCRIPTS)
 
@@ -104,7 +104,6 @@ clean:
        $(RM) $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
        $(RM) $(ACM_OBJS)
        $(RM) $(PROG_DEPS)
-       $(RM) -r xen
        $(RM) -r build
 
 .PHONY: mrproper
diff -r 7d3bb465e938 -r daed6ac9d1f7 tools/xenfb/Makefile
--- a/tools/xenfb/Makefile      Wed Jan 31 10:11:26 2007 +0000
+++ b/tools/xenfb/Makefile      Wed Jan 31 10:25:12 2007 +0000
@@ -12,7 +12,7 @@ all: build
 all: build
 
 .PHONY: build
-build: mk-symlinks
+build:
        $(MAKE) vncfb sdlfb
 
 install: all

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog