aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-10-30 23:11:18 +0200
committerLoïc Hoguin <[email protected]>2016-10-30 23:42:41 +0200
commit43a11f5412fa1ed278734f72142982cf3f4f99ee (patch)
treeb41ff937b7c6a4855691b3f424918b0f5bce3907
parent01efaa6764088ee0df0d1ec6e5f561707af5ebe0 (diff)
downloaderlang.mk-43a11f5412fa1ed278734f72142982cf3f4f99ee.tar.gz
erlang.mk-43a11f5412fa1ed278734f72142982cf3f4f99ee.tar.bz2
erlang.mk-43a11f5412fa1ed278734f72142982cf3f4f99ee.zip
Fix running Dialyzer on apps/* when they have deps
-rw-r--r--core/deps.mk4
-rw-r--r--plugins/dialyzer.mk3
2 files changed, 6 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk
index cc5f5bb..9acdee3 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -75,6 +75,9 @@ endif
ifneq ($(SKIP_DEPS),)
deps::
else
+ifeq ($(ALL_DEPS_DIRS),)
+deps:: apps
+else
deps:: $(ALL_DEPS_DIRS) apps
ifeq ($(IS_APP)$(IS_DEP),)
$(verbose) rm -f $(ERLANG_MK_TMP)/deps.log
@@ -94,6 +97,7 @@ endif
fi \
done
endif
+endif
# Deps related targets.
diff --git a/plugins/dialyzer.mk b/plugins/dialyzer.mk
index 57337ad..24533fc 100644
--- a/plugins/dialyzer.mk
+++ b/plugins/dialyzer.mk
@@ -42,7 +42,8 @@ define filter_opts.erl
endef
$(DIALYZER_PLT): deps app
- $(verbose) dialyzer --build_plt --apps erts kernel stdlib $(PLT_APPS) $(OTP_DEPS) $(LOCAL_DEPS) $(DEPS)
+ $(verbose) dialyzer --build_plt --apps erts kernel stdlib $(PLT_APPS) $(OTP_DEPS) $(LOCAL_DEPS) \
+ `cat $(ERLANG_MK_TMP)/deps.log`
plt: $(DIALYZER_PLT)