X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;h=1877773ae5d5d03efd9bf4d46e68187874af4258;hb=6593ee3c311ec87304c7bed52a9e6034338679fb;hp=d41af2e0a2a11774814ca2bc5ad5e42316f32293;hpb=a1073097716c800734e117267ce7aa92aa0d9a17;p=palacios.git

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index d41af2e..1877773 100644
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -51,10 +51,6 @@ VPATH := $(PROJECT_ROOT)/src
 
 
 
-#
-#TCPSTACK, uIP is used currently
-#
-TCPSTACK=UIP
 
 #
 #TCPSTACK, uIP is used currently
@@ -64,7 +60,7 @@ UIP=OFF
 #
 #LWIP, ON -- used, OFF -- not used
 #
-LWIP=ON
+LWIP=OFF
 
 
 #
@@ -147,7 +143,7 @@ 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
 
 
 
@@ -162,7 +158,7 @@ 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 := 
@@ -287,6 +283,10 @@ net/%.o : net/%.c
 all : $(ALL_TARGETS)
 
 
+lwip:
+	(cd ../src/lwip/build; make clean; make)
+
+
 #geekos/vmx_lowlevel.o: $(PROJECT_ROOT)/src/geekos/vmx_lowlevel.asm
 #	$(NASM) -O99 \
 #	-f elf \
@@ -340,7 +340,7 @@ geekos/kernel.bin : geekos/kernel.exe
 	$(PAD) $@ 512
 
 # The kernel executable and symbol map.
-geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(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