X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=5c6cc51f5f32d659981e44b6868edcb7ac256ca7;hb=a1a2be8eb002e13b1eb6ccaca40e4396f8816402;hp=8e570363efad1d2cc7bbd513568d0b9c1ea63567;hpb=6d967c202c0afba89cc4a279118ed36ea3d5bf04;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8e57036..5c6cc51 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,7 +1,16 @@
 # 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.71 $
 
+
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
 
@@ -174,16 +183,6 @@ endif
 #
 TCPSTACK=UIP
 
-#
-#RAMDISK
-#
-RAMDISK_SRCS=
-BOOT_FLAGS=
-
-ifeq ($(RAMDISK_BOOT),1)
-BOOT_FLAGS := $(BOOT_FLAGS) -DRAMDISK_BOOT
-RAMDISK_SRCS := ramdisk.c cdrom.c
-endif
 
 
 
@@ -286,7 +285,7 @@ VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
 
 
 
-DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c $(RAMDISK_SRCS)
+DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c
 
 DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
 
@@ -430,7 +429,7 @@ devices/%.o : devices/%.asm
 	$(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o
 
 net/%.o : net/%.c
-	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
+	$(TARGET_CC) -c $(CC_GENERAL_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
 
 # ----------------------------------------------------------------------
 # Targets -
@@ -462,10 +461,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