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.152.2.1
retrieving revision 1.155
diff -u -p -r1.152.2.1 -r1.155
--- src/share/mk/bsd.lib.mk	1999/09/10 22:55:14	1.152.2.1
+++ src/share/mk/bsd.lib.mk	1999/07/14 20:18:07	1.155
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.152.2.1 1999/09/10 22:55:14 he Exp $
+#	$NetBSD: bsd.lib.mk,v 1.155 1999/07/14 20:18:07 wrstuden Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -15,16 +15,17 @@ __initialized__:
 realinstall:	checkver libinstall
 clean cleandir distclean: cleanlib
 
-.if exists(${.CURDIR}/shlib_version)
-SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
-SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
+.if exists(${SHLIB_VERSION_FILE})
+SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
+SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
 
 # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
 	exists(${BSDSRCDIR}/lib/checkver)
 checkver:
 	@(cd ${.CURDIR} && \
-		${BSDSRCDIR}/lib/checkver -d ${DESTDIR}${LIBDIR} ${LIB})
+		${BSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
+		    -d ${DESTDIR}${LIBDIR} ${LIB})
 .else
 checkver:
 .endif
@@ -111,61 +112,97 @@ SHLIB_LDENDFILE= ${DESTDIR}/usr/lib/crte
 CFLAGS+=	${COPTS}
 
 .c.o:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.c} ${.IMPSRC}
+.else
 	@echo ${COMPILE.c:Q} ${.IMPSRC}
 	@${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
+.endif
 
 .c.po:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.c} -pg ${.IMPSRC} -o ${.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
+.endif
 
 .c.so:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.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
+.endif
 
 .c.ln:
 	${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
 
 .cc.o .C.o:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.cc} ${.IMPSRC}
+.else
 	@echo ${COMPILE.cc:Q} ${.IMPSRC}
 	@${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
+.endif
 
 .cc.po .C.po:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.cc} -pg ${.IMPSRC} -o ${.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
+.endif
 
 .cc.so .C.so:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.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
+.endif
 
 .m.o:
+.if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
+	${COMPILE.m} ${.IMPSRC}
+.else
 	@echo ${COMPILE.m:Q} ${.IMPSRC}
 	@${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
+.endif
 
 .m.po:
+.if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
+	${COMPILE.m} -pg ${.IMPSRC} -o ${.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
+.endif
 
 .m.so:
+.if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
+	${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.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
+.endif
 
 .S.o .s.o:
 	@echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}
@@ -243,10 +280,10 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINO
 	@echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\)
 	@rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .if defined(DESTDIR)
-	$(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+	$(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
 	    ${SHLIB_LDSTARTFILE} \
 	    --whole-archive lib${LIB}_pic.a \
-	    -nostdlib -L${DESTDIR}${LIBDIR} -R${LIBDIR} \
+	    -L${DESTDIR}${LIBDIR} -R${LIBDIR} \
 	    --no-whole-archive ${LDADD} \
 	    ${SHLIB_LDENDFILE}
 .else
@@ -295,7 +332,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .endif
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.a)
+.if !defined(BUILD)
 ${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE
 .endif
 
@@ -308,7 +345,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_p.a)
+.if !defined(BUILD)
 ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE
 .endif
 
@@ -321,7 +358,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}_pic.a)
+.if !defined(BUILD)
 ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE
 .endif
 
@@ -334,7 +371,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/lib${LI
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR})
+.if !defined(BUILD)
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE
 .endif
 
@@ -362,7 +399,7 @@ libinstall:: ${DESTDIR}${LINTLIBDIR}/lli
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
 .endif
-.if !defined(BUILD) && !make(all) && !make(llib-l${LIB}.ln)
+.if !defined(BUILD)
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE
 .endif