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.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- src/share/mk/bsd.lib.mk	2000/05/03 03:44:12	1.166
+++ src/share/mk/bsd.lib.mk	2000/05/03 15:15:50	1.167
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.166 2000/05/03 03:44:12 matt Exp $
+#	$NetBSD: bsd.lib.mk,v 1.167 2000/05/03 15:15:50 matt Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -221,20 +221,18 @@ CFLAGS+=	${COPTS}
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
-_OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
-
 .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
 	|| ${MKLINKLIB} != "no"
 _LIBS=lib${LIB}.a
-OBJS+=${_OBJS}
 .else
 _LIBS=
 .endif
 
+OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 
 .if ${MKPROFILE} != "no"
 _LIBS+=lib${LIB}_p.a
-POBJS+=${_OBJS:.o=.po}
+POBJS+=${OBJS:.o=.po}
 .endif
 
 .if ${MKPIC} != "no"
@@ -243,7 +241,7 @@ SOLIB=lib${LIB}.a
 .else
 SOLIB=lib${LIB}_pic.a
 _LIBS+=${SOLIB}
-SOBJS+=${_OBJS:.o=.so}
+SOBJS+=${OBJS:.o=.so}
 .endif
 .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
 _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
@@ -255,7 +253,12 @@ _LIBS+=llib-l${LIB}.ln
 LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 .endif
 
+.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+	|| ${MKLINKLIB} != "no"
 ALLOBJS=${OBJS} ${POBJS} ${SOBJS} ${LOBJS}
+.else
+ALLOBJS=${POBJS} ${SOBJS} ${LOBJS}
+.endif
 .NOPATH: ${ALLOBJS} ${_LIBS}
 
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}