X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=1b2cf5ddf901dc7c2cf5e892f38b787fd2565c0e;hb=3ff677ae3dbe5ec9a433ca772437de90da7d25c9;hp=8712934d323ede29b7f4cb94fdc66d814949d35e;hpb=d3422ccc1d15e9aa29cfd78bfe335ce82f8969c8;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8712934..1b2cf5d 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -3,7 +3,7 @@
 #  Northwestern University 
 # (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
 # (c) 2008, Peter Dinda <pdinda@northwestern.edu> 
-# (c) 2008, Lei Xia <xiaxlei@gmail.com>
+# (c) 2008, Lei Xia <lxia@northwestern.edu>
 # (c) 2008, The V3VEE Project <http://www.v3vee.org> 
 #
 # Based on GeekOS Makefile:
@@ -53,18 +53,20 @@ VPATH := $(PROJECT_ROOT)/src
 # 
 
 ifeq ($(LEAN_AND_MEAN),1) 
-DEBUG=0
-DEBUG_SECTIONS=
+DEBUG := 0
+DEBUG_SECTIONS :=
 else
-DEBUG=1
-DEBUG_SECTIONS= 
+DEBUG := 1
+DEBUG_SECTIONS := 
 endif
 
 
 ifeq ($(DEBUG_ALL),1)
-  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC -DDEBUG_RAMDISK -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
+  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
+# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK
 endif
 
+
 ifeq ($(DEBUG_SHADOW_PAGING),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING
 else 
@@ -227,7 +229,7 @@ endif
 # List of targets to build by default.
 # These targets encompass everything needed to boot
 # and run GeekOS.
-ALL_TARGETS := vmm vm_kernel
+ALL_TARGETS := vmm force_payload
 
 
 VMM_OBJS := \
@@ -260,6 +262,12 @@ VMM_OBJS := \
 	palacios/vmm_queue.o \
 	palacios/vmm_host_events.o \
 	palacios/svm_lowlevel.o \
+	palacios/vmm_msr.o \
+	palacios/svm_msr.o \
+	palacios/vmm_socket.o \
+	palacios/vmm_xed.o \
+	palacios/vmm_rbtree.o \
+	palacios/vmm_profiler.o \
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -273,8 +281,8 @@ XED_OBJS := \
 	xed/v3-xed-compat.o \
 	xed/v3-udiv-compat.o \
 
-$(XED_OBJS) :: EXTRA_CFLAGS =
-
+$(XED_OBJS) :: EXTRA_CFLAGS = \
+	$(JRLDEBUG) \
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -289,19 +297,8 @@ DEVICES_OBJS := \
 	devices/cdrom.o \
 	devices/bochs_debug.o \
 
-$(DEVICES_OBJS) :: EXTRA_CFLAGS =
-
-#
-# DECODER is the decoder that will be used 
-# currently we only support xed
-#
-DECODER=XED
-
-ifeq ($(DECODER),XED)
-VMM_OBJS += palacios/vmm_xed.o
-else
-# This is an error
-endif
+$(DEVICES_OBJS) :: EXTRA_CFLAGS = \
+	$(JRLDEBUG) \
 
 
 
@@ -394,11 +391,12 @@ CC_GENERAL_OPTS = \
 	$(EXTRA_C_OPTS) \
 	$(VMM_FLAGS) \
 	-I$(PROJECT_ROOT)/include \
-	-fPIC \
 	-Werror \
+	-fPIC \
 	-Wp,-MD,$(@D)/.$(@F).d \
 	-Wp,-MT,$@ \
 
+#-fPIC \
 #-fvisibility=hidden