diff options
| author | jlam <jlam> | 2005-07-15 20:14:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-07-15 20:14:02 +0000 |
| commit | d4f731ff0b0cceef954e40bffd8a8c38267bcaf3 (patch) | |
| tree | 891fd0228b3d843aa6c33a088cc94bc8bb92dcd4 /mk/tools/automake.mk | |
| parent | d2eea181f0c5ef51db2ef63ecadc8d3add70bd6b (diff) | |
| download | pkgsrc-d4f731ff0b0cceef954e40bffd8a8c38267bcaf3.tar.gz | |
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a
run-time dependency (DEPENDS) on a tool is to append a ":run" modifier
to the tool name, e.g.,
USE_TOOLS+= perl:run
Tools without modifiers or with an explicit ":build" modifier will
cause build dependencies (BUILD_DEPENDS) on those tools to be added.
This makes the notation a bit more compact.
Diffstat (limited to 'mk/tools/automake.mk')
| -rw-r--r-- | mk/tools/automake.mk | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk index 21acd800355..e35256af448 100644 --- a/mk/tools/automake.mk +++ b/mk/tools/automake.mk @@ -1,4 +1,4 @@ -# $NetBSD: automake.mk,v 1.14 2005/06/11 05:22:03 jlam Exp $ +# $NetBSD: automake.mk,v 1.15 2005/07/15 20:14:04 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -79,7 +79,8 @@ USE_TOOLS+= gettext-m4 .endif # Only allow one of "automake" and "automake14" in USE_TOOLS. -.if !empty(USE_TOOLS:Mautomake) && !empty(USE_TOOLS:Mautomake14) +.if !empty(USE_TOOLS:C/:.*//:Mautomake) && \ + !empty(USE_TOOLS:C/:.*//:Mautomake14) PKG_FAIL_REASON+= "\`\`automake'' and \`\`automake14'' conflict in USE_TOOLS." .endif @@ -103,17 +104,21 @@ _TOOLS_AM_NAMES+= automake automake-1.4 \ _TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING .endfor -.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:Mautomake) +.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake) . if !empty(PKGPATH:Mdevel/automake) MAKEFLAGS+= TOOLS_IGNORE.automake= . else AUTOMAKE_REQD?= 1.9 AUTOCONF_REQD?= 2.58 -TOOLS_DEPMETHOD.automake?= BUILD_DEPENDS +. if !empty(USE_TOOLS:Mautomake\:run) +_TOOLS_DEPMETHOD.automake= DEPENDS +. else +_TOOLS_DEPMETHOD.automake= BUILD_DEPENDS +. endif TOOLS_DEPENDS.automake?= automake>=${AUTOMAKE_REQD}:../../devel/automake -. if empty(${TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake}) -${TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake} +. if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake}) +${_TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake} . endif EVAL_PREFIX+= _TOOLS_AM_PREFIX=automake @@ -125,17 +130,21 @@ TOOLS_REAL_CMD.automake= ${_TOOLS_AM_PREFIX}/bin/automake . endif .endif -.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:Mautomake14) +.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:C/:.*//:Mautomake14) . if !empty(PKGPATH:Mdevel/automake14) MAKEFLAGS+= TOOLS_IGNORE.automake14= . else AUTOMAKE_REQD?= 1.4 AUTOCONF_REQD?= 2.13 -TOOLS_DEPMETHOD.automake14?= BUILD_DEPENDS +. if !empty(USE_TOOLS:Mautomake14\:run) +_TOOLS_DEPMETHOD.automake14= DEPENDS +. else +_TOOLS_DEPMETHOD.automake14= BUILD_DEPENDS +. endif TOOLS_DEPENDS.automake14?= automake14>=${AUTOMAKE_REQD}:../../devel/automake14 -. if empty(${TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14}) -${TOOLS_DEPMETHOD.automake14}+= ${TOOLS_DEPENDS.automake14} +. if empty(${_TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14}) +${_TOOLS_DEPMETHOD.automake14}+= ${TOOLS_DEPENDS.automake14} . endif EVAL_PREFIX+= _TOOLS_AM_PREFIX=automake14 |