From b0c1e3736463cf30c50790d1dc11c33c2c90db00 Mon Sep 17 00:00:00 2001 From: kieranm Date: Thu, 30 Jan 2003 10:17:17 +0000 Subject: [PATCH] Updated Makefiles to reflect new "contrib" directory for architecture specific code --- proj/minimal/Makefile | 5 +++-- proj/unixlib/Makefile | 3 ++- proj/unixsim/Makefile | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/proj/minimal/Makefile b/proj/minimal/Makefile index 2275b3e5..180a2de0 100644 --- a/proj/minimal/Makefile +++ b/proj/minimal/Makefile @@ -28,16 +28,17 @@ # # Author: Adam Dunkels # - + CCDEP=gcc CC=gcc CFLAGS=-g -Wall -DIPv4 -Os -fpack-struct LWIPARCH=unix ARFLAGS=rs LWIPDIR=../../src +CONTRIBDIR=../../../contrib CFLAGS:=$(CFLAGS) \ - -I$(LWIPDIR)/include -I$(LWIPDIR)/arch/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \ + -I$(LWIPDIR)/include -I$(CONTRIBDIR)/ports/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \ -Iapps -I. # COREFILES, CORE4FILES: The minimum set of files needed for lwIP. diff --git a/proj/unixlib/Makefile b/proj/unixlib/Makefile index f7113564..ed0ecaa4 100644 --- a/proj/unixlib/Makefile +++ b/proj/unixlib/Makefile @@ -34,9 +34,10 @@ CC=gcc CFLAGS=-g -Wall -fPIC -DIPv4 -DLWIP_DEBUG LWIPARCH=unix LWIPDIR=../../src +CONTRIBDIR=../../../contrib CFLAGS:=$(CFLAGS) \ - -I$(LWIPDIR)/include -I$(LWIPDIR)/arch/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \ + -I$(LWIPDIR)/include -I$(CONTRIBDIR)/ports/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \ -Iapps -I. # COREFILES, CORE4FILES: The minimum set of files needed for lwIP. diff --git a/proj/unixsim/Makefile b/proj/unixsim/Makefile index cd2ea2a7..2dbe136b 100644 --- a/proj/unixsim/Makefile +++ b/proj/unixsim/Makefile @@ -36,9 +36,10 @@ LDFLAGS=-lpcap LWIPARCH=unix ARFLAGS=rs LWIPDIR=../../src +CONTRIBDIR=../../../contrib CFLAGS:=$(CFLAGS) \ - -I$(LWIPDIR)/include -I$(LWIPDIR)/arch/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \ + -I$(LWIPDIR)/include -I$(CONTRIBDIR)/ports/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \ -Iapps -I. # COREFILES, CORE4FILES: The minimum set of files needed for lwIP. @@ -58,7 +59,7 @@ NETIFFILES=$(LWIPDIR)/netif/loopif.c \ $(LWIPDIR)/netif/etharp.c $(LWIPDIR)/netif/slipif.c # ARCHFILES: Archiecture specific files. -ARCHFILES=$(wildcard $(LWIPDIR)/arch/$(LWIPARCH)/*.c $(LWIPDIR)/arch/$(LWIPARCH)/netif/*.c) +ARCHFILES=$(wildcard $(CONTRIBDIR)/ports/$(LWIPARCH)/*.c $(CONTRIBDIR)/ports/$(LWIPARCH)/netif/*.c) # APPFILES: Applications. APPFILES=apps/fs.c apps/httpd.c \