X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/c1dd7729321250407f804f0fe26939ea141f6e14..69228c73e01ec9a3ae6cf5a1f8c4d83d8c6f4999:/Makefile

diff --git a/Makefile b/Makefile
index db28faf60..015f3acba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,31 @@
 EMACS=emacs
 
+.PHONY: ert test test-batch
+
 package: *.el
 	@ver=`grep -o "Version: .*" company.el | cut -c 10-`; \
-	tar cjvf company-$$ver.tar.bz2 --mode 644 `git ls-files '*.el' | xargs`
+	tar cjvf company-$$ver.tar.bz2 --mode 644 $$(find . -name \*.el)
 
 elpa: *.el
 	@version=`grep -o "Version: .*" company.el | cut -c 10-`; \
 	dir=company-$$version; \
 	mkdir -p "$$dir"; \
-	cp `git ls-files '*.el' | xargs` company-$$version; \
+	cp $$(find . -name \*.el) company-$$version; \
 	echo "(define-package \"company\" \"$$version\" \
 	\"Modular in-buffer completion framework\")" \
 	> "$$dir"/company-pkg.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 test/all.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 test/all.el \
+	--eval "(ert-run-tests-batch-and-exit '(not (tag interactive)))"
+
+compile:
+	${EMACS} -Q --batch -L . -f batch-byte-compile company.el company-*.el