Module Name: src
Committed By: pooka
Date: Mon Aug 24 23:01:59 UTC 2015
Modified Files:
src/sys/rump/dev/lib: Makefile.inc
src/sys/rump/dev/lib/libsysmon: Makefile
src/sys/rump/dev/lib/libusb: Makefile
src/sys/rump/dev/lib/libwscons: Makefile
Added Files:
src/sys/rump/include/opt: sysmon_envsys.h sysmon_power.h sysmon_wdog.h
wsdisplay.h wskbd.h wsmouse.h wsmux.h
Removed Files:
src/sys/rump/dev/lib/libsysmon/opt: sysmon_envsys.h sysmon_power.h
sysmon_wdog.h
src/sys/rump/dev/lib/libusb/opt: opt_usb.h opt_usbverbose.h
src/sys/rump/dev/lib/libwscons/opt: opt_wsdisplay_compat.h wsdisplay.h
wskbd.h wsmouse.h wsmux.h
src/sys/rump/librump/rumpdev/opt: wsdisplay.h
Log Message:
continue consolidating non-modular option files
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libsysmon/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h \
src/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h \
src/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/opt/opt_usb.h \
src/sys/rump/dev/lib/libusb/opt/opt_usbverbose.h
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libwscons/Makefile
cvs rdiff -u -r1.1 -r0 \
src/sys/rump/dev/lib/libwscons/opt/opt_wsdisplay_compat.h \
src/sys/rump/dev/lib/libwscons/opt/wskbd.h \
src/sys/rump/dev/lib/libwscons/opt/wsmouse.h \
src/sys/rump/dev/lib/libwscons/opt/wsmux.h
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libwscons/opt/wsdisplay.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/sysmon_envsys.h \
src/sys/rump/include/opt/sysmon_power.h \
src/sys/rump/include/opt/sysmon_wdog.h \
src/sys/rump/include/opt/wsdisplay.h src/sys/rump/include/opt/wskbd.h \
src/sys/rump/include/opt/wsmouse.h src/sys/rump/include/opt/wsmux.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpdev/opt/wsdisplay.h
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/dev/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.3 src/sys/rump/dev/lib/Makefile.inc:1.4
--- src/sys/rump/dev/lib/Makefile.inc:1.3 Mon Mar 1 13:12:19 2010
+++ src/sys/rump/dev/lib/Makefile.inc Mon Aug 24 23:01:58 2015
@@ -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"
Index: src/sys/rump/dev/lib/libsysmon/Makefile
diff -u src/sys/rump/dev/lib/libsysmon/Makefile:1.6 src/sys/rump/dev/lib/libsysmon/Makefile:1.7
--- src/sys/rump/dev/lib/libsysmon/Makefile:1.6 Thu Mar 13 01:47:07 2014
+++ src/sys/rump/dev/lib/libsysmon/Makefile Mon Aug 24 23:01:58 2015
@@ -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_taskq.c sysmon_power.c sysm
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>
Index: src/sys/rump/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.7 src/sys/rump/dev/lib/libusb/Makefile:1.8
--- src/sys/rump/dev/lib/libusb/Makefile:1.7 Wed May 20 11:53:08 2015
+++ src/sys/rump/dev/lib/libusb/Makefile Mon Aug 24 23:01:59 2015
@@ -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 @@ SRCS= dummy.c
#CPPFLAGS+= -DUHUB_DEBUG
-CPPFLAGS+= -I${.CURDIR}/opt
-
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libwscons/Makefile
diff -u src/sys/rump/dev/lib/libwscons/Makefile:1.4 src/sys/rump/dev/lib/libwscons/Makefile:1.5
--- src/sys/rump/dev/lib/libwscons/Makefile:1.4 Thu Mar 13 01:48:08 2014
+++ src/sys/rump/dev/lib/libwscons/Makefile Mon Aug 24 23:01:59 2015
@@ -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= wsevent.c wskbd.c wskbdutil.c ws
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>
Added files:
Index: src/sys/rump/include/opt/sysmon_envsys.h
diff -u /dev/null src/sys/rump/include/opt/sysmon_envsys.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/sysmon_envsys.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: sysmon_envsys.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
+
+#define NSYSMON_ENVSYS 1
Index: src/sys/rump/include/opt/sysmon_power.h
diff -u /dev/null src/sys/rump/include/opt/sysmon_power.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/sysmon_power.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: sysmon_power.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
+
+#define NSYSMON_POWER 1
Index: src/sys/rump/include/opt/sysmon_wdog.h
diff -u /dev/null src/sys/rump/include/opt/sysmon_wdog.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/sysmon_wdog.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: sysmon_wdog.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
+
+#define NSYSMON_WDOG 1
Index: src/sys/rump/include/opt/wsdisplay.h
diff -u /dev/null src/sys/rump/include/opt/wsdisplay.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/wsdisplay.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1 @@
+/* $NetBSD: wsdisplay.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
Index: src/sys/rump/include/opt/wskbd.h
diff -u /dev/null src/sys/rump/include/opt/wskbd.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/wskbd.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: wskbd.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
+
+#define NWSKBD 1
Index: src/sys/rump/include/opt/wsmouse.h
diff -u /dev/null src/sys/rump/include/opt/wsmouse.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/wsmouse.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: wsmouse.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
+
+#define NWSMOUSE 1
Index: src/sys/rump/include/opt/wsmux.h
diff -u /dev/null src/sys/rump/include/opt/wsmux.h:1.1
--- /dev/null Mon Aug 24 23:01:59 2015
+++ src/sys/rump/include/opt/wsmux.h Mon Aug 24 23:01:59 2015
@@ -0,0 +1 @@
+/* $NetBSD: wsmux.h,v 1.1 2015/08/24 23:01:59 pooka Exp $ */
