LWIP - fixed makefiles

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

Signed-off-by: Tomas Hruby <tom@minix3.org>

diff --git a/lib/liblwip/Makefile b/lib/liblwip/Makefile
index 810b0612dd4016eb76e6eb63b5fce3b067793c02..1022ed03365178df31a1364256b224d814bb5dbb 100644 (file)
--- 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 c2f1d369b3c935603733b516d2cbbcbf2c83bc49..baf93007be7cced50cc2a67a05fb8c913e9c2948 100644 (file)
--- 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 5c4edbc7b96664076ae9848d493724815b7e5e50..65b80de6d33ccb9021d80bd41f381bc2d27f8bd0 100644 (file)
--- 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>