xen-changelog

[Top] [All Lists]

[Xen-changelog] merge

from [BitKeeper Bot]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] merge
From:	BitKeeper Bot <riel@xxxxxxxxxxx>
Date:	Mon, 28 Mar 2005 21:51:31 +0000
Delivery-date:	Tue, 29 Mar 2005 08:03:45 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxxxx>
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

ChangeSet 1.1382, 2005/03/28 22:51:31+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        merge



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


diff -Nru a/xen/Makefile b/xen/Makefile
--- a/xen/Makefile      2005-03-29 03:03:44 -05:00
+++ b/xen/Makefile      2005-03-29 03:03:44 -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,7 +110,7 @@
        ( 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 -
 tags: 
        ( find include/asm-$(TARGET_ARCH) -name '*.h'; \
          find include -type d \( -name "asm-*" -o -name config \) -prune -o \

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Merge, BitKeeper Bot [Xen-changelog] merge, BitKeeper Bot <= [Xen-changelog] Merge, BitKeeper Bot [Xen-changelog] Merge, BitKeeper Bot

Previous by Date:	[Xen-changelog] Add a tags target to the Xen Makefile., BitKeeper Bot
Next by Date:	[Xen-changelog] Fix cpu_relax/rep_nop to include a compiler barrier. This is needed, BitKeeper Bot
Previous by Thread:	[Xen-changelog] Merge, BitKeeper Bot
Next by Thread:	[Xen-changelog] Merge, BitKeeper Bot
Indexes:	[Date] [Thread] [Top] [All Lists]