ia64/xen-unstable

changeset 5583:4a7652a70a9d

bitkeeper revision 1.1758 (42bff8419M7X5aOGlHhSQueJtvoYaA)

Fix out of source tree build bugs:
- add (srctree)/include/asm-xen to include list
- fix include2/asm link to reference asm-XENARCH
- fix install target for public headeres
This fix enables the complication of several configurations from the same (read-only) source tree.

Signed-off-by: Shahar Frank <shaharf@qumranet.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Jun 27 12:59:45 2005 +0000 (2005-06-27)
parents 8ad10be47849
children d892fbf61323
files linux-2.6.11-xen-sparse/arch/xen/Makefile
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Makefile	Sun Jun 26 12:08:53 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile	Mon Jun 27 12:59:45 2005 +0000
     1.3 @@ -16,12 +16,22 @@ XENARCH	:= $(subst ",,$(CONFIG_XENARCH))
     1.4  
     1.5  # pick up headers from include/asm-xen/asm in preference over include/asm
     1.6  NOSTDINC_FLAGS  = -nostdinc -iwithprefix include/asm-xen -Iinclude/asm-xen -iwithprefix include
     1.7 +ifneq ($(KBUILD_SRC),)
     1.8 +NOSTDINC_FLAGS += -I$(srctree)/include/asm-xen
     1.9 +endif
    1.10  
    1.11  # make uname return the processor arch
    1.12  UTS_MACHINE := $(XENARCH)
    1.13  
    1.14  core-y	+= arch/xen/kernel/
    1.15  
    1.16 +.PHONY: include2/asm
    1.17 +include2/asm:
    1.18 +ifneq ($(KBUILD_SRC),)
    1.19 +	@echo '  SYMLINK ../include/asm-$(XENARCH) -> include2/asm'
    1.20 +	$(Q)ln -fsn ../include/asm-$(XENARCH) include2/asm
    1.21 +endif
    1.22 +
    1.23  include/.asm-ignore: include/asm
    1.24  	@rm -f include/.asm-ignore
    1.25  	@mv include/asm include/.asm-ignore
    1.26 @@ -46,7 +56,7 @@ include/asm-$(ARCH)/asm_offsets.h: arch/
    1.27  	$(call filechk,gen-asm-offsets)
    1.28  
    1.29  prepare: include/.asm-ignore include/asm-xen/asm \
    1.30 -	arch/xen/arch include/asm-$(ARCH)/asm_offsets.h ;
    1.31 +	arch/xen/arch include/asm-$(ARCH)/asm_offsets.h include2/asm ;
    1.32  
    1.33  all: vmlinuz
    1.34  
    1.35 @@ -64,7 +74,7 @@ install: vmlinuz
    1.36  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    1.37  	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_PATH)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
    1.38  	mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
    1.39 -	install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
    1.40 +	install -m0644 $(srctree)/include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
    1.41  
    1.42  archclean:
    1.43  	@if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;