diff options
| author | rillig <rillig@pkgsrc.org> | 2007-03-09 00:39:54 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-03-09 00:39:54 +0000 |
| commit | 8dd9cf3d4162913fd089809e2232b553d9841b46 (patch) | |
| tree | 008807eeeda864fdd459d9968b98336e030621b9 /mk/depends | |
| parent | 18851a0799b64dde749a6e48d0b462fbb7cba28a (diff) | |
| download | pkgsrc-8dd9cf3d4162913fd089809e2232b553d9841b46.tar.gz | |
Renamed some more flavor-specific targets to have the form _flavor-*.
Split check-vulnerable into a general an a flavor-specific part, for
consistence with all the other targets.
Diffstat (limited to 'mk/depends')
| -rw-r--r-- | mk/depends/bsd.depends.mk | 5 | ||||
| -rw-r--r-- | mk/depends/depends.mk | 19 |
2 files changed, 7 insertions, 17 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index 0a0439556ff..96b00491013 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.depends.mk,v 1.10 2007/03/02 05:58:34 wiz Exp $ +# $NetBSD: bsd.depends.mk,v 1.11 2007/03/09 00:39:54 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to dependencies. @@ -77,6 +77,9 @@ depends-clean: ### depends-cookie creates the depends "cookie" state file. This should ### be overridden per package system flavor. ### +### XXX: Why? The other cookies are also created by pkgsrc, not by the +### flavor. +### .PHONY: depends-cookie .if !target(depends-cookie) depends-cookie: diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk index e17dec6204e..c0b29653c65 100644 --- a/mk/depends/depends.mk +++ b/mk/depends/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.11 2007/01/02 17:23:41 rillig Exp $ +# $NetBSD: depends.mk,v 1.12 2007/03/09 00:39:54 rillig Exp $ ###################################################################### ### depends (PUBLIC) @@ -39,7 +39,7 @@ ${_COOKIE.depends}: real-depends ### _REAL_DEPENDS_TARGETS+= depends-message _REAL_DEPENDS_TARGETS+= pre-depends-hook -_REAL_DEPENDS_TARGETS+= depends-install +_REAL_DEPENDS_TARGETS+= _flavor-install-dependencies _REAL_DEPENDS_TARGETS+= depends-cookie _REAL_DEPENDS_TARGETS+= error-check @@ -51,23 +51,10 @@ depends-message: @${PHASE_MSG} "Installing dependencies for ${PKGNAME}" ###################################################################### -### depends-install (PRIVATE, override) -###################################################################### -### depends-install checks that all dependencies are installed, and will -### install any missing dependencies. This should be overridden per -### package system flavor. -### -.if !target(depends-install) -.PHONY: depends-install -depends-install: - @${DO_NADA} -.endif - -###################################################################### ### pre-depends-hook (PRIVATE, override, hook) ###################################################################### ### pre-depends-hook is a generic hook target that is run just before -### dependencies are installed for depends-install. +### dependencies are installed for _flavor-install-dependencies. ### .PHONY: pre-depends-hook pre-depends-hook: |