]> rtime.felk.cvut.cz Git - omk/sssa.git/blobdiff - snippets/sdcc
Fixed behaviour of make -k if there is an error in a subdirectory
[omk/sssa.git] / snippets / sdcc
index 33bc2fce4f4172508d5e49a4b35b1e8f649a25c4..af66b6f735e03e1f180d79d2c6340df055422fbb 100644 (file)
@@ -92,7 +92,7 @@ OBJS_DIR    := $(USER_OBJS_DIR)
 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))
        @[ -z "$(wildcard $(USER_LIB_DIR)/$(LD_SCRIPT).ld*)" ] && $(call canttest,LD_SCRIPT $(LD_SCRIPT).ld* not found)
 endif
 
@@ -320,15 +320,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),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_obj_SOURCES)))
 $(eval $(call omk_pass_template, binary-pass,  $(LOCAL_BUILD_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(test_PROGRAMS)))
 $(eval $(call omk_pass_template, utils-pass,   $(LOCAL_BUILD_DIR),USER_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: