diff options
Diffstat (limited to 'Completion/Unix/Command/_make')
| -rw-r--r-- | Completion/Unix/Command/_make | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index a2ee9ecac..1761bba71 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -69,7 +69,7 @@ _make-expandVars() { } _make-parseMakefile () { - local input var val target dep TAB=$'\t' dir=$1 tmp IFS= + local input var val target dep TAB=$'\t' tmp IFS= while read input do @@ -108,14 +108,10 @@ _make-parseMakefile () { f=${f%[\">]} fi f=$(_make-expandVars $f) - case $f in - (/*) ;; - (*) f=$dir/$f ;; - esac if [[ -r $f ]] then - _make-parseMakefile ${f%%/[^/]##} < $f + _make-parseMakefile < $f fi ;; esac @@ -150,7 +146,7 @@ _make-findBasedir () { _make() { - local prev="$words[CURRENT-1]" file expl tmp is_gnu dir incl match + local prev="$words[CURRENT-1]" file expl tmp is_gnu incl match local context state state_descr line local -a option_specs local -A VARIABLES VAR_ARGS opt_args @@ -266,16 +262,16 @@ _make() { if [[ $is_gnu == gnu ]] then if zstyle -t ":completion:${curcontext}:targets" call-command; then - _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null) + _make-parseMakefile < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null) else - _make-parseMakefile $PWD < $file + _make-parseMakefile < $file fi else if [[ $OSTYPE == (freebsd|dragonfly|netbsd)* || /$words[1] == */bmake* ]]; then TARGETS+=(${=${(f)"$(_call_program targets "$words[1]" -s -f "$file" -V.ALLTARGETS 2> /dev/null)"}}) - _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsdg1Fstdout -f "$file" .PHONY 2> /dev/null) + _make-parseMakefile < <(_call_program targets "$words[1]" -nsdg1Fstdout -f "$file" .PHONY 2> /dev/null) else - _make-parseMakefile $PWD < $file + _make-parseMakefile < $file fi fi fi @@ -287,14 +283,10 @@ _make() { compset -P 1 '*=' _value "$@" && ret=0 else - _tags targets variables - while _tags - do - _requested targets expl 'make targets' \ - compadd -Q -- $TARGETS && ret=0 - _requested variables expl 'make variables' \ - compadd -S '=' -F keys -- ${(k)VARIABLES} && ret=0 - done + _alternative \ + 'targets:make target:compadd -Q -a TARGETS' \ + 'variables:make variable:compadd -S = -F keys -k VARIABLES' \ + '*:file:_files' && ret=0 fi esac |