diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2005-01-25 14:05:02 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2005-01-25 14:05:02 +0000 |
| commit | 36f2347fd3fe710aa6f10909597c7f47bfb3430f (patch) | |
| tree | 9f6863ead3058a6ed5d1a5eabedd8b88076a5b0d | |
| parent | 1ac07367bb077785c1ecb6f8d3ab27d79ff73f17 (diff) | |
| download | xen-36f2347fd3fe710aa6f10909597c7f47bfb3430f.tar.gz xen-36f2347fd3fe710aa6f10909597c7f47bfb3430f.tar.bz2 xen-36f2347fd3fe710aa6f10909597c7f47bfb3430f.zip | |
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
| -rw-r--r-- | xen/Makefile | 4 | ||||
| -rw-r--r-- | xen/Rules.mk | 1 | ||||
| -rw-r--r-- | xen/arch/x86/Makefile | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/xen/Makefile b/xen/Makefile index 1e477388ba..fd2c06df3d 100644 --- 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 63c3a51784..c5d3405781 100644 --- 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 574b0c35a5..805591766e 100644 --- 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 |