Updated build

Author: sadko4u

src/Makefile

@@ -44,6 +44,7 @@ endif
 ARTIFACT_NAME           = $($(ARTIFACT_ID)_NAME)
 ARTIFACT_VERSION        = $($(ARTIFACT_ID)_VERSION)
 ARTIFACT_DEPENDENCIES   = $(addprefix $(HOST),$(DEPENDENCIES))
+ARTIFACT_DEP_LIST       = $(addprefix $(HOST),$(call uniq, $(DEPENDENCIES) $(TEST_DEPENDENCIES) $(HOST)$(ARTIFACT_ID)))
 
 ARTIFACT_BIN            = $($(HOST)$(ARTIFACT_ID)_BIN)
 ARTIFACT_INC            = $($(HOST)$(ARTIFACT_ID)_INC)
@@ -59,6 +60,7 @@ ARTIFACT_SLIBLINK       = $(LIBRARY_PREFIX)$(ARTIFACT_NAME)$(STATICLIB_EXT)
 ARTIFACT_PC             = $(ARTIFACT_BIN)/$(ARTIFACT_NAME)$(PKGCONFIG_EXT)
 ARTIFACT_DEPS           = $(call dquery, OBJ, $(ARTIFACT_DEPENDENCIES))
 ARTIFACT_CFLAGS         = $(call query, CFLAGS, $(ARTIFACT_DEPENDENCIES) $(HOST)$(ARTIFACT_ID))
+ARTIFACT_DEPFLAGS       = $(call query, CFLAGS, $(ARTIFACT_DEP_LIST))
 ARTIFACT_LDFLAGS        = $(call query, LDFLAGS, $(ARTIFACT_DEPENDENCIES) $(HOST)$(ARTIFACT_ID))
 ARTIFACT_OBJFILES       = $(call query, OBJ, $(ARTIFACT_DEPENDENCIES) $(HOST)$(ARTIFACT_ID))
 
@@ -105,15 +107,17 @@ dep_clean:
 $(DEP_CXX): dep_clean
 	echo "  dep  [$(ARTIFACT_NAME)] $(DEP_CXX_FILE)"
 	mkdir -p $(dir $(@))
-	$(CXX) -MM -MT "\$$($(ARTIFACT_ID)_BIN)/$(DEP_DEP_FILE)" -MF $(@) $(DEP_CXX_FILE) $(CXXFLAGS) $(INCLUDE) $(ARTIFACT_CFLAGS)
+	$(CXX) -MM -MT "\$$($(ARTIFACT_ID)_BIN)/$(DEP_DEP_FILE)" -MF $(@) $(DEP_CXX_FILE) $(CXXFLAGS) $(INCLUDE) $(ARTIFACT_DEPFLAGS)
 
 depend: $(DEP_CXX)
-	$(foreach dep,$(ARTIFACT_DEPENDENCIES) $(HOST)$(ARTIFACT_ID),\
+	$(foreach dep,$(ARTIFACT_DEP_LIST),\
 	  $(if $($(dep)_INC), \
-	    $(eval SED_RULES += s/$(shell echo "$($(dep)_INC)" | sed "s/\\//\\\\\//g")/\$$$$\\($(dep)_INC\\)/g;)\
+	    $(eval REPLACEMENT = $(shell echo "$($(dep)_INC)" | sed -E "s/\//\\\\\\\\\//g")) \
+	    $(eval SED_RULES += s/$(REPLACEMENT)/\$$$$\\($(dep)_INC\\)/g;)\
 	  )\
 	  $(if $($(dep)_BIN), \
-	    $(eval SED_RULES += s/$(shell echo "$($(dep)_BIN)" | sed "s/\\//\\\\\//g")/\\$$$$\\($(dep)_BIN\\)/g;)\
+	    $(eval REPLACEMENT = $(shell echo "$($(dep)_BIN)" | sed -E "s/\//\\\\\\\\\//g")) \
+	    $(eval SED_RULES += s/$(REPLACEMENT)/\\$$$$\\($(dep)_BIN\\)/g;)\
 	  )\
 	)
 	cat $(DEP_CXX) | sed -E "$(SED_RULES)" >Makefile.d

src/Makefile.d

@@ -1,12 +1,15 @@
 $(LSP_R3D_BASE_LIB_BIN)/main/base_backend.o: main/base_backend.cpp \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/types.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/version.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/finally.h \
  $(LSP_R3D_BASE_LIB_INC)/lsp-plug.in/r3d/base/backend.h \
  $(LSP_R3D_BASE_LIB_INC)/lsp-plug.in/r3d/base/version.h \
  $(LSP_R3D_IFACE_INC)/lsp-plug.in/r3d/iface/backend.h \
  $(LSP_R3D_IFACE_INC)/lsp-plug.in/r3d/iface/version.h \
- $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/types.h \
- $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/version.h \
- $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/finally.h \
  $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/status.h \
  $(LSP_R3D_IFACE_INC)/lsp-plug.in/r3d/iface/types.h \
  $(LSP_COMMON_LIB_INC)/lsp-plug.in/stdlib/string.h
-$(LSP_R3D_BASE_LIB_BIN)/test/main.o: test/main.cpp
+$(LSP_R3D_BASE_LIB_BIN)/test/main.o: test/main.cpp \
+ $(LSP_TEST_FW_INC)/lsp-plug.in/test-fw/main.h \
+ $(LSP_TEST_FW_INC)/lsp-plug.in/test-fw/version.h \
+ $(LSP_TEST_FW_INC)/lsp-plug.in/test-fw/types.h