X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=abf800827b32767280ea99633892c7137b74885c;hb=87bd3921fe6a17138bdba3a41b501a8d620cb48a;hp=8ebcd215cb9282856e5a4c9c3461f54f99d2f06b;hpb=8cd226e9445d54e8914ca71abdc233f8fb15d513;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8ebcd21..abf8008 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:
@@ -265,6 +265,9 @@ VMM_OBJS := \
 	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
 
@@ -293,20 +296,11 @@ DEVICES_OBJS := \
 	devices/ramdisk.o \
 	devices/cdrom.o \
 	devices/bochs_debug.o \
+	devices/os_debug.o \
+	devices/apic.o	\
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
-#
-# 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