aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-12-29 11:16:06 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2004-12-29 11:16:06 +0000
commitb556516ff2340895d9d6c2acf2530e077cf3d245 (patch)
tree7498d4ed7ca6b94f62aa0d28fd4450baef00e1c5 /xen
parentc8b536e1c653b7f3e14833af961f7bffcade4552 (diff)
downloadxen-b556516ff2340895d9d6c2acf2530e077cf3d245.tar.gz
xen-b556516ff2340895d9d6c2acf2530e077cf3d245.tar.bz2
xen-b556516ff2340895d9d6c2acf2530e077cf3d245.zip
bitkeeper revision 1.1159.170.67 (41d291f6BNS1b72mftsOXrpMhpZ9og)
M
Diffstat (limited to 'xen')
-rw-r--r--xen/Makefile5
-rw-r--r--xen/tools/Makefile6
-rw-r--r--xen/tools/figlet/LICENSE (renamed from xen/figlet/LICENSE)0
-rw-r--r--xen/tools/figlet/Makefile (renamed from xen/figlet/Makefile)0
-rw-r--r--xen/tools/figlet/README (renamed from xen/figlet/README)0
-rw-r--r--xen/tools/figlet/figlet.c (renamed from xen/figlet/figlet.c)0
-rw-r--r--xen/tools/figlet/xen.flf (renamed from xen/figlet/xen.flf)0
7 files changed, 9 insertions, 2 deletions
diff --git a/xen/Makefile b/xen/Makefile
index d08706d669..a5c883d51d 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -29,7 +29,7 @@ dist: $(TARGET)
$(MAKE) prefix=`pwd`/../dist/install dist=yes install
clean:
- $(MAKE) -C figlet clean
+ $(MAKE) -C tools clean
$(MAKE) -C common clean
$(MAKE) -C drivers clean
$(MAKE) -C arch/$(TARGET_ARCH) clean
@@ -38,6 +38,7 @@ clean:
$(TARGET): delete-unfresh-files
[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
+ $(MAKE) -C tools
$(MAKE) include/xen/compile.h
$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
@@ -67,7 +68,7 @@ include/xen/compile.h:
@LANG=C echo \#define XEN_CHANGESET \"`bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo "information unavailable"`\" >> $@
@LANG=C echo >> $@
@LANG=C echo \#define XEN_BANNER \\ >> $@
- cd ./figlet && make && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../$@ && cd ..
+ ( cd ./tools/figlet && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../../$@ )
@LANG=C echo >> $@
include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
diff --git a/xen/tools/Makefile b/xen/tools/Makefile
new file mode 100644
index 0000000000..8252970158
--- /dev/null
+++ b/xen/tools/Makefile
@@ -0,0 +1,6 @@
+
+default:
+ $(MAKE) -C figlet
+
+clean:
+ $(MAKE) -C figlet clean \ No newline at end of file
diff --git a/xen/figlet/LICENSE b/xen/tools/figlet/LICENSE
index 59fd244536..59fd244536 100644
--- a/xen/figlet/LICENSE
+++ b/xen/tools/figlet/LICENSE
diff --git a/xen/figlet/Makefile b/xen/tools/figlet/Makefile
index 9ed8fdff9c..9ed8fdff9c 100644
--- a/xen/figlet/Makefile
+++ b/xen/tools/figlet/Makefile
diff --git a/xen/figlet/README b/xen/tools/figlet/README
index b4c58b3a5b..b4c58b3a5b 100644
--- a/xen/figlet/README
+++ b/xen/tools/figlet/README
diff --git a/xen/figlet/figlet.c b/xen/tools/figlet/figlet.c
index 8e79e83170..8e79e83170 100644
--- a/xen/figlet/figlet.c
+++ b/xen/tools/figlet/figlet.c
diff --git a/xen/figlet/xen.flf b/xen/tools/figlet/xen.flf
index e13e842fd7..e13e842fd7 100644
--- a/xen/figlet/xen.flf
+++ b/xen/tools/figlet/xen.flf