Leaf makefiles in tests replaced with dash-friendly version

[omk.git] / snippets / sysless

diff --git a/snippets/sysless b/snippets/sysless
index 57eb3690081c45bc1d42f9a45086a5c5cccce73d..1018323e820ec14a03044a0a63d2fe85e971fea7 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -190,7 +190,7 @@ endif # HOST_RULE_TEMPLATES
 ifdef OMK_TESTSROOT
 default-config-pass-check include-pass-check:
 library-pass-check binary-pass-check:
-       @[ -x "$(shell which $(CC))" ] || $(call canttest,Cannot file compiler: $(CC))
+       @[ -x "$(shell which $(CC))" ] || $(call canttest,Cannot find compiler: $(CC))
 endif
 
 #=====================================================================
@@ -238,15 +238,14 @@ run: run-$(firstword $(link_VARIANTS))
 
 #=====================================================================
 # Generate pass rules from generic templates
-OTHER_PASSES = dep clean install
 
 $(eval $(call omk_pass_template, include-pass, $(LOCAL_BUILD_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)$(config_include_HEADERS)$(LOCAL_CONFIG_H)))
 $(eval $(call omk_pass_template, library-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_obj_SOURCES)))
 $(eval $(call omk_pass_template, binary-pass,  $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(bin_PROGRAMS) $(test_PROGRAMS)))
 $(eval $(call omk_pass_template, utils-pass,   $(LOCAL_BUILD_DIR),HOST_RULE_TEMPLATES=y,$(utils_PROGRAMS)))
-
-
-$(eval $(call omk_pass_template,$(OTHER_PASSES),$(LOCAL_BUILD_DIR),,always))
+$(eval $(call omk_pass_template, dep,    $(LOCAL_BUILD_DIR),,always))
+$(eval $(call omk_pass_template, clean,  $(LOCAL_BUILD_DIR),,always))
+$(eval $(call omk_pass_template, install,$(LOCAL_BUILD_DIR),,always))
 
 
 dep-local:
@@ -273,6 +272,7 @@ check-dir:
        @$(call mkdir_def,$(USER_UTILS_DIR))
        @$(call mkdir_def,$(USER_TESTS_DIR))
 
+include-pass-submakes: extra-rules-subdirs
 # Which passes to pass
 default: include-pass library-pass binary-pass utils-pass