Mailing List Archive

ChangeSet 1.1389, 2005/04/28 09:56:40+01:00, kaf24@firebug.cl.cam.ac.uk

Cset exclude: vh249@arcadians.cl.cam.ac.uk|ChangeSet|20050427165530|30167



Makefile | 9 +++++----
arch/x86/Makefile | 2 +-
drivers/char/Makefile | 2 --
3 files changed, 6 insertions(+), 7 deletions(-)


diff -Nru a/xen/Makefile b/xen/Makefile
--- a/xen/Makefile 2005-04-28 06:03:06 -04:00
+++ b/xen/Makefile 2005-04-28 06:03:06 -04:00
@@ -47,7 +47,8 @@
rm -f include/asm-*/asm-offsets.h
rm -f tools/figlet/*.o tools/figlet/figlet

-$(TARGET): delete-unfresh-files include/xen/compile.h
+$(TARGET): delete-unfresh-files
+ $(MAKE) include/xen/compile.h
[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
@@ -55,8 +56,9 @@
$(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/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.
@@ -81,10 +83,9 @@
tools/figlet/figlet.o: tools/figlet/figlet.c
$(HOSTCC) -o $@ -c $<

-.PHONY: include/xen/banner.h
include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
- @cmp $@.new $@ && rm -f $@.new || mv -f $@.new $@
+ @mv -f $@.new $@

include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
@(set -e; \
diff -Nru a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
--- a/xen/arch/x86/Makefile 2005-04-28 06:03:06 -04:00
+++ b/xen/arch/x86/Makefile 2005-04-28 06:03:06 -04:00
@@ -13,7 +13,7 @@

default: $(TARGET)

-$(TARGET): $(TARGET)-syms boot/mkelf32 ../../include/xen/compile.h
+$(TARGET): $(TARGET)-syms boot/mkelf32
./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000

$(CURDIR)/arch.o: $(OBJS)
diff -Nru a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
--- a/xen/drivers/char/Makefile 2005-04-28 06:03:06 -04:00
+++ b/xen/drivers/char/Makefile 2005-04-28 06:03:06 -04:00
@@ -5,7 +5,5 @@
driver.o: $(OBJS)
$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)

-console.o: ../../include/xen/banner.h
-
clean:
rm -f *.o *~ core

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog