Fixed pass invocation in subdirs

[omk.git] / snippets / base

diff --git a/snippets/base b/snippets/base
index 4e7709c4d10073f84fe2661ebce376c1dc7eaed6..ee31ce4ee5506d4318111fd2b314100e825b7ec8 100644 (file)
--- 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
-
 ifdef W
   ifeq ("$(origin W)", "command line")
     OMK_WHOLE_TREE:=$(W)
@@ -49,21 +47,23 @@ ifneq ($(OMK_WHOLE_TREE),1)
   omk_checks=check-make-ver check-dir
   export omk_prereq_checked=1
   endif
-all: build
+all: build-pseudo-pass
 
 prepare: $(omk_checks) prepare-pass
-build: prepare
-       +@echo "make[omk]: build"
-       @$(MAKE) $(NO_PRINT_DIRECTORY) -f $(MAKERULES_DIR)/Makefile.rules build-pseudo-pass
-       @echo "Compilation finished"
+build-pseudo-pass: prepare
+       +@$(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,12 +201,12 @@ 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
 # ====================
 
-# Syntax: $(call mkdir,<dir name>)
+# Syntax: $(call mkdir_def,<dir name>)
 define mkdir_def
        [ -d $(1) ] || mkdir -p $(1) || exit 1
 endef
@@ -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,8 +241,7 @@ define omk_pass_subdir_template
 .PHONY: $(pass)-$(2)-subdir
 $(pass)-subdirs: $(pass)-$(2)-subdir
 $(pass)-$(2)-subdir:
-       @$(call mkdir_def,$(OMK_WORK_DIR)/$(2))
-       +@$(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
@@ -256,11 +255,11 @@ 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
 
-.PHONY: extra-rules-subdirs
+.PHONY: extra-rules-subdirs mkdir-omk-work
 extra-rules-subdirs:
 
 $(foreach subdir,$(EXTRA_RULES_SUBDIRS),$(eval $(call extra_rules_subdir_template,$(subdir))))
@@ -269,32 +268,36 @@ $(foreach subdir,$(EXTRA_RULES_SUBDIRS),$(eval $(call extra_rules_subdir_templat
 define omk_pass_template
 .PHONY: $(pass) $(pass)-local $(pass)-msg $(pass)-subdirs
 $(pass): $(pass)-local
-$(pass)-local: $(pass)-subdirs $(pass)-msg
-$(foreach subdir,$(SUBDIRS),$(call omk_pass_subdir_template,$(pass),$(subdir)))
+$(pass)-local: $(pass)-subdirs $(pass)-msg mkdir-omk-work
+$(foreach subdir,$(SUBDIRS),$$(eval $$(call omk_pass_subdir_template,$(pass),$(subdir))))
 
 $(pass)-msg: $(pass)-subdirs
-       +@echo "make[omk]: $(pass) in $(RELATIVE_DIR)"
+       +@$(QUIET_CMD_ECHO) "make[omk]: $(pass) in $(RELATIVE_DIR)"
 endef
 
+mkdir-omk-work:
+       $(Q3)$(call mkdir_def,$(OMK_WORK_DIR))
+
+
 
 # =======================
 # 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" ; )