[Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1363.1.1, 2005/03/24 21:52:41+00:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
        into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean



 Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


diff -Nru a/xen/Makefile b/xen/Makefile
--- a/xen/Makefile      2005-03-24 17:03:00 -05:00
+++ b/xen/Makefile      2005-03-24 17:03:00 -05:00
@@ -8,9 +8,9 @@
 
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
-export XEN_VERSION       = 2
+export XEN_VERSION       = 3
 export XEN_SUBVERSION    = 0
-export XEN_EXTRAVERSION  = ""
+export XEN_EXTRAVERSION  = "-devel"
 
 export BASEDIR          := $(CURDIR)
 
@@ -79,9 +79,9 @@
        @mv -f $@.new $@
 
 tools/figlet/figlet: tools/figlet/figlet.o
-       $(CC) -o $@ $<
+       $(HOSTCC) -o $@ $<
 tools/figlet/figlet.o: tools/figlet/figlet.c
-       $(CC) -o $@ -c $<
+       $(HOSTCC) -o $@ -c $<
 
 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
@@ -110,6 +110,6 @@
        ( find include/asm-$(TARGET_ARCH) -name '*.h'; \
          find include -type d \( -name "asm-*" -o -name config \) -prune -o \
                -name '*.h' -print; \
-         find $(SUBDIRS) -name '*.[ch]' ) | grep -v /SCCS/ | etags -
+         find $(SUBDIRS) -name '*.[chS]' ) | grep -v /SCCS/ | etags -
 MAP:
        nm $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] 
\)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/xen-changelog