pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/depends Make use of a "real-depends" helper target ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0db2f958b62a
branches:  trunk
changeset: 514174:0db2f958b62a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jun 08 15:45:06 2006 +0000

description:
Make use of a "real-depends" helper target to hook all of the other
targets onto, and move the depends-message further down so that if
the depends cookie file already exists, then no message is outputted.

diffstat:

 mk/depends/depends.mk |  27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 86bedc0c4a33 -r 0db2f958b62a mk/depends/depends.mk
--- a/mk/depends/depends.mk     Thu Jun 08 15:41:36 2006 +0000
+++ b/mk/depends/depends.mk     Thu Jun 08 15:45:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.5 2006/06/08 08:55:10 rillig Exp $
+# $NetBSD: depends.mk,v 1.6 2006/06/08 15:45:06 jlam Exp $
 
 ######################################################################
 ### depends (PUBLIC)
@@ -7,7 +7,6 @@
 ### the package.
 ###
 _DEPENDS_TARGETS+=     acquire-depends-lock
-_DEPENDS_TARGETS+=     depends-message
 _DEPENDS_TARGETS+=     ${_DEPENDS_COOKIE}
 _DEPENDS_TARGETS+=     release-depends-lock
 
@@ -20,18 +19,32 @@
 acquire-depends-lock: acquire-lock
 release-depends-lock: release-lock
 
-.PHONY: depends-message
-depends-message:
-       @${PHASE_MSG} "Installing dependencies for ${PKGNAME}"
-
 .if !exists(${_DEPENDS_COOKIE})
-${_DEPENDS_COOKIE}: pre-depends-hook depends-install depends-cookie
+${_DEPENDS_COOKIE}: real-depends
 .else
 ${_DEPENDS_COOKIE}:
        @${DO_NADA}
 .endif
 
 ######################################################################
+### real-depends (PRIVATE)
+######################################################################
+### real-depends is a helper target onto which one can hook all of the
+### targets that do the actual dependency installation.
+###
+_REAL_DEPENDS_TARGETS+=        depends-message
+_REAL_DEPENDS_TARGETS+=        pre-depends-hook
+_REAL_DEPENDS_TARGETS+=        depends-install
+_REAL_DEPENDS_TARGETS+=        depends-cookie
+
+.PHONY: real-depends
+real-depends: ${_REAL_DEPENDS_TARGETS}
+
+.PHONY: depends-message
+depends-message:
+       @${PHASE_MSG} "Installing dependencies for ${PKGNAME}"
+
+######################################################################
 ### depends-install (PRIVATE, override)
 ######################################################################
 ### depends-install checks that all dependencies are installed, and will



Home | Main Index | Thread Index | Old Index