aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2003-05-07 15:20:21 +0000
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2003-05-07 15:20:21 +0000
commit365d58892ed906f9bab5232af9cd356c84b47081 (patch)
tree3ecba1525a9b2180aea2c5c818d88e7073086b6a
parent642bd0999b4d21360384ddc69bbbbbcbc24655fc (diff)
downloadxen-365d58892ed906f9bab5232af9cd356c84b47081.tar.gz
xen-365d58892ed906f9bab5232af9cd356c84b47081.tar.bz2
xen-365d58892ed906f9bab5232af9cd356c84b47081.zip
bitkeeper revision 1.211 (3eb92435Me0VsFGKxdrtpCw31sPWBw)
add "make install" target to install boot and binary files in install/boot and install/bin as appropriate
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--Makefile9
-rw-r--r--tools/balloon/Makefile5
-rw-r--r--tools/domain_builder/Makefile3
-rw-r--r--tools/domctl/Makefile3
-rw-r--r--tools/internal/Makefile3
-rw-r--r--tools/vdmanager/Makefile3
-rw-r--r--xen/Makefile2
-rw-r--r--xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile3
9 files changed, 30 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9cc9e724e8..589492e612 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -6,6 +6,7 @@ akw27@labyrinth.cl.cam.ac.uk
akw27@plucky.localdomain
bd240@boulderdash.cl.cam.ac.uk
bd240@labyrinth.cl.cam.ac.uk
+iap10@freefall.cl.cam.ac.uk
iap10@labyrinth.cl.cam.ac.uk
jws22@gauntlet.cl.cam.ac.uk
jws@cairnwell.research
diff --git a/Makefile b/Makefile
index 9f25d7134e..f80a30c946 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,15 @@ all:
$(MAKE) -C tools/internal
$(MAKE) -C tools/vdmanager
+install: all
+ $(MAKE) -C xen install
+ $(MAKE) -C tools/balloon install
+ $(MAKE) -C tools/domain_builder install
+ $(MAKE) -C tools/domctl install
+ $(MAKE) -C tools/internal install
+ $(MAKE) -C tools/vdmanager install
+
+
clean:
$(MAKE) -C xen clean
$(MAKE) -C tools/balloon clean
diff --git a/tools/balloon/Makefile b/tools/balloon/Makefile
index 49bab90077..dd88eab72a 100644
--- a/tools/balloon/Makefile
+++ b/tools/balloon/Makefile
@@ -1,9 +1,12 @@
CC = gcc
TARGET=balloon
-TARGET: balloon.c
+$(TARGET): balloon.c
$(CC) -O2 -Wall -o $(TARGET) balloon.c
+install: $(TARGET)
+ cp $(TARGET) ../../../install/bin
+
clean:
$(RM) *.o $(TARGET) *~
diff --git a/tools/domain_builder/Makefile b/tools/domain_builder/Makefile
index 6707481f1b..4e54fd4f4e 100644
--- a/tools/domain_builder/Makefile
+++ b/tools/domain_builder/Makefile
@@ -6,6 +6,9 @@ all: dom_builder.o dom_kill.o
$(CC) -o $(BUILDER) dom_builder.o
$(CC) -o $(KILL) dom_kill.o
+install: all
+ cp domain_builder kill_domain ../../../install/bin
+
dom_builder.o: dom_builder.c dom0_defs.h dom0_ops.h hypervisor_defs.h mem_defs.h
$(CC) -c dom_builder.c
diff --git a/tools/domctl/Makefile b/tools/domctl/Makefile
index 9916d82d1f..951b7468b2 100644
--- a/tools/domctl/Makefile
+++ b/tools/domctl/Makefile
@@ -1,6 +1,9 @@
default:
ant dist
+install: default
+ cp domctl.jar domctl ../../../install/bin
+
clean:
ant clean
rm -f domctl.jar
diff --git a/tools/internal/Makefile b/tools/internal/Makefile
index d2e19221d1..b695595455 100644
--- a/tools/internal/Makefile
+++ b/tools/internal/Makefile
@@ -27,6 +27,9 @@ $(XI_STOP).o: $(XI_STOP).c dom0_defs.h dom0_ops.h hypervisor_defs.h mem_defs.h
$(XI_DESTROY).o: $(XI_DESTROY).c dom0_ops.h dom0_defs.h
$(CC) -c $(XI_DESTROY).c
+install: all
+ cp -a $(XI_CREATE) $(XI_BUILD) $(XI_START) $(XI_STOP) $(XI_DESTROY) ../../../install/bin
+
clean:
$(RM) *.o $(XI_CREATE) $(XI_START) $(XI_STOP) $(XI_DESTROY) $(XI_BUILD)
diff --git a/tools/vdmanager/Makefile b/tools/vdmanager/Makefile
index 14f6eeb91b..ddb8f0c9ef 100644
--- a/tools/vdmanager/Makefile
+++ b/tools/vdmanager/Makefile
@@ -1,6 +1,9 @@
default:
ant dist
+install: default
+ cp -a vdmanager vdmanager.jar ../../../install/bin
+
clean:
ant clean
rm -f vdmanager.jar
diff --git a/xen/Makefile b/xen/Makefile
index d12aaf84d6..e9d1bcb0f6 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -19,7 +19,7 @@ debug:
install: $(TARGET)
gzip -f -9 < $(TARGET) > $(TARGET).gz
- cp $(TARGET).gz ../../install/images/image
+ cp $(TARGET).gz ../../install/boot/
clean: delete-links
$(MAKE) -C tools clean
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile b/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
index 557fe98217..534c4a4606 100644
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
@@ -89,6 +89,9 @@ FORCE: ;
bzImage: vmlinux
@$(MAKEBOOT) image.gz
+install: bzImage
+ cp -a arch/$(ARCH)/boot/image.gz ../install/boot/xenolinux.gz
+
archclean:
@$(MAKEBOOT) clean