Fri Jan 2 11:13:38 2009 UTC ()
Define -DMODULAR in Makefile.rump instead of the sys/rump/librump
Makefile.inc so that it gets picked up by UPDATE=1


(pooka)
diff -r1.22 -r1.23 src/sys/rump/Makefile.rump
diff -r1.3 -r1.4 src/sys/rump/librump/Makefile.inc
cvs diff -r1.22 -r1.23 src/sys/rump/Makefile.rump (expand / switch to unified diff)

--- src/sys/rump/Makefile.rump 2009/01/01 22:16:35 1.22
+++ src/sys/rump/Makefile.rump 2009/01/02 11:13:38 1.23
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile.rump,v 1.22 2009/01/01 22:16:35 pooka Exp $ 1# $NetBSD: Makefile.rump,v 1.23 2009/01/02 11:13:38 pooka Exp $
2# 2#
3 3
4WARNS?= 4 4WARNS?= 4
5NOLINT= # kernel code 5NOLINT= # kernel code
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9# use kernel ABI instead of rump ABI (needs md code) 9# use kernel ABI instead of rump ABI (needs md code)
10.ifndef(RUMPKMOD) 10.ifndef(RUMPKMOD)
11CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS} 11CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
12.endif 12.endif
13 13
14CFLAGS+= -ffreestanding -fno-strict-aliasing 14CFLAGS+= -ffreestanding -fno-strict-aliasing
15CPPFLAGS+= -D_RUMPKERNEL # XXX: this should die 15CPPFLAGS+= -D_RUMPKERNEL # XXX: this should die
16CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE 16CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
17CPPFLAGS+= -DMAXUSERS=32 17CPPFLAGS+= -DMAXUSERS=32
18CPPFLAGS+= -DDIAGNOSTIC 18CPPFLAGS+= -DDIAGNOSTIC
19CPPFLAGS+= -I${.CURDIR} -I. 19CPPFLAGS+= -I${.CURDIR} -I.
20CPPFLAGS+= -I${RUMPTOP}/../../common/include -I${RUMPTOP}/../arch 20CPPFLAGS+= -I${RUMPTOP}/../../common/include -I${RUMPTOP}/../arch
21CPPFLAGS+= -I${RUMPTOP}/include 21CPPFLAGS+= -I${RUMPTOP}/include
22CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt 22CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
23CPPFLAGS+= -nostdinc -I${RUMPTOP}/.. 23CPPFLAGS+= -nostdinc -I${RUMPTOP}/..
24#CPPFLAGS+= -DDEBUG 24#CPPFLAGS+= -DDEBUG
25 25
26RUMPKERNEL= This is NetBSD and I am the rump. Good evening. 26RUMPKERNEL= This is NetBSD and I am the rump. Good evening.
27 27
28# workaround: evbppc is not a well-defined arch 28# workaround: evbppc is not a well-defined arch
29.if (${MACHINE} == "evbppc") 29.if (${MACHINE} == "evbppc")
cvs diff -r1.3 -r1.4 src/sys/rump/librump/Makefile.inc (expand / switch to unified diff)

--- src/sys/rump/librump/Makefile.inc 2009/01/01 19:07:43 1.3
+++ src/sys/rump/librump/Makefile.inc 2009/01/02 11:13:38 1.4
@@ -1,14 +1,3 @@ @@ -1,14 +1,3 @@
1# $NetBSD: Makefile.inc,v 1.3 2009/01/01 19:07:43 pooka Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2009/01/02 11:13:38 pooka Exp $
2# 2#
3 
4# 
5# Mandatory flags 
6# 
7CPPFLAGS+= -DMODULAR 
8 
9# 
10# Optional flags 
11# 
12 
13# Comment this out if you want the build to default to allowing threads 
14CPPFLAGS+= -DRUMP_WITHOUT_THREADS 3CPPFLAGS+= -DRUMP_WITHOUT_THREADS