make: Fix detection of intermediate targets where make has changed it…

…s database whitespace
scop · May 18, 2015 · 4b209b0 · 4b209b0
1 parent 1950590
commit 4b209b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/completions/make b/completions/make
@@ -20,16 +20,16 @@ function _make_target_extract_script()
     fi
 
     cat <<EOF
-    1,/^# Files/                  d;            # skip until files section
-    /^# Not a target/,/^$/        d;            # skip not target blocks
+    1,/^# * Files/                d;            # skip until files section
+    /^# * Not a target/,/^$/      d;            # skip not target blocks
     /^${prefix_pat}/,/^$/!        d;            # skip anything user dont want
 
     # The stuff above here describes lines that are not
     #  explicit targets or not targets other than special ones
     # The stuff below here decides whether an explicit target
     #  should be output.
 
-    /^# File is an intermediate prerequisite/ {
+    /^# * File is an intermediate prerequisite/ {
       s/^.*$//;x;                               # unhold target
       d;                                        # delete line
     }

diff --git a/test/fixtures/make/Makefile b/test/fixtures/make/Makefile
@@ -6,8 +6,10 @@ NAME := sample
 .PHONY: all
 all: $(NAME)
 
-$(NAME): sample.c
-	cc -o $@ $^
+$(NAME): sample.o
+
+.INTERMEDIATE: sample.o
+sample.o: sample.c
 
 .PHONY: install
 install: all