فهرست منبع

build(Makefile): define Makefile vars before use

Zaiming (Stone) Shi 4 سال پیش
والد
کامیت
4fe7b93c43
1فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 5 4
      Makefile

+ 5 - 4
Makefile

@@ -111,6 +111,9 @@ cover: $(REBAR)
 coveralls: $(REBAR)
 coveralls: $(REBAR)
 	@ENABLE_COVER_COMPILE=1 $(REBAR) as test coveralls send
 	@ENABLE_COVER_COMPILE=1 $(REBAR) as test coveralls send
 
 
+COMMON_DEPS := $(REBAR) get-dashboard conf-segs
+ELIXIR_COMMON_DEPS := ensure-hex ensure-mix-rebar3 ensure-mix-rebar
+
 .PHONY: $(REL_PROFILES)
 .PHONY: $(REL_PROFILES)
 $(REL_PROFILES:%=%): $(COMMON_DEPS)
 $(REL_PROFILES:%=%): $(COMMON_DEPS)
 	@$(REBAR) as $(@) do release
 	@$(REBAR) as $(@) do release
@@ -143,7 +146,7 @@ deps-all: $(REBAR) $(PROFILES:%=deps-%)
 ## share downloads between CI steps and/or copied into containers
 ## share downloads between CI steps and/or copied into containers
 ## which may not have the right credentials
 ## which may not have the right credentials
 .PHONY: $(PROFILES:%=deps-%)
 .PHONY: $(PROFILES:%=deps-%)
-$(PROFILES:%=deps-%): $(REBAR) get-dashboard
+$(PROFILES:%=deps-%): $(COMMON_DEPS)
 	@$(REBAR) as $(@:deps-%=%) get-deps
 	@$(REBAR) as $(@:deps-%=%) get-deps
 	@rm -f rebar.lock
 	@rm -f rebar.lock
 
 
@@ -155,9 +158,6 @@ xref: $(REBAR)
 dialyzer: $(REBAR)
 dialyzer: $(REBAR)
 	@$(REBAR) as check dialyzer
 	@$(REBAR) as check dialyzer
 
 
-COMMON_DEPS := $(REBAR) get-dashboard conf-segs
-ELIXIR_COMMON_DEPS := ensure-hex ensure-mix-rebar3 ensure-mix-rebar
-
 ## rel target is to create release package without relup
 ## rel target is to create release package without relup
 .PHONY: $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel)
 .PHONY: $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel)
 $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel): $(COMMON_DEPS)
 $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel): $(COMMON_DEPS)
@@ -217,6 +217,7 @@ endef
 ALL_TGZS = $(REL_PROFILES)
 ALL_TGZS = $(REL_PROFILES)
 $(foreach zt,$(ALL_TGZS),$(eval $(call gen-docker-target-testing,$(zt))))
 $(foreach zt,$(ALL_TGZS),$(eval $(call gen-docker-target-testing,$(zt))))
 
 
+.PHONY:
 conf-segs:
 conf-segs:
 	@scripts/merge-config.escript
 	@scripts/merge-config.escript