[src/trunk]: src/sys/rump Rename IOCONFIG to IOCONF. It matches the config(1...

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

details:   https://anonhg.NetBSD.org/src/rev/709709e5e113
branches:  trunk
changeset: 752570:709709e5e113
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 01 15:41:15 2010 +0000

description:
Rename IOCONFIG to IOCONF.  It matches the config(1) keyword and
aligns better in Makefiles.

diffstat:

 sys/rump/Makefile.rump             |  10 +++++-----
 sys/rump/dev/lib/libucom/Makefile  |   5 ++---
 sys/rump/dev/lib/libulpt/Makefile  |   7 +++----
 sys/rump/dev/lib/libumass/Makefile |   4 ++--
 sys/rump/dev/wip/libukbd/Makefile  |   5 ++---
 sys/rump/dev/wip/libums/Makefile   |   5 ++---
 6 files changed, 16 insertions(+), 20 deletions(-)

diffs (138 lines):

diff -r b726f58574ce -r 709709e5e113 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Mon Mar 01 15:30:47 2010 +0000
+++ b/sys/rump/Makefile.rump    Mon Mar 01 15:41:15 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rump,v 1.51 2010/02/17 13:28:40 pooka Exp $
+#      $NetBSD: Makefile.rump,v 1.52 2010/03/01 15:41:15 pooka Exp $
 #
 
 WARNS?=                3       # XXX: src/sys won't compile with -Wsign-compare yet
@@ -102,11 +102,11 @@
        ${AR} ${_ARRANFL} ${.TARGET}
 .endif
 
-# If IOCONFIG is defined, autocreate ioconf.c and locators.h.
+# If IOCONF is defined, autocreate ioconf.c and locators.h.
 # This is useful mainly for devices.
-.if !empty(IOCONFIG)
-ioconf.c: ${IOCONFIG}
-       ${TOOL_CONFIG} -b ${.OBJDIR} -s ${RUMPTOP}/.. ${.CURDIR}/${IOCONFIG}
+.if !empty(IOCONF)
+ioconf.c: ${IOCONF}
+       ${TOOL_CONFIG} -b ${.OBJDIR} -s ${RUMPTOP}/.. ${.CURDIR}/${IOCONF}
        # config doesn't change the files if they're unchanged.  however,
        # here we want to satisfy our make dependency, so force a
        # timestamp update
diff -r b726f58574ce -r 709709e5e113 sys/rump/dev/lib/libucom/Makefile
--- a/sys/rump/dev/lib/libucom/Makefile Mon Mar 01 15:30:47 2010 +0000
+++ b/sys/rump/dev/lib/libucom/Makefile Mon Mar 01 15:41:15 2010 +0000
@@ -1,17 +1,16 @@
-#      $NetBSD: Makefile,v 1.3 2010/03/01 11:34:27 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
 
 LIB=   rumpdev_ucom
+IOCONF= UCOM.ioconf
 
 SRCS=  ucom.c uplcom.c u3g.c
 
 SRCS+= ucom_at_usb.c
 SRCS+= tty.c tty_conf.c tty_tty.c tty_subr.c
 
-IOCONFIG= UCOM.ioconf
-
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
diff -r b726f58574ce -r 709709e5e113 sys/rump/dev/lib/libulpt/Makefile
--- a/sys/rump/dev/lib/libulpt/Makefile Mon Mar 01 15:30:47 2010 +0000
+++ b/sys/rump/dev/lib/libulpt/Makefile Mon Mar 01 15:41:15 2010 +0000
@@ -1,16 +1,15 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2010/03/01 15:41:15 pooka Exp $
 #
 
-.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
+.PATH: ${.CURDIR}/../../../../dev/usb
 
 LIB=   rumpdev_ulpt
+IOCONF=        ULPT.ioconf
 
 SRCS=  ulpt.c
 
 SRCS+= ulpt_at_usb.c
 
-IOCONFIG= ULPT.ioconf
-
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
diff -r b726f58574ce -r 709709e5e113 sys/rump/dev/lib/libumass/Makefile
--- a/sys/rump/dev/lib/libumass/Makefile        Mon Mar 01 15:30:47 2010 +0000
+++ b/sys/rump/dev/lib/libumass/Makefile        Mon Mar 01 15:41:15 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/02/17 20:44:34 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2010/03/01 15:41:15 pooka Exp $
 #
 #
 # umass.  includes scsibus+sd for simplicity due to the umass code
@@ -8,7 +8,7 @@
 .PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/scsipi
 
 LIB=   rumpdev_umass
-IOCONFIG= UMASS.ioconf
+IOCONF=        UMASS.ioconf
 
 .if ${MACHINE} == "i386"
 SRCS=  umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
diff -r b726f58574ce -r 709709e5e113 sys/rump/dev/wip/libukbd/Makefile
--- a/sys/rump/dev/wip/libukbd/Makefile Mon Mar 01 15:30:47 2010 +0000
+++ b/sys/rump/dev/wip/libukbd/Makefile Mon Mar 01 15:41:15 2010 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2010/02/16 20:42:45 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern      \
        ${.CURDIR}/../../../../dev/wscons
 
 LIB=   rumpdev_ukbd
+IOCONF= UKBD.ioconf
 
 SRCS=  ukbd.c ukbdmap.c
 
@@ -14,8 +15,6 @@
 # XXX
 SRCS+=  tty.c tty_conf.c tty_tty.c tty_subr.c
 
-IOCONFIG= UKBD.ioconf
-
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
diff -r b726f58574ce -r 709709e5e113 sys/rump/dev/wip/libums/Makefile
--- a/sys/rump/dev/wip/libums/Makefile  Mon Mar 01 15:30:47 2010 +0000
+++ b/sys/rump/dev/wip/libums/Makefile  Mon Mar 01 15:41:15 2010 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.3 2010/02/16 20:42:45 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
 
 LIB=   rumpdev_ums
+IOCONF= UMS.ioconf
 
 SRCS=  ums.c
 
@@ -13,8 +14,6 @@
 # XXX
 SRCS+=  tty.c tty_conf.c tty_tty.c tty_subr.c
 
-IOCONFIG= UMS.ioconf
-
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>