X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=build%2FMakefile;h=27d9909887521d13bcc3df07bc67cd5a187d604c;hb=9526410ca7474542623aa2e74b2ce001dd7ec55e;hp=7217262ee0f99f28d60d46a27537b9a898bfe547;hpb=08acae0a3bff332150a7873ff3c643625fb84090;p=palacios.git

diff --git a/build/Makefile b/build/Makefile
index 7217262..27d9909 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -40,14 +40,13 @@
 # ----------------------------------------------------------------------
 PROJECT_ROOT := ..
 PALACIOS_BUILD_DIR := $(PROJECT_ROOT)/palacios/build
-KITTEN_TOP_DIR := $(PROJECT_ROOT)/kitten
 GEEKOS_BUILD_DIR := $(PROJECT_ROOT)/geekos/build
 GUEST_ISO_DIR := /opt/vmm-tools/isos
 
 # List of targets to build by default.
 # These targets encompass everything needed to boot
 # and run GeekOS.
-ALL_TARGETS := palacios geekos
+ALL_TARGETS := geekos-full
 
 QEMU := /usr/local/qemu/bin/qemu-system-x86_64
 
@@ -187,40 +186,39 @@ endif
 all : $(ALL_TARGETS)
 
 
+palacios64:
+	(cd $(PALACIOS_BUILD_DIR) && make ARCH=64 $(DEBUG_SECTIONS))
 
-palacios:
+palacios32:
 	(cd $(PALACIOS_BUILD_DIR) && make $(DEBUG_SECTIONS))
 
 
-palacios-full:
+palacios-full32:
 	(cd $(PALACIOS_BUILD_DIR) && make $(DEBUG_SECTIONS) world)
 
+palacios-full64:
+	(cd $(PALACIOS_BUILD_DIR) && make ARCH=64 $(DEBUG_SECTIONS) world)	
 
 palacios-lean:
 	(cd $(PALACIOS_BUILD_DIR) && make LEAN_AND_MEAN=1 world)
 
-kitten: palacios-full
-	cp $(PALACIOS_BUILD_DIR)/libv3vee.a $(KITTEN_TOP_DIR)/palacios/
-	cp $(PALACIOS_BUILD_DIR)/../lib/xed/libxed32e.a $(KITTEN_TOP_DIR)/palacios/
-	cp $(PALACIOS_BUILD_DIR)/vm_kernel $(KITTEN_TOP_DIR)/palacios/
-	(cd $(KITTEN_TOP_DIR) && make)
 
 
-geekos: 
+geekos: palacios32
 	cp $(PALACIOS_BUILD_DIR)/libv3vee.a $(GEEKOS_BUILD_DIR)/palacios/
 	cp $(PALACIOS_BUILD_DIR)/../lib/xed/libxed.a $(GEEKOS_BUILD_DIR)/palacios/
 	cp $(PALACIOS_BUILD_DIR)/vm_kernel $(GEEKOS_BUILD_DIR)/palacios/
 	(cd $(GEEKOS_BUILD_DIR) && make)
 
 
-geekos-full: 
+geekos-full: palacios-full32
 	cp $(PALACIOS_BUILD_DIR)/libv3vee.a $(GEEKOS_BUILD_DIR)/palacios/
 	cp $(PALACIOS_BUILD_DIR)/../lib/xed/libxed.a $(GEEKOS_BUILD_DIR)/palacios/
 	cp $(PALACIOS_BUILD_DIR)/vm_kernel $(GEEKOS_BUILD_DIR)/palacios/
 	(cd $(GEEKOS_BUILD_DIR) && make clean && make)
 
 
-world: palacios-full geekos-full
+world: geekos-full palacios-full64
 
 lean-and-mean: palacios-lean geekos-full