make: fix detection of target rules (take 2)

Commit d6b764116 (make: fix detection of target rules) checked
for target rules before macro assignments.  This failed for some
Makefiles generated by autotools because partially defined macros
were expanded while testing for a target rule.

Revert to checking for macro assignments first, but try to detect
if the proposed left hand side of the assignment might form part
of a target rule with an inline command.

Also handle the case where the ';' separator of the inline command
has been obfuscated by putting it in a macro.

Saves 128-160 bytes.

(GitHub pdpmake issues 31, 44)

1 files changed, 23 insertions, 0 deletions

diff --git a/testsuite/make.tests b/testsuite/make.tests
index 0397ab4de..6438c90c9 100755
--- a/testsuite/make.tests
+++ b/testsuite/make.tests
@@ -103,6 +103,29 @@ a = a
 target:;@echo a = $(a)
 '
 
+# Ensure an inline command on a target rule can be detected even if
+# the semicolon is obfuscated.
+testing "make equal sign in obfuscated inline command" \
+        "make -f -" "a = a\n" "" '
+a = a
+semi = ;
+target:$(semi)@echo a = $(a)
+'
+
+# The fix for the above test broke a complex chain of macro assignments
+# generated by autotools.
+testing "make complex chain of macro assignments" \
+        "make -f -" "flag 1\n" "" '
+FLAG_ = $(FLAG_$(VALUE))
+FLAG_0 = flag 0
+FLAG_1 = flag 1
+MYFLAG = $(FLAG_$(VALUE))
+VALUE = 1
+
+target:
+        @echo $(MYFLAG)
+'
+
 # When a build command fails and the '-k' option has been provided
 # (continue execution on error) no further commands should be executed
 # for the current target.