Updated build

Author: sadko4u

Makefile

@@ -57,18 +57,18 @@ clean:
 fetch:
 	@$(CHK_CONFIG)
 	@echo "Fetching desired source code dependencies"
-	@$(MAKE) -s -f "make/modules.mk" $(@) BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)"
+	@$(MAKE) -s -f "$(BASEDIR)/make/modules.mk" $(@) BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)"
 	@echo "Fetch OK"
 
 tree:
 	@echo "Fetching all possible source code dependencies"
-	@$(MAKE) -s -f "make/modules.mk" $(@) BASEDIR="$(BASEDIR)" TREE="1"
+	@$(MAKE) -s -f "$(BASEDIR)/make/modules.mk" $(@) BASEDIR="$(BASEDIR)" TREE="1"
 	@echo "Fetch OK"
 
 prune: clean
 	@echo "Pruning the whole project tree"
-	@$(MAKE) -s -f "make/modules.mk" prune BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)"
-	@$(MAKE) -s -f "make/modules.mk" prune BASEDIR="$(BASEDIR)" TREE="1"
+	@$(MAKE) -s -f "$(BASEDIR)/make/modules.mk" prune BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)"
+	@$(MAKE) -s -f "$(BASEDIR)/make/modules.mk" prune BASEDIR="$(BASEDIR)" TREE="1"
 	@-rm -rf "$(CONFIG)"
 	@echo "Prune OK"
 
@@ -86,7 +86,7 @@ config:
 distsrc:
 	@echo "Building source code archive"
 	@mkdir -p "$(DISTSRC)/modules"
-	@$(MAKE) -s -f "make/modules.mk" tree BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules" TREE="1"
+	@$(MAKE) -s -f "$(BASEDIR)/make/modules.mk" tree BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules" TREE="1"
 	@cp -R $(BASEDIR)/include $(BASEDIR)/make $(BASEDIR)/src "$(DISTSRC)/"
 	@cp $(BASEDIR)/CHANGELOG $(BASEDIR)/COPYING* $(BASEDIR)/Makefile $(BASEDIR)/*.mk "$(DISTSRC)/"
 	@find "$(DISTSRC)" -iname '.git' | xargs -exec rm -rf {}

dependencies.mk

@@ -29,16 +29,12 @@ 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
 
-STDLIB_VERSION             := system
-STDLIB_TYPE                := opt
-STDLIB_LDFLAGS             := -lpthread
+LIBPTHREAD_VERSION         := system
+LIBPTHREAD_NAME            := libpthread
+LIBPTHREAD_TYPE            := opt
+LIBPTHREAD_LDFLAGS         := -lpthread
 
-ifeq ($(PLATFORM),Windows)
-  TEST_STDLIB_VERSION        := system
-  TEST_STDLIB_TYPE           := opt
-  TEST_STDLIB_LDFLAGS        := -lshlwapi
-else
-  TEST_STDLIB_VERSION        := system
-  TEST_STDLIB_TYPE           := opt
-  TEST_STDLIB_LDFLAGS        := 
-endif
+LIBSHLWAPI_VERSION         := system
+LIBSHLWAPI_NAME            := libshlwapi
+LIBSHLWAPI_TYPE            := opt
+LIBSHLWAPI_LDFLAGS         := -lshlwapi

make/configure.mk

@@ -25,20 +25,24 @@ BINDIR                     := $(PREFIX)/bin
 INCDIR                     := $(PREFIX)/include
 BASEDIR                    := $(CURDIR)
 BUILDDIR                   := $(BASEDIR)/.build
-CONFIG                     := $(BASEDIR)/.config.mk
 MODULES                    := $(BASEDIR)/modules
+CONFIG                     := $(BASEDIR)/.config.mk
 TEST                       := 0
 DEBUG                      := 0
 PROFILE                    := 0
 TRACE                      := 0
 
+include $(BASEDIR)/make/functions.mk
 include $(BASEDIR)/make/system.mk
-include $(BASEDIR)/project.mk
 include $(BASEDIR)/make/tools.mk
 include $(BASEDIR)/dependencies.mk
+include $(BASEDIR)/project.mk
 
-DEPENDENCIES               += $(TEST_DEPENDENCIES)
+# Compute the full list of dependencies
+UNIQ_DEPENDENCIES          := $(call uniq, $(DEPENDENCIES) $(TEST_DEPENDENCIES))
+DEPENDENCIES                = $(UNIQ_DEPENDENCIES)
 
+# Determine versions
 ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
   $(foreach dep, $(DEPENDENCIES), \
     $(eval $(dep)_BRANCH=devel) \
@@ -116,23 +120,23 @@ define vardef =
 endef
 
 # Define predefined variables
-ifndef $(ARTIFACT_VARS)_NAME
-  $(ARTIFACT_VARS)_NAME      := $(ARTIFACT_NAME)
+ifndef $(ARTIFACT_ID)_NAME
+  $(ARTIFACT_ID)_NAME        := $(ARTIFACT_NAME)
 endif
-ifndef $(ARTIFACT_VARS)_DESC
-  $(ARTIFACT_VARS)_DESC      := $(ARTIFACT_DESC)
+ifndef $(ARTIFACT_ID)_DESC
+  $(ARTIFACT_ID)_DESC        := $(ARTIFACT_DESC)
 endif
-ifndef $(ARTIFACT_VARS)_VERSION 
-  $(ARTIFACT_VARS)_VERSION   := $(ARTIFACT_VERSION)
+ifndef $(ARTIFACT_ID)_VERSION 
+  $(ARTIFACT_ID)_VERSION     := $(ARTIFACT_VERSION)
 endif
-ifndef $(ARTIFACT_VARS)_PATH
-  $(ARTIFACT_VARS)_PATH      := $(BASEDIR)
+ifndef $(ARTIFACT_ID)_PATH
+  $(ARTIFACT_ID)_PATH        := $(BASEDIR)
 endif
 
-$(ARTIFACT_VARS)_TESTING    = $(TEST)
-$(ARTIFACT_VARS)_TYPE      := src
+$(ARTIFACT_ID)_TESTING      = $(TEST)
+$(ARTIFACT_ID)_TYPE        := src
 
-OVERALL_DEPS := $(DEPENDENCIES) $(ARTIFACT_VARS)
+OVERALL_DEPS := $(DEPENDENCIES) $(ARTIFACT_ID)
 __tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
 
 CONFIG_VARS = \

make/functions.mk

@@ -19,7 +19,26 @@
 #
 
 # Deduplicates all strings in the list
+# $(call uniq, <list>)
+# $(call uniq, $(DEPENDENCIES))
 uniq                    = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
 # Recursively lookup directory for specific file pattern
-rwildcard               = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+# $(call rwildcard, <path>, <file-name-pattern>)
+# $(call rwildcard, main, *.cpp)
+rwildcard               = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+
+# Fetch different flags from symbolic dependencies
+# $(call query, <field>, <list>)
+# $(call query, CFLAGS, $(DEPENDENCIES))
+query                   = $(foreach d,$(call uniq, $2),$($(d)_$(strip $1)))
+
+# Fetch conditionally if dependency field is present
+# $(call dquery, <field>, <list>)
+# $(call dquery, OBJ, $(DEPENDENCIES))
+dquery                  = $(foreach d,$(call uniq, $2),$(if $($(d)_$(strip $1)),$(d)))
+
+# Fetch different flags from symbolic dependencies
+# $(call cquery, <test-field>, <return-field>, <list>)
+# $(call cquery, OBJ_META, BIN, $(DEPENDENCIES))
+cquery                  = $(foreach d,$(call uniq, $3),$(if $($(d)_$(strip $1)),$($(d)_$(strip $2))))

make/tools.mk

@@ -43,17 +43,21 @@ INSTALL            := install
 # Patch flags and tools
 FLAG_RELRO          = -Wl,-z,relro,-z,now
 FLAG_STDLIB         = -lc
+CFLAGS_EXT          =
+CXXFLAGS_EXT        =
+LDFLAGS_EXT         =
+
 ifeq ($(PLATFORM),Solaris)
-  FLAG_RELRO              =
-  LD                      = gld
+  FLAG_RELRO          =
+  LD                  = gld
 else ifeq ($(PLATFORM),Windows)
-  FLAG_RELRO              =
-  FLAG_STDLIB             =
+  FLAG_RELRO          =
+  FLAG_STDLIB         =
+else ifeq ($(PLATFORM),BSD)
+  EXE_FLAGS_EXT      += -L/usr/local/lib
+  SO_FLAGS_EXT       += -L/usr/local/lib
 endif
 
-CFLAGS_EXT          =
-CXXFLAGS_EXT        =
-
 ifeq ($(DEBUG),1)
   CFLAGS_EXT         += -O0 -g3 -DLSP_DEBUG
   CXXFLAGS_EXT       += -O0 -g3 -DLSP_DEBUG

project.mk

@@ -19,22 +19,28 @@
 #
 
 # Package version
+ARTIFACT_ID                 = LSP_DSP_LIB
 ARTIFACT_NAME               = lsp-dsp-lib
 ARTIFACT_DESC               = DSP library for digital signal processing
-ARTIFACT_VARS               = LSP_DSP_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
 ARTIFACT_VERSION            = 0.5.12-devel
 
 # List of dependencies
 DEPENDENCIES = \
-  STDLIB \
+  LIBPTHREAD \
   LSP_COMMON_LIB
 
 TEST_DEPENDENCIES = \
-  TEST_STDLIB \
   LSP_TEST_FW
 
-# All possible dependencies
+# Platform-dependent
+ifeq ($(PLATFORM),Windows)
+  TEST_DEPENDENCIES += \
+    LIBSHLWAPI
+endif
+
+# Overall system dependencies
 ALL_DEPENDENCIES = \
   $(DEPENDENCIES) \
-  $(TEST_DEPENDENCIES)
+  $(TEST_DEPENDENCIES) \
+  LIBSHLWAPI