From c09d3dcc218a49aacb1ccfb6f8a6059186aa1b6b Mon Sep 17 00:00:00 2001
From: Danil Zagoskin <stolen@yandex-team.ru>
Date: Tue, 23 Dec 2014 21:50:30 +0300
Subject: Build deps, app, rel targets really in that order

---
 core/erlc.mk    | 4 ++--
 erlang.mk       | 6 +++---
 plugins/relx.mk | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/erlc.mk b/core/erlc.mk
index 8d720aa..01bd6e0 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -75,11 +75,11 @@ ebin/$(PROJECT).app:: $(shell find mibs -type f -name \*.mib)
 endif
 
 ebin/$(PROJECT).app:: $(shell find src -type f -name \*.erl) \
-		$(shell find src -type f -name \*.core)
+		$(shell find src -type f -name \*.core) | deps
 	$(if $(strip $?),$(call compile_erl,$?))
 
 ebin/$(PROJECT).app:: $(shell find src -type f -name \*.xrl) \
-		$(shell find src -type f -name \*.yrl)
+		$(shell find src -type f -name \*.yrl) | deps
 	$(if $(strip $?),$(call compile_xyrl,$?))
 endif
 
diff --git a/erlang.mk b/erlang.mk
index 7816648..b9750e2 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -276,11 +276,11 @@ ebin/$(PROJECT).app:: $(shell find mibs -type f -name \*.mib)
 endif
 
 ebin/$(PROJECT).app:: $(shell find src -type f -name \*.erl) \
-		$(shell find src -type f -name \*.core)
+		$(shell find src -type f -name \*.core) | deps
 	$(if $(strip $?),$(call compile_erl,$?))
 
 ebin/$(PROJECT).app:: $(shell find src -type f -name \*.xrl) \
-		$(shell find src -type f -name \*.yrl)
+		$(shell find src -type f -name \*.yrl) | deps
 	$(if $(strip $?),$(call compile_xyrl,$?))
 endif
 
@@ -1116,7 +1116,7 @@ endef
 $(RELX):
 	@$(call relx_fetch)
 
-relx-rel: $(RELX)
+relx-rel: $(RELX) | deps app
 	@$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS)
 
 distclean-relx-rel:
diff --git a/plugins/relx.mk b/plugins/relx.mk
index ee226d3..6f270bb 100644
--- a/plugins/relx.mk
+++ b/plugins/relx.mk
@@ -38,7 +38,7 @@ endef
 $(RELX):
 	@$(call relx_fetch)
 
-relx-rel: $(RELX)
+relx-rel: $(RELX) | deps app
 	@$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS)
 
 distclean-relx-rel:
-- 
cgit v1.2.3