From 4fe7b93c43ddbca94712062dfa03b79b05c8bc91 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Mon, 31 Jan 2022 16:35:42 +0100 Subject: [PATCH] build(Makefile): define Makefile vars before use --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d54c3273..c4ede011c 100644 --- a/Makefile +++ b/Makefile @@ -111,6 +111,9 @@ cover: $(REBAR) coveralls: $(REBAR) @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) $(REL_PROFILES:%=%): $(COMMON_DEPS) @$(REBAR) as $(@) do release @@ -143,7 +146,7 @@ deps-all: $(REBAR) $(PROFILES:%=deps-%) ## share downloads between CI steps and/or copied into containers ## which may not have the right credentials .PHONY: $(PROFILES:%=deps-%) -$(PROFILES:%=deps-%): $(REBAR) get-dashboard +$(PROFILES:%=deps-%): $(COMMON_DEPS) @$(REBAR) as $(@:deps-%=%) get-deps @rm -f rebar.lock @@ -155,9 +158,6 @@ xref: $(REBAR) dialyzer: $(REBAR) @$(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 .PHONY: $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel) $(REL_PROFILES:%=%-rel) $(PKG_PROFILES:%=%-rel): $(COMMON_DEPS) @@ -217,6 +217,7 @@ endef ALL_TGZS = $(REL_PROFILES) $(foreach zt,$(ALL_TGZS),$(eval $(call gen-docker-target-testing,$(zt)))) +.PHONY: conf-segs: @scripts/merge-config.escript