s/`bbdb'/BBDB

[gnu-emacs-elpa] / Makefile

diff --git a/Makefile b/Makefile
index a4bebd1e47cb9c72b4be22002e61b3826932265d..c52be4be3873cffc3d0bd7d024d3cd3bb8d84baf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
 EMACS=emacs
-CURL=curl --silent
-ERT_URL=http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el
 
 .PHONY: ert test test-batch
 
@@ -19,17 +17,15 @@ elpa: *.el
        tar cvf company-$$version.tar --mode 644 "$$dir"
 
 clean:
-       @rm -rf company-*/ company-*.tar company-*.tar.bz2
+       @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el
 
 test:
-       ${EMACS} -Q -nw --eval "(add-to-list 'load-path \".\")" \
-       -l company-tests.el --eval "(ert t)"
+       ${EMACS} -Q -nw -L . -l company-tests.el -l company-elisp-tests.el \
+       --eval "(let (pop-up-windows) (ert t))"
 
 test-batch:
-       ${EMACS} -Q --batch --eval "(add-to-list 'load-path \".\")" \
-       -l company-tests.el --eval "(ert-run-tests-batch-and-exit \
-         '(not (tag interactive)))"
+       ${EMACS} -Q --batch -L . -l company-tests.el -l company-elisp-tests.el \
+       --eval "(ert-run-tests-batch-and-exit '(not (tag interactive)))"
 
-downloads:
-       ${EMACS} -Q --batch -l ert || \
-       ${CURL} ${ERT_URL} > ert.el
+compile:
+       ${EMACS} -Q --batch -L . -f batch-byte-compile company.el company-*.el