Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Permit "make all install", as well as "make foo ins...



details:   https://anonhg.NetBSD.org/src/rev/2aa8f2b6e33e
branches:  trunk
changeset: 476048:2aa8f2b6e33e
user:      fredb <fredb%NetBSD.org@localhost>
date:      Sat Sep 04 21:48:33 1999 +0000

description:
Permit "make all install", as well as "make foo install" (where foo would be
installed by "make install") without setting of BUILD. All cases where BUILD
is already set are unchanged from the old behavior.

"make all install" is now practically equivalent to "make BUILD= all install",
but without actually setting build.

Fixes pr's 8313, 3894.

diffstat:

 share/mk/bsd.doc.mk   |   4 ++--
 share/mk/bsd.files.mk |   4 ++--
 share/mk/bsd.kmod.mk  |   4 ++--
 share/mk/bsd.lib.mk   |  12 ++++++------
 share/mk/bsd.man.mk   |   4 ++--
 share/mk/bsd.nls.mk   |   4 ++--
 share/mk/bsd.prog.mk  |   6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diffs (171 lines):

diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.doc.mk
--- a/share/mk/bsd.doc.mk       Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.doc.mk       Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.doc.mk,v 1.42 1999/08/21 06:17:45 simonb Exp $
+#      $NetBSD: bsd.doc.mk,v 1.43 1999/09/04 21:48:33 fredb Exp $
 #      @(#)bsd.doc.mk  8.1 (Berkeley) 8/14/93
 
 .if !target(__initialized__)
@@ -55,7 +55,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${DOCDIR}/${DIR}/${F}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${F})
 ${DESTDIR}${DOCDIR}/${DIR}/${F}: .MADE
 .endif
 
diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.files.mk
--- a/share/mk/bsd.files.mk     Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.files.mk     Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.files.mk,v 1.9 1999/08/21 06:17:45 simonb Exp $
+#      $NetBSD: bsd.files.mk,v 1.10 1999/09/04 21:48:33 fredb Exp $
 
 # This file can be included multiple times.  It clears the definition of
 # FILES at the end so that this is possible.
@@ -25,7 +25,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${F})
 ${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}: .MADE
 .endif
 
diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.kmod.mk
--- a/share/mk/bsd.kmod.mk      Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.kmod.mk      Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.kmod.mk,v 1.31 1999/08/21 06:17:46 simonb Exp $
+#      $NetBSD: bsd.kmod.mk,v 1.32 1999/09/04 21:48:33 fredb Exp $
 
 .if !target(__initialized__)
 __initialized__:
@@ -62,7 +62,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${KMODDIR}/${PROG}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${KMODDIR}/${PROG}: .MADE
 .endif
 
diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.lib.mk       Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.156 1999/08/21 06:17:46 simonb Exp $
+#      $NetBSD: bsd.lib.mk,v 1.157 1999/09/04 21:48:33 fredb Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -332,7 +332,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
 
@@ -345,7 +345,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
 
@@ -358,7 +358,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
 
@@ -371,7 +371,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
 
@@ -399,7 +399,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
 
diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.man.mk
--- a/share/mk/bsd.man.mk       Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.man.mk       Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.man.mk,v 1.47 1999/08/21 06:17:46 simonb Exp $
+#      $NetBSD: bsd.man.mk,v 1.48 1999/09/04 21:48:33 fredb Exp $
 #      @(#)bsd.man.mk  8.1 (Berkeley) 6/8/93
 
 .if !target(__initialized__)
@@ -79,7 +79,7 @@
 .      if !defined(UPDATE)
 .PHONY: ${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}
 .      endif
-.      if !defined(BUILD)
+.      if !defined(BUILD) && !make(all) && !make(${P})
 ${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}: .MADE
 .      endif
 
diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.nls.mk
--- a/share/mk/bsd.nls.mk       Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.nls.mk       Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.nls.mk,v 1.18 1999/08/21 06:17:46 simonb Exp $
+#      $NetBSD: bsd.nls.mk,v 1.19 1999/09/04 21:48:33 fredb Exp $
 
 .if !target(__initialized__)
 __initialized__:
@@ -45,7 +45,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${F})
 ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat: .MADE
 .endif
 
diff -r acc93f90ae61 -r 2aa8f2b6e33e share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sat Sep 04 21:11:21 1999 +0000
+++ b/share/mk/bsd.prog.mk      Sat Sep 04 21:48:33 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.102 1999/08/21 06:17:46 simonb Exp $
+#      $NetBSD: bsd.prog.mk,v 1.103 1999/09/04 21:48:33 fredb Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -137,7 +137,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
 
@@ -171,7 +171,7 @@
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
 .endif
-.if !defined(BUILD)
+.if !defined(BUILD) && !make(all) && !make(${S})
 ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE
 .endif
 



Home | Main Index | Thread Index | Old Index