Fix the Makefile so that we can compile projectile

The functionality has been basically copied from cider and now we can call make in order to produce projectile.elc.
bbatsov · Jan 5, 2019 · 260ce3f · 260ce3f
1 parent 823c0aa
commit 260ce3f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
-/elpa
-/.elpa
-/.cask
-*.elc
 *~
-[#]*[#]
+*\#*\#
+*.\#*
+*.elc
+.cask
+elpa*
 /TAGS
 /project
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,7 @@
 ### Bugs fixed
 
 * [#1315](https://github.com/bbatsov/projectile/issues/1315): Give preference to the project types that were registered last.
+* [#1367](https://github.com/bbatsov/projectile/issues/1367): Fix the Makefile so that we can compile projectile - use `make`.
 
 ## 1.0.0 (2018-07-21)
 

diff --git a/Makefile b/Makefile
@@ -10,16 +10,21 @@ OBJS = $(SRCS:.el=.elc)
 
 .PHONY: compile test clean
 
-elpa:
+all: compile
+
+elpa-$(EMACS):
 	$(CASK) install
 	$(CASK) update
 	touch $@
 
+elpa: elpa-$(EMACS)
+
 elpaclean:
 	rm -f elpa*
 	rm -rf .cask # Clean packages installed for development
 
-compile: $(OBJS)
+compile: elpa
+	$(CASK) build
 
 clean:
 	rm -f $(OBJS)