remove librump/rumpnet/opt, consolidate in rump/include/opt

This commit is contained in:
pooka 2015-08-24 22:31:33 +00:00
parent d0b433d7a7
commit 143bba9536
7 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.rump,v 1.116 2015/08/24 18:17:04 pooka Exp $
# $NetBSD: Makefile.rump,v 1.117 2015/08/24 22:31:33 pooka Exp $
#
.if !defined(_RUMP_MK)
@ -53,6 +53,7 @@ CPPFLAGS+= -imacros ${BUILDRUMP_IMACROS}
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
CPPFLAGS+= -I${RUMPTOP}/include/opt
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
SHLIB_MAJOR?= 0

View File

@ -0,0 +1,3 @@
/* $NetBSD: arp.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */
#define NARP 1

View File

@ -0,0 +1,2 @@
/* $NetBSD: pfsync.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.rumpnet,v 1.17 2014/12/03 00:19:04 christos Exp $
# $NetBSD: Makefile.rumpnet,v 1.18 2015/08/24 22:31:33 pooka Exp $
#
LIB= rumpnet
@ -37,7 +37,7 @@ SRCS+=
# bpf stubs, required for all kernels
SRCS+= bpf_stub.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet/opt
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include "${RUMPTOP}/Makefile.rump"

View File

@ -1,3 +0,0 @@
/* $NetBSD: arp.h,v 1.2 2009/01/01 19:43:57 pooka Exp $ */
#define NARP 1

View File

@ -1,2 +0,0 @@
/* $NetBSD: pfsync.h,v 1.1 2009/09/14 10:36:50 degroote Exp $ */

View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile.inc,v 1.4 2010/03/01 13:12:20 pooka Exp $
# $NetBSD: Makefile.inc,v 1.5 2015/08/24 22:31:34 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet \
-I${RUMPTOP}/librump/rumpnet/opt
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet
.include "${RUMPTOP}/Makefile.rump"