[src/trunk]: src/sys/rump continue consolidating non-modular option files

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

details:   https://anonhg.NetBSD.org/src/rev/107ee837b806
branches:  trunk
changeset: 810297:107ee837b806
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 23:01:58 2015 +0000

description:
continue consolidating non-modular option files

diffstat:

 sys/rump/dev/lib/Makefile.inc                  |  5 ++---
 sys/rump/dev/lib/libsysmon/Makefile            |  4 ++--
 sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h |  3 ---
 sys/rump/dev/lib/libsysmon/opt/sysmon_power.h  |  3 ---
 sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h   |  3 ---
 sys/rump/dev/lib/libusb/Makefile               |  4 +---
 sys/rump/dev/lib/libusb/opt/opt_usb.h          |  2 --
 sys/rump/dev/lib/libusb/opt/opt_usbverbose.h   |  3 ---
 sys/rump/dev/lib/libwscons/Makefile            |  4 ++--
 sys/rump/dev/lib/libwscons/opt/wsdisplay.h     |  1 -
 sys/rump/dev/lib/libwscons/opt/wskbd.h         |  1 -
 sys/rump/dev/lib/libwscons/opt/wsmouse.h       |  1 -
 sys/rump/include/opt/sysmon_envsys.h           |  3 +++
 sys/rump/include/opt/sysmon_power.h            |  3 +++
 sys/rump/include/opt/sysmon_wdog.h             |  3 +++
 sys/rump/include/opt/wsdisplay.h               |  1 +
 sys/rump/include/opt/wskbd.h                   |  3 +++
 sys/rump/include/opt/wsmouse.h                 |  3 +++
 sys/rump/include/opt/wsmux.h                   |  1 +
 sys/rump/librump/rumpdev/opt/wsdisplay.h       |  1 -
 20 files changed, 24 insertions(+), 28 deletions(-)

diffs (166 lines):

diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/Makefile.inc
--- a/sys/rump/dev/lib/Makefile.inc     Mon Aug 24 22:52:15 2015 +0000
+++ b/sys/rump/dev/lib/Makefile.inc     Mon Aug 24 23:01:58 2015 +0000
@@ -1,8 +1,7 @@
-#      $NetBSD: Makefile.inc,v 1.3 2010/03/01 13:12:19 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2015/08/24 23:01:58 pooka Exp $
 #
 
 RUMPTOP=       ${.CURDIR}/../../..
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev \
-               -I${RUMPTOP}/librump/rumpdev/opt
+CPPFLAGS+=     -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev
 
 .include "${RUMPTOP}/Makefile.rump"
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libsysmon/Makefile
--- a/sys/rump/dev/lib/libsysmon/Makefile       Mon Aug 24 22:52:15 2015 +0000
+++ b/sys/rump/dev/lib/libsysmon/Makefile       Mon Aug 24 23:01:58 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/03/13 01:47:07 pooka Exp $
+#      $NetBSD: Makefile,v 1.7 2015/08/24 23:01:58 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/sysmon
@@ -12,7 +12,7 @@
 
 SRCS+= sysmon_component.c
 
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
+CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h
--- a/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h    Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: sysmon_envsys.h,v 1.1 2010/01/31 03:06:59 pooka Exp $  */
-
-#define NSYSMON_ENVSYS 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libsysmon/opt/sysmon_power.h
--- a/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h     Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: sysmon_power.h,v 1.1 2010/01/31 03:07:00 pooka Exp $   */
-
-#define NSYSMON_POWER 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h
--- a/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h      Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: sysmon_wdog.h,v 1.1 2010/01/31 03:07:00 pooka Exp $    */
-
-#define NSYSMON_WDOG 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libusb/Makefile
--- a/sys/rump/dev/lib/libusb/Makefile  Mon Aug 24 22:52:15 2015 +0000
+++ b/sys/rump/dev/lib/libusb/Makefile  Mon Aug 24 23:01:58 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2015/05/20 11:53:08 pooka Exp $
+#      $NetBSD: Makefile,v 1.8 2015/08/24 23:01:59 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/usb
@@ -17,7 +17,5 @@
 
 #CPPFLAGS+= -DUHUB_DEBUG
 
-CPPFLAGS+=     -I${.CURDIR}/opt
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libusb/opt/opt_usb.h
--- a/sys/rump/dev/lib/libusb/opt/opt_usb.h     Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/*     $NetBSD: opt_usb.h,v 1.1 2011/06/10 00:32:52 matt Exp $ */
-
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libusb/opt/opt_usbverbose.h
--- a/sys/rump/dev/lib/libusb/opt/opt_usbverbose.h      Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_usbverbose.h,v 1.1 2010/02/11 02:22:10 pooka Exp $ */
-
-#define USBVERBOSE
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libwscons/Makefile
--- a/sys/rump/dev/lib/libwscons/Makefile       Mon Aug 24 22:52:15 2015 +0000
+++ b/sys/rump/dev/lib/libwscons/Makefile       Mon Aug 24 23:01:58 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2014/03/13 01:48:08 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2015/08/24 23:01:59 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/wscons
@@ -10,7 +10,7 @@
 
 SRCS+= wscons_component.c
 
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
+CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libwscons/opt/wsdisplay.h
--- a/sys/rump/dev/lib/libwscons/opt/wsdisplay.h        Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: wsdisplay.h,v 1.2 2012/06/24 17:28:09 alnsn Exp $      */
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libwscons/opt/wskbd.h
--- a/sys/rump/dev/lib/libwscons/opt/wskbd.h    Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#define NWSKBD 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/dev/lib/libwscons/opt/wsmouse.h
--- a/sys/rump/dev/lib/libwscons/opt/wsmouse.h  Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#define NWSMOUSE 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/sysmon_envsys.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/sysmon_envsys.h      Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: sysmon_envsys.h,v 1.1 2015/08/24 23:01:59 pooka Exp $  */
+
+#define NSYSMON_ENVSYS 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/sysmon_power.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/sysmon_power.h       Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: sysmon_power.h,v 1.1 2015/08/24 23:01:59 pooka Exp $   */
+
+#define NSYSMON_POWER 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/sysmon_wdog.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/sysmon_wdog.h        Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: sysmon_wdog.h,v 1.1 2015/08/24 23:01:59 pooka Exp $    */
+
+#define NSYSMON_WDOG 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/wsdisplay.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/wsdisplay.h  Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: wsdisplay.h,v 1.1 2015/08/24 23:01:59 pooka Exp $      */
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/wskbd.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/wskbd.h      Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: wskbd.h,v 1.1 2015/08/24 23:01:59 pooka Exp $  */
+
+#define NWSKBD 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/wsmouse.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/wsmouse.h    Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: wsmouse.h,v 1.1 2015/08/24 23:01:59 pooka Exp $        */
+
+#define NWSMOUSE 1
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/include/opt/wsmux.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/wsmux.h      Mon Aug 24 23:01:58 2015 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: wsmux.h,v 1.1 2015/08/24 23:01:59 pooka Exp $  */
diff -r a7bf1e1fd637 -r 107ee837b806 sys/rump/librump/rumpdev/opt/wsdisplay.h
--- a/sys/rump/librump/rumpdev/opt/wsdisplay.h  Mon Aug 24 22:52:15 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: wsdisplay.h,v 1.1 2010/01/09 16:29:32 pooka Exp $      */