minor fixes

[palacios.git] / geekos / build / Makefile

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index d41af2e..c62d482 100644 (file)
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -51,20 +51,16 @@ VPATH := $(PROJECT_ROOT)/src
 
 
 
-#
-#TCPSTACK, uIP is used currently
-#
-TCPSTACK=UIP
 
 #
-#TCPSTACK, uIP is used currently
+#uIP, ON -- used, OFF -- not used
 #
 UIP=OFF
 
 #
 #LWIP, ON -- used, OFF -- not used
 #
-LWIP=ON
+LWIP=OFF
 
 
 #
@@ -142,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
@@ -162,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 :=
@@ -287,6 +279,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 +336,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