Skip to content

Commit 530bb3c

Browse files
author
Thomas Arts
committed
Update Makefile
1 parent 20f4b36 commit 530bb3c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ BASE_DIR = $(shell pwd)
66
ERLANG_BIN = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
77
REBAR ?= $(BASE_DIR)/rebar3
88
OVERLAY_VARS ?=
9-
TEST_IGNORE ?=
9+
TEST_IGNORE ?= riak
1010
TEST_DEPS_DIR ?= _build/test/lib
1111
REL_DIR ?= _build/default/rel
1212
DEPS = $(patsubst $(TEST_DEPS_DIR)/%, %, $(wildcard $(TEST_DEPS_DIR)/*))
@@ -73,6 +73,8 @@ test : test-deps
7373
$(REBAR) eunit
7474

7575

76+
77+
7678
##
7779
## Release targets
7880
##
@@ -153,22 +155,21 @@ APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
153155
xmerl snmp public_key mnesia eunit syntax_tools compiler
154156
COMBO_PLT = $(HOME)/.$(REPO)_combo_dialyzer_plt
155157

156-
check_plt: compile
158+
check_plt: build_plt
157159
dialyzer --check_plt --plt $(COMBO_PLT) --apps $(APPS) \
158-
deps/*/ebin
160+
_build/default/lib/*/ebin
159161

160162
build_plt: compile
161163
dialyzer --build_plt --output_plt $(COMBO_PLT) --apps $(APPS) \
162-
deps/*/ebin
164+
_build/default/lib/*/ebin
163165

164-
dialyzer: compile
166+
dialyzer: check_plt
165167
@echo
166168
@echo Use "'make check_plt'" to check PLT prior to using this target.
167169
@echo Use "'make build_plt'" to build PLT prior to using this target.
168170
@echo
169171
@sleep 1
170-
dialyzer -Wno_return --plt $(COMBO_PLT) deps/*/ebin | \
171-
fgrep -v -f ./dialyzer.ignore-warnings
172+
dialyzer -Wno_return --plt $(COMBO_PLT) _build/default/lib/*/ebin
172173

173174
cleanplt:
174175
@echo

0 commit comments

Comments
 (0)