=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/share/mk/bsd.lib.mk,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- src/share/mk/bsd.lib.mk 2011/07/16 23:34:21 1.61 +++ src/share/mk/bsd.lib.mk 2012/04/08 15:56:28 1.62 @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.61 2011/07/16 23:34:21 guenther Exp $ +# $OpenBSD: bsd.lib.mk,v 1.62 2012/04/08 15:56:28 jsg Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -22,10 +22,10 @@ .MAIN: all # prefer .S to a .c, add .po, remove stuff not used in the BSD libraries. -# .so used for PIC object files. .ln used for lint output files. +# .so used for PIC object files. # .m for objective c files. .SUFFIXES: -.SUFFIXES: .out .o .go .po .so .S .s .c .cc .C .cxx .f .y .l .ln .m4 .m +.SUFFIXES: .out .o .go .po .so .S .s .c .cc .C .cxx .f .y .l .m4 .m .c.o: @echo "${COMPILE.c} ${.IMPSRC} -o ${.TARGET}" @@ -51,9 +51,6 @@ @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o -.c.ln: - ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC} - .cc.o .C.o .cxx.o: @echo "${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}" @${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o @@ -168,10 +165,6 @@ .endif .endif -.if defined(WANTLINT) && ${WANTLINT:L} != "no" -_LIBS+=llib-l${LIB}.ln -.endif - all: ${_LIBS} _SUBDIRUSE OBJS+= ${SRCS:N*.h:R:S/$/.o/} @@ -210,13 +203,6 @@ -o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ `${LORDER} ${SOBJS}|tsort -q` ${LDADD} -LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} -LLIBS?= -lc -llib-l${LIB}.ln: ${LOBJS} - @echo building llib-l${LIB}.ln - @rm -f llib-l${LIB}.ln - @${LINT} -C${LIB} ${LOBJS} ${LLIBS} - .if !target(clean) clean: _SUBDIRUSE rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES} @@ -224,7 +210,6 @@ rm -f lib${LIB}_g.a ${GOBJS} rm -f lib${LIB}_p.a ${POBJS} rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS} - rm -f llib-l${LIB}.ln ${LOBJS} .endif cleandir: _SUBDIRUSE clean @@ -284,10 +269,6 @@ .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR} -.endif -.if defined(WANTLINT) && ${WANTLINT:L} != "no" - ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR} .endif .if defined(LINKS) && !empty(LINKS) . for lnk file in ${LINKS}