Module Name: src
Committed By: pooka
Date: Mon Mar 1 15:41:16 UTC 2010
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/dev/lib/libucom: Makefile
src/sys/rump/dev/lib/libulpt: Makefile
src/sys/rump/dev/lib/libumass: Makefile
src/sys/rump/dev/wip/libukbd: Makefile
src/sys/rump/dev/wip/libums: Makefile
Log Message:
Rename IOCONFIG to IOCONF. It matches the config(1) keyword and
aligns better in Makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libucom/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libulpt/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libukbd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libums/Makefile
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.51 src/sys/rump/Makefile.rump:1.52
--- src/sys/rump/Makefile.rump:1.51 Wed Feb 17 13:28:40 2010
+++ src/sys/rump/Makefile.rump Mon Mar 1 15:41:15 2010
@@ -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
Index: src/sys/rump/dev/lib/libucom/Makefile
diff -u src/sys/rump/dev/lib/libucom/Makefile:1.3 src/sys/rump/dev/lib/libucom/Makefile:1.4
--- src/sys/rump/dev/lib/libucom/Makefile:1.3 Mon Mar 1 11:34:27 2010
+++ src/sys/rump/dev/lib/libucom/Makefile Mon Mar 1 15:41:15 2010
@@ -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>
Index: src/sys/rump/dev/lib/libulpt/Makefile
diff -u src/sys/rump/dev/lib/libulpt/Makefile:1.2 src/sys/rump/dev/lib/libulpt/Makefile:1.3
--- src/sys/rump/dev/lib/libulpt/Makefile:1.2 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libulpt/Makefile Mon Mar 1 15:41:15 2010
@@ -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>
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.4 src/sys/rump/dev/lib/libumass/Makefile:1.5
--- src/sys/rump/dev/lib/libumass/Makefile:1.4 Wed Feb 17 20:44:34 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Mar 1 15:41:15 2010
@@ -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
Index: src/sys/rump/dev/wip/libukbd/Makefile
diff -u src/sys/rump/dev/wip/libukbd/Makefile:1.3 src/sys/rump/dev/wip/libukbd/Makefile:1.4
--- src/sys/rump/dev/wip/libukbd/Makefile:1.3 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/wip/libukbd/Makefile Mon Mar 1 15:41:15 2010
@@ -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>
Index: src/sys/rump/dev/wip/libums/Makefile
diff -u src/sys/rump/dev/wip/libums/Makefile:1.3 src/sys/rump/dev/wip/libums/Makefile:1.4
--- src/sys/rump/dev/wip/libums/Makefile:1.3 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/wip/libums/Makefile Mon Mar 1 15:41:15 2010
@@ -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>
