X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=12ae68447c2875ecbb50890c2ea025dbc63f4855;hb=86d4afa4bb4bb68cb4a65d562c0bdcbdb71c201a;hp=c7449272ed61ac57479856173ffc468695848a8f;hpb=02929aaeaa37abfe33c1f6d70a5ab4d7dcd92df2;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index c744927..12ae684 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,15 @@
 # Makefile for GeekOS kernel, userspace, and tools
+#
+#  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, The V3VEE Project <http://www.v3vee.org> 
+#
+# Based on GeekOS Makefile:
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.66 $
+# $Revision: 1.71 $
+
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -141,6 +150,8 @@ endif
 endif
 
 
+#DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
+
 ifeq ($(DEBUG),1)
   JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 -DVMM_DEBUG=1 -DVMM_INFO=1 -DVMM_TRACE=1 $(DEBUG_SECTIONS)
 
@@ -228,8 +239,10 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
 	serial.c  reboot.c \
         paging.c \
 	debug.c vmm_stubs.c  vm.c  pci.c\
+	queue.c  socket.c net.c ring_buffer.c \
 	main.c
 
+
 # Kernel object files built from C source files
 KERNEL_C_OBJS := $(KERNEL_C_SRCS:%.c=geekos/%.o)
 
@@ -458,10 +471,16 @@ vmm.img : fd.img
 	cp fd.img vmm.img
 	$(PAD) vmm.img 1474560
 
-force_rombios: 
+rombios_link:
+	ln -s -f ../src/vmboot/rombios/BIOS-bochs-latest rombios
+
+vgabios_link:
+	ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
+
+force_rombios: rombios_link
 	(cd ../src/vmboot/rombios; make clean; make)
 
-force_vgabios:
+force_vgabios: vgabios_link
 	(cd ../src/vmboot/vgabios; make clean; make)
 
 force_payload: force_rombios force_vgabios