Skip to content

Commit 4c5ad40

Browse files
committed
Fix Makefile errors
1 parent c6c416a commit 4c5ad40

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VERSION := $(shell EMACS=$(EMACS) $(CASK) version)
55
SRC = $(wildcard *.el)
66
PACKAGE = dist/flycheck-swift-$(VERSION).el
77

8-
.PHONY: help all cask-install package install test clean
8+
.PHONY: help all deps package install test clean
99

1010
help:
1111
## Shows this message.
@@ -22,12 +22,11 @@ help:
2222
all: package
2323
## Builds the package.
2424

25-
cask-install:
25+
deps:
2626
## Installs the dependencies.
2727
$(CASK) install
2828

2929
$(PACKAGE): $(SRC) ## no-doc
30-
$(MAKE) cask-install
3130
rm -rf dist
3231
$(CASK) package
3332

@@ -39,15 +38,17 @@ install: package
3938
$(CASK) exec $(EMACS) --batch \
4039
-l package \
4140
-f package-initialize \
41+
--eval "(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.org/packages/\") t)" \
42+
-f package-refresh-contents \
4243
--eval '(package-install-file "$(PACKAGE)")'
4344

4445
clean:
4546
## Cleans the dist directory.
4647
rm -rf dist
4748

48-
test: package
49+
test:
4950
## Tests the package.
5051
$(CASK) exec $(EMACS) --batch -q \
51-
-l $(PACKAGE) \
52+
--eval "(add-to-list 'load-path \""$(shell readlink -f .)"\")" \
5253
-l test/flycheck-swift-test.el \
5354
-f ert-run-tests-batch-and-exit

0 commit comments

Comments
 (0)