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 retrieving revision 1.279 retrieving revision 1.280 diff -u -p -r1.279 -r1.280 --- src/share/mk/bsd.lib.mk 2008/05/02 11:45:19 1.279 +++ src/share/mk/bsd.lib.mk 2008/05/03 14:36:06 1.280 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.279 2008/05/02 11:45:19 lukem Exp $ +# $NetBSD: bsd.lib.mk,v 1.280 2008/05/03 14:36:06 lukem Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -7,6 +7,13 @@ # Pull in here so we can override its .c.o rule .include +.if ${MKPRIVATELIB} != "no" +MKDEBUGLIB:= no +MKLINT:= no +MKPIC:= no +MKPROFILE:= no +.endif + ##### Basic targets .PHONY: checkver libinstall realinstall: checkver libinstall @@ -333,6 +340,8 @@ OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g} STOBJS+=${OBJS} +LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} + .if ${MKPRIVATELIB} != "no" # No installation is required libinstall:: @@ -371,7 +380,6 @@ _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 @@ -497,6 +505,11 @@ 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}