Skip to content

Commit 6921518

Browse files
authored
Merge pull request #503 from arichiardi/fix-makefile-compile
Fix Makefile so that we can compile again
2 parents b0b8231 + 4ea0543 commit 6921518

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
# Emacs byte-compiled files
77
*.elc
88
.cask
9+
elpa*

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
### Changes
2828

2929
* Change the accepted values of `clojure-indent-style` from keywords to symbols.
30+
* [#503](https://github.com/clojure-emacs/clojure-mode/pull/503): Fix Makefile so that we can compile again.
3031

3132
## 5.9.1 (2018-08-27)
3233

Makefile

+12-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,23 @@ PKGDIR := $(shell EMACS=$(EMACS) $(CASK) package-directory)
88
SRCS = $(wildcard *.el)
99
OBJS = $(SRCS:.el=.elc)
1010

11-
.PHONY: compile test clean
11+
.PHONY: compile test clean elpa
1212

13-
elpa:
13+
all: compile
14+
15+
elpa-$(EMACS):
1416
$(CASK) install
1517
$(CASK) update
1618
touch $@
1719

18-
compile: $(OBJS)
20+
elpa: elpa-$(EMACS)
21+
22+
elpaclean:
23+
rm -f elpa*
24+
rm -rf .cask # Clean packages installed for development
25+
26+
compile: elpa
27+
$(CASK) build
1928

2029
clean:
2130
rm -f $(OBJS)

0 commit comments

Comments
 (0)