X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;h=c62d4828591a8f3fb1acae97ead3330aa1348515;hb=86ad850e874113d7f5aeb862b64cb222d40e903b;hp=eafa4b3b68459aff1969bae7ce13a3228ecfa455;hpb=e52012d02075f22e392e5a1d86165f273302b6f7;p=palacios.git

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index eafa4b3..c62d482 100644
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -53,14 +53,14 @@ VPATH := $(PROJECT_ROOT)/src
 
 
 #
-#TCPSTACK, uIP is used currently
+#uIP, ON -- used, OFF -- not used
 #
 UIP=OFF
 
 #
 #LWIP, ON -- used, OFF -- not used
 #
-LWIP=ON
+LWIP=OFF
 
 
 #
@@ -138,16 +138,10 @@ COMMON_C_SRCS := fmtout.c string.c memmove.c
 COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
 
 
-
-
 V3_LD_FLAGS := -L./palacios/
 #V3_LIBS := -lxed -lv3vee
 V3_LIBS := ./palacios/libxed.a ./palacios/libv3vee.a ./palacios/libxed.a ./palacios/libv3vee.a
-
-
-
-
-
+V3_OBJS := ./palacios/libxed.a ./palacios/libv3vee.a ./palacios/vm_kernel
 
 ifeq ($(UIP),ON)
 	UIP_C_SRCS := psock.c timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c resolv.c
@@ -158,8 +152,10 @@ else
 endif
 
 ifeq ($(LWIP),ON)
-	LWIP_OBJS := lwip/*.o
+
+	LWIP_OBJS := lwip
 	CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG
+
 else
 	LWIP_OBJS := 
 	CC_LWIP_OPTS :=
@@ -283,7 +279,7 @@ net/%.o : net/%.c
 all : $(ALL_TARGETS)
 
 
-force_lwip:
+lwip:
 	(cd ../src/lwip/build; make clean; make)
 
 
@@ -340,7 +336,7 @@ geekos/kernel.bin : geekos/kernel.exe
 	$(PAD) $@ 512
 
 # The kernel executable and symbol map.
-geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) force_lwip $(TCPSTACK_OBJS) 
+geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(TCPSTACK_OBJS) $(V3_OBJS)
 	$(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \
 		$(V3_LD_FLAGS) \
 		$(KERNEL_OBJS) $(COMMON_C_OBJS) $(TCPSTACK_OBJS) $(V3_LIBS) -b binary ./palacios/vm_kernel