ia64/xen-unstable

changeset 9539:03d996c80eb3

Change how we add the include asm override to CPPFLAGS.
Add to CPPFLAGS instead of entirely redefining it.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Mar 30 17:50:40 2006 +0100 (2006-03-30)
parents 4c2cc7390312
children 9316fe0c9c4f
files linux-2.6-xen-sparse/arch/i386/Makefile linux-2.6-xen-sparse/arch/x86_64/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/Makefile	Thu Mar 30 17:26:19 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/Makefile	Thu Mar 30 17:50:40 2006 +0100
     1.3 @@ -107,7 +107,7 @@ boot := arch/i386/boot
     1.4  	zdisk bzdisk fdimage fdimage144 fdimage288 install
     1.5  
     1.6  ifdef CONFIG_XEN
     1.7 -CPPFLAGS        := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE)
     1.8 +CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
     1.9  head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o
    1.10  boot := arch/i386/boot-xen
    1.11  .PHONY: vmlinuz
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Makefile	Thu Mar 30 17:26:19 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Makefile	Thu Mar 30 17:50:40 2006 +0100
     2.3 @@ -71,7 +71,7 @@ boot := arch/x86_64/boot
     2.4  	fdimage fdimage144 fdimage288 archclean
     2.5  
     2.6  ifdef CONFIG_XEN
     2.7 -CPPFLAGS := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE)
     2.8 +CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
     2.9  head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o arch/x86_64/kernel/init_task.o
    2.10  LDFLAGS_vmlinux := -e _start
    2.11  boot := arch/i386/boot-xen