From cf82732ba253a87d1d8fe3c7bb68dadc963a4fb6 Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Wed, 15 Oct 2008 13:57:03 +0000
Subject: [PATCH] Revert weird revivesa merge botch.  (Hi Bill!)

---
 sys/rump/fs/lib/Makefile.inc | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/sys/rump/fs/lib/Makefile.inc b/sys/rump/fs/lib/Makefile.inc
index 3542886f8e3e..142830ccc729 100644
--- a/sys/rump/fs/lib/Makefile.inc
+++ b/sys/rump/fs/lib/Makefile.inc
@@ -1,17 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.11 2008/10/15 06:51:21 wrstuden Exp $
+#	$NetBSD: Makefile.inc,v 1.12 2008/10/15 13:57:03 pooka Exp $
 #
 
-LIBISPRIVATE=	yes
-NOMAN=		wizd
+RUMPTOP=	${.CURDIR}/../../..
 
-WARNS?=		4
-DBG=		-O0 -g
-
-CPPFLAGS+=	-I${.CURDIR} -I.
-.if "${RUMPKERNEL}" != "no"
-CFLAGS+=	-ffreestanding
-CPPFLAGS:=	-I${NETBSDSRCDIR}/sys/rump/include ${CPPFLAGS}
-CPPFLAGS+=	-D_KERNEL -I${NETBSDSRCDIR}/common/include
-CPPFLAGS+=	-D_RUMPKERNEL
-CPPFLAGS+=	-nostdinc -I${NETBSDSRCDIR}/sys
-.endif
+.include "${RUMPTOP}/Makefile.rump"