Merge branch 'dgreensp-object-rest-spread'

[gnu-emacs-elpa] / Makefile

diff --git a/Makefile b/Makefile
index a710a9377c68804acb16676aeb6f90d077c3cca3..7777a67c3a6c53c71363d53caf36fb554b42c040 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # -*- Makefile -*-
 
+EMACS = emacs
+
 # Compile with noninteractive and relatively clean environment.
 BATCHFLAGS = -batch -q --no-site-file
 
@@ -8,17 +10,14 @@ SRCS = js2-mode.el js2-imenu-extras.el
 OBJS = $(SRCS:.el=.elc)
 
 %.elc: %.el
-       emacs $(BATCHFLAGS) -f batch-byte-compile $^
+       ${EMACS} $(BATCHFLAGS) -L . -f batch-byte-compile $^
 
 all: $(OBJS)
 
 clean:
        -rm -f $(OBJS)
 
-# custom build (require loads)
-js2-imenu-extras.elc: js2-mode.elc
-       emacs $(BATCHFLAGS) -l ./js2-mode.elc -f batch-byte-compile $*.el
-
 test:
-       emacs $(BATCHFLAGS) -l js2-mode.el -l tests/parser.el\
-         -l tests/indent.el -l tests/externs.el -f ert-run-tests-batch
+       ${EMACS} $(BATCHFLAGS) -L . -l js2-mode.el -l js2-old-indent.el -l tests/parser.el\
+         -l tests/indent.el -l tests/externs.el -l tests/json-path.el \
+         -l tests/navigation.el -f ert-run-tests-batch-and-exit