Refactor Makefile.

diff --git a/Makefile b/Makefile
index 58aac73d1c32735a4ad2743b679abb0a6c76c871..aa9f9f650f341f4888bef9363ea68663a2d9fefb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,6 @@
 all: clean install compile test
 
-bench: benchjs benchel
-
-benchjs:
-       node_modules/.bin/matcha
+bench: benchel benchjs
 
 benchel:
        emacs -Q -L . \
@@ -11,6 +8,9 @@ benchel:
        -l benchmark/context-coloring-benchmark \
        -f context-coloring-benchmark-run
 
+benchjs:
+       node_modules/.bin/matcha
+
 compile:
        emacs -Q -batch -f batch-byte-compile *.el
 
@@ -20,12 +20,16 @@ clean:
 install:
        npm install
 
-test:
-       node_modules/.bin/mocha
+test: testel testjs
+
+testel:
        emacs -Q -batch -L . \
        -l ert \
        -l context-coloring \
        -l test/context-coloring-test.el \
        -f ert-run-tests-batch-and-exit
 
-.PHONY: all bench benchjs benchel compile clean install test
+testjs:
+       node_modules/.bin/mocha
+
+.PHONY: all bench benchel benchjs compile clean install test testel testjs