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

diff --git a/xen/Makefile b/xen/Makefile
index 1e477388ba7bd149c0c1da8846570b50b980e527..fd2c06df3daef92a4d7be01a73ee76d940c4761c 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -49,9 +49,9 @@ $(TARGET): delete-unfresh-files include/xen/compile.h
        $(MAKE) -C drivers
        $(MAKE) -C arch/$(TARGET_ARCH)
 
-# Blow away kernel.o because build info is stored statically within it.
 delete-unfresh-files:
-       rm -f include/xen/banner.h include/xen/compile.h common/kernel.o
+       rm -f include/xen/banner.h include/xen/compile.h
+       $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
 include/xen/compile.h: LANG=C

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 63c3a51784c21b1d7263d76d52126daaacf4c84c..c5d34057819b7148f4b22ae9df153e6f3df60128 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -22,6 +22,7 @@ HDRS    += $(wildcard $(BASEDIR)/include/public/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
 # compile.h is always regenerated, but other files shouldn't be rebuilt
+HDRS    := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
 HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
 
 C_SRCS  := $(wildcard *.c)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 574b0c35a548ae7c7b040ba5c823dae75ce5e9fe..805591766e25056e32ad4323e2b524bcb43bb785 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -35,4 +35,8 @@ clean:
        rm -f x86_32/*.o x86_32/*~ x86_32/core
        rm -f x86_64/*.o x86_64/*~ x86_64/core
 
-.PHONY: default clean
+# setup.o contains bits of compile.h so it must be blown away
+delete-unfresh-files:
+       rm -f setup.o
+
+.PHONY: default clean delete-unfresh-files