From a65dc3fc865ce0cdf30b72ca0eee09d02dba6e43 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Sat, 8 Jun 2013 21:13:19 +0000
Subject: [PATCH] Redo these changes properly:  -r1.12
 libexec/lfs_cleanerd/Makefile  -r1.15 sbin/fsck_lfs/Makefile  -r1.6
 sbin/newfs_lfs/Makefile

hi ad@
---
 libexec/lfs_cleanerd/Makefile.inc |  4 +---
 sbin/fsck_lfs/Makefile            |  5 ++---
 sbin/fsck_lfs/lfs_user.h          | 10 +++++++++-
 sbin/newfs_lfs/Makefile           |  5 ++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libexec/lfs_cleanerd/Makefile.inc b/libexec/lfs_cleanerd/Makefile.inc
index 033a33199c10..0742b8816461 100644
--- a/libexec/lfs_cleanerd/Makefile.inc
+++ b/libexec/lfs_cleanerd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2013/06/06 00:54:49 dholland Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2013/06/08 21:13:19 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 WARNS?=3		# XXX: too many sign-compare issues
@@ -15,8 +15,6 @@ FSCK_LFS= ${NETBSDSRCDIR}/sbin/fsck_lfs
 DPADD+=  ${LIBUTIL}
 LDADD+=  -lutil
 CPPFLAGS+=-I${FSCK_LFS} -I${NETBSDSRCDIR}/sbin/mount_lfs # -DUSE_CLIENT_SERVER 
-CPPFLAGS+="-Dmutex_enter(x)=" "-Dmutex_exit(x)="
-CPPFLAGS+="-DKASSERT(x)="
 #CPPFLAGS+=-DREPAIR_ZERO_FINFO
 #CPPFLAGS+=-DTEST_PATTERN
 
diff --git a/sbin/fsck_lfs/Makefile b/sbin/fsck_lfs/Makefile
index 02acf475347f..71617395e77a 100644
--- a/sbin/fsck_lfs/Makefile
+++ b/sbin/fsck_lfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2013/06/08 02:16:03 dholland Exp $
+#	$NetBSD: Makefile,v 1.20 2013/06/08 21:13:19 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 WARNS?=	3	# XXX: sign-compare issues
@@ -13,8 +13,7 @@ SRCS+=	segwrite.c setup.c utilities.c vars.c vnode.c
 SRCS+=	kernelops.c
 FSCK=	${NETBSDSRCDIR}/sbin/fsck
 .PATH:	${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK}
-CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FSCK_LFS "-Dmutex_enter(x)=" "-Dmutex_exit(x)="
-CPPFLAGS+="-DKASSERT(x)="
+CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FSCK_LFS
 # -DVERBOSE_BLOCKMAP 
 
 LDADD+=-lutil
diff --git a/sbin/fsck_lfs/lfs_user.h b/sbin/fsck_lfs/lfs_user.h
index b5ad8e2aa862..c26df344f09a 100644
--- a/sbin/fsck_lfs/lfs_user.h
+++ b/sbin/fsck_lfs/lfs_user.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_user.h,v 1.4 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: lfs_user.h,v 1.5 2013/06/08 21:13:19 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -49,6 +49,14 @@ struct finfo;
 #define simple_lock(arg)	/* empty */
 #define simple_unlock(arg)	/* empty */
 
+#define mutex_enter(mutex)	/* empty */
+#define mutex_exit(mutex)	/* empty */
+
+/*
+ * Outside of the kernel use standard assertions
+ */
+#define KASSERT assert
+
 /*
  * Structure used to pass around logical block paths generated by
  * ulfs_getlbns and used by truncate and bmap code.
diff --git a/sbin/newfs_lfs/Makefile b/sbin/newfs_lfs/Makefile
index 8c929e8d3836..f7a93f960b4d 100644
--- a/sbin/newfs_lfs/Makefile
+++ b/sbin/newfs_lfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2013/06/08 02:16:03 dholland Exp $
+#	$NetBSD: Makefile,v 1.12 2013/06/08 21:13:19 dholland Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 WARNS?=	3	# XXX: sign-compare issues
@@ -23,7 +23,6 @@ LDADD=  -lutil
 LDADD+=-lprop
 DPADD+=${LIBPROP}
 
-CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} "-Dmutex_enter(x)=" "-Dmutex_exit(x)=" # -DNDEBUG # -DVERBOSE_BLOCKMAP
-CPPFLAGS+="-DKASSERT(x)="
+CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP
 
 .include <bsd.prog.mk>