X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=9d4c88f52438f477e2c4378da79f03dea90bde34;hb=f7bc654c609c9780d52f6fa980de987ddd337416;hp=c6c7186ed3c394d194d99fcd38c4298c656ab62e;hpb=153204955413dcb12b2156fc80bdda6e275009b9;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index c6c7186..9d4c88f 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -284,7 +284,6 @@ VMM_OBJS := \
 	palacios/vmm_time.o \
 	palacios/vmm_shadow_paging.o \
 	palacios/vm_guest_mem.o \
-	palacios/vm_dev.o \
 	palacios/vmm_dev_mgr.o \
 	palacios/vmm_decoder.o \
 	palacios/svm_halt.o \
@@ -294,6 +293,7 @@ VMM_OBJS := \
 	palacios/vmm_hashtable.o \
 	palacios/vmm_string.o \
 	palacios/vmm_emulator.o \
+	palacios/vmm_sprintf.o \
 	palacios/vmm_queue.o \
 	palacios/vmm_host_events.o \
 	palacios/svm_lowlevel.o \
@@ -307,13 +307,19 @@ VMM_OBJS := \
 	palacios/vmm_ringbuffer.o \
 	palacios/vmm_hypercall.o \
 	palacios/vmm_lock.o \
+	palacios/vmx.o \
+	palacios/vmcs.o \
+	palacios/vmx_handler.o \
+	palacios/vmx_lowlevel.o \
+	palacios/vmxassist.o \
+	palacios/vmx_io.o \
+	palacios/vmx_msr.o \
 	$(OBJ_FILES)
 
-#		vmx.c vmcs_gen.c vmcs.c
 
 # Extra C flags for the VMM objects
 $(VMM_OBJS) :: EXTRA_CFLAGS = \
-	$(JRLDEBUG) $(CFLAGS)\
+	$(JRLDEBUG) $(CFLAGS) -DVMXASSIST_PATH="\"../build/vmxassist\"" \
 
 
 
@@ -346,6 +352,10 @@ DEVICES_OBJS := \
 	devices/piix3.o \
 	devices/net_cd.o \
 	devices/net_hd.o \
+	devices/lnx_virtio_blk.o \
+	devices/lnx_virtio_balloon.o \
+	devices/lnx_virtio_sym.o \
+	devices/sym_swap.o \
 
 #	devices/ne2k.o	\
 #	devices/cdrom.o \
@@ -546,8 +556,11 @@ rombios_link:
 vgabios_link:
 	ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
+vmxassist_link:
+	ln -s -f ../src/vmboot/vmxassist/vmxassist.bin vmxassist
+
 
-force_payload: rombios_link vgabios_link
+force_payload: rombios_link vgabios_link vmxassist_link
 	../scripts/make_payload.pl payload_layout.txt vm_kernel
 
 inter1: force_payload
@@ -585,6 +598,7 @@ clean :
 	for d in palacios devices xed; do \
 		(cd $$d && rm -f * .*.d); \
 	done
+	rm -f libv3vee.a
 
 
 # Include all of the generated dependency files if they exist