Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / commitdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw (parent: dae94a7)
minor fixes
Jack Lange [Wed, 8 Oct 2008 23:09:22 +0000 (18:09 -0500)]
geekos/build/Makefile patch | blob | history

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index 210b39a..c62d482 100644 (file)
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -152,13 +152,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 :=
Public Palacios Development Repository for the V3VEE Project