Compilable version with both lwip and uip

[palacios.releases.git] / palacios / src / lwip / build / Makefile

diff --git a/palacios/src/lwip/build/Makefile b/palacios/src/lwip/build/Makefile
index 376b22c..af7ceb3 100644 (file)
--- a/palacios/src/lwip/build/Makefile
+++ b/palacios/src/lwip/build/Makefile
@@ -42,16 +42,16 @@ CFLAGS=-g -Wall -fpic -DIPv4 -DLWIP_DEBUG
 ARCHIVE=ar
 
 CFLAGS:=$(CFLAGS) \
-       -I$(PROJECT_ROOT)include/lwip  -I$(PROJECT_ROOT)include/lwip/ipv4 -I$(PROJECT_ROOT)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 \
        $(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/stats.c $(LWIPDIR)/core/sys.c \
-        $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \
+        $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c $(LWIPDIR)/core/raw.c\
         $(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/init.c 
 CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \
        $(LWIPDIR)/core/ipv4/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c \
-       $(LWIPDIR)/core/ipv4/inet_chksum.c 
+       $(LWIPDIR)/core/ipv4/inet_chksum.c $(LWIPDIR)/core/ipv4/ip_frag.c
 
 
 # APIFILES: The files which implement the sequential and socket APIs.
@@ -63,32 +63,32 @@ 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: $(LWIPOBJS) 
+all: $(LWIPOBJS)
        cp *.o $(PROJECT_ROOT)build/lwip/
 
 .PHONY: all
 
 clean:
-       rm -f *.o $(LWIPLIB) *.s .depend* *.core
+       rm -f *.o .depend*
 
 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