aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Richiardi <a.richiardi.work@gmail.com>2019-01-05 11:10:38 -0800
committerBozhidar Batsov <bozhidar.batsov@gmail.com>2019-01-13 10:54:58 +0200
commitd4cec87f2571bef9ef26e586ebeb9a87abf98f31 (patch)
tree2ba93c4f5d7ab9d37b7b9b8faef0c0491e61185f
parent208793de6e6d063a3bde535339fccc3396aa7336 (diff)
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.
-rw-r--r--.gitignore10
-rw-r--r--CHANGELOG.md1
-rw-r--r--Makefile11
3 files changed, 14 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 803c294..025b7c9 100644
--- 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
index 75c99ce..770cea3 100644
--- 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
index 52064b5..0452bce 100644
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,23 @@ PKGDIR := $(shell EMACS=$(EMACS) $(CASK) package-directory)
SRCS = $(wildcard *.el)
OBJS = $(SRCS:.el=.elc)
-.PHONY: compile test clean
+.PHONY: compile test clean elpa
-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)