build fixes

[palacios.git] / geekos / build / Makefile

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index d41af2e..eafa4b3 100644 (file)
--- 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
@@ -287,6 +283,10 @@ net/%.o : net/%.c
 all : $(ALL_TARGETS)
 
 
+force_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) force_lwip $(TCPSTACK_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