diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 8f3a2fe5e50d..6bc944d6cd89 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.106 2002/08/19 09:41:28 lukem Exp $
+#	$NetBSD: Makefile,v 1.107 2002/08/19 14:55:14 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -17,10 +17,11 @@
 # The Hesiod functions are always in libc. To choose that getpwent() and friends
 # actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below.
 
+USE_SHLIBDIR=	yes
+
 .include <bsd.own.mk>
 
 LIB=		c
-USE_SHLIBDIR=	yes
 CPPFLAGS+=	-D_LIBC -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT
 CPPFLAGS+=	-I${.CURDIR}/include
 
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 1fc8ebd1dc81..96ad745ea3f2 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.12 2002/05/24 04:02:48 itojun Exp $
+#	$NetBSD: Makefile,v 1.13 2002/08/19 14:55:15 lukem Exp $
+
+USE_SHLIBDIR=	yes
 
 LIB=	crypt
-USE_SHLIBDIR=	yes
 
 SRCS=	crypt.c md5crypt.c bcrypt.c blowfish.c
 
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 8073d390b036..d1e26b151afd 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.22 2002/03/18 16:20:36 christos Exp $
+#	$NetBSD: Makefile,v 1.23 2002/08/19 14:55:15 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
+USE_SHLIBDIR=	yes
+
 WARNS=	3
 LIB=	edit
-USE_SHLIBDIR=	yes
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index dc2af0c08245..85936f7cd68c 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/19 09:41:31 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/19 14:55:15 lukem Exp $
+
+USE_SHLIBDIR=	yes
 
 LIB=	ipsec
-USE_SHLIBDIR=	yes
 CFLAGS+=-g
 CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -DINET6 -I${.CURDIR} -I. -DYY_NO_UNPUT
 
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index fc52cdcf9bba..5ef11d47e99a 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.37 2001/12/28 01:32:39 lukem Exp $
+#	$NetBSD: Makefile,v 1.38 2002/08/19 14:55:16 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
 
-LIB=	kvm
 USE_SHLIBDIR=	yes
+
+LIB=	kvm
 CPPFLAGS+=-DLIBC_SCCS
 
 SRCS=	kvm.c kvm_file.c kvm_getloadavg.c kvm_proc.c
diff --git a/lib/libm/arch/i387/Makefile b/lib/libm/arch/i387/Makefile
index 4958cb190dea..9068bcd197b1 100644
--- a/lib/libm/arch/i387/Makefile
+++ b/lib/libm/arch/i387/Makefile
@@ -1,10 +1,11 @@
-#  $NetBSD: Makefile,v 1.3 2001/12/28 01:32:39 lukem Exp $
+#  $NetBSD: Makefile,v 1.4 2002/08/19 14:55:16 lukem Exp $
 #
 
 NOLINT=		# defined
-LIB=		m387
 USE_SHLIBDIR=	yes
 
+LIB=		m387
+
 SRCS=e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
      e_logf.S e_log10.S e_log10f.S e_remainder.S e_remainderf.S \
      e_scalb.S e_scalbf.S e_sqrt.S e_sqrtf.S s_atan.S s_atanf.S \
diff --git a/lib/librmt/Makefile b/lib/librmt/Makefile
index ecb1c475908b..678ce03678e2 100644
--- a/lib/librmt/Makefile
+++ b/lib/librmt/Makefile
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.7 2001/12/12 00:51:05 tv Exp $
+#	$NetBSD: Makefile,v 1.8 2002/08/19 14:55:16 lukem Exp $
+
+NOPIC=		# defined
+NOPROFILE=	# defined
 
 LIB=		rmt
 SRCS=		rmtlib.c
 MAN=		rmtops.3
 
 CPPFLAGS+=	-D_REENTRANT
-NOPIC=		# defined
-NOPROFILE=	# defined
 
 .include <bsd.lib.mk>
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index b5743fe9a60f..8e273e464610 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,4 +1,7 @@
-#	$NetBSD: Makefile,v 1.35 2002/01/29 11:22:25 tv Exp $
+#	$NetBSD: Makefile,v 1.36 2002/08/19 14:55:16 lukem Exp $
+
+NOMAN=		# defined
+NOPIC=		# defined
 
 RPCSRCS=	bootparam_prot.x klm_prot.x mount.x nfs_prot.x\
 		nlm_prot.x rex.x rnusers.x rusers.x rquota.x rstat.x rwall.x\
@@ -11,8 +14,6 @@ INCS=		${HDRS} ${RPCSRCS}
 INCSDIR=	/usr/include/rpcsvc
 
 LIB=		rpcsvc
-NOMAN=		# defined
-NOPIC=		# defined
 
 .include <bsd.lib.mk>
 
diff --git a/lib/libterm/Makefile b/lib/libterm/Makefile
index 870ef87f8db6..a1c7c5106886 100644
--- a/lib/libterm/Makefile
+++ b/lib/libterm/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.26 2002/02/26 00:24:59 lukem Exp $
+#	$NetBSD: Makefile,v 1.27 2002/08/19 14:55:17 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
-LIB=	termcap
 USE_SHLIBDIR=	yes
+
+LIB=	termcap
 CPPFLAGS+=-I${.CURDIR} -DCM_N -DCM_GT -DCM_B -DCM_D
 SRCS=	termcap.c tgoto.c tputs.c
 
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 47234a93e271..582a107e2ddf 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.34 2002/08/19 09:41:34 lukem Exp $
+#	$NetBSD: Makefile,v 1.35 2002/08/19 14:55:18 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
+USE_SHLIBDIR=	yes
+
 .include <bsd.own.mk>
 
 LIB=	util
-USE_SHLIBDIR=	yes
 CPPFLAGS+=-DLIBC_SCCS
 SRCS=	fparseln.c getbootfile.c getmaxpartitions.c getrawpartition.c \
 	humanize_number.c login.c login_cap.c login_tty.c \
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 0dd25dad575c..10e85f70d7a4 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.9 2001/12/12 00:51:06 tv Exp $
+#	$NetBSD: Makefile,v 1.10 2002/08/19 14:55:18 lukem Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
 
+NOPIC=		# defined
+
 LIB=		y
 SRCS=		main.c yyerror.c
-NOPIC=		# defined
 
 .include <bsd.lib.mk>
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index fbc2834e0e24..28553f4d5cbd 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.16 2001/12/28 01:32:40 lukem Exp $
+#	$NetBSD: Makefile,v 1.17 2002/08/19 14:55:18 lukem Exp $
 
-LIB=		z
 NOMAN=		# defined
 USE_SHLIBDIR=	yes
 
+LIB=		z
+
 SRCS=	adler32.c compress.c crc32.c deflate.c gzio.c infblock.c \
 	infcodes.c inffast.c inflate.c inftrees.c infutil.c trees.c uncompr.c \
 	zutil.c gzio_compat.c