Reorganize files.

[gnu-emacs-elpa] / Makefile

diff --git a/Makefile b/Makefile
index 0b370430859399223874f8d957c74a9c2ed07b2a..08c23eb4ced0671a843d33d0e6fae94167a35d9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-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
 
 all: uncompile compile test
 
@@ -10,7 +8,7 @@ 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}
@@ -28,25 +26,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