From 742fe168300285f99101c3a91e4354a5de7b7c02 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 2 Jun 2019 16:04:35 +0200 Subject: [PATCH] Makefile verbose mode: make V=1 as for CMake --- Makefile | 8 +++++--- client/Makefile | 6 ++++-- client/jansson/Makefile | 6 ++++-- client/tinycbor/Makefile | 6 ++++-- common/Makefile.common | 7 ++++--- common/mbedtls/Makefile | 6 ++++-- liblua/Makefile | 6 ++++-- tools/mfkey/Makefile | 6 ++++-- tools/nonce2key/Makefile | 6 ++++-- 9 files changed, 37 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index a202f921d..910aa62f6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 GZIP=gzip # Windows' echo echos its input verbatim, on Posix there is some @@ -77,7 +79,7 @@ help: @echo "+ checks - Detect various encoding issues in source code" @echo @echo "Possible platforms: try \"make PLATFORM=\" for more info, default is PM3RDV4" - @echo "To see full command lines, use make Q=" + @echo "To activate verbose mode, use make V=1" client: client/all diff --git a/client/Makefile b/client/Makefile index 38a40a835..c3300b0cd 100644 --- a/client/Makefile +++ b/client/Makefile @@ -10,8 +10,10 @@ # Add -DPRESETS to compile with preset models (edit config.h) # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 CC = gcc CXX = g++ diff --git a/client/jansson/Makefile b/client/jansson/Makefile index 0ef29827a..323d26216 100644 --- a/client/jansson/Makefile +++ b/client/jansson/Makefile @@ -1,6 +1,8 @@ # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 include_HEADERS = jansson.h nodist_include_HEADERS = jansson_config.h diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile index 17f60a49c..8124196eb 100644 --- a/client/tinycbor/Makefile +++ b/client/tinycbor/Makefile @@ -1,6 +1,8 @@ # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 LIB_A = tinycbor.a tinycbor_SOURCES = \ diff --git a/common/Makefile.common b/common/Makefile.common index a743b911b..132507547 100644 --- a/common/Makefile.common +++ b/common/Makefile.common @@ -13,9 +13,10 @@ # variables # -# Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 # Make sure that all is the default target # (The including Makefile still needs to define what 'all' is) diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile index 485101306..fa0dff05f 100644 --- a/common/mbedtls/Makefile +++ b/common/mbedtls/Makefile @@ -1,6 +1,8 @@ # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 LIB_A = libmbedtls.a mbedtls_SOURCES = \ diff --git a/liblua/Makefile b/liblua/Makefile index c305ece5d..bf2a4fa3c 100644 --- a/liblua/Makefile +++ b/liblua/Makefile @@ -4,8 +4,10 @@ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 # Your platform. See PLATS for possible values. PLAT= none diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile index e54ad1782..24508265a 100644 --- a/tools/mfkey/Makefile +++ b/tools/mfkey/Makefile @@ -1,6 +1,8 @@ # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 VPATH = ../../common ../../common/crapto1 ../../client CC = gcc diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile index 9335caf6c..481c3e275 100644 --- a/tools/nonce2key/Makefile +++ b/tools/nonce2key/Makefile @@ -1,6 +1,8 @@ # Hide full compilation line: -Q?=@ -# To see full command lines, use make Q= +ifneq ($(V),1) + Q?=@ +endif +# To see full command lines, use make V=1 CC = gcc CFLAGS = -std=c99 -Wall -O3 -I.