ia64/xen-unstable

changeset 3501:502b0127031e

bitkeeper revision 1.1159.223.28 (41f2cea9tkhheORopsoScolnVoBxgw)

Description: split banner.h
Split banner.h, to make it easier to edit, and more properly fit in with
normal build systems.
Also, inline the rules to actually build figlet.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
author iap10@labyrinth.cl.cam.ac.uk
date Sat Jan 22 22:07:37 2005 +0000 (2005-01-22)
parents ef59de03bebf
children 288b96264654
files .rootkeys xen/Makefile xen/include/xen/banner.h xen/include/xen/compile.h.in
line diff
     1.1 --- a/.rootkeys	Sat Jan 22 22:05:19 2005 +0000
     1.2 +++ b/.rootkeys	Sat Jan 22 22:07:37 2005 +0000
     1.3 @@ -852,7 +852,9 @@ 404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/inclu
     1.4  3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
     1.5  3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
     1.6  40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
     1.7 +41f2cea7ZvnB9JC4qkiq1K8H7xJw5Q xen/include/xen/banner.h
     1.8  3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
     1.9 +41f2cea7Yna7xc0X9fyavIjoSFFeVg xen/include/xen/compile.h.in
    1.10  3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h
    1.11  3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xen/config.h
    1.12  3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xen/console.h
     2.1 --- a/xen/Makefile	Sat Jan 22 22:05:19 2005 +0000
     2.2 +++ b/xen/Makefile	Sat Jan 22 22:07:37 2005 +0000
     2.3 @@ -35,14 +35,13 @@ dist: install
     2.4  clean: tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean
     2.5  	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
     2.6  	rm -f include/asm-*/asm-offsets.h
     2.7 +	rm -f tools/figlet/*.o tools/figlet/figlet
     2.8  
     2.9  tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean : %.clean:
    2.10  	$(MAKE) -C $* clean
    2.11  
    2.12 -$(TARGET): delete-unfresh-files
    2.13 +$(TARGET): delete-unfresh-files include/xen/compile.h
    2.14  	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
    2.15 -	$(MAKE) -C tools
    2.16 -	$(MAKE) include/xen/compile.h
    2.17  	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
    2.18  	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
    2.19  	$(MAKE) -C common
    2.20 @@ -54,25 +53,30 @@ delete-unfresh-files:
    2.21  	rm -f include/xen/compile.h common/kernel.o
    2.22  
    2.23  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    2.24 -include/xen/compile.h:
    2.25 -	@LANG=C echo /\* Autogenerated by root Makefile. Do not edit. \*/ > $@
    2.26 -	@LANG=C echo >> $@
    2.27 -	@LANG=C echo \#define XEN_COMPILE_DATE \"`date`\" >> $@
    2.28 -	@LANG=C echo \#define XEN_COMPILE_TIME \"`date +%T`\" >> $@
    2.29 -	@LANG=C echo \#define XEN_COMPILE_BY \"`whoami`\" >> $@
    2.30 -	@LANG=C echo \#define XEN_COMPILE_DOMAIN \"`([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown])`\" >> $@
    2.31 -	@LANG=C echo \#define XEN_COMPILE_HOST \"`hostname`\" >> $@
    2.32 -	@LANG=C echo \#define XEN_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> $@
    2.33 -	@LANG=C echo >> $@
    2.34 -	@LANG=C echo \#define XEN_VERSION\ \ \ \ \ \ $(XEN_VERSION) >> $@
    2.35 -	@LANG=C echo \#define XEN_SUBVERSION\ \ \ $(XEN_SUBVERSION) >> $@
    2.36 -	@LANG=C echo \#define XEN_EXTRAVERSION \"$(XEN_EXTRAVERSION)\" >> $@
    2.37 -	@LANG=C echo >> $@
    2.38 -	@LANG=C echo \#define XEN_CHANGESET \"`bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo "information unavailable"`\" >> $@
    2.39 -	@LANG=C echo >> $@
    2.40 -	@LANG=C echo \#define XEN_BANNER \\ >> $@
    2.41 -	( cd ./tools/figlet && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../../$@ )
    2.42 -	@LANG=C echo >> $@
    2.43 +include/xen/compile.h: LANG=C
    2.44 +include/xen/compile.h: include/xen/compile.h.in include/xen/banner.h
    2.45 +	sed -e 's/@@date@@/$(shell date)/g' \
    2.46 +	    -e 's/@@time@@/$(shell date +%T)/g' \
    2.47 +	    -e 's/@@whoami@@/$(shell whoami)/g' \
    2.48 +	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
    2.49 +	    -e 's/@@hostname@@/$(shell hostname)/g' \
    2.50 +	    -e 's/@@compiler@@/$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -1)/g' \
    2.51 +	    -e 's/@@version@@/$(XEN_VERSION)/g' \
    2.52 +	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
    2.53 +	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
    2.54 +	    -e 's/@@changeset@@/$(shell bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo information unavailable)/g' \
    2.55 +	    < include/xen/compile.h.in > $@.new
    2.56 +	cat include/xen/banner.h >> $@.new
    2.57 +	mv $@.new $@
    2.58 +
    2.59 +tools/figlet/figlet: tools/figlet/figlet.o
    2.60 +	$(CC) -o $@ $<
    2.61 +tools/figlet/figlet.o: tools/figlet/figlet.c
    2.62 +	$(CC) -o $@ -c $<
    2.63 +
    2.64 +include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
    2.65 +	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
    2.66 +	mv $@.new $@
    2.67  
    2.68  include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
    2.69  	@(set -e; \
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/include/xen/banner.h	Sat Jan 22 22:07:37 2005 +0000
     3.3 @@ -0,0 +1,12 @@
     3.4 +"\040\137\137\040\040\137\137\040\040\040\040\040\040\040\040\040\040\040" \
     3.5 +"\040\137\137\137\137\040\040\040\040\137\137\137\040\040\012\040\134\040" \
     3.6 +"\134\057\040\057\137\137\137\040\137\040\137\137\040\040\040\174\137\137" \
     3.7 +"\137\040\134\040\040\057\040\137\040\134\040\012\040\040\134\040\040\057" \
     3.8 +"\057\040\137\040\134\040\047\137\040\134\040\040\040\040\137\137\051\040" \
     3.9 +"\174\174\040\174\040\174\040\174\012\040\040\057\040\040\134\040\040\137" \
    3.10 +"\137\057\040\174\040\174\040\174\040\040\057\040\137\137\057\040\174\040" \
    3.11 +"\174\137\174\040\174\012\040\057\137\057\134\137\134\137\137\137\174\137" \
    3.12 +"\174\040\174\137\174\040\174\137\137\137\137\137\050\137\051\137\137\137" \
    3.13 +"\057\040\012\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040" \
    3.14 +"\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\012" \
    3.15 +
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xen/include/xen/compile.h.in	Sat Jan 22 22:07:37 2005 +0000
     4.3 @@ -0,0 +1,13 @@
     4.4 +#define XEN_COMPILE_DATE	"@@date@@"
     4.5 +#define XEN_COMPILE_TIME	"@@time@@"
     4.6 +#define XEN_COMPILE_BY		"@@whoami@@"
     4.7 +#define XEN_COMPILE_DOMAIN	"@@domain@@"
     4.8 +#define XEN_COMPILE_HOST	"@@hostname@@"
     4.9 +#define XEN_COMPILER		"@@compiler@@"
    4.10 +
    4.11 +#define XEN_VERSION		@@version@@
    4.12 +#define XEN_SUBVERSION		@@subversion@@
    4.13 +#define XEN_EXTRAVERSION	@@extraversion@@
    4.14 +
    4.15 +#define XEN_CHANGESET		"@@changeset@@"
    4.16 +#define XEN_BANNER		\