ia64/xen-unstable

changeset 3529:f1210445f1f9

bitkeeper revision 1.1159.230.1 (41f6520ec91dTdY6i_ggr80c6cRooQ)

Fix Xen dependencies and always rebuild arch/x86/setup.o rather than
common/kernel.o (boot banner was moved out to arch-specific).
signed-off-by: keir.fraser@cl.cam.ac.uk
author kaf24@scramble.cl.cam.ac.uk
date Tue Jan 25 14:05:02 2005 +0000 (2005-01-25)
parents 5d73739fd212
children 47059455441d
files xen/Makefile xen/Rules.mk xen/arch/x86/Makefile
line diff
     1.1 --- a/xen/Makefile	Tue Jan 25 13:05:37 2005 +0000
     1.2 +++ b/xen/Makefile	Tue Jan 25 14:05:02 2005 +0000
     1.3 @@ -49,9 +49,9 @@ clean:
     1.4  	$(MAKE) -C drivers
     1.5  	$(MAKE) -C arch/$(TARGET_ARCH)
     1.6  
     1.7 -# Blow away kernel.o because build info is stored statically within it.
     1.8  delete-unfresh-files:
     1.9 -	rm -f include/xen/banner.h include/xen/compile.h common/kernel.o
    1.10 +	rm -f include/xen/banner.h include/xen/compile.h
    1.11 +	$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
    1.12  
    1.13  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    1.14  include/xen/compile.h: LANG=C
     2.1 --- a/xen/Rules.mk	Tue Jan 25 13:05:37 2005 +0000
     2.2 +++ b/xen/Rules.mk	Tue Jan 25 14:05:02 2005 +0000
     2.3 @@ -22,6 +22,7 @@ HDRS    += $(wildcard $(BASEDIR)/include
     2.4  HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
     2.5  HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
     2.6  # compile.h is always regenerated, but other files shouldn't be rebuilt
     2.7 +HDRS    := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
     2.8  HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
     2.9  
    2.10  C_SRCS  := $(wildcard *.c)
     3.1 --- a/xen/arch/x86/Makefile	Tue Jan 25 13:05:37 2005 +0000
     3.2 +++ b/xen/arch/x86/Makefile	Tue Jan 25 14:05:02 2005 +0000
     3.3 @@ -35,4 +35,8 @@ clean:
     3.4  	rm -f x86_32/*.o x86_32/*~ x86_32/core
     3.5  	rm -f x86_64/*.o x86_64/*~ x86_64/core
     3.6  
     3.7 -.PHONY: default clean
     3.8 +# setup.o contains bits of compile.h so it must be blown away
     3.9 +delete-unfresh-files:
    3.10 +	rm -f setup.o
    3.11 +
    3.12 +.PHONY: default clean delete-unfresh-files