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.203
retrieving revision 1.209
diff -u -p -r1.203 -r1.209
--- src/share/mk/bsd.lib.mk	2002/05/07 02:06:32	1.203
+++ src/share/mk/bsd.lib.mk	2002/11/09 08:22:04	1.209
@@ -1,7 +1,8 @@
-#	$NetBSD: bsd.lib.mk,v 1.203 2002/05/07 02:06:32 eeh Exp $
+#	$NetBSD: bsd.lib.mk,v 1.209 2002/11/09 08:22:04 thorpej Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
+.include <bsd.shlib.mk>
 
 ##### Basic targets
 .PHONY:		checkver cleanlib libinstall
@@ -87,35 +88,38 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 # SHLIB_LDENDFILE:	support .o file, call C++ file-level destructors
 # FPICFLAGS:		flags for ${FC} to compile .[fF] files to .so objects.
 # CPPICFLAGS:		flags for ${CPP} to preprocess .[sS] files for ${AS}
-# CPICFLAGS:		flags for ${CC} to compile .[cC] files to .so objects.
-# CAPICFLAGS		flags for {$CC} to compiling .[Ss] files
+# CPICFLAGS:		flags for ${CC} to compile .[cC] files to pic objects.
+# CSHLIBFLAGS:		flags for ${CC} to compile .[cC] files to .so objects.
+#			(usually includes ${CPICFLAGS})
+# CAPICFLAGS:		flags for ${CC} to compiling .[Ss] files
 #		 	(usually just ${CPPPICFLAGS} ${CPICFLAGS})
 # APICFLAGS:		flags for ${AS} to assemble .[sS] to .so objects.
 
 .if ${MACHINE_ARCH} == "alpha"
-		# Alpha-specific shared library flags
+
 FPICFLAGS ?= -fPIC
 CPICFLAGS ?= -fPIC -DPIC
 CPPPICFLAGS?= -DPIC 
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS ?=
+
 .elif ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
-		# mips-specific shared library flags
 
-# On mips, all libs are compiled with ABIcalls, not just sharedlibs.
+# On MIPS, all libs are compiled with ABIcalls (and are thus PIC),
+# not just sharedlibs.
 MKPICLIB= no
 
 # so turn shlib PIC flags on for ${AS}.
 AINC+=-DABICALLS
-AFLAGS+= -fPIC
-AS+=	-KPIC
 
 .elif ${MACHINE_ARCH} == "vax" && ${OBJECT_FMT} == "ELF"
+
 # On the VAX, all object are PIC by default, not just sharedlibs.
 MKPICLIB= no
 
 .elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && \
        ${OBJECT_FMT} == "ELF"
+
 # If you use -fPIC you need to define BIGPIC to turn on 32-bit 
 # relocations in asm code
 FPICFLAGS ?= -fPIC
@@ -124,6 +128,17 @@ CPPPICFLAGS?= -DPIC -DBIGPIC
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS ?= -KPIC
 
+.elif ${MACHINE_ARCH} == "hppa"
+
+FPICFLAGS ?= -fPIC
+CPICFLAGS?= -fPIC -DPIC
+CPPPICFLAGS?= -DPIC 
+CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
+APICFLAGS?= -k
+# XXX libraries often need the millicode functions in libgcc.a,
+# so we have to work around the -nostdlib:
+LDADD+= `$(CC) -print-libgcc-file-name`
+
 .else
 
 # Platform-independent flags for NetBSD a.out shared libraries
@@ -139,6 +154,16 @@ APICFLAGS?= -k
 
 MKPICLIB?= yes
 
+.if ${MKPICLIB} != "no"
+CSHLIBFLAGS+= ${CPICFLAGS}
+.endif
+
+.if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)
+MKSHLIBOBJS= yes
+.else
+MKSHLIBOBJS= no
+.endif
+
 # Platform-independent linker flags for ELF shared libraries
 .if ${OBJECT_FMT} == "ELF"
 SHLIB_SOVERSION=	${SHLIB_MAJOR}
@@ -172,10 +197,10 @@ FFLAGS+=	${FOPTS}
 
 .c.so:
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
 .else
-	@echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@echo ${COMPILE.c:Q} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 .endif
@@ -205,10 +230,10 @@ FFLAGS+=	${FOPTS}
 
 .cc.so .C.so:
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.cc} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
 .else
 	@echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@${COMPILE.cc} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 .endif
@@ -268,10 +293,10 @@ FFLAGS+=	${FOPTS}
 
 .m.so:
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
-	${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${COMPILE.m} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
 .else
 	@echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@${COMPILE.m} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 .endif
@@ -310,7 +335,15 @@ POBJS+=${OBJS:.o=.po}
 
 .if ${MKPIC} != "no"
 .if ${MKPICLIB} == "no"
+.if ${MKSHLIBOBJS} != "no"
+# make _pic.a, which isn't really pic,
+# since it's needed for making shared lib.
+# but don't install it.
+SOLIB=lib${LIB}_pic.a
+SOBJS+=${OBJS:.o=.so}
+.else
 SOLIB=lib${LIB}.a
+.endif
 .else
 SOLIB=lib${LIB}_pic.a
 _LIBS+=${SOLIB}
@@ -347,10 +380,10 @@ __archivebuild: .USE
 
 __archiveinstall: .USE
 	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${UPDATE:D:U-a "${RANLIB} -t"} ${.ALLSRC} ${.TARGET}
+	    ${UPDATE:D:U-a "${RANLIB} -t"} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 __archivesymlinkpic: .USE
-	${INSTALL_SYMLINK} ${.ALLSRC} ${.TARGET}
+	${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
 CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
@@ -397,8 +430,12 @@ LLIBS?=		-lc
 llib-l${LIB}.ln: ${LOBJS}
 	@echo building llib-l${LIB}.ln
 	@rm -f llib-l${LIB}.ln
+.if defined(DESTDIR)
+	@${LINT} -C${LIB} ${.ALLSRC} -L${DESTDIR}/usr/libdata ${LLIBS}
+.else
 	@${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}
 .endif
+.endif
 
 cleanlib:
 	rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES}
@@ -494,27 +531,32 @@ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SH
 ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif
 	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.ALLSRC} ${.TARGET}
+		${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 .if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
-	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif
 .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
 	/sbin/ldconfig -m ${_LIBSODIR} ${LIBDIR}
 .endif
 .if ${OBJECT_FMT} == "ELF"
-	${INSTALL_SYMLINK} lib${LIB}.so.${SHLIB_FULLVERSION} \
-	    ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
 .if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
-	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
 .endif
 .if ${MKLINKLIB} != "no"
-	${INSTALL_SYMLINK} lib${LIB}.so.${SHLIB_FULLVERSION} \
-	    ${DESTDIR}${_LIBSODIR}/lib${LIB}.so
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${_LIBSODIR}/lib${LIB}.so
 .if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
-	    ${DESTDIR}${LIBDIR}/lib${LIB}.so
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${LIBDIR}/lib${LIB}.so
 .endif
 .endif
 .endif
@@ -536,7 +578,7 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
 .endif
 	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
+		${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
 .endif
 .endif