[src/trunk]: src/sys/rump remove librump/rumpnet/opt, consolidate in rump/inc...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a2957eae02f6
branches:  trunk
changeset: 810294:a2957eae02f6
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 22:31:33 2015 +0000

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

diffstat:

 sys/rump/Makefile.rump                    |  3 ++-
 sys/rump/include/opt/arp.h                |  3 +++
 sys/rump/include/opt/pfsync.h             |  2 ++
 sys/rump/librump/rumpnet/Makefile.rumpnet |  4 ++--
 sys/rump/librump/rumpnet/opt/arp.h        |  3 ---
 sys/rump/librump/rumpnet/opt/pfsync.h     |  2 --
 sys/rump/net/lib/Makefile.inc             |  5 ++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Mon Aug 24 22:25:50 2015 +0000
+++ b/sys/rump/Makefile.rump    Mon Aug 24 22:31:33 2015 +0000
@@ -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+=     -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
diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/include/opt/arp.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/arp.h        Mon Aug 24 22:31:33 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: arp.h,v 1.1 2015/08/24 22:31:33 pooka Exp $    */
+
+#define NARP 1
diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/include/opt/pfsync.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/pfsync.h     Mon Aug 24 22:31:33 2015 +0000
@@ -0,0 +1,2 @@
+/*     $NetBSD: pfsync.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */
+
diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/librump/rumpnet/Makefile.rumpnet
--- a/sys/rump/librump/rumpnet/Makefile.rumpnet Mon Aug 24 22:25:50 2015 +0000
+++ b/sys/rump/librump/rumpnet/Makefile.rumpnet Mon Aug 24 22:31:33 2015 +0000
@@ -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 @@
 # 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"
 
diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/librump/rumpnet/opt/arp.h
--- a/sys/rump/librump/rumpnet/opt/arp.h        Mon Aug 24 22:25:50 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: arp.h,v 1.2 2009/01/01 19:43:57 pooka Exp $    */
-
-#define NARP 1
diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/librump/rumpnet/opt/pfsync.h
--- a/sys/rump/librump/rumpnet/opt/pfsync.h     Mon Aug 24 22:25:50 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/*     $NetBSD: pfsync.h,v 1.1 2009/09/14 10:36:50 degroote Exp $      */
-
diff -r 89f8bc1fadab -r a2957eae02f6 sys/rump/net/lib/Makefile.inc
--- a/sys/rump/net/lib/Makefile.inc     Mon Aug 24 22:25:50 2015 +0000
+++ b/sys/rump/net/lib/Makefile.inc     Mon Aug 24 22:31:33 2015 +0000
@@ -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"