[src/netbsd-1-4]: src/share/mk Pull up revision 1.157:

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/93a7d883dcb4
branches:  netbsd-1-4
changeset: 469360:93a7d883dcb4
user:      he <he%NetBSD.org@localhost>
date:      Fri Sep 10 22:55:14 1999 +0000

description:
Pull up revision 1.157:
  Allow natural use of multiple "make" targets in the main tree
  without setting BUILD, fixing PR#8313 and PR#3894.

diffstat:

 share/mk/bsd.lib.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r aba8f90742c8 -r 93a7d883dcb4 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Fri Sep 10 22:53:18 1999 +0000
+++ b/share/mk/bsd.lib.mk       Fri Sep 10 22:55:14 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.152 1999/03/30 09:30:43 fair Exp $
+#      $NetBSD: bsd.lib.mk,v 1.152.2.1 1999/09/10 22:55:14 he Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -295,7 +295,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}.a)
 ${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE
 .endif
 
@@ -308,7 +308,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}_p.a)
 ${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE
 .endif
 
@@ -321,7 +321,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}_pic.a)
 ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE
 .endif
 
@@ -334,7 +334,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR})
 ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: .MADE
 .endif
 
@@ -362,7 +362,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(llib-l${LIB}.ln)
 ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE
 .endif