Merge branch '64bit' into 64bit-right

[palacios.git] / geekos / build / Makefile

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index 0601b6d..210b39a 100644 (file)
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -141,7 +141,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
 
 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
@@ -152,8 +152,13 @@ else
 endif
 
 ifeq ($(LWIP),ON)
+<<<<<<< HEAD:geekos/build/Makefile
+       LWIP_OBJS := lwip
+       CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG
+=======
        LWIP_OBJS := lwip/*.o
        CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG -DLWIP
+>>>>>>> 64bit:geekos/build/Makefile
 else
        LWIP_OBJS := 
        CC_LWIP_OPTS :=
@@ -277,7 +282,7 @@ net/%.o : net/%.c
 all : $(ALL_TARGETS)
 
 
-force_lwip:
+lwip:
        (cd ../src/lwip/build; make clean; make)
 
 
@@ -334,7 +339,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
+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