[src/trunk]: src Redo these changes properly:

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e75fcc1fb402
branches:  trunk
changeset: 787258:e75fcc1fb402
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 21:13:19 2013 +0000

description:
Redo these changes properly:
 -r1.12 libexec/lfs_cleanerd/Makefile
 -r1.15 sbin/fsck_lfs/Makefile
 -r1.6 sbin/newfs_lfs/Makefile

hi ad@

diffstat:

 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(-)

diffs (79 lines):

diff -r a5c9822267d9 -r e75fcc1fb402 libexec/lfs_cleanerd/Makefile.inc
--- a/libexec/lfs_cleanerd/Makefile.inc Sat Jun 08 20:43:35 2013 +0000
+++ b/libexec/lfs_cleanerd/Makefile.inc Sat Jun 08 21:13:19 2013 +0000
@@ -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 @@
 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 -r a5c9822267d9 -r e75fcc1fb402 sbin/fsck_lfs/Makefile
--- a/sbin/fsck_lfs/Makefile    Sat Jun 08 20:43:35 2013 +0000
+++ b/sbin/fsck_lfs/Makefile    Sat Jun 08 21:13:19 2013 +0000
@@ -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+= 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 -r a5c9822267d9 -r e75fcc1fb402 sbin/fsck_lfs/lfs_user.h
--- a/sbin/fsck_lfs/lfs_user.h  Sat Jun 08 20:43:35 2013 +0000
+++ b/sbin/fsck_lfs/lfs_user.h  Sat Jun 08 21:13:19 2013 +0000
@@ -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 @@
 #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 -r a5c9822267d9 -r e75fcc1fb402 sbin/newfs_lfs/Makefile
--- a/sbin/newfs_lfs/Makefile   Sat Jun 08 20:43:35 2013 +0000
+++ b/sbin/newfs_lfs/Makefile   Sat Jun 08 21:13:19 2013 +0000
@@ -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+=-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>