Updated makefile

Author: sadko4u

CHANGELOG

@@ -7,6 +7,7 @@
 * Submitted x86/x86_64 AVX2-optimized linear interpolation functions.
 * Submitted ARMv7 NEON-optimized linear interpolation functions.
 * Submitted AArch64 ASIMD-optimized linear interpolation functions.
+* Updated build system.
 
 === 0.5.11 ===
 * Improved build: fixed many GCC warnings.

dependencies.mk

@@ -19,12 +19,12 @@
 #
 
 # Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.11
+LSP_COMMON_LIB_VERSION     := 1.0.12
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL         := https://github.com/sadko4u/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.7
+LSP_TEST_FW_VERSION        := 1.0.8
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL            := https://github.com/sadko4u/$(LSP_TEST_FW_NAME).git

make/configure.mk

@@ -95,6 +95,7 @@ define srcconfig =
   $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
   $(if $($(name)_LDLAGS),,  $(eval $(name)_LDFLAGS :=))
   $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     := "$($(name)_BIN)/$($(name)_NAME).o"))
+  $(if $($(name)_OBJ_TEST),,$(eval $(name)_OBJ_TEST:= "$($(name)_BIN)/$($(name)_NAME)-test.o"))
   $(if $($(name)_MFLAGS),,  $(eval $(name)_MFLAGS  := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
 endef
 
@@ -159,6 +160,7 @@ CONFIG_VARS = \
     $(name)_MFLAGS \
     $(name)_LDFLAGS \
     $(name)_OBJ \
+    $(name)_OBJ_TEST \
   )
 
 .DEFAULT_GOAL      := config

make/modules.mk

@@ -18,42 +18,45 @@
 # along with lsp-dsp-lib.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-BASEDIR            := $(CURDIR)
-CONFIG             := $(CURDIR)/.config.mk
+BASEDIR                := $(CURDIR)
+DEPLIST                := $(BASEDIR)/dependencies.mk
+PROJECT                := $(BASEDIR)/project.mk
+CONFIG                 := $(BASEDIR)/.config.mk
 
 include $(BASEDIR)/make/functions.mk
-include $(BASEDIR)/dependencies.mk
-ifneq ($(TREE),1)
+ifeq ($(TREE),1)
+  include $(DEPLIST)
+else
   -include $(CONFIG)
 endif
-include $(BASEDIR)/project.mk
+include $(PROJECT)
 
-SYS_DEPENDENCIES        = $(DEPENDENCIES) $(TEST_DEPENDENCIES)
-ALL_DEPENDENCIES_UNIQ   = $(call uniq,$(ALL_DEPENDENCIES))
+UNIQ_DEPENDENCIES       = $(call uniq,$(DEPENDENCIES) $(TEST_DEPENDENCIES))
+UNIQ_ALL_DEPENDENCIES  := $(call uniq,$(ALL_DEPENDENCIES))
 
 # Find the proper branch of the GIT repository
 ifeq ($(TREE),1)
-  MODULES            := $(BASEDIR)/modules
-  GIT                := git
+  MODULES                := $(BASEDIR)/modules
+  GIT                    := git
 
   ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
-    $(foreach dep, $(ALL_DEPENDENCIES_UNIQ), \
+    $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), \
       $(eval $(dep)_BRANCH=devel) \
       $(eval $(dep)_PATH=$(MODULES)/$($(dep)_NAME)) \
     )
   else
-    $(foreach dep, $(ALL_DEPENDENCIES_UNIQ), \
+    $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), \
       $(eval $(dep)_BRANCH="$($(dep)_VERSION)") \
       $(eval $(dep)_PATH=$(MODULES)/$($(dep)_NAME)) \
     )
   endif
 endif
 
 # Form list of modules, exclude all modules that have 'system' version
-SRC_MODULES         = $(foreach dep, $(SYS_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
-HDR_MODULES         = $(foreach dep, $(SYS_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
-ALL_SRC_MODULES     = $(foreach dep, $(ALL_DEPENDENCIES_UNIQ), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
-ALL_HDR_MODULES     = $(foreach dep, $(ALL_DEPENDENCIES_UNIQ), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
+SRC_MODULES         = $(foreach dep, $(UNIQ_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
+HDR_MODULES         = $(foreach dep, $(UNIQ_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
+ALL_SRC_MODULES     = $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
+ALL_HDR_MODULES     = $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
 ALL_PATHS           = $(foreach dep, $(ALL_SRC_MODULES) $(ALL_HDR_MODULES), $($(dep)_PATH))
 
 # Branches

src/Makefile

@@ -42,6 +42,7 @@ ARTIFACT_LIBLINK        = $(LIBRARY_PREFIX)$(ARTIFACT_NAME)$(LIBRARY_EXT)
 ARTIFACT_SLIBLINK       = $(LIBRARY_PREFIX)$(ARTIFACT_NAME)$(STATICLIB_EXT)
 ARTIFACT_PC             = $(ARTIFACT_BIN)/$(ARTIFACT_NAME)$(PKGCONFIG_EXT)
 ARTIFACT_OBJ            = $($(ARTIFACT_ID)_OBJ)
+ARTIFACT_OBJ_TEST       = $($(ARTIFACT_ID)_OBJ_TEST)
 ARTIFACT_MFLAGS         = $($(ARTIFACT_ID)_MFLAGS) $(foreach dep,$(DEPENDENCIES),-DUSE_$(dep))
 ARTIFACT_DEPS           = $(call dquery, OBJ, $(DEPENDENCIES))
 ARTIFACT_CFLAGS         = $(call query, CFLAGS, $(DEPENDENCIES) $(ARTIFACT_ID))
@@ -53,11 +54,13 @@ ARTIFACT_TARGETS        = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
 # Source code
 CXX_SRC_MAIN            = main/dsp.cpp main/generic/generic.cpp
 CXX_SRC_TEST            = $(call rwildcard, test, *.cpp)
+CXX_SRC_NOTEST          =
 CXX_SRC_EXT             = $(patsubst $($(ARTIFACT_ID)_BIN)/%.o, %.cpp, $(CXX_OBJ_EXT))
 CXX_SRC                 = $(CXX_SRC_MAIN) $(CXX_SRC_EXT)
 
 CXX_OBJ_MAIN            = $(patsubst %.cpp, $($(ARTIFACT_ID)_BIN)/%.o, $(CXX_SRC_MAIN))
 CXX_OBJ_TEST            = $(patsubst %.cpp, $($(ARTIFACT_ID)_BIN)/%.o, $(CXX_SRC_TEST))
+CXX_OBJ_NOTEST          = $(patsubst %.cpp, $($(ARTIFACT_ID)_BIN)/%.o, $(CXX_SRC_NOTEST))
 CXX_OBJ_EXT             = 
 CXX_OBJ_X86             = $(ARTIFACT_BIN)/main/x86/x86.o
 CXX_OBJ_SSE             = $(ARTIFACT_BIN)/main/x86/sse.o
@@ -100,8 +103,6 @@ CXX_ASIMD_CFLAGS      	= -march=armv8-a+simd
 BUILD_ALL               = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
 
 ifeq ($($(ARTIFACT_ID)_TESTING),1)
-  CXX_SRC                += $(CXX_SRC_TEST)
-  CXX_OBJ                += $(CXX_OBJ_TEST)
   ARTIFACT_TARGETS       += $(ARTIFACT_TEST_BIN)
 endif
 
@@ -139,7 +140,7 @@ $(ARTIFACT_DEPS):
 # Compilation
 compile: $(ARTIFACT_OBJ)
 
-$(CXX_OBJ_MAIN) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST):
+$(CXX_OBJ_MAIN) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST) $(CXX_OBJ_NOTEST):
 	@echo "  $(CXX)  [$(ARTIFACT_NAME)] $(CXX_FILE)"
 	@mkdir -p $(dir $@)
 	@$(CXX) -o $(@) -c $(CXX_FILE) -fPIC $(CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(ARTIFACT_CFLAGS)
@@ -148,21 +149,25 @@ $(CXX_OBJ_MAIN) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST):
 $(ARTIFACT_OBJ): $(CXX_OBJ)
 	@echo "  $(LD)   [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ))"
 	@$(LD) -o $(ARTIFACT_OBJ) -r $(CXX_OBJ)
-	
+
+$(ARTIFACT_OBJ_TEST): $(CXX_OBJ_TEST)
+	@echo "  $(LD)   [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ_TEST))"
+	@$(LD) -o $(ARTIFACT_OBJ_TEST) -r $(CXX_OBJ_TEST)
+
 # Linking
 all: $(ARTIFACT_TARGETS)
 
-$(ARTIFACT_LIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ)
+$(ARTIFACT_LIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(CXX_OBJ_NOTEST)
 	@echo "  $(CXX)  [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_LIB))"
-	@$(CXX) -o $(ARTIFACT_LIB) $(ARTIFACT_OBJFILES) $(SO_FLAGS) $(ARTIFACT_LDFLAGS)
+	@$(CXX) -o $(ARTIFACT_LIB) $(ARTIFACT_OBJFILES) $(CXX_OBJ_NOTEST) $(SO_FLAGS) $(ARTIFACT_LDFLAGS)
 
-$(ARTIFACT_SLIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ)
+$(ARTIFACT_SLIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(CXX_OBJ_NOTEST)
 	@echo "  $(AR)   [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_SLIB))"
-	@$(AR) rcs $(ARTIFACT_SLIB) $(ARTIFACT_OBJFILES)
+	@$(AR) rcs $(ARTIFACT_SLIB) $(ARTIFACT_OBJFILES) $(CXX_OBJ_NOTEST)
 
-$(ARTIFACT_TEST_BIN): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(ARTIFACT_TEST_OBJ)
+$(ARTIFACT_TEST_BIN): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(ARTIFACT_OBJ_TEST)
 	@echo "  $(CXX)  [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_TEST_BIN))"
-	@$(CXX) -o $(ARTIFACT_TEST_BIN) $(ARTIFACT_OBJFILES) $(EXE_FLAGS) $(ARTIFACT_LDFLAGS)
+	@$(CXX) -o $(ARTIFACT_TEST_BIN) $(ARTIFACT_OBJFILES) $(ARTIFACT_OBJ_TEST) $(EXE_FLAGS) $(ARTIFACT_LDFLAGS)
 
 $(ARTIFACT_PC):
 	@mkdir -p $(dir $(ARTIFACT_PC))