Better handle the cask stuff

* Makefile: Handle the case when inside Emacs. Automate cask install and cleanup.

1 files changed, 17 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 04210df..fafb3b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,12 @@
 EMACS ?= emacs
+
+# Handle the mess when inside Emacs.
+unexport INSIDE_EMACS		#cask not like this.
+ifeq ($(EMACS), t)
+EMACS = emacs
+endif
+
+EMACS_VERSION = $(shell $(EMACS) -Q --batch --eval '(princ emacs-version)')
 EFLAGS = -Q -L $(PWD)/lisp --batch
 
 # Note: If you change this, also change it in lisp/pdf-tools.el and
@@ -13,7 +21,7 @@ PKGFILE_CONTENT = (define-package "pdf-tools" "$(PACKAGE_VERSION)"	\
 PACKAGE_NAME = pdf-tools-$(PACKAGE_VERSION)
 PACKAGE_DIR = $(PACKAGE_NAME)
 
-.PHONY: all clean distclean package bytecompile test check melpa
+.PHONY: all clean distclean package bytecompile test check melpa cask-install
 
 all: package
 
@@ -24,6 +32,7 @@ clean:
 	! [ -f server/Makefile ] || $(MAKE) -C server clean
 
 distclean: clean
+	rm -rf .cask
 	! [ -f server/Makefile ] || $(MAKE) -C server distclean
 
 package: server/epdfinfo
@@ -53,12 +62,17 @@ server/Makefile: server/configure
 server/configure: server/configure.ac
 	cd server && ./autogen.sh
 
-bytecompile: 
+bytecompile: cask-install
 	cask exec $(EMACS) $(EFLAGS) -f batch-byte-compile lisp/*.el
 
-test: all
+test: all cask-install
 	cask exec $(EMACS) $(EFLAGS) -l test/run-tests.el $(PACKAGE_NAME).tar
 
+cask-install: .cask/$(EMACS_VERSION)
+
+.cask/$(EMACS_VERSION):
+	cask install
+
 check: bytecompile test
 
 print-version: