X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/233ea1a7660e4d6c0b13c91712de122ddbae9f0a..3007b2917d71a7d66eb94876536dfd80b0661d40:/Makefile

diff --git a/Makefile b/Makefile
index 0b5c23781..4519b7073 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-CASK = cask
 EMACS = emacs
+CASK = EMACS=${EMACS} cask
 DEPENDENCIES = .cask/
-SCOPIFIER_PORT = $$(lsof -t -i:6969)
-KILL_SCOPIFIER = if [ -n "${SCOPIFIER_PORT}" ]; then kill ${SCOPIFIER_PORT}; fi
+SOURCE_FILES = \
+	context-coloring.el \
+	context-coloring-javascript.el \
+	context-coloring-emacs-lisp.el
 
 all: uncompile compile test
 
@@ -10,13 +12,13 @@ bench: ${DEPENDENCIES}
 	${CASK} exec ${EMACS} -Q \
 	-L . \
 	-l context-coloring \
-	-l benchmark/context-coloring-benchmark.el \
+	-l context-coloring-benchmark \
 	-f context-coloring-benchmark-run
 
 compile: ${DEPENDENCIES}
 	${CASK} exec ${EMACS} -Q -batch \
 	-L . \
-	-f batch-byte-compile *.el
+	-f batch-byte-compile ${SOURCE_FILES}
 
 uncompile:
 	rm -f *.elc
@@ -28,25 +30,21 @@ ${DEPENDENCIES}:
 	${CASK}
 
 test: ${DEPENDENCIES}
-	${KILL_SCOPIFIER}
 	${CASK} exec ${EMACS} -Q -batch \
 	-L . \
 	-l ert \
-	-l ert-async \
-	-l test/context-coloring-coverage.el \
+	-l context-coloring-coverage \
 	-f context-coloring-coverage-ci-init \
-	-l test/context-coloring-test.el \
+	-l context-coloring-test \
 	-f ert-run-tests-batch-and-exit
 
 cover: ${DEPENDENCIES}
-	${KILL_SCOPIFIER}
 	${CASK} exec ${EMACS} -Q -batch \
 	-L . \
 	-l ert \
-	-l ert-async \
-	-l test/context-coloring-coverage.el \
+	-l context-coloring-coverage \
 	-f context-coloring-coverage-local-init \
-	-l test/context-coloring-test.el \
+	-l context-coloring-test \
 	-f ert-run-tests-batch-and-exit
 
 .PHONY: all bench compile uncompile clean test cover