Support BSD make syntax and match *.am

These don't really go together, but...

3 files changed, 32 insertions, 8 deletions

diff --git a/bin/hilex.c b/bin/hilex.c
index 1f9b98a5..9fa0b5a9 100644
--- a/bin/hilex.c
+++ b/bin/hilex.c
@@ -51,7 +51,7 @@ static const struct {
 	const char *linePatt;
 } Lexers[] = {
 	{ &LexC, "c", "[.][chlmy]$", NULL },
-	{ &LexMake, "make", "[.]mk$|^Makefile$", NULL },
+	{ &LexMake, "make", "[.](mk|am)$|^Makefile$", NULL },
 	{ &LexMdoc, "mdoc", "[.][1-9]$", "^[.]Dd" },
 	{ &LexText, "text", "[.]txt$", NULL },
 };
diff --git a/bin/make.l b/bin/make.l
index 88f286dc..027fefa3 100644
--- a/bin/make.l
+++ b/bin/make.l
@@ -21,7 +21,7 @@
 #include "hilex.h"
 %}
 
-%s Assign
+%s Assign Preproc
 %x Variable Shell
 
 ident [._[:alnum:]]+
@@ -54,6 +54,30 @@ operator [:!]|::
 	return Keyword;
 }
 
+{target}/{operator} { return Ident; }
+
+^"."{ident} |
+^"-"?include {
+	BEGIN(pop = Preproc);
+	return Macro;
+}
+<Preproc>{
+	"\n" {
+		BEGIN(pop = INITIAL);
+		return Normal;
+	}
+	"\\\n""\t"? { return Normal; }
+
+	"\""[^""]*"\"" |
+	"<"[^>]*">" {
+		return String;
+	}
+
+	[!<>=]"="?|"||"|"&&" { return Operator; }
+	[0-9]+|"0x"[[:xdigit:]]+ { return Number; }
+	defined|make|empty|exists|target|commands|in { return Keyword; }
+}
+
 ^{ident}/[[:blank:]]*{assign} {
 	return Ident;
 }
@@ -67,12 +91,10 @@ operator [:!]|::
 		BEGIN(pop = INITIAL);
 		return Normal;
 	}
-	"\\\n""\t"? { return String; }
+	"\\\n""\t"? { return Escape; }
 	[^\\$[:space:]]+|. { return String; }
 }
 
-^"-"?include { return Macro; }
-
 {target} { return Ident; }
 
 "#"([^\\\n]|"\\"[^\n]|"\\\n")* { return Comment; }
diff --git a/bin/man1/hilex.1 b/bin/man1/hilex.1
index a151476a..e07695a3 100644
--- a/bin/man1/hilex.1
+++ b/bin/man1/hilex.1
@@ -166,12 +166,14 @@ Inferred for
 files.
 .
 .It Cm make
-The portable subset of
-.Xr make 1 .
+The BSD
+.Xr make 1
+language.
 Inferred for
+.Pa Makefile ,
 .Pa *.mk
 and
-.Pa Makefile
+.Pa *.am
 files.
 .
 .It Cm mdoc