X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;h=352199c9b63339f5397ba33fe94c40d73147ca21;hb=022f63d320c2837822dc7f6be84f860a01f02d7c;hp=210b39a4ae73b82a4d65e71ff2ded1672e742653;hpb=452885dcf15a56694ba283a079877ac38b545b0f;p=palacios.git

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index 210b39a..352199c 100644
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -51,7 +51,6 @@ VPATH := $(PROJECT_ROOT)/src
 
 
 
-
 #
 #uIP, ON -- used, OFF -- not used
 #
@@ -79,6 +78,9 @@ LWIP=OFF
 #endif
 
 
+ifeq ($(PROFILE_VMM),1)
+  EXTRA_C_OPTS:= -DPROFILE_VMM
+endif
 
 
 # ----------------------------------------------------------------------
@@ -152,13 +154,10 @@ 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 :=