 @@ -1,32 +1,34 @@
-#	$NetBSD: Makefile.rump,v 1.20 2008/12/30 21:31:10 pooka Exp $
+#	$NetBSD: Makefile.rump,v 1.21 2009/01/01 19:43:57 pooka Exp $
+#
 WARNS?=		4
 NOLINT=		# kernel code
 .include <bsd.own.mk>
 # use kernel ABI instead of rump ABI (needs md code)
 .ifndef(RUMPKMOD)
 CPPFLAGS:=	-I${RUMPTOP}/include ${CPPFLAGS}
 .endif
 CFLAGS+=	-ffreestanding
 CPPFLAGS+=	-D_RUMPKERNEL	# XXX: this should die
 CPPFLAGS+=	-D_KERNEL -DMULTIPROCESSOR -D_MODULE
 CPPFLAGS+=	-DMAXUSERS=32
 CPPFLAGS+=	-DDIAGNOSTIC
 CPPFLAGS+=	-I${.CURDIR} -I.
 CPPFLAGS+=	-I${RUMPTOP}/../../common/include -I${RUMPTOP}/../arch
 CPPFLAGS+=	-I${RUMPTOP}/include
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern/opt
 CPPFLAGS+=	-nostdinc -I${RUMPTOP}/..
 #CPPFLAGS+=	-DDEBUG
 RUMPKERNEL=	This is NetBSD and I am the rump.  Good evening.
 # workaround: evbppc is not a well-defined arch
 .if (${MACHINE} == "evbppc")
 CPPFLAGS+=	-DPPC_OEA
 .endif
 # If an options are changed, trigger a rebuild
 ${SRCS:S/.c/.o/g}: ${RUMPTOP}/Makefile.rump

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.rumpkern,v 1.27 2009/01/01 19:07:43 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.28 2009/01/01 19:43:57 pooka Exp $
+#
 .include "${RUMPTOP}/Makefile.rump"
 LIB=		rump
 LDFLAGS+=	-Wl,--wrap=malloc
 .PATH:	${RUMPTOP}/librump/rumpkern				\
 	${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern		\
 	${RUMPTOP}/../conf ${RUMPTOP}/../dev			\
 	${RUMPTOP}/../../common/lib/libutil			\
 	${RUMPTOP}/../../common/lib/libutil			\
 	${RUMPTOP}/../../common/lib/libc/gen			\
 @@ -59,27 +59,26 @@ SRCS+=	snprintb.c rb.c heapsort.c
 #CPPFLAGS+=	-DRUMP_USE_REAL_KMEM
 #SRCS+=		subr_kmem.c subr_vmem.c
 .if ${MACHINE_ARCH} == "vax"
 .PATH:	${RUMPTOP}/../lib/libkern/arch/vax
 SRCS+=	blkset.S
 .endif
 # no shlib_version because this is automatically in sync with lib/librump
 SHLIB_MAJOR=    0
 SHLIB_MINOR=    0
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern/opt -DMAXUSERS=32
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpvfs
 CFLAGS+=	-Wno-pointer-sign
+#
 # If archdir exists, it is required to provide:
 # 1) kobj_reloc() and kobj_machdep()
 # 2) ...?
 # 3) PROFIT!
+#
 ARCHDIR=	${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
 .if exists(${ARCHDIR})
 .include "${ARCHDIR}/Makefile.inc"
 .PATH:	${ARCHDIR}

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.rumpvfs,v 1.2 2008/12/19 00:57:24 pooka Exp $
+#	$NetBSD: Makefile.rumpvfs,v 1.3 2009/01/01 19:43:57 pooka Exp $
+#
 .include "${RUMPTOP}/Makefile.rump"
 LIB=	rumpvfs
 .PATH:	${RUMPTOP}/librump/rumpvfs				\
 	${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern		\
 	${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs
+#
 # Source modules, first the ones specifically implemented for librump.
+#
 @@ -24,19 +24,18 @@ SRCS+=	vfs_bio.c vfs_cache.c vfs_cwd.c v
 # sys/miscfs
 SRCS+=	genfs_vfsops.c genfs_vnops.c sync_subr.c
 # sys/kern bufq
 SRCS+=	subr_bufq.c bufq_disksort.c bufq_fcfs.c bufq_priocscan.c	\
 	bufq_readprio.c
 SRCS+=	rumpvnode_if.c
 # no shlib_version because this is automatically in sync with lib/librump
 SHLIB_MAJOR=    0
 SHLIB_MINOR=    0
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern/opt -DMAXUSERS=32
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 CFLAGS+=	-Wno-pointer-sign
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>

 @@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.1 2008/10/02 21:59:19 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2009/01/01 19:43:58 pooka Exp $
+#
 RUMPTOP=	${.CURDIR}/../../..
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpnet/opt
 .include "${RUMPTOP}/Makefile.rump"