Devel test rules converted to snippets

[omk.git] / snippets / base

diff --git a/snippets/base b/snippets/base
index 31a1929722208dae547f5c610c831700de9abadf..470b9a0c715c895e7d6b915dbd3b41cfd008e088 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -145,6 +145,25 @@ else
   QUIET_CMD_ECHO = echo
 endif
 
+# Convenient variables
+comma   := ,
+squote  := '
+#'
+empty   :=
+space   := $(empty) $(empty)
+
+###
+# Escape single quote for use in echo statements
+escsq = $(subst $(squote),'\$(squote)',$1)
+
+###
+# Strip/replace OUTPUT_DIR from/in the argument
+strip_out = $(patsubst $(OUTPUT_DIR)/%,%,$(1))
+repl_out  = $(patsubst $(OUTPUT_DIR)/%,$$(OUTPUT_DIR)/%,$(1))
+
+.PHONY: FORCE
+
+
 MAKEFILE_OMK=Makefile.omk
 # All subdirectories (even linked ones) containing Makefile.omk
 # Usage in Makefile.omk: SUBDIRS = $(ALL_OMK_SUBDIRS)
@@ -199,14 +218,12 @@ pass = $(strip $(1))
 # Usage: $(call omk_pass_subdir_template,<pass name>,<build dir>,<subdir>)
 define omk_pass_subdir_template
 .PHONY: $(pass)-$(3)-subdir
-$(pass)-submakes: $(pass)-$(3)-subdir
+$(pass)-subdirs: $(pass)-$(3)-subdir
 $(pass)-$(3)-subdir:
        @$(call mkdir_def,$(2)/$(3))
        +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(3) $(NO_PRINT_DIRECTORY) \
                RELATIVE_DIR=$(RELATIVE_PREFIX)$(3) -C $(2)/$(3) \
-               -f $(SUBDIR_MAKEFILE) $(pass)-submakes
-# In subdirectories we can call submakes directly since passes are
-# already searialized on the toplevel make.
+               -f $(SUBDIR_MAKEFILE) $(pass)
 endef
 
 ifdef OMK_TESTSROOT
@@ -229,26 +246,13 @@ $(foreach subdir,$(EXTRA_RULES_SUBDIRS),$(eval $(call extra_rules_subdir_templat
 
 # Usage: $(call omk_pass_template,<pass name>,<build dir>,[<local make flags>],[<local enable condition>])
 define omk_pass_template
-.PHONY: $(pass) $(pass)-local $(pass)-check $(pass)-submakes
-$(foreach subdir,$(SUBDIRS),$(eval $(call omk_pass_subdir_template,$(pass),$(2),$(subdir))))
-$(pass):
-# Submakes have to be called this way and not as dependecies for pass
-# serialization to work
-       +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \
-               RELATIVE_DIR=$(RELATIVE_DIR) \
-               -f $(SOURCESDIR_MAKEFILE) $(pass)-submakes
-$(pass)-submakes:
-       @true                   # Do not emit "nothing to be done" messages
-
-ifneq ($(4)$($(pass)_HOOKS),)
-$(pass)-submakes: $(pass)-this-dir
-$(pass)-this-dir: $(foreach subdir,$(SUBDIRS),$(pass)-$(subdir)-subdir)
+.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),$(2),$(subdir)))
+
+$(pass)-msg: $(pass)-subdirs
        +@echo "make[omk]: $(pass) in $(RELATIVE_DIR)"
-       @$(call mkdir_def,$(2))
-       +@$(MAKE) $(NO_PRINT_DIRECTORY) SOURCES_DIR=$(SOURCES_DIR) RELATIVE_DIR=$(RELATIVE_DIR) -C $(2) \
-               -f $(SOURCESDIR_MAKEFILE) $(3) $(check-target) $(1:%=%-local)
-$(pass)-local: $($(pass)_HOOKS)
-endif
 endef
 
 # =======================
@@ -259,7 +263,7 @@ default-config:
        @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 $(OUTPUT_DIR) \
+       @$(MAKE) $(NO_PRINT_DIRECTORY) -C $(MAKERULES_DIR) \
                RELATIVE_DIR="" SOURCES_DIR=$(OUTPUT_DIR) \
                -f $(OUTPUT_DIR)/Makefile default-config-pass