X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Flwip%2Fbuild%2FMakefile;h=ce165515b77a993a32cd5fc6b7bb944b58a86f19;hb=4381d301f8bdb373db95231264bd5d0e34b04ec8;hp=73662b2f209d812f54bc84ecf69a69ca9e6302bc;hpb=cb5c761311d5277a6fc376bbfe471e003b375686;p=palacios.git

diff --git a/palacios/src/lwip/build/Makefile b/palacios/src/lwip/build/Makefile
index 73662b2..ce16551 100644
--- a/palacios/src/lwip/build/Makefile
+++ b/palacios/src/lwip/build/Makefile
@@ -31,19 +31,18 @@
 
 ## modified by Lei Xia 
 
-CONTRIBDIR=..
+PROJECT_ROOT=../../../
 
 #Set this to where you have the lwip core module
-LWIPDIR=$(CONTRIBDIR)
+LWIPDIR=..
 
-
-CC_PREFIX :=  ../../../../devtools/i386/bin/i386-elf-
+CC_PREFIX :=  $(PROJECT_ROOT)../devtools/i386/bin/i386-elf-
 CC=$(CC_PREFIX)gcc
 CFLAGS=-g -Wall -fpic -DIPv4 -DLWIP_DEBUG
 ARCHIVE=ar
 
 CFLAGS:=$(CFLAGS) \
-	-I$(LWIPDIR)/include  -I$(LWIPDIR)/include/ipv4 -I../../../include/libc
+	-I$(PROJECT_ROOT)include/ -I$(PROJECT_ROOT)include/lwip  -I$(PROJECT_ROOT)include/lwip/ipv4 -I$(PROJECT_ROOT)include/libc 
 
 # COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
 COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
@@ -64,19 +63,21 @@ NETIFFILES=$(LWIPDIR)/netif/loopif.c \
 	$(LWIPDIR)/netif/etharp.c
 
 # ARCHFILES: Architecture specific files.
-ARCHIFILES=
+ARCHFILES=$(LWIPDIR)/arch/sys_arch.c
 
 # LWIPFILES: All the above.
 LWIPFILES=$(COREFILES) $(CORE4FILES) $(APIFILES) $(NETIFFILES) $(ARCHFILES)
 LWIPFILESW=$(wildcard $(LWIPFILES))
 LWIPOBJS=$(notdir $(LWIPFILESW:.c=.o))
 
-LWIPLIB=lwip.o
+#LWIPLIB=lwip.o
 
 %.o:
 	$(CC) $(CFLAGS) -c  $(LWIPFILES)
 
-all: $(LWIPLIB) 
+all: $(LWIPOBJS) 
+	cp *.o $(PROJECT_ROOT)build/lwip/
+
 .PHONY: all
 
 clean:
@@ -86,8 +87,8 @@ depend dep: .depend
 
 include .depend
 
-$(LWIPLIB): $(LWIPOBJS)
-	$(CC) -g -nostartfiles -shared -static $^ -o $@ 
+##$(LWIPLIB): $(LWIPOBJS)
+##	$(CC) -g -nostartfiles -shared -static $^ -o $@ 
 
 .depend: $(LWIPFILES)
 	$(CC) $(CFLAGS) -MM $^ > .depend || rm -f .depend