Merge branch 'master' into devel

Conflicts:

	snippets/linux

diff --cc snippets/linux
index 09f4ad18506d8ab5cdea4049a061b67c18fcf0d4,336e0350c2b9c71bab934775361b2e2a6ee47090..2be4bea0fd2009cded3c755119c8fff3fb736699
--- 1/snippets/linux
--- 2/snippets/linux
+++ b/snippets/linux
@@@ -399,30 -390,12 +399,30 @@@ $(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $
        $(Q)$(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$($(1)_objslo) $$(LOADLIBES) $$($(1)_libs:%=-l%)
  endef
  
 --include $(shell true; find $(USER_BUILD_DIR) -name 'lib*.omkvar') # `true' is a hack for MinGW
 +# Syntax: $(call program_link_template,<executable-name>,<dest-dir>)
 +define program_link_template
 +$(2)/$(1)$(EXE_SUFFIX): dir=$(LINK_BUILD_DIR)/$$(notdir $(2))
 +$(2)/$(1)$(EXE_SUFFIX): $$($(1)_objs)
 +      @$(QUIET_CMD_ECHO) "  LINK    $$@"
 +      $(Q) $$($(1)_linker) \
 +        $$($(1)_objs) $$($(1)_libs:%=-l%) $$(LOADLIBES) $$(LDFLAGS) -Wl,-Map,$$(dir)/$(1).exe.map -o $$@
 +      @echo "$$@: \\" >$$(dir)/$(1).exe.d
 +      @sed -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $$(dir)/$(1).exe.map|tr '&' '\134'  >>$$(dir)/$(1).exe.d
 +      @echo >>$$(dir)/$(1).exe.d
 +endef
 +
- -include $(shell find $(USER_BUILD_DIR) -name '*.omkvar')
++-include $(shell true; find $(USER_BUILD_DIR) -name '*.omkvar') # `true' is a hack for MinGW
  #$(warning $(shared_libs))
  $(foreach lib,$(shared_libs),$(eval $(call solib_link_template,$(lib))))
 +$(foreach prg,$(bin_programs),$(eval $(call program_link_template,$(prg),$(USER_BIN_DIR))))
 +$(foreach prg,$(utils_programs),$(eval $(call program_link_template,$(prg),$(USER_UTILS_DIR))))
 +$(foreach prg,$(test_programs),$(eval $(call program_link_template,$(prg),$(USER_TESTS_DIR))))
  
 -.PHONY: link-shared-libs
 -link-shared-libs: $(shared_libs:%=$(USER_LIB_DIR)/lib%.$(SOLIB_EXT))
 +.PHONY: link-pseudo-pass
 +link-pseudo-pass: $(shared_libs:%=$(USER_LIB_DIR)/lib%.$(SOLIB_EXT)) \
 +                $(bin_programs:%=$(USER_BIN_DIR)/%$(EXE_SUFFIX)) \
 +                $(utils_programs:%=$(USER_UTILS_DIR)/%$(EXE_SUFFIX)) \
 +                $(tests_programs:%=$(USER_TESTS_DIR)/%$(EXE_SUFFIX))
  endif # link-shared-libs
  
  #=====================================================================