1). Colorize when expression at the beginning of line. 2). Handle '\' at the end of prerequisites. 3). Colorize (origin|flavor). 4). Fix colorizing of built-in standed after a common variable.

Author: fadeevab

Syntaxes/Makefile.plist

@@ -17,6 +17,10 @@
 			<key>include</key>
 			<string>#comment</string>
 		</dict>
+		<dict>
+			<key>include</key>
+			<string>#variables</string>
+		</dict>
 		<dict>
 			<key>include</key>
 			<string>#variable-assignment</string>
@@ -485,7 +489,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>^(?!\t)</string>
+			<string>[^\\]$</string>
 			<key>name</key>
 			<string>meta.scope.target.makefile</string>
 			<key>patterns</key>
@@ -494,7 +498,7 @@
 					<key>begin</key>
 					<string>\G</string>
 					<key>end</key>
-					<string>^</string>
+					<string>[^\\]$</string>
 					<key>name</key>
 					<string>meta.scope.prerequisites.makefile</string>
 					<key>patterns</key>
@@ -643,13 +647,13 @@
 						</dict>
 						<dict>
 							<key>match</key>
-							<string>\G(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\.LIBPATTERNS)(?=\s*\))</string>
+							<string>(?&lt;=\()(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\.LIBPATTERNS)(?=\s*\))</string>
 							<key>name</key>
 							<string>variable.language.makefile</string>
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>\G(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\s</string>
+							<string>(?&lt;=\()(subst|patsubst|strip|findstring|filter(-out)?|sort|word(list)?|firstword|lastword|dir|notdir|suffix|basename|addsuffix|addprefix|join|wildcard|realpath|abspath|info|error|warning|shell|foreach|if|or|and|call|eval|value|file|guile)\s</string>
 							<key>beginCaptures</key>
 							<dict>
 								<key>1</key>
@@ -678,9 +682,17 @@
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>\G(origin|flavor)\s(?=[^\s)]+\s*\))</string>
+							<string>(?&lt;=\()(origin|flavor)\s(?=[^\s)]+\s*\))</string>
 							<key>contentName</key>
 							<string>variable.other.makefile</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>1</key>
+								<dict>
+									<key>name</key>
+									<string>support.function.$1.makefile</string>
+								</dict>
+							</dict>
 							<key>end</key>
 							<string>(?=\))</string>
 							<key>name</key>
@@ -695,7 +707,7 @@
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>\G(?!\))</string>
+							<string>(?&lt;=\()(?!\))</string>
 							<key>end</key>
 							<string>(?=\))</string>
 							<key>name</key>