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.202
retrieving revision 1.236
diff -u -p -r1.202 -r1.236
--- src/share/mk/bsd.lib.mk	2002/05/07 01:45:45	1.202
+++ src/share/mk/bsd.lib.mk	2003/10/18 15:33:59	1.236
@@ -1,16 +1,28 @@
-#	$NetBSD: bsd.lib.mk,v 1.202 2002/05/07 01:45:45 eeh Exp $
+#	$NetBSD: bsd.lib.mk,v 1.236 2003/10/18 15:33:59 lukem Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
+.include <bsd.shlib.mk>
+.include <bsd.gcc.mk>
+# Pull in <bsd.sys.mk> here so we can override its .c.o rule
+.include <bsd.sys.mk>
 
 ##### Basic targets
 .PHONY:		checkver cleanlib libinstall
 realinstall:	checkver libinstall
 clean:		cleanlib
 
+##### LIB specific flags.
+COPTS+=    ${COPTS.lib${LIB}}
+CPPFLAGS+=  ${CPPFLAGS.lib${LIB}}
+CXXFLAGS+=  ${CXXFLAGS.lib${LIB}}
+LDADD+=     ${LDADD.lib${LIB}}
+LDFLAGS+=   ${LDFLAGS.lib${LIB}}
+LDSTATIC+=  ${LDSTATIC.lib${LIB}}
+
 ##### Build and install rules
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
-CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include/g++}
+CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
 
 .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
@@ -67,7 +79,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 # add additional suffixes not exported.
 # .po is used for profiling object files.
 # .so is used for PIC object files.
-.SUFFIXES: .out .a .ln .so .po .o .s .S .c .cc .C .m .F .f .r .y .l .cl .p .h
+.SUFFIXES: .out .a .ln .so .po .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h
 .SUFFIXES: .sh .m4 .m
 
 
@@ -87,42 +99,42 @@ 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 
+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.
-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 
+
+# If you use -fPIC you need to define BIGPIC to turn on 32-bit
 # relocations in asm code
 FPICFLAGS ?= -fPIC
 CPICFLAGS ?= -fPIC -DPIC
 CPPPICFLAGS?= -DPIC -DBIGPIC
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
-APICFLAGS ?= -KPIC -DBIGPIC
+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
 
@@ -131,171 +143,240 @@ SHLIB_SOVERSION=${SHLIB_FULLVERSION}
 SHLIB_SHFLAGS=
 FPICFLAGS ?= -fPIC
 CPICFLAGS?= -fPIC -DPIC
-CPPPICFLAGS?= -DPIC 
+CPPPICFLAGS?= -DPIC
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS?= -k
 
 .endif
 
-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}
-SHLIB_SHFLAGS=		-soname lib${LIB}.so.${SHLIB_SOVERSION}
-SHLIB_LDSTARTFILE?=	${DESTDIR}/usr/lib/crtbeginS.o
-SHLIB_LDENDFILE?=	${DESTDIR}/usr/lib/crtendS.o
+SHLIB_SHFLAGS=		-Wl,-soname,lib${LIB}.so.${SHLIB_SOVERSION}
+SHLIB_LDSTARTFILE?=	${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGINS}
+SHLIB_LDENDFILE?=	${_GCC_CRTENDS} ${DESTDIR}/usr/lib/crtn.o
 .endif
 
 CFLAGS+=	${COPTS}
 FFLAGS+=	${FOPTS}
 
 .c.o:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.c} ${.IMPSRC}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.c:Q} ${.IMPSRC}
-	@${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .c.po:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.c:Q} -pg ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .c.so:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .c.ln:
-	${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
-
-.cc.o .C.o:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} ${CPPFLAGS.${.IMPSRC:T}:M-[-IDU]*} -i ${.IMPSRC}
+
+.cc.o .cpp.o .cxx.o .C.o:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.cc} ${.IMPSRC}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.cc:Q} ${.IMPSRC}
-	@${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
-.cc.po .C.po:
+.cc.po .cpp.po .cxx.o .C.po:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.cc:Q} -pg ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
-.cc.so .C.so:
+.cc.so .cpp.so .cxx.so .C.so:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)
-	${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .f.o:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(FOPTS) && !empty(FOPTS:M*-g*)
-	${COMPILE.f} ${.IMPSRC}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.f:Q} ${.IMPSRC}
-	@${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .f.po:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(FOPTS) && !empty(FOPTS:M*-g*)
-	${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.f:Q} -pg ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .f.so:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(FOPTS) && !empty(FOPTS:M*-g*)
-	${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.f:Q} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .f.ln:
-	${ECHO} Skipping lint for Fortran libraries.
+	${_MKMSG} "compile  ${.TARGET}"
+	@echo Skipping lint for Fortran libraries.
 
 .m.o:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
-	${COMPILE.m} ${.IMPSRC}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.m:Q} ${.IMPSRC}
-	@${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .m.po:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
-	${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .m.so:
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.m} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
-	${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	${_MKCMD}\
+	mv ${.TARGET}.tmp ${.TARGET}
 .else
-	@echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 .endif
 
 .S.o .s.o:
-	@echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}
-	@${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.tmp
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 
 .S.po .s.po:
-	@echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.tmp
+	${_MKCMD}\
+	${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
 
 .S.so .s.so:
-	@echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
-	@${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
-	|| ${MKLINKLIB} != "no"
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.tmp
+	${_MKCMD}\
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
+	rm -f ${.TARGET}.tmp
+
+.if defined(LIB)
+.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+	|| ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"
 _LIBS=lib${LIB}.a
 .else
 _LIBS=
@@ -310,7 +391,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}
@@ -326,92 +415,134 @@ LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.l
 _LIBS+=llib-l${LIB}.ln
 .endif
 
-.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
-	|| ${MKLINKLIB} != "no"
-ALLOBJS=${OBJS} ${POBJS} ${SOBJS}
-.else
-ALLOBJS=${POBJS} ${SOBJS} 
+ALLOBJS=
+.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+	|| ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"
+ALLOBJS+=${OBJS}
 .endif
+ALLOBJS+=${POBJS} ${SOBJS}
 .if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
 ALLOBJS+=${LOBJS}
 .endif
+.else
+LOBJS=
+SOBJS=
+.endif
 
 .NOPATH: ${ALLOBJS} ${_LIBS} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
 
 __archivebuild: .USE
-	@rm -f ${.TARGET}
-	@${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
+	${_MKMSG} "  build  ${.TARGET}"
+	${_MKCMD}\
+	rm -f ${.TARGET}
+	${_MKCMD}\
+	${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
+	${_MKCMD}\
 	${RANLIB} ${.TARGET}
 
 __archiveinstall: .USE
+	${_MKMSG} "install  ${.TARGET}"
+	${_MKCMD}\
 	${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}
+	${_MKMSG} "install  ${.TARGET}"
+	${_MKCMD}\
+	${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
+CLEANFILES+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
+CLEANFILES+=	${YHEADER:D${SRCS:M*.y:.y=.h}}
 
-DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
-CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
+${OBJS} ${POBJS} ${SOBJS} ${LOBJS}: ${DPSRCS}
 
 lib${LIB}.a:: ${OBJS} __archivebuild
-	@echo building standard ${LIB} library
 
 lib${LIB}_p.a:: ${POBJS} __archivebuild
-	@echo building profiled ${LIB} library
 
 lib${LIB}_pic.a:: ${SOBJS} __archivebuild
-	@echo building shared object ${LIB} library
+
+
+_LIBLDOPTS=
+.if ${SHLIBDIR} != "/usr/lib"
+_LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
+		-R${SHLIBDIR} \
+		-L${DESTDIR}${SHLIBDIR}
+.elif ${SHLIBINSTALLDIR} != "/usr/lib"
+_LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
+		-L${DESTDIR}${SHLIBINSTALLDIR}
+.endif
 
 lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
-	@echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
-	@rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
+	${_MKMSG} "  build  ${.TARGET}"
+	${_MKCMD}\
+	rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)
-	$(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
-	    ${SHLIB_LDSTARTFILE} \
-	    --whole-archive ${SOLIB} \
-	    --no-whole-archive ${LDADD} \
-	    -L${DESTDIR}${_LIBSODIR} -L${DESTDIR}${LIBDIR} \
-	    -R${_LIBSODIR} -R${LIBDIR} \
-	    ${SHLIB_LDENDFILE}
-.else
-	$(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
-	    ${SHLIB_LDSTARTFILE} \
-	    --whole-archive ${SOLIB} --no-whole-archive ${LDADD} \
-	    ${SHLIB_LDENDFILE}
+	${_MKCMD}\
+	${CC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
+	    ${_LIBLDOPTS} \
+	    -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
+	    -Wl,--whole-archive ${SOLIB} \
+	    -Wl,--no-whole-archive ${LDADD} \
+	    -L${_GCC_LIBGCCDIR}
+.else
+	${_MKCMD}\
+	${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
+	    ${_LIBLDOPTS} \
+	    -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
 .endif
 .if ${OBJECT_FMT} == "ELF"
 #  We don't use INSTALL_SYMLINK here because this is just
 #  happening inside the build directory/objdir. XXX Why does
 #  this spend so much effort on libraries that aren't live??? XXX
+	${_MKCMD}\
 	ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
+	${_MKCMD}\
 	mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
+	${_MKCMD}\
 	ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
+	${_MKCMD}\
 	mv -f lib${LIB}.so.tmp lib${LIB}.so
 .endif
 
 .if !empty(LOBJS)
 LLIBS?=		-lc
 llib-l${LIB}.ln: ${LOBJS}
-	@echo building llib-l${LIB}.ln
-	@rm -f llib-l${LIB}.ln
-	@${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}
+	${_MKMSG} "compile  ${.TARGET}"
+	${_MKCMD}\
+	rm -f llib-l${LIB}.ln
+.if defined(DESTDIR)
+	${_MKCMD}\
+	${LINT} -C${LIB} ${.ALLSRC} -L${DESTDIR}/usr/libdata ${LLIBS}
+.else
+	${_MKCMD}\
+	${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}
+.endif
 .endif
 
 cleanlib:
+	${_MKCMD}\
 	rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES}
+	${_MKCMD}\
 	rm -f lib${LIB}.a ${OBJS}
+	${_MKCMD}\
 	rm -f lib${LIB}_p.a ${POBJS}
+	${_MKCMD}\
 	rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS}
+	${_MKCMD}\
+	rm -f ${OBJS:=.tmp} ${POBJS:=.tmp} ${SOBJS:=.tmp}
+	${_MKCMD}\
 	rm -f llib-l${LIB}.ln ${LOBJS}
 
 .if defined(SRCS)
 afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
+	@(TMP=/tmp/_depend$$$$; trap 'rm -f $$TMP ; exit 1' 1 2 3 13 15; \
 	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so \1.ln:/' \
-	      < .depend > $$TMP; \
+	      < .depend > $$TMP && \
 	    mv $$TMP .depend)
 .endif
 
@@ -419,7 +550,7 @@ afterdepend: .depend
 # Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
 libinstall::
 
-.if ${MKLINKLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
 libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 
@@ -493,28 +624,41 @@ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SH
 .endif
 ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif
+	${_MKMSG} "install  ${.TARGET}"
+	${_MKCMD}\
 	${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}
+	${_MKCMD}\
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
 .endif
 .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
+	${_MKCMD}\
 	/sbin/ldconfig -m ${_LIBSODIR} ${LIBDIR}
 .endif
 .if ${OBJECT_FMT} == "ELF"
-	${INSTALL_SYMLINK} lib${LIB}.so.${SHLIB_FULLVERSION} \
-	    ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
+	${_MKCMD}\
+	${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}
+	${_MKCMD}\
+	${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
+	${_MKCMD}\
+	${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
+	${_MKCMD}\
+	${INSTALL_SYMLINK} ${SYSPKGTAG} \
+		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+		${DESTDIR}${LIBDIR}/lib${LIB}.so
 .endif
 .endif
 .endif
@@ -535,8 +679,10 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 .endif
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
 .endif
+	${_MKMSG} "install  ${.TARGET}"
+	${_MKCMD}\
 	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
+		${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
 .endif
 .endif
 
@@ -547,6 +693,5 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
 .include <bsd.dep.mk>
-.include <bsd.sys.mk>
 
 ${TARGETS}:	# ensure existence