ia64/xen-unstable

changeset 9594:133ce326febd

Clean up HDRS Makefile variable.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 05 15:46:01 2006 +0100 (2006-04-05)
parents c1d53788a25e
children 68ef2efa929b
files xen/Rules.mk xen/arch/x86/Rules.mk
line diff
     1.1 --- a/xen/Rules.mk	Wed Apr 05 15:42:01 2006 +0100
     1.2 +++ b/xen/Rules.mk	Wed Apr 05 15:46:01 2006 +0100
     1.3 @@ -26,21 +26,20 @@ override TARGET_SUBARCH  := $(XEN_TARGET
     1.4  override COMPILE_ARCH    := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
     1.5  override TARGET_ARCH     := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
     1.6  
     1.7 -TARGET  := $(BASEDIR)/xen
     1.8 -HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
     1.9 -HDRS    += $(wildcard $(BASEDIR)/include/public/*.h)
    1.10 -HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
    1.11 -HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
    1.12 -HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/*.h)
    1.13 -HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/svm/*.h)
    1.14 -HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/vmx/*.h)
    1.15 -# Do not depend on auto-generated header files.
    1.16 -HDRS    := $(subst $(BASEDIR)/include/asm-$(TARGET_ARCH)/asm-offsets.h,,$(HDRS))
    1.17 -HDRS    := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
    1.18 -HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
    1.19 +TARGET := $(BASEDIR)/xen
    1.20 +
    1.21 +HDRS := $(wildcard $(BASEDIR)/include/xen/*.h)
    1.22 +HDRS += $(wildcard $(BASEDIR)/include/public/*.h)
    1.23 +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
    1.24 +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
    1.25  
    1.26  include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
    1.27  
    1.28 +# Do not depend on auto-generated header files.
    1.29 +HDRS := $(subst $(BASEDIR)/include/asm-$(TARGET_ARCH)/asm-offsets.h,,$(HDRS))
    1.30 +HDRS := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
    1.31 +HDRS := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
    1.32 +
    1.33  # Note that link order matters!
    1.34  ALL_OBJS-y               += $(BASEDIR)/common/built_in.o
    1.35  ALL_OBJS-y               += $(BASEDIR)/drivers/built_in.o
     2.1 --- a/xen/arch/x86/Rules.mk	Wed Apr 05 15:42:01 2006 +0100
     2.2 +++ b/xen/arch/x86/Rules.mk	Wed Apr 05 15:46:01 2006 +0100
     2.3 @@ -46,6 +46,10 @@ x86_32 := n
     2.4  x86_64 := y
     2.5  endif
     2.6  
     2.7 +HDRS += $(wildcard $(BASEDIR)/include/asm-x86/hvm/*.h)
     2.8 +HDRS += $(wildcard $(BASEDIR)/include/asm-x86/hvm/svm/*.h)
     2.9 +HDRS += $(wildcard $(BASEDIR)/include/asm-x86/hvm/vmx/*.h)
    2.10 +
    2.11  # Test for at least GCC v3.2.x.
    2.12  gcc-ver = $(shell $(CC) -dumpversion | sed -e 's/^\(.\)\.\(.\)\.\(.\)/\$(1)/')
    2.13  ifeq ($(call gcc-ver,1),1)