diff options
| author | Loïc Hoguin <[email protected]> | 2015-07-04 18:10:03 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-07-04 18:10:03 +0200 |
| commit | 0eb54a71605a955df14c5df793ebe676c86259f9 (patch) | |
| tree | a9259406c19b034c32d426d570b941e89e237058 /core/erlc.mk | |
| parent | c2debce2bfcf2400905ff56c4a80e4c3251c6e56 (diff) | |
| download | erlang.mk-0eb54a71605a955df14c5df793ebe676c86259f9.tar.gz erlang.mk-0eb54a71605a955df14c5df793ebe676c86259f9.tar.bz2 erlang.mk-0eb54a71605a955df14c5df793ebe676c86259f9.zip | |
Add $(verbose) to avoid completely silencing commands
Diffstat (limited to 'core/erlc.mk')
| -rw-r--r-- | core/erlc.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index 20b8fbb..f6bd6fd 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -77,7 +77,7 @@ ifeq ($(wildcard src/$(PROJECT).app.src),) $(app_verbose) echo $(subst $(newline),,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES)))) \ > ebin/$(PROJECT).app else - @if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ + $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ echo "Empty modules entry not found in $(PROJECT).app.src. Please consult the erlang.mk README for instructions." >&2; \ exit 1; \ fi @@ -88,7 +88,7 @@ else endif erlc-include: - -@if [ -d ebin/ ]; then \ + - $(verbose) if [ -d ebin/ ]; then \ find include/ src/ -type f -name \*.hrl -newer ebin -exec touch $(shell find src/ -type f -name "*.erl") \; 2>/dev/null || printf ''; \ fi @@ -101,14 +101,14 @@ endef define compile_xyrl $(xyrl_verbose) erlc -v -o ebin/ $(1) $(xyrl_verbose) erlc $(ERLC_OPTS) -o ebin/ ebin/*.erl - @rm ebin/*.erl + $(verbose) rm ebin/*.erl endef define compile_asn1 $(asn1_verbose) erlc -v -I include/ -o ebin/ $(1) - @mv ebin/*.hrl include/ - @mv ebin/*.asn1db include/ - @rm ebin/*.erl + $(verbose) mv ebin/*.hrl include/ + $(verbose) mv ebin/*.asn1db include/ + $(verbose) rm ebin/*.erl endef define compile_mib @@ -119,17 +119,17 @@ endef ifneq ($(wildcard src/),) ebin/$(PROJECT).app:: - @mkdir -p ebin/ + $(verbose) mkdir -p ebin/ ifneq ($(wildcard asn1/),) ebin/$(PROJECT).app:: $(sort $(call core_find,asn1/,*.asn1)) - @mkdir -p include + $(verbose) mkdir -p include $(if $(strip $?),$(call compile_asn1,$?)) endif ifneq ($(wildcard mibs/),) ebin/$(PROJECT).app:: $(sort $(call core_find,mibs/,*.mib)) - @mkdir -p priv/mibs/ include + $(verbose) mkdir -p priv/mibs/ include $(if $(strip $?),$(call compile_mib,$?)) endif |