ia64/xen-unstable

changeset 13764:daed6ac9d1f7

[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@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Wed Jan 31 10:25:12 2007 +0000 (2007-01-31)
parents 7d3bb465e938
children c834e3984baa
files tools/Rules.mk tools/blktap/Makefile tools/security/Makefile tools/xenfb/Makefile
line diff
     1.1 --- a/tools/Rules.mk	Wed Jan 31 10:11:26 2007 +0000
     1.2 +++ b/tools/Rules.mk	Wed Jan 31 10:25:12 2007 +0000
     1.3 @@ -32,7 +32,7 @@ CFLAGS += $(CFLAGS-y)
     1.4  %.o: %.cc
     1.5  	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
     1.6  
     1.7 -.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS) mk-foreign-headers
     1.8 +.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS)
     1.9  
    1.10  mk-symlinks-SunOS:
    1.11  
    1.12 @@ -43,7 +43,7 @@ mk-symlinks-Linux:
    1.13  	  ln -sf ../../$(LINUX_ROOT)/include/xen/public/*.h . )
    1.14  	( cd xen && rm -f sys && ln -sf linux sys )
    1.15  
    1.16 -mk-symlinks-xen: mk-foreign-headers
    1.17 +mk-symlinks-xen:
    1.18  	mkdir -p xen
    1.19  	( cd xen && ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . )
    1.20  	mkdir -p xen/hvm
    1.21 @@ -53,9 +53,9 @@ mk-symlinks-xen: mk-foreign-headers
    1.22  	mkdir -p xen/arch-x86
    1.23  	( cd xen/arch-x86 && ln -sf ../../$(XEN_ROOT)/xen/include/public/arch-x86/*.h . )
    1.24  	mkdir -p xen/foreign
    1.25 -	( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/*.h . )
    1.26 -
    1.27 -mk-foreign-headers:
    1.28 -	make -C $(XEN_ROOT)/xen/include/public/foreign
    1.29 +	( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/Makefile . )
    1.30 +	( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/reference.size . )
    1.31 +	( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/*.py . )
    1.32 +	make -C xen/foreign
    1.33  
    1.34  mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS)
     2.1 --- a/tools/blktap/Makefile	Wed Jan 31 10:11:26 2007 +0000
     2.2 +++ b/tools/blktap/Makefile	Wed Jan 31 10:25:12 2007 +0000
     2.3 @@ -9,7 +9,7 @@ SUBDIRS-y += drivers
     2.4  all: build
     2.5  
     2.6  .PHONY: build
     2.7 -build: mk-symlinks
     2.8 +build:
     2.9  	@set -e; for subdir in $(SUBDIRS-y); do \
    2.10  	$(MAKE) -C $$subdir all;       \
    2.11  		done
    2.12 @@ -22,7 +22,7 @@ install:
    2.13  
    2.14  .PHONY: clean
    2.15  clean:
    2.16 -	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
    2.17 +	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS
    2.18  	@set -e; for subdir in $(SUBDIRS-y); do \
    2.19  	$(MAKE) -C $$subdir clean;       \
    2.20  		done
     3.1 --- a/tools/security/Makefile	Wed Jan 31 10:11:26 2007 +0000
     3.2 +++ b/tools/security/Makefile	Wed Jan 31 10:25:12 2007 +0000
     3.3 @@ -86,7 +86,7 @@ install:
     3.4  endif
     3.5  
     3.6  .PHONY: build
     3.7 -build: mk-symlinks $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
     3.8 +build: $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
     3.9  	python python/setup.py build
    3.10  	chmod 700 $(ACM_SCRIPTS)
    3.11  
    3.12 @@ -104,7 +104,6 @@ clean:
    3.13  	$(RM) $(ACM_INST_TOOLS) $(ACM_NOINST_TOOLS)
    3.14  	$(RM) $(ACM_OBJS)
    3.15  	$(RM) $(PROG_DEPS)
    3.16 -	$(RM) -r xen
    3.17  	$(RM) -r build
    3.18  
    3.19  .PHONY: mrproper
     4.1 --- a/tools/xenfb/Makefile	Wed Jan 31 10:11:26 2007 +0000
     4.2 +++ b/tools/xenfb/Makefile	Wed Jan 31 10:25:12 2007 +0000
     4.3 @@ -12,7 +12,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
     4.4  all: build
     4.5  
     4.6  .PHONY: build
     4.7 -build: mk-symlinks
     4.8 +build:
     4.9  	$(MAKE) vncfb sdlfb
    4.10  
    4.11  install: all