summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2014-10-08 16:46:15 -0700
committerTim Hatch <tim@timhatch.com>2014-10-08 16:46:15 -0700
commit6f82393fe38d73ffc2ef61b16722c603e41b6ec2 (patch)
tree989216d235528e149e11255a749727146d6a3ef0
parent1df8062fcb726c0f7e6f7985e6279d51d1190922 (diff)
downloadpygments-6f82393fe38d73ffc2ef61b16722c603e41b6ec2.tar.gz
MakefileLexer: Add GNU Automake directives.
Fixes #995
-rw-r--r--pygments/lexers/make.py4
-rw-r--r--tests/examplefiles/automake.mk7
2 files changed, 10 insertions, 1 deletions
diff --git a/pygments/lexers/make.py b/pygments/lexers/make.py
index 76ca7376..0ce3ef4b 100644
--- a/pygments/lexers/make.py
+++ b/pygments/lexers/make.py
@@ -38,7 +38,9 @@ class MakefileLexer(Lexer):
# BSD Make
r'\.\s*(include|undef|error|warning|if|else|elif|endif|for|endfor)|'
# GNU Make
- r'\s*(ifeq|ifneq|ifdef|ifndef|else|endif|-?include|define|endef|:|vpath))(?=\s)')
+ r'\s*(ifeq|ifneq|ifdef|ifndef|else|endif|-?include|define|endef|:|vpath)|'
+ # GNU Automake
+ r'\s*(if|else|endif))(?=\s)')
r_comment = re.compile(r'^\s*@?#')
def get_tokens_unprocessed(self, text):
diff --git a/tests/examplefiles/automake.mk b/tests/examplefiles/automake.mk
new file mode 100644
index 00000000..47a50a38
--- /dev/null
+++ b/tests/examplefiles/automake.mk
@@ -0,0 +1,7 @@
+if DEBUG
+DBG = debug
+else
+DBG =
+endif
+noinst_PROGRAMS = $(DBG)
+