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
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- src/share/mk/bsd.lib.mk	2003/09/30 07:24:23	1.235
+++ src/share/mk/bsd.lib.mk	2003/10/18 15:33:59	1.236
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.235 2003/09/30 07:24:23 lukem 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>
@@ -171,132 +171,207 @@ 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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_MKCMD}\
 	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
 	rm -f ${.TARGET}.tmp
 .endif
 
 .c.ln:
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_MKCMD}\
 	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
 	rm -f ${.TARGET}.tmp
 .endif
 
 .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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_MKCMD}\
 	${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
 	rm -f ${.TARGET}.tmp
 .endif
 
 .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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_MKCMD}\
 	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
 	rm -f ${.TARGET}.tmp
 .endif
 
 .f.ln:
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_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*)
+	${_MKCMD}\
 	mv ${.TARGET}.tmp ${.TARGET}
 .else
+	${_MKCMD}\
 	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+	${_MKCMD}\
 	rm -f ${.TARGET}.tmp
 .endif
 
 .S.o .s.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:
+	${_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:
+	${_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)
@@ -359,15 +434,23 @@ SOBJS=
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
 
 __archivebuild: .USE
-	@rm -f ${.TARGET}
+	${_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"} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 __archivesymlinkpic: .USE
+	${_MKMSG} "install  ${.TARGET}"
+	${_MKCMD}\
 	${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
@@ -377,13 +460,10 @@ CLEANFILES+=	${YHEADER:D${SRCS:M*.y:.y=.
 ${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=
@@ -398,9 +478,11 @@ _LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}$
 
 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)
+	${_MKCMD}\
 	${CC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
 	    ${_LIBLDOPTS} \
 	    -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
@@ -408,6 +490,7 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
 	    -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}
@@ -416,30 +499,43 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
 #  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
+	${_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)
@@ -528,30 +624,38 @@ ${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} \
 		${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 .if ${_LIBSODIR} != ${LIBDIR}
+	${_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"
+	${_MKCMD}\
 	${INSTALL_SYMLINK} ${SYSPKGTAG} \
 		lib${LIB}.so.${SHLIB_FULLVERSION} \
 		${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
 .if ${_LIBSODIR} != ${LIBDIR}
+	${_MKCMD}\
 	${INSTALL_SYMLINK} ${SYSPKGTAG} \
 		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
 		${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
 .endif
 .if ${MKLINKLIB} != "no"
+	${_MKCMD}\
 	${INSTALL_SYMLINK} ${SYSPKGTAG} \
 		lib${LIB}.so.${SHLIB_FULLVERSION} \
 		${DESTDIR}${_LIBSODIR}/lib${LIB}.so
 .if ${_LIBSODIR} != ${LIBDIR}
+	${_MKCMD}\
 	${INSTALL_SYMLINK} ${SYSPKGTAG} \
 		${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
 		${DESTDIR}${LIBDIR}/lib${LIB}.so
@@ -575,6 +679,8 @@ ${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} \
 		${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
 .endif