Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.273.4.1
retrieving revision 1.279
diff -u -p -r1.273.4.1 -r1.279
--- src/share/mk/bsd.lib.mk	2008/06/02 13:21:43	1.273.4.1
+++ src/share/mk/bsd.lib.mk	2008/05/02 11:45:19	1.279
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.273.4.1 2008/06/02 13:21:43 mjf Exp $
+#	$NetBSD: bsd.lib.mk,v 1.279 2008/05/02 11:45:19 lukem Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -7,15 +7,6 @@
 # Pull in <bsd.sys.mk> here so we can override its .c.o rule
 .include <bsd.sys.mk>
 
-LIBISPRIVATE?=	no
-
-.if ${LIBISPRIVATE} != "no"
-MKDEBUGLIB:=	no
-MKLINT:=	no
-MKPIC:=		no
-MKPROFILE:=	no
-.endif
-
 ##### Basic targets
 .PHONY:		checkver libinstall
 realinstall:	checkver libinstall
@@ -342,12 +333,10 @@ OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 
 STOBJS+=${OBJS}
 
-LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
-
-.if ${LIBISPRIVATE} != "no"
+.if ${MKPRIVATELIB} != "no"
 # No installation is required
 libinstall::
-.else	# ${LIBISPRIVATE} == "no"					# {
+.else	# ${MKPRIVATELIB} == "no"					# {
 
 .if ${MKDEBUGLIB} != "no"
 _LIBS+=lib${LIB}_g.a
@@ -382,11 +371,12 @@ _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif
 .endif									# }
 
+LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 .if ${MKLINT} != "no" && !empty(LOBJS)
 _LIBS+=llib-l${LIB}.ln
 .endif
 
-.endif	# ${LIBISPRIVATE} == "no"					# }
+.endif	# ${MKPRIVATELIB} == "no"					# }
 
 ALLOBJS=
 .if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
@@ -507,11 +497,6 @@ llib-l${LIB}.ln: ${LOBJS}
 .endif
 .endif									# }
 
-lint: ${LOBJS}
-.if defined(LOBJS) && !empty(LOBJS)
-	${LINT} ${LINTFLAGS} ${LOBJS}
-.endif
-
 cleanlib: .PHONY
 	rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES}
 	rm -f lib${LIB}.a ${STOBJS}