X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=41515153d440cb5820679dc3bb490f34ccbbce6b;hb=68cac210354f03675feb5370dfa7fae1fb97ceee;hp=ef7d453aabca1989f1d71b23266770cbd2f76c38;hpb=8e7a84531f31b9124e99371e802c1dd8b880884a;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index ef7d453..4151515 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.30 $
+# $Revision: 1.37 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -122,9 +122,9 @@ VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
 
 
 VMM_C_SRCS :=   vm_guest.c \
-	 	svm.c svm_handler.c vmm.c vmm_util.c svm_ctrl_regs.c \
+	 	svm.c svm_handler.c vmm.c vmm_util.c vmm_ctrl_regs.c \
 		vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.c \
-		vmm_intr.c vmm_irq.c\
+		vmm_intr.c vmm_time.c\
 		vmm_shadow_paging.c vm_guest_mem.c  \
                 vm_dev.c vmm_dev_mgr.c \
 #\
@@ -134,7 +134,7 @@ VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
 
 VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
 
-DEVICE_C_SRCS :=  nvram.c timer.c simple_pic.c 8259a.c
+DEVICE_C_SRCS :=  generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c
 
 DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
 
@@ -211,7 +211,7 @@ CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror
 CC_KERNEL_OPTS := -g -DGEEKOS -I$(PROJECT_ROOT)/include
 
 # Flags used for VMM C source files
-CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include
+CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include -D__V3VEE__ -D__V3_32BIT__
 
 # Flags used for VMM C ASM files
 NASM_VMM_OPTS := -I$(PROJECT_ROOT)/src/palacios/ -f elf $(EXTRA_NASM_OPTS)
@@ -295,11 +295,15 @@ vmm.img : fd.img
 	$(PAD) vmm.img 1474560
 
 force_rombios: 
-	(cd ../src/vmboot/rombios; make)
+	(cd ../src/vmboot/rombios; make clean; make)
+#	cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
 
-world: force_rombios
+force_vgabios:
+	(cd ../src/vmboot/vgabios; make clean; make)
+
+world: force_rombios force_vgabios
 	../scripts/make_payload.pl payload_layout.txt vm_kernel
-	make clean
+	- make clean
 	make vmm.img
 
 # make ready to boot over PXE