X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=1f63eaa252e5901dca73abd17b88aeb3b49b908d;hb=ea2968665a3b24afca4a4a361926021b482b6c57;hp=05e5eea31194f71243d0601a0211dc324415e38b;hpb=c2ace437ef90d8516c8e3141464972ecaff4d62e;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 05e5eea..1f63eaa 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.57 $
+# $Revision: 1.60 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -151,7 +151,7 @@ ALL_TARGETS := vmm.img vm_kernel
 
 # Kernel source files
 KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
-        blockdev.c ide.c \
+        blockdev.c ide.c ne2k.c \
 	keyboard.c screen.c timer.c \
 	mem.c crc32.c \
 	gdt.c tss.c segment.c \
@@ -201,7 +201,8 @@ VMM_C_SRCS :=   vm_guest.c \
 		vmm_intr.c vmm_time.c \
 		vmm_shadow_paging.c vm_guest_mem.c  \
                 vm_dev.c vmm_dev_mgr.c vmm_decoder.c \
-                svm_halt.c svm_pause.c vmm_config.c vmm_hashtable.c \
+                svm_halt.c svm_pause.c svm_wbinvd.c \
+	        vmm_config.c vmm_hashtable.c \
 		vmm_string.c vmm_emulator.c \
 		 $(DECODER_SRCS)
 #		vmx.c vmcs_gen.c vmcs.c
@@ -442,7 +443,7 @@ geekos/kernel.bin : geekos/kernel.exe
 geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(TCPSTACK_OBJS) vm_kernel
 	$(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \
 		$(DECODER_FLAGS) \
-		$(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(V3LIBS) -b binary vm_kernel
+		$(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(V3LIBS) $(TCPSTACK_OBJS) -b binary vm_kernel
 	$(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms
 
 
@@ -458,7 +459,7 @@ force:
 
 # Clean build directories of generated files
 clean :
-	for d in geekos common libc user tools palacios devices; do \
+	for d in geekos common libc user tools palacios devices net; do \
 		(cd $$d && rm -f *); \
 	done