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.126
retrieving revision 1.137
diff -u -p -r1.126 -r1.137
--- src/share/mk/bsd.lib.mk	1998/03/07 02:02:58	1.126
+++ src/share/mk/bsd.lib.mk	1998/08/09 14:46:19	1.137
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.126 1998/03/07 02:02:58 jonathan Exp $
+#	$NetBSD: bsd.lib.mk,v 1.137 1998/08/09 14:46:19 lukem Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -13,7 +13,7 @@ __initialized__:
 
 .PHONY:		cleanlib libinstall
 realinstall:	libinstall
-clean cleandir:	cleanlib
+clean cleandir distclean: cleanlib
 
 .if exists(${.CURDIR}/shlib_version)
 SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
@@ -176,11 +176,15 @@ CFLAGS+=	${COPTS}
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
+.if !defined(NOSTATICLIB) || defined(NOPIC) || \
+	(defined(LDSTATIC) && ${LDSTATIC} != "")
+_LIBS=lib${LIB}.a
+.else
+_LIBS=
+.endif
 
 .if !defined(NOPROFILE)
-_LIBS=lib${LIB}.a lib${LIB}_p.a
-.else
-_LIBS=lib${LIB}.a
+_LIBS+=lib${LIB}_p.a
 .endif
 
 .if !defined(NOPIC)
@@ -209,6 +213,9 @@ __archiveinstall: .USE
 
 DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
 CLEANFILES+=	${DPSRCS}
+.if defined(YHEADER)
+CLEANFILES+=	${SRCS:M*.y:.y=.h}
+.endif
 
 OBJS+=		${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 lib${LIB}.a:: ${OBJS} __archivebuild
@@ -230,6 +237,14 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
 	    ${SHLIB_LDSTARTFILE} \
 	    --whole-archive lib${LIB}_pic.a --no-whole-archive ${LDADD} \
 	    ${SHLIB_LDENDFILE}
+.if (${OBJECT_FMT} == "ELF")
+	rm -f lib${LIB}.so.${SHLIB_MAJOR}
+	ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	    lib${LIB}.so.${SHLIB_MAJOR}
+	rm -f lib${LIB}.so
+	ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	    lib${LIB}.so
+.endif
 
 LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 LLIBS?=		-lc
@@ -242,7 +257,7 @@ cleanlib:
 	rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES}
 	rm -f lib${LIB}.a ${OBJS}
 	rm -f lib${LIB}_p.a ${POBJS}
-	rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS}
+	rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS}
 	rm -f llib-l${LIB}.ln ${LOBJS}
 
 .if defined(SRCS)
@@ -254,6 +269,8 @@ afterdepend: .depend
 .endif
 
 .if !target(libinstall)
+.if !defined(NOSTATICLIB) || defined(NOPIC) || \
+	(defined(LDSTATIC) && ${LDSTATIC} != "")
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a
@@ -264,6 +281,7 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE
 
 .PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 ${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall
+.endif
 
 .if !defined(NOPROFILE)
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
@@ -278,7 +296,7 @@ ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE
 ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall
 .endif
 
-.if !defined(NOPIC)
+.if !defined(NOPIC) && !defined(NOPICINSTALL)
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
@@ -326,7 +344,7 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 .PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
+	    ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
 .endif
 .endif