X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;h=352199c9b63339f5397ba33fe94c40d73147ca21;hb=2bc23d57beaa42446ee7db3f0c7052086f88b0c5;hp=1877773ae5d5d03efd9bf4d46e68187874af4258;hpb=6593ee3c311ec87304c7bed52a9e6034338679fb;p=palacios.git diff --git a/geekos/build/Makefile b/geekos/build/Makefile index 1877773..352199c 100644 --- a/geekos/build/Makefile +++ b/geekos/build/Makefile @@ -51,9 +51,8 @@ VPATH := $(PROJECT_ROOT)/src - # -#TCPSTACK, uIP is used currently +#uIP, ON -- used, OFF -- not used # UIP=OFF @@ -79,6 +78,9 @@ LWIP=OFF #endif +ifeq ($(PROFILE_VMM),1) + EXTRA_C_OPTS:= -DPROFILE_VMM +endif # ---------------------------------------------------------------------- @@ -138,17 +140,11 @@ 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 UIP_C_OBJS := $(UIP_C_SRCS:%.c=net/%.o) @@ -158,8 +154,10 @@ else endif ifeq ($(LWIP),ON) + 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 :=