From 2d9009b0ab20bc2cba46f84a52095ed8645820c4 Mon Sep 17 00:00:00 2001
From: Ambarisha B <b.ambarisha@gmail.com>
Date: Thu, 21 Mar 2013 21:14:51 +0100
Subject: [PATCH] LWIP - fixed makefiles

- Modified libnetsock/Makefile and servers/lwip/Makefile to
  include ipvX headers

Signed-off-by: Tomas Hruby <tom@minix3.org>
---
 lib/liblwip/Makefile    |  1 -
 lib/libnetsock/Makefile |  2 +-
 servers/lwip/Makefile   | 14 ++++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/liblwip/Makefile b/lib/liblwip/Makefile
index 810b0612d..1022ed033 100644
--- a/lib/liblwip/Makefile
+++ b/lib/liblwip/Makefile
@@ -9,4 +9,3 @@ CPPFLAGS += -I${.CURDIR}/include/ -I${.CURDIR}/include/ipv4 -I${.CURDIR}/include
 SRCS += sys_arch.c
 
 .include <bsd.lib.mk>
-.include <bsd.own.mk>
diff --git a/lib/libnetsock/Makefile b/lib/libnetsock/Makefile
index c2f1d369b..baf93007b 100644
--- a/lib/libnetsock/Makefile
+++ b/lib/libnetsock/Makefile
@@ -1,7 +1,7 @@
 LIB = netsock
 
 CPPFLAGS += -I${.CURDIR}/include/ -D_SYSTEM
-CPPFLAGS+= -I${.CURDIR}/../../lib/liblwip/include
+CPPFLAGS+= -I${.CURDIR}/../../lib/liblwip/include -I${.CURDIR}/../../lib/liblwip/include/ipv4 -I${.CURDIR}/../../lib/liblwip/include/ipv6
 CFLAGS += -Wall -Wextra -std=c99
 
 SRCS += socket.c
diff --git a/servers/lwip/Makefile b/servers/lwip/Makefile
index 5c4edbc7b..65b80de6d 100644
--- a/servers/lwip/Makefile
+++ b/servers/lwip/Makefile
@@ -1,4 +1,6 @@
-# Makefile for inet.
+# Makefile for lwip server.
+.include <bsd.own.mk>
+
 PROG=	lwip
 SRCS=	lwip.c		\
 	driver.c	\
@@ -17,9 +19,13 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+=  -I${.CURDIR} -D_SYSTEM
-CPPFLAGS+= -I${.CURDIR}/../../lib/liblwip/include
+WARNS?=5
+
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/liblwip/include
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/liblwip/include/ipv4
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/liblwip/include/ipv6
+CPPFLAGS+= -D_SYSTEM=1
 
-CFLAGS += -Wextra -std=c99
+CFLAGS+= -std=c99
 
 .include <minix.service.mk>
-- 
2.44.0