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.123
retrieving revision 1.138
diff -u -p -r1.123 -r1.138
--- src/share/mk/bsd.lib.mk	1998/02/18 03:14:31	1.123
+++ src/share/mk/bsd.lib.mk	1998/08/22 18:59:40	1.138
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.123 1998/02/18 03:14:31 jonathan Exp $
+#	$NetBSD: bsd.lib.mk,v 1.138 1998/08/22 18:59:40 tv 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
@@ -32,7 +32,7 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio
 
 # Data-driven table using make variables to control  how shared libraries
 # are built for different platforms and object formats.
-# SHLIB_TYPE:		currently either "ELF" or "a.out".
+# OBJECT_FMT:		currently either "ELF" or "a.out", from <bsd.own.mk>
 # SHLIB_SOVERSION:  	version number to be compiled into a shared library
 #                    	via -soname. Usualy ${SHLIB_MAJOR} on ELF.
 #   			NetBSD/pmax used to use ${SHLIB_MAJOR}.{SHLIB-MINOR}.
@@ -50,7 +50,6 @@ SHLIB_MINOR != . ${.CURDIR}/shlib_versio
 
 .if (${MACHINE_ARCH} == "alpha")
 		# Alpha-specific shared library flags
-SHLIB_TYPE=ELF
 SHLIB_LDSTARTFILE= ${DESTDIR}/usr/lib/crtbeginS.o
 SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crtendS.o
 
@@ -60,7 +59,6 @@ CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS ?=
 .elif (${MACHINE_ARCH} == "mips")
 		# mips-specific shared library flags
-SHLIB_TYPE=ELF
 # Still use gnu-derived ld.so on pmax; don't have or need lib<>.so support.
 SHLIB_LDSTARTFILE=
 SHLIB_LDENDFILE=
@@ -79,13 +77,12 @@ AS+=	-KPIC
 
 .else
 
-# Platform-independent flags for NetBSD a.out shared libraries
-SHLIB_TYPE=a.out
+# Platform-independent flags for NetBSD a.out shared libraries (and PowerPC)
 SHLIB_LDSTARTFILE=
 SHLIB_LDENDFILE=
-SHLIB_SHFLAGS= -Bshareable -Bforcearchive
+SHLIB_SHFLAGS=
 SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
-SHLIB_WHOLE=
+SHLIB_WHOLE=-Bforcearchive
 SHLIB_NOWHOLE=
 CPICFLAGS?= -fpic -DPIC
 CPPPICFLAGS?= -DPIC 
@@ -95,11 +92,11 @@ APICFLAGS?= -k
 .endif
 
 # Platform-independent linker flags for ELF shared libraries
-.if (${SHLIB_TYPE} == "ELF")
-SHILB_WHOLE=--whole-archive
-SHILB_NOWHOLE=--no-whole-archive
+.if (${OBJECT_FMT} == "ELF")
+SHLIB_WHOLE=--whole-archive
+SHLIB_NOWHOLE=--no-whole-archive
 SHLIB_SOVERSION=${SHLIB_MAJOR}
-SHLIB_SHFLAGS=-shared -soname lib${LIB}.so.${SHLIB_SOVERSION}
+SHLIB_SHFLAGS=-soname lib${LIB}.so.${SHLIB_SOVERSION}
 .endif
 
 CFLAGS+=	${COPTS}
@@ -179,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)
@@ -201,7 +202,7 @@ all: ${SRCS} ${_LIBS}
 
 __archivebuild: .USE
 	@rm -f ${.TARGET}
-	@${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC} | ${TSORT}`
+	@${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
 	${RANLIB} ${.TARGET}
 
 __archiveinstall: .USE
@@ -212,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
@@ -229,10 +233,18 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
 	@echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
 	@rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-	$(LD) -x ${SHLIB_SHFLAGS} -o ${.TARGET} \
+	$(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
 	    ${SHLIB_LDSTARTFILE} \
-	    ${SHLIB_WHOLE} lib${LIB}_pic.a ${SHLIB_NOWHOLE} ${LDADD} \
+	    --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
@@ -245,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)
@@ -257,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
@@ -267,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
@@ -281,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
@@ -307,7 +322,7 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} \
 		${.TARGET}
-.if (${SHLIB_TYPE} == "ELF")
+.if (${OBJECT_FMT} == "ELF")
 	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
 	ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
@@ -329,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