From bb696b756b4c1c2df1937e4bf8f41a0d5c9e8e4b Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 29 Aug 2015 17:34:03 -0400
Subject: [PATCH] reduce make verbosity

---
 makefiles/firmware.mk                     |  4 ++--
 makefiles/module.mk                       |  4 ++++
 makefiles/nuttx/firmware_nuttx.mk         | 12 ++++++------
 makefiles/nuttx/toolchain_gnu-arm-eabi.mk |  1 -
 makefiles/posix/firmware_posix.mk         |  2 +-
 makefiles/posix/toolchain_native.mk       |  2 --
 makefiles/qurt/firmware_qurt.mk           |  2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk
index c59b66b21f..d5ac4d7d7a 100644
--- a/makefiles/firmware.mk
+++ b/makefiles/firmware.mk
@@ -232,7 +232,7 @@ $(MODULE_OBJS):		workdir = $(@D)
 $(MODULE_OBJS):		$(GLOBAL_DEPS) $(NUTTX_CONFIG_HEADER)
 	$(Q) $(MKDIR) -p $(workdir)
 	$(Q) $(MAKE) -r -f $(PX4_MK_DIR)module.mk \
-		-C $(workdir) \
+		--no-print-directory -C $(workdir) \
 		MODULE_WORK_DIR=$(workdir) \
 		MODULE_OBJ=$@ \
 		MODULE_MK=$(mkfile) \
@@ -292,7 +292,7 @@ $(LIBRARY_LIBS):	workdir = $(@D)
 $(LIBRARY_LIBS):	$(GLOBAL_DEPS) $(NUTTX_CONFIG_HEADER)
 	$(Q) $(MKDIR) -p $(workdir)
 	$(Q) $(MAKE) -r -f $(PX4_MK_DIR)library.mk \
-		-C $(workdir) \
+		--no-print-directory -C $(workdir) \
 		LIBRARY_WORK_DIR=$(workdir) \
 		LIBRARY_LIB=$@ \
 		LIBRARY_MK=$(mkfile) \
diff --git a/makefiles/module.mk b/makefiles/module.mk
index 3c9ca35026..c92abaec3f 100644
--- a/makefiles/module.mk
+++ b/makefiles/module.mk
@@ -113,7 +113,9 @@
 ifeq ($(MODULE_MK),)
 $(error No module makefile specified)
 endif
+ifeq ($(V),1)
 $(info %% MODULE_MK           = $(MODULE_MK))
+endif
 
 #
 # Get the board/toolchain config
@@ -125,10 +127,12 @@ include $(BOARD_FILE)
 #
 include $(MODULE_MK)
 MODULE_SRC		:= $(dir $(MODULE_MK))
+ifeq ($(V),1)
 $(info %  MODULE_NAME         = $(MODULE_NAME))
 $(info %  MODULE_SRC          = $(MODULE_SRC))
 $(info %  MODULE_OBJ          = $(MODULE_OBJ))
 $(info %  MODULE_WORK_DIR     = $(MODULE_WORK_DIR))
+endif
 
 #
 # Things that, if they change, might affect everything
diff --git a/makefiles/nuttx/firmware_nuttx.mk b/makefiles/nuttx/firmware_nuttx.mk
index 644c3a0e72..ca4831b8bd 100644
--- a/makefiles/nuttx/firmware_nuttx.mk
+++ b/makefiles/nuttx/firmware_nuttx.mk
@@ -30,7 +30,7 @@ $(FIRMWARES): $(BUILD_DIR)%.build/firmware.px4:	checkgitversion generateuorbtopi
 	@$(ECHO) %%%% Building $(config) in $(work_dir)
 	@$(ECHO) %%%%
 	$(Q) $(MKDIR) -p $(work_dir)
-	$(Q) $(MAKE) -r -C $(work_dir) \
+	$(Q) $(MAKE) -r --no-print-directory -C $(work_dir) \
 		-f $(PX4_MK_DIR)firmware.mk \
 		CONFIG=$(config) \
 		WORK_DIR=$(work_dir) \
@@ -77,11 +77,11 @@ $(ARCHIVE_DIR)%.export:	configuration = nsh
 $(NUTTX_ARCHIVES): $(ARCHIVE_DIR)%.export: $(NUTTX_SRC)
 	@$(ECHO) %% Configuring NuttX for $(board)
 	$(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export)
-	$(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) distclean
+	$(Q) $(MAKE) -r -j$(J) --no-print-directory -C $(NUTTX_SRC) -r $(MQUIET) distclean
 	$(Q) (cd $(NUTTX_SRC)/configs && $(COPYDIR) $(PX4_BASE)nuttx-configs/$(board) .)
 	$(Q) (cd $(NUTTX_SRC)tools && ./configure.sh $(board)/$(configuration))
 	@$(ECHO) %% Exporting NuttX for $(board)
-	$(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) CONFIG_ARCH_BOARD=$(board) export
+	$(Q) $(MAKE) -r -j$(J) --no-print-directory -C $(NUTTX_SRC) -r $(MQUIET) CONFIG_ARCH_BOARD=$(board) export
 	$(Q) $(MKDIR) -p $(dir $@)
 	$(Q) $(COPY) $(NUTTX_SRC)nuttx-export.zip $@
 	$(Q) (cd $(NUTTX_SRC)/configs && $(RMDIR) $(board))
@@ -98,12 +98,12 @@ BOARD			 = $(BOARDS)
 menuconfig: $(NUTTX_SRC)
 	@$(ECHO) %% Configuring NuttX for $(BOARD)
 	$(Q) (cd $(NUTTX_SRC) && $(RMDIR) nuttx-export)
-	$(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) distclean
+	$(Q) $(MAKE) -r -j$(J) --no-print-directory -C $(NUTTX_SRC) -r $(MQUIET) distclean
 	$(Q) (cd $(NUTTX_SRC)/configs && $(COPYDIR) $(PX4_BASE)nuttx-configs/$(BOARD) .)
 	$(Q) (cd $(NUTTX_SRC)tools && ./configure.sh $(BOARD)/nsh)
 	@$(ECHO) %% Running menuconfig for $(BOARD)
-	$(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) oldconfig
-	$(Q) $(MAKE) -r -j$(J) -C $(NUTTX_SRC) -r $(MQUIET) menuconfig
+	$(Q) $(MAKE) -r -j$(J) --no-print-directory -C $(NUTTX_SRC) -r $(MQUIET) oldconfig
+	$(Q) $(MAKE) -r -j$(J) --no-print-directory -C $(NUTTX_SRC) -r $(MQUIET) menuconfig
 	@$(ECHO) %% Saving configuration file
 	$(Q)$(COPY) $(NUTTX_SRC).config $(PX4_BASE)nuttx-configs/$(BOARD)/nsh/defconfig
 else
diff --git a/makefiles/nuttx/toolchain_gnu-arm-eabi.mk b/makefiles/nuttx/toolchain_gnu-arm-eabi.mk
index 27be31da8e..0c6c5679f9 100644
--- a/makefiles/nuttx/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/nuttx/toolchain_gnu-arm-eabi.mk
@@ -271,7 +271,6 @@ define PRELINK
 	@$(ECHO) "PRELINK: $1"
 	@$(MKDIR) -p $(dir $1)
 	$(Q) $(LD) -Ur -Map $1.map  -o $1 $2 && $(OBJCOPY) --localize-hidden $1
-	#$(Q) $(LD) -Ur -Map $1.map  -o $1 $2 && $(OBJCOPY) --localize-hidden $1
 endef
 
 # Update the archive $1 with the files in $2
diff --git a/makefiles/posix/firmware_posix.mk b/makefiles/posix/firmware_posix.mk
index f88caf569a..f6f087d449 100644
--- a/makefiles/posix/firmware_posix.mk
+++ b/makefiles/posix/firmware_posix.mk
@@ -47,7 +47,7 @@ $(FIRMWARES): $(BUILD_DIR)%.build/firmware.a:	checkgitversion generateuorbtopich
 	@$(ECHO) %%%% Building $(config) in $(work_dir)
 	@$(ECHO) %%%%
 	$(Q) $(MKDIR) -p $(work_dir)
-	$(Q) $(MAKE) -r -C $(work_dir) \
+	$(Q) $(MAKE) -r --no-print-directory -C $(work_dir) \
 		-f $(PX4_MK_DIR)firmware.mk \
 		CONFIG=$(config) \
 		WORK_DIR=$(work_dir) \
diff --git a/makefiles/posix/toolchain_native.mk b/makefiles/posix/toolchain_native.mk
index eeba6d8f91..87e38ba349 100644
--- a/makefiles/posix/toolchain_native.mk
+++ b/makefiles/posix/toolchain_native.mk
@@ -348,7 +348,6 @@ endef
 define LINK_A
 	@$(ECHO) "LINK_A:    $1"
 	@$(MKDIR) -p $(dir $1)
-	echo "$(Q) $(AR) $1 $2"
 	$(Q) $(AR) $1 $2
 endef
 
@@ -357,7 +356,6 @@ endef
 define LINK_SO
 	@$(ECHO) "LINK_SO:    $1"
 	@$(MKDIR) -p $(dir $1)
-	echo "$(Q) $(CXX) $(LDFLAGS) -shared -Wl,-soname,`basename $1`.1 -o $1 $2 $(LIBS) $(EXTRA_LIBS)"
 	$(Q) $(CXX) $(LDFLAGS) -shared -Wl,-soname,`basename $1`.1 -o $1 $2 $(LIBS) -pthread -lc
 endef
 
diff --git a/makefiles/qurt/firmware_qurt.mk b/makefiles/qurt/firmware_qurt.mk
index a367e4a327..50c4b267b4 100644
--- a/makefiles/qurt/firmware_qurt.mk
+++ b/makefiles/qurt/firmware_qurt.mk
@@ -47,7 +47,7 @@ $(FIRMWARES): $(BUILD_DIR)%.build/firmware.a:	generateuorbtopicheaders
 	@$(ECHO) %%%% Building $(config) in $(work_dir)
 	@$(ECHO) %%%%
 	$(Q) $(MKDIR) -p $(work_dir)
-	$(Q) $(MAKE) -r -C $(work_dir) \
+	$(Q) $(MAKE) -r --no-print-directory -C $(work_dir) \
 		-f $(PX4_MK_DIR)firmware.mk \
 		CONFIG=$(config) \
 		WORK_DIR=$(work_dir) \