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.152.2.4
retrieving revision 1.153
diff -u -p -r1.152.2.4 -r1.153
--- src/share/mk/bsd.lib.mk	2000/08/14 14:04:12	1.152.2.4
+++ src/share/mk/bsd.lib.mk	1999/06/07 01:37:00	1.153
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.152.2.4 2000/08/14 14:04:12 he Exp $
+#	$NetBSD: bsd.lib.mk,v 1.153 1999/06/07 01:37:00 christos Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -18,7 +18,6 @@ clean cleandir distclean: cleanlib
 .if exists(${.CURDIR}/shlib_version)
 SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
 SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
-SHLIB_TEENY != . ${.CURDIR}/shlib_version ; echo $$teeny
 
 # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
@@ -26,23 +25,11 @@ SHLIB_TEENY != . ${.CURDIR}/shlib_versio
 checkver:
 	@(cd ${.CURDIR} && \
 		${BSDSRCDIR}/lib/checkver -d ${DESTDIR}${LIBDIR} ${LIB})
-.endif
-.endif
-
-.if !target(checkver)
-checkver:
-.endif
-
-.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR)
-.if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR)
-.if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY)
-SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
 .else
-SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
+checkver:
 .endif
 .else
-SHLIB_FULLVERSION=${SHLIB_MAJOR}
-.endif
+checkver:
 .endif
 
 # add additional suffixes not exported.
@@ -60,7 +47,7 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
 # 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}.
+#   			NetBSD/pmax used to use ${SHLIB_MAJOR}.{SHLIB-MINOR}.
 # SHLIB_SHFLAGS:	Flags to tell ${LD} to emit  shared library.
 #			with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:	support .o file, call C++ file-level constructors
@@ -105,7 +92,7 @@ APICFLAGS ?= -KPIC
 SHLIB_LDSTARTFILE=
 SHLIB_LDENDFILE=
 SHLIB_SHFLAGS=
-SHLIB_SOVERSION=${SHLIB_FULLVERSION}
+SHLIB_SOVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
 CPICFLAGS?= -fpic -DPIC
 CPPPICFLAGS?= -DPIC 
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
@@ -124,61 +111,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}
@@ -212,7 +235,7 @@ _LIBS+=lib${LIB}_p.a
 .if ${MKPIC} != "no"
 _LIBS+=lib${LIB}_pic.a
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-_LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
+_LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
 .endif
 
@@ -251,10 +274,10 @@ SOBJS+=		${OBJS:.o=.so}
 lib${LIB}_pic.a:: ${SOBJS} __archivebuild
 	@echo building shared object ${LIB} library
 
-lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}_pic.a ${DPADD} \
+lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}_pic.a ${DPADD} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
-	@echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
-	@rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
+	@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} \
 	    ${SHLIB_LDSTARTFILE} \
@@ -270,10 +293,10 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: lib${
 .endif
 .if ${OBJECT_FMT} == "ELF"
 	rm -f lib${LIB}.so.${SHLIB_MAJOR}
-	ln -s lib${LIB}.so.${SHLIB_FULLVERSION} \
+	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_FULLVERSION} \
+	ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 	    lib${LIB}.so
 .endif
 
@@ -308,7 +331,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
 
@@ -321,7 +344,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
 
@@ -334,7 +357,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
 
@@ -343,16 +366,16 @@ ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib
 .endif
 
 .if ${MKPIC} != "no" && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .if !defined(UPDATE)
-.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
-.if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_FULLVERSION})
-${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: .MADE
+.if !defined(BUILD)
+${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE
 .endif
 
-.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
-${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -o ${LIBOWN} -g ${LIBGRP} \
 		-m ${LIBMODE} ${.ALLSRC} ${.TARGET}
 .if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
@@ -360,11 +383,11 @@ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB
 .endif
 .if ${OBJECT_FMT} == "ELF"
 	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
-	ln -s lib${LIB}.so.${SHLIB_FULLVERSION} \
+	ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
 	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so
 .if ${MKLINKLIB} != "no"
-	ln -s lib${LIB}.so.${SHLIB_FULLVERSION} \
+	ln -s lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 	    ${DESTDIR}${LIBDIR}/lib${LIB}.so
 .endif
 .endif
@@ -375,7 +398,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