[src/trunk]: src/sys/rump opt files were nop't

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

details:   https://anonhg.NetBSD.org/src/rev/2aa5b323cc06
branches:  trunk
changeset: 340160:2aa5b323cc06
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 23:21:50 2015 +0000

description:
opt files were nop't

diffstat:

 sys/rump/dev/lib/libmiiphy/Makefile                 |  4 ++--
 sys/rump/dev/lib/libmiiphy/opt/opt_mii.h            |  1 -
 sys/rump/dev/lib/libpci/Makefile                    |  4 ++--
 sys/rump/dev/lib/libpci/opt/opt_pci.h               |  1 -
 sys/rump/dev/lib/libpci/opt/opt_pciide.h            |  1 -
 sys/rump/dev/lib/libpci_usbhc/Makefile              |  3 +--
 sys/rump/dev/lib/libscsipi/Makefile                 |  4 ++--
 sys/rump/dev/lib/libscsipi/opt/atapibus.h           |  3 ---
 sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h |  1 -
 sys/rump/dev/lib/libscsipi/opt/opt_scsi.h           |  1 -
 sys/rump/dev/lib/libscsipi/opt/scsibus.h            |  3 ---
 sys/rump/dev/lib/libscsipi/opt/wd.h                 |  1 -
 sys/rump/dev/lib/libumass/Makefile                  |  4 +---
 sys/rump/include/opt/atapibus.h                     |  3 +++
 sys/rump/include/opt/scsibus.h                      |  3 +++
 sys/rump/include/opt/wd.h                           |  1 +
 16 files changed, 15 insertions(+), 23 deletions(-)

diffs (151 lines):

diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libmiiphy/Makefile
--- a/sys/rump/dev/lib/libmiiphy/Makefile       Mon Aug 24 23:21:16 2015 +0000
+++ b/sys/rump/dev/lib/libmiiphy/Makefile       Mon Aug 24 23:21:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/05/26 19:55:53 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2015/08/24 23:21:50 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -16,7 +16,7 @@
     inphy.c iophy.c lxtphy.c makphy.c nsphy.c nsphyter.c pnaphy.c \
     qsphy.c rdcphy.c rgephy.c rlphy.c sqphy.c tlphy.c tqphy.c urlphy.c
 
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${.CURDIR}/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
    
 .include "${RUMPTOP}/Makefile.rump"
 .include <bsd.lib.mk>
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libmiiphy/opt/opt_mii.h
--- a/sys/rump/dev/lib/libmiiphy/opt/opt_mii.h  Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_mii.h,v 1.1 2014/04/04 14:18:19 pooka Exp $        */
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libpci/Makefile
--- a/sys/rump/dev/lib/libpci/Makefile  Mon Aug 24 23:21:16 2015 +0000
+++ b/sys/rump/dev/lib/libpci/Makefile  Mon Aug 24 23:21:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2015/06/15 15:38:52 pooka Exp $
+#      $NetBSD: Makefile,v 1.7 2015/08/24 23:21:50 pooka Exp $
 #
 
 RUMPTOP= ${TOPRUMP}
@@ -22,7 +22,7 @@
 
 SRCS+= pci_at_mainbus.c
 
-CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
 CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
 
 .if ${RUMP_PCI_IOSPACE:Uno} == "yes"
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libpci/opt/opt_pci.h
--- a/sys/rump/dev/lib/libpci/opt/opt_pci.h     Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_pci.h,v 1.1 2014/04/04 12:53:59 pooka Exp $        */
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libpci/opt/opt_pciide.h
--- a/sys/rump/dev/lib/libpci/opt/opt_pciide.h  Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_pciide.h,v 1.1 2015/05/17 13:51:31 pooka Exp $     */
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libpci_usbhc/Makefile
--- a/sys/rump/dev/lib/libpci_usbhc/Makefile    Mon Aug 24 23:21:16 2015 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/Makefile    Mon Aug 24 23:21:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2015/05/20 12:21:38 pooka Exp $
+#      $NetBSD: Makefile,v 1.2 2015/08/24 23:21:51 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -15,7 +15,6 @@
 SRCS+= usb_pci.c
 
 CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
-CPPFLAGS+= -I${.CURDIR}/../libusb/opt
 
 .include "${RUMPTOP}/Makefile.rump"
 .include <bsd.lib.mk>
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libscsipi/Makefile
--- a/sys/rump/dev/lib/libscsipi/Makefile       Mon Aug 24 23:21:16 2015 +0000
+++ b/sys/rump/dev/lib/libscsipi/Makefile       Mon Aug 24 23:21:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/03/13 01:58:20 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2015/08/24 23:21:51 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/scsipi
@@ -16,7 +16,7 @@
 
 SRCS+= scsipi_component.c
 
-CPPFLAGS+=     -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libscsipi/opt/atapibus.h
--- a/sys/rump/dev/lib/libscsipi/opt/atapibus.h Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: atapibus.h,v 1.1 2010/08/23 20:49:53 pooka Exp $       */
-
-#define NATAPIBUS 1
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h
--- a/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h       Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_compat_freebsd.h,v 1.1 2010/08/23 20:49:54 pooka Exp $     */
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libscsipi/opt/opt_scsi.h
--- a/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_scsi.h,v 1.1 2010/08/23 20:49:54 pooka Exp $       */
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libscsipi/opt/scsibus.h
--- a/sys/rump/dev/lib/libscsipi/opt/scsibus.h  Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: scsibus.h,v 1.1 2010/08/23 20:49:54 pooka Exp $        */
-
-#define NSCSIBUS 1
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libscsipi/opt/wd.h
--- a/sys/rump/dev/lib/libscsipi/opt/wd.h       Mon Aug 24 23:21:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: wd.h,v 1.1 2010/08/23 20:49:54 pooka Exp $     */
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/dev/lib/libumass/Makefile
--- a/sys/rump/dev/lib/libumass/Makefile        Mon Aug 24 23:21:16 2015 +0000
+++ b/sys/rump/dev/lib/libumass/Makefile        Mon Aug 24 23:21:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2015/06/13 23:33:20 pooka Exp $
+#      $NetBSD: Makefile,v 1.9 2015/08/24 23:21:51 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/usb
@@ -14,7 +14,5 @@
 SRCS=  dummy.c
 .endif
 
-CPPFLAGS+=     -I${.CURDIR}/../libscsipi/opt# -I${RUMPTOP}/librump/rumpvfs
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/include/opt/atapibus.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/atapibus.h   Mon Aug 24 23:21:50 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: atapibus.h,v 1.1 2015/08/24 23:21:51 pooka Exp $       */
+
+#define NATAPIBUS 1
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/include/opt/scsibus.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/scsibus.h    Mon Aug 24 23:21:50 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: scsibus.h,v 1.1 2015/08/24 23:21:51 pooka Exp $        */
+
+#define NSCSIBUS 1
diff -r 763c576e0e1d -r 2aa5b323cc06 sys/rump/include/opt/wd.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/wd.h Mon Aug 24 23:21:50 2015 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: wd.h,v 1.1 2015/08/24 23:21:51 pooka Exp $     */