From 11e4a43ad94e12fb62112e392f9a78991acec210 Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Thu, 29 May 2008 13:12:29 +0000
Subject: [PATCH] Specify RUMP_WITHOUT_THREADS only in one place.

---
 sys/rump/librump/Makefile.inc      | 4 ++++
 sys/rump/librump/rumpkern/Makefile | 3 +--
 sys/rump/librump/rumpuser/Makefile | 4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 sys/rump/librump/Makefile.inc

diff --git a/sys/rump/librump/Makefile.inc b/sys/rump/librump/Makefile.inc
new file mode 100644
index 000000000000..8c7cbbabd062
--- /dev/null
+++ b/sys/rump/librump/Makefile.inc
@@ -0,0 +1,4 @@
+#	$NetBSD: Makefile.inc,v 1.1 2008/05/29 13:12:29 pooka Exp $
+#
+
+CPPFLAGS+=	-DRUMP_WITHOUT_THREADS
diff --git a/sys/rump/librump/rumpkern/Makefile b/sys/rump/librump/rumpkern/Makefile
index ba2ab203d961..146602a882de 100644
--- a/sys/rump/librump/rumpkern/Makefile
+++ b/sys/rump/librump/rumpkern/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2008/05/04 12:52:58 ad Exp $
+#	$NetBSD: Makefile,v 1.34 2008/05/29 13:12:29 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -44,7 +44,6 @@ OBJS+=	${RUMPUSEROBJDIR}/rumpuser.o ${RUMPUSEROBJDIR}/rumpuser_pth.o
 CPPFLAGS+=	-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/common/include	\
 		-I${NETBSDSRCDIR}/sys/rump/librump/rumpuser		\
 		-I${.CURDIR}/opt -DMAXUSERS=32
-CPPFLAGS+=	-DRUMP_WITHOUT_THREADS
 
 CFLAGS+=	-Wno-pointer-sign
 
diff --git a/sys/rump/librump/rumpuser/Makefile b/sys/rump/librump/rumpuser/Makefile
index 48cd62c9e8e4..3c86f9dc18b7 100644
--- a/sys/rump/librump/rumpuser/Makefile
+++ b/sys/rump/librump/rumpuser/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2008/03/11 10:50:16 pooka Exp $
+#	$NetBSD: Makefile,v 1.7 2008/05/29 13:12:29 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -7,8 +7,6 @@ LIB=		rumpuser
 
 SRCS=		rumpuser.c rumpuser_pth.c
 
-CPPFLAGS+=	-DRUMP_WITHOUT_THREADS
-
 RUMPKERNEL=	no
 
 .include "${NETBSDSRCDIR}/sys/rump/Makefile.rump"