From a031e0ad431ed5d88c0f2024a074baff66ed8700 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 31 Dec 2008 00:34:33 +0100
Subject: [PATCH] Added different verbosity levels V=1,2,3

---
 snippets/base | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/snippets/base b/snippets/base
index 37f6d8a..cb2fb87 100644
--- a/snippets/base
+++ b/snippets/base
@@ -33,8 +33,6 @@ ifndef OUTPUT_DIR
 OUTPUT_DIR := $(MAKERULES_DIR)
 endif
 
-.PHONY: all default check-make-ver omkize prepare build-pseudo-pass
-
 ifdef W
   ifeq ("$(origin W)", "command line")
     OMK_WHOLE_TREE:=$(W)
@@ -53,17 +51,19 @@ all: build-pseudo-pass
 
 prepare: $(omk_checks) prepare-pass
 build-pseudo-pass: prepare
-	+@echo "make[omk]: build"
-	@$(MAKE) -C $(MAKERULES_DIR) -f Makefile.rules build
-	@echo "Compilation finished"
+	+@$(QUIET_CMD_ECHO) "make[omk]: build"
+	$(Q3)$(MAKE) -C $(MAKERULES_DIR) -f Makefile.rules build
+	@$(QUIET_CMD_ECHO) "Compilation finished"
 
 prepare-pass: $(omk_checks)
 else
 # Run make in the top-level directory
 all:
-	@$(MAKE) -C $(MAKERULES_DIR) OMK_SERIALIZE_INCLUDED=n SOURCES_DIR=$(MAKERULES_DIR) RELATIVE_DIR="" $(MAKECMDGOALS) W=0
+	$(Q3)$(MAKE) -C $(MAKERULES_DIR) OMK_SERIALIZE_INCLUDED=n SOURCES_DIR=$(MAKERULES_DIR) RELATIVE_DIR="" $(MAKECMDGOALS) W=0
 endif
 
+.PHONY: all default check-make-ver omkize prepare build-pseudo-pass
+
 ifdef OMK_TESTSROOT
 # Usage: $(call canttest,<error message>)
 define canttest
@@ -144,11 +144,11 @@ endif
 ifndef OMK_VERBOSE
   OMK_VERBOSE = 0
 endif
-ifneq ($(OMK_VERBOSE),0)
-  Q =
-else
-  Q = @
-endif
+
+Q =  $(if $(filter 0    ,$(OMK_VERBOSE)),@)
+Q2 = $(if $(filter 0 1  ,$(OMK_VERBOSE)),@)
+Q3 = $(if $(filter 0 1 2,$(OMK_VERBOSE)),@)
+
 ifneq ($(findstring s,$(MAKEFLAGS)),)
   QUIET_CMD_ECHO = true
   OMK_SILENT = 1
@@ -201,7 +201,7 @@ check-make-ver:
 
 distclean dist-clean:
 	@$(QUIET_CMD_ECHO) "  RM      $(COMPILED_DIR_NAME) $(BUILD_DIR_NAME)"
-	@rm -fr $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)  $(OUTPUT_DIR)/$(BUILD_DIR_NAME)
+	$(Q3)rm -fr $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)  $(OUTPUT_DIR)/$(BUILD_DIR_NAME)
 
 # Common OMK templates
 # ====================
@@ -231,7 +231,7 @@ BUILD_OMK_DIR := $(OUTPUT_DIR)/$(BUILD_DIR_NAME)/omk
 OMK_WORK_DIR := $(BUILD_OMK_DIR)$(RELATIVE_DIR:%=/%)
 
 check-dir::
-	@$(call mkdir_def,$(BUILD_OMK_DIR))
+	$(Q3)$(call mkdir_def,$(BUILD_OMK_DIR))
 
 pass = $(strip $(1))
 
@@ -241,7 +241,7 @@ define omk_pass_subdir_template
 .PHONY: $(pass)-$(2)-subdir
 $(pass)-subdirs: $(pass)-$(2)-subdir
 $(pass)-$(2)-subdir:
-	+@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(2) $(NO_PRINT_DIRECTORY) \
+	+$(Q3)$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(2) $(NO_PRINT_DIRECTORY) \
 		RELATIVE_DIR=$(RELATIVE_PREFIX)$(2) -C $(2) \
 		-f $(SUBDIR_MAKEFILE) $(pass)
 endef
@@ -255,7 +255,7 @@ endif
 define extra_rules_subdir_template
 extra-rules-subdirs: extra-rules-$(1)
 extra-rules-$(1):
-	+@$(MAKE) OMK_SERIALIZE_INCLUDED=n MAKERULES_DIR=$(SOURCES_DIR)/$(1) OUTPUT_DIR=$(OUTPUT_DIR) \
+	+$(Q3)$(MAKE) OMK_SERIALIZE_INCLUDED=n MAKERULES_DIR=$(SOURCES_DIR)/$(1) OUTPUT_DIR=$(OUTPUT_DIR) \
 		SOURCES_DIR=$(SOURCES_DIR)/$(1) RELATIVE_DIR=$(RELATIVE_PREFIX)$(1) -C $(SOURCES_DIR)/$(1)
 endef
 
@@ -276,7 +276,7 @@ $(pass)-msg: $(pass)-subdirs
 endef
 
 mkdir-omk-work:
-	@$(call mkdir_def,$(OMK_WORK_DIR))
+	$(Q3)$(call mkdir_def,$(OMK_WORK_DIR))
 
 
 
@@ -284,20 +284,20 @@ mkdir-omk-work:
 # DEFAULT CONFIG PASS
 
 default-config:
-	@echo "# Start of OMK config file" > "$(CONFIG_FILE)-default"
-	@echo "# This file should not be altered manually" >> "$(CONFIG_FILE)-default"
-	@echo "# Overrides should be stored in file $(notdir $(CONFIG_FILE))" >> "$(CONFIG_FILE)-default"
-	@echo >> "$(CONFIG_FILE)-default"
-	@$(MAKE) $(NO_PRINT_DIRECTORY) -C $(MAKERULES_DIR) \
+	$(Q3)echo "# Start of OMK config file" > "$(CONFIG_FILE)-default"
+	$(Q3)echo "# This file should not be altered manually" >> "$(CONFIG_FILE)-default"
+	$(Q3)echo "# Overrides should be stored in file $(notdir $(CONFIG_FILE))" >> "$(CONFIG_FILE)-default"
+	$(Q3)echo >> "$(CONFIG_FILE)-default"
+	$(Q3)$(MAKE) $(NO_PRINT_DIRECTORY) -C $(MAKERULES_DIR) \
 		RELATIVE_DIR="" SOURCES_DIR=$(OUTPUT_DIR) \
 		-f $(OUTPUT_DIR)/Makefile default-config-pass
 
 $(eval $(call omk_pass_template,default-config-pass,$$(LOCAL_BUILD_DIR),,always))
 
 default-config-pass-local:
-#	@echo Default config for $(RELATIVE_DIR)
-	@echo "# Config for $(RELATIVE_DIR)" >> "$(CONFIG_FILE)-default"
-	@$(foreach x, $(default_CONFIG), echo '$(x)' | \
+#	$(Q3)echo Default config for $(RELATIVE_DIR)
+	$(Q3)echo "# Config for $(RELATIVE_DIR)" >> "$(CONFIG_FILE)-default"
+	$(Q3)$(foreach x, $(default_CONFIG), echo '$(x)' | \
 		sed -e 's/^[^=]*=x$$/#\0/' >> "$(CONFIG_FILE)-default" ; )
 
 
-- 
2.39.2