csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: Fix detection of intermediate targets where make has changed its database whitespace

Browse Source
This commit is contained in:
Tristan Wibberley 2015-05-17 14:57:37 +01:00 committed by Ville Skyttä
parent 1950590367
commit 4b209b0b17
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
completions/make
View File

@ -20,8 +20,8 @@ function _make_target_extract_script()
fi fi
cat <<EOF cat <<EOF
1,/^# Files/ d; # skip until files section 1,/^# * Files/ d; # skip until files section
/^# Not a target/,/^$/ d; # skip not target blocks /^# * Not a target/,/^$/ d; # skip not target blocks
/^${prefix_pat}/,/^$/! d; # skip anything user dont want /^${prefix_pat}/,/^$/! d; # skip anything user dont want
# The stuff above here describes lines that are not # The stuff above here describes lines that are not
@ -29,7 +29,7 @@ function _make_target_extract_script()
# The stuff below here decides whether an explicit target # The stuff below here decides whether an explicit target
# should be output. # should be output.
/^# File is an intermediate prerequisite/ { /^# * File is an intermediate prerequisite/ {
s/^.*$//;x; # unhold target s/^.*$//;x; # unhold target
d; # delete line d; # delete line
} }

6
test/fixtures/make/Makefile vendored
View File

@ -6,8 +6,10 @@ NAME := sample
.PHONY: all .PHONY: all
all: $(NAME) all: $(NAME)
$(NAME): sample.c $(NAME): sample.o
cc -o $@ $^
.INTERMEDIATE: sample.o
sample.o: sample.c
.PHONY: install .PHONY: install
install: all install: all