bitkeeper revision 1.1159.223.71 (42060876pgZEpnal0wuK3VOOWP9zCQ)

Fix build system to rebuild file containing banner text every time.
Signed-off-by: keir.fraser@cl.cam.ac.uk

diff --git a/xen/Makefile b/xen/Makefile
index 33b03f4854c73f8cfe69c3c928aac8b5b4402929..57a89ad454b6f2e3ee9abebad99cf986260f8e95 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -54,8 +54,9 @@ $(TARGET): delete-unfresh-files include/xen/compile.h
        $(MAKE) -C drivers
        $(MAKE) -C arch/$(TARGET_ARCH)
 
+# drivers/char/console.o may contain static banner/compile info. Blow it away.
 delete-unfresh-files:
-       rm -f include/xen/banner.h include/xen/compile.h
+       rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
        $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index aa6caae098392397c13d440a8078e363f41db61a..9a6029dcafab5e3be194525242a2d67765e3f8b4 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -36,8 +36,7 @@ clean:
        rm -f x86_64/*.o x86_64/*~ x86_64/core
        rm -f mtrr/*.o mtrr/*~ mtrr/core
 
-# setup.o contains bits of compile.h so it must be blown away
 delete-unfresh-files:
-       rm -f setup.o
+       # nothing
 
 .PHONY: default clean delete-unfresh-files