diff options
author | Loïc Hoguin <[email protected]> | 2015-11-20 18:34:49 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2015-11-20 18:36:55 +0100 |
commit | 442fd20e0e88814e49ed4076904f52da84b47220 (patch) | |
tree | 6edf8459d47ace385d27a321d2d85edb0e146a57 | |
parent | beec62e994fbf0003dd637a3b093ef65a9bbc8ff (diff) | |
parent | 5d33b1607f0139afb4b8773c1c9f320433c1182b (diff) | |
download | erlang.mk-442fd20e0e88814e49ed4076904f52da84b47220.tar.gz erlang.mk-442fd20e0e88814e49ed4076904f52da84b47220.tar.bz2 erlang.mk-442fd20e0e88814e49ed4076904f52da84b47220.zip |
Merge branch 'set-x-on-verbose-2' of https://github.com/rabbitmq/erlang.mk
-rw-r--r-- | core/core.mk | 2 | ||||
-rw-r--r-- | core/deps.mk | 1 | ||||
-rw-r--r-- | core/erlc.mk | 7 | ||||
-rw-r--r-- | test/Makefile | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/core/core.mk b/core/core.mk index 52a9472..81d9f7e 100644 --- a/core/core.mk +++ b/core/core.mk @@ -30,9 +30,11 @@ PROJECT_VERSION ?= rolling V ?= 0 verbose_0 = @ +verbose_2 = set -x; verbose = $(verbose_$(V)) gen_verbose_0 = @echo " GEN " $@; +gen_verbose_2 = set -x; gen_verbose = $(gen_verbose_$(V)) # Temporary files directory. diff --git a/core/deps.mk b/core/deps.mk index bf39be1..b70d445 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -43,6 +43,7 @@ export NO_AUTOPATCH # Verbosity. dep_verbose_0 = @echo " DEP " $(1); +dep_verbose_2 = set -x; dep_verbose = $(dep_verbose_$(V)) # Core targets. diff --git a/core/erlc.mk b/core/erlc.mk index 42d0e32..1b94644 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -19,25 +19,32 @@ COMPILE_MIB_FIRST_PATHS = $(addprefix mibs/,$(addsuffix .mib,$(COMPILE_MIB_FIRST # Verbosity. app_verbose_0 = @echo " APP " $(PROJECT); +app_verbose_2 = set -x; app_verbose = $(app_verbose_$(V)) appsrc_verbose_0 = @echo " APP " $(PROJECT).app.src; +appsrc_verbose_2 = set -x; appsrc_verbose = $(appsrc_verbose_$(V)) makedep_verbose_0 = @echo " DEPEND" $(PROJECT).d; +makedep_verbose_2 = set -x; makedep_verbose = $(makedep_verbose_$(V)) erlc_verbose_0 = @echo " ERLC " $(filter-out $(patsubst %,%.erl,$(ERLC_EXCLUDE)),\ $(filter %.erl %.core,$(?F))); +erlc_verbose_2 = set -x; erlc_verbose = $(erlc_verbose_$(V)) xyrl_verbose_0 = @echo " XYRL " $(filter %.xrl %.yrl,$(?F)); +xyrl_verbose_2 = set -x; xyrl_verbose = $(xyrl_verbose_$(V)) asn1_verbose_0 = @echo " ASN1 " $(filter %.asn1,$(?F)); +asn1_verbose_2 = set -x; asn1_verbose = $(asn1_verbose_$(V)) mib_verbose_0 = @echo " MIB " $(filter %.bin %.mib,$(?F)); +mib_verbose_2 = set -x; mib_verbose = $(mib_verbose_$(V)) ifneq ($(wildcard src/),) diff --git a/test/Makefile b/test/Makefile index 4779c9f..870f4dc 100644 --- a/test/Makefile +++ b/test/Makefile @@ -61,6 +61,7 @@ OTP_MASTER = https://raw.githubusercontent.com/erlang/otp/master # V=1: Show test commands. # V=2: Also show normal Erlang.mk output. # V=3: Also show verbose Erlang.mk output. +# V=4: Also show a trace of each command after expansion. V ?= 0 @@ -82,7 +83,7 @@ else ifeq ($V,2) i = @echo == $@: else t = - v = V=1 + v = V=$(shell echo $$(($(V)-2))) i = @echo == $@: endif |