X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=992dcfea5b891ea80c47722aee2b00126aa45ad3;hb=1dbd6d179c681dbce107af39c4089d1aa13a714d;hp=8fbe2a230ef1c30c39bf527f004d4e77ba0cd59e;hpb=3496b5b5469fe691a6847eb76d973019bb769318;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8fbe2a2..992dcfe 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -219,8 +219,14 @@ endif
 
 ifeq ($(INSTRUMENT_VMM),1)
   EXTRA_C_OPTS:= -DINSTRUMENT_VMM
+  INSTRUMENT_OPT := -finstrument-functions
+  OBJ_FILES := palacios/vmm_instrument.o
+else
+  INSTRUMENT_OPT := 
 endif
 
+
+
 # ----------------------------------------------------------------------
 # Configuration -
 #   Various options specifying how GeekOS should be built,
@@ -273,7 +279,8 @@ VMM_OBJS := \
 	palacios/vmm_profiler.o \
 	palacios/vmm_direct_paging.o \
 	palacios/vmm_ringbuffer.o \
-	palacios/vmm_instrument.o \
+	palacios/vmm_hypercall.o \
+	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -304,6 +311,7 @@ DEVICES_OBJS := \
 	devices/bochs_debug.o \
 	devices/os_debug.o \
 	devices/apic.o	\
+	devices/io_apic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
@@ -407,11 +415,6 @@ CC_GENERAL_OPTS = \
 #-fPIC \
 #-fvisibility=hidden
 
-ifeq ($(INSTRUMENT_VMM),1)
-	INSTRUMENT_OPT = -finstrument-functions
-else
-	INSTRUMENT_OPT = 
-endif
 
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
 OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment