Module Name: src
Committed By: pooka
Date: Mon Aug 24 22:31:34 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpnet: Makefile.rumpnet
src/sys/rump/net/lib: Makefile.inc
Added Files:
src/sys/rump/include/opt: arp.h pfsync.h
Removed Files:
src/sys/rump/librump/rumpnet/opt: arp.h pfsync.h
Log Message:
remove librump/rumpnet/opt, consolidate in rump/include/opt
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/rump/Makefile.rump
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/arp.h \
src/sys/rump/include/opt/pfsync.h
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpnet/Makefile.rumpnet
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpnet/opt/arp.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpnet/opt/pfsync.h
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.116 src/sys/rump/Makefile.rump:1.117
--- src/sys/rump/Makefile.rump:1.116 Mon Aug 24 18:17:04 2015
+++ src/sys/rump/Makefile.rump Mon Aug 24 22:31:33 2015
@@ -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
Index: src/sys/rump/librump/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.17 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.18
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.17 Wed Dec 3 00:19:04 2014
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Mon Aug 24 22:31:33 2015
@@ -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"
Index: src/sys/rump/net/lib/Makefile.inc
diff -u src/sys/rump/net/lib/Makefile.inc:1.4 src/sys/rump/net/lib/Makefile.inc:1.5
--- src/sys/rump/net/lib/Makefile.inc:1.4 Mon Mar 1 13:12:20 2010
+++ src/sys/rump/net/lib/Makefile.inc Mon Aug 24 22:31:34 2015
@@ -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"
Added files:
Index: src/sys/rump/include/opt/arp.h
diff -u /dev/null src/sys/rump/include/opt/arp.h:1.1
--- /dev/null Mon Aug 24 22:31:34 2015
+++ src/sys/rump/include/opt/arp.h Mon Aug 24 22:31:33 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: arp.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */
+
+#define NARP 1
Index: src/sys/rump/include/opt/pfsync.h
diff -u /dev/null src/sys/rump/include/opt/pfsync.h:1.1
--- /dev/null Mon Aug 24 22:31:34 2015
+++ src/sys/rump/include/opt/pfsync.h Mon Aug 24 22:31:33 2015
@@ -0,0 +1,2 @@
+/* $NetBSD: pfsync.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */
+
