summaryrefslogtreecommitdiff
path: root/mk/depends
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-07-05 09:08:35 +0000
committerjlam <jlam@pkgsrc.org>2006-07-05 09:08:35 +0000
commitc67605d10e3f8bf5cee5ebce7ea81b64630cb1ac (patch)
tree266445424a702f9333f761cfa65f977c42683645 /mk/depends
parent23a08e10e1d475f1f7ea2ca236e8e1f999e564cc (diff)
downloadpkgsrc-c67605d10e3f8bf5cee5ebce7ea81b64630cb1ac.tar.gz
Make the check-vulnerable target more self-sufficient, by moving some
of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that check-vulnerable can be used as a source target. Make check-vulnerable a source target for every phase of the build workflow, which ensures that it is always run if the user starts a new phase from the command line. Fix the cookie-generation targets so that they don't append, only overwrite to the cookie file. This works around potential problems due to recursive makes. Move the cookie checks so that they surround the corresponding phase target. The presence of the cookie should now inform the make process to avoid doing any processing of phases that occur before the phase corresponding to the cookie.
Diffstat (limited to 'mk/depends')
-rw-r--r--mk/depends/depends.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk
index d963c7ab2ac..69c84940264 100644
--- a/mk/depends/depends.mk
+++ b/mk/depends/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.7 2006/06/09 13:59:08 jlam Exp $
+# $NetBSD: depends.mk,v 1.8 2006/07/05 09:08:35 jlam Exp $
######################################################################
### depends (PUBLIC)
@@ -12,19 +12,19 @@ _DEPENDS_TARGETS+= release-depends-lock
.PHONY: depends
.if !target(depends)
+. if !exists(${_DEPENDS_COOKIE})
depends: ${_DEPENDS_TARGETS}
+. else
+depends:
+ @${DO_NADA}
+. endif
.endif
.PHONY: acquire-depends-lock release-depends-lock
acquire-depends-lock: acquire-lock
release-depends-lock: release-lock
-.if !exists(${_DEPENDS_COOKIE})
${_DEPENDS_COOKIE}: real-depends
-.else
-${_DEPENDS_COOKIE}:
- @${DO_NADA}
-.endif
######################################################################
### real-depends (PRIVATE)