X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=build%2FMakefile;h=0364304ad59129793c2c91b3504f13ba9c736b62;hp=e3466321a41bbc2092fdb0a2cdc6a29b98ace64a;hb=6593ee3c311ec87304c7bed52a9e6034338679fb;hpb=f2ca95fb9b02995a2826fee0d5559a9739f390f2

diff --git a/build/Makefile b/build/Makefile
index e346632..0364304 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -164,6 +164,10 @@ all : $(ALL_TARGETS)
 
 
 palacios:
+	(cd $(PALACIOS_BUILD_DIR) && make $(DEBUG_SECTIONS))
+
+
+palacios-full:
 	(cd $(PALACIOS_BUILD_DIR) && make $(DEBUG_SECTIONS) world)
 
 
@@ -171,19 +175,28 @@ geekos:
 	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: 
+	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
+
 
 
 # make ready to boot over PXE
-geekos-pxe: geekos
+geekos-pxe: 
 	cp $(GEEKOS_BUILD_DIR)/vmm.img /tftpboot/vmm.img
 
-geekos-run: geekos
+geekos-run: 
 	$(QEMU) -m 1024 -serial file:serial.out -cdrom $(GUEST_ISO_DIR)/puppy.iso -fda $(GEEKOS_BUILD_DIR)/vmm.img 
 
-geekos-iso: geekos 
+geekos-iso: 
 	cp $(GEEKOS_BUILD_DIR)/vmm.img iso/vmm.img
 	mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o test.iso iso