ia64/xen-unstable

changeset 4674:3000c660f103

bitkeeper revision 1.1389 (4270a548HjJvvxATKrCShKKiLW-siw)

Cset exclude: vh249@arcadians.cl.cam.ac.uk|ChangeSet|20050427165530|30167
author kaf24@firebug.cl.cam.ac.uk
date Thu Apr 28 08:56:40 2005 +0000 (2005-04-28)
parents 98d5be103415
children 16efdf7bbd57 7f38080250df
files xen/Makefile xen/arch/x86/Makefile xen/drivers/char/Makefile
line diff
     1.1 --- a/xen/Makefile	Wed Apr 27 16:55:50 2005 +0000
     1.2 +++ b/xen/Makefile	Thu Apr 28 08:56:40 2005 +0000
     1.3 @@ -47,7 +47,8 @@ clean: delete-unfresh-files
     1.4  	rm -f include/asm-*/asm-offsets.h
     1.5  	rm -f tools/figlet/*.o tools/figlet/figlet
     1.6  
     1.7 -$(TARGET): delete-unfresh-files include/xen/compile.h
     1.8 +$(TARGET): delete-unfresh-files
     1.9 +	$(MAKE) include/xen/compile.h
    1.10  	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
    1.11  	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
    1.12  	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
    1.13 @@ -55,8 +56,9 @@ clean: delete-unfresh-files
    1.14  	$(MAKE) -C drivers
    1.15  	$(MAKE) -C arch/$(TARGET_ARCH)
    1.16  
    1.17 +# drivers/char/console.o may contain static banner/compile info. Blow it away.
    1.18  delete-unfresh-files:
    1.19 -	rm -f include/xen/compile.h
    1.20 +	rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
    1.21  	$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
    1.22  
    1.23  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    1.24 @@ -81,10 +83,9 @@ tools/figlet/figlet: tools/figlet/figlet
    1.25  tools/figlet/figlet.o: tools/figlet/figlet.c
    1.26  	$(HOSTCC) -o $@ -c $<
    1.27  
    1.28 -.PHONY: include/xen/banner.h
    1.29  include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
    1.30  	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
    1.31 -	@cmp $@.new $@ && rm -f $@.new || mv -f $@.new $@
    1.32 +	@mv -f $@.new $@
    1.33  
    1.34  include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
    1.35  	@(set -e; \
     2.1 --- a/xen/arch/x86/Makefile	Wed Apr 27 16:55:50 2005 +0000
     2.2 +++ b/xen/arch/x86/Makefile	Thu Apr 28 08:56:40 2005 +0000
     2.3 @@ -13,7 +13,7 @@ endif
     2.4  
     2.5  default: $(TARGET)
     2.6  
     2.7 -$(TARGET): $(TARGET)-syms boot/mkelf32 ../../include/xen/compile.h
     2.8 +$(TARGET): $(TARGET)-syms boot/mkelf32
     2.9  	./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000
    2.10  
    2.11  $(CURDIR)/arch.o: $(OBJS)
     3.1 --- a/xen/drivers/char/Makefile	Wed Apr 27 16:55:50 2005 +0000
     3.2 +++ b/xen/drivers/char/Makefile	Thu Apr 28 08:56:40 2005 +0000
     3.3 @@ -5,7 +5,5 @@ default: driver.o
     3.4  driver.o: $(OBJS)
     3.5  	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
     3.6  
     3.7 -console.o: ../../include/xen/banner.h
     3.8 -
     3.9  clean:
    3.10  	rm -f *.o *~ core