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

@@ -31,9 +31,10 @@ LSP_TEST_FW_URL            := https://github.com/sadko4u/$(LSP_TEST_FW_NAME).git
 
 LSP_R3D_IFACE_VERSION      := 0.5.1
 LSP_R3D_IFACE_NAME         := lsp-r3d-iface
-LSP_R3D_IFACE_TYPE         := hdr
+LSP_R3D_IFACE_TYPE         := src
 LSP_R3D_IFACE_URL          := https://github.com/sadko4u/$(LSP_R3D_IFACE_NAME).git
 
-STDLIB_VERSION             := system
-STDLIB_TYPE                := opt
-STDLIB_LDFLAGS             := -lpthread -ldl
+LIBPTHREAD_VERSION         := system
+LIBPTHREAD_NAME            := libpthread
+LIBPTHREAD_TYPE            := opt
+LIBPTHREAD_LDFLAGS         := -lpthread

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

@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
+#           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+#
+# This file is part of lsp-r3d-base-lib
+#
+# lsp-r3d-base-lib is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# lsp-r3d-base-lib is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with lsp-r3d-base-lib.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# 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
+# $(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/modules.mk

@@ -18,40 +18,45 @@
 # along with lsp-r3d-base-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)/dependencies.mk
-ifneq ($(TREE),1)
+include $(BASEDIR)/make/functions.mk
+ifeq ($(TREE),1)
+  include $(DEPLIST)
+else
   -include $(CONFIG)
 endif
-include $(BASEDIR)/project.mk
+include $(PROJECT)
 
-SYS_DEPENDENCIES    = $(DEPENDENCIES) $(TEST_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), \
+    $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), \
       $(eval $(dep)_BRANCH=devel) \
       $(eval $(dep)_PATH=$(MODULES)/$($(dep)_NAME)) \
     )
   else
-    $(foreach dep, $(ALL_DEPENDENCIES), \
+    $(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), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
-ALL_HDR_MODULES     = $(foreach dep, $(ALL_DEPENDENCIES), $(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

project.mk

@@ -19,22 +19,22 @@
 #
 
 # Package version
+ARTIFACT_ID                 = LSP_R3D_BASE_LIB
 ARTIFACT_NAME               = lsp-r3d-base-lib
 ARTIFACT_DESC               = Base library for implementing and loading 3D rendering backend
-ARTIFACT_VARS               = LSP_R3D_BASE_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
 ARTIFACT_EXPORT_ALL         = 0
 ARTIFACT_VERSION            = 0.5.5-devel
 
 # List of dependencies
-TEST_DEPENDENCIES = \
-  LSP_TEST_FW
-
 DEPENDENCIES = \
-  STDLIB \
+  LIBPTHREAD \
   LSP_COMMON_LIB \
   LSP_R3D_IFACE
 
+TEST_DEPENDENCIES = \
+  LSP_TEST_FW
+
 ALL_DEPENDENCIES = \
   $(DEPENDENCIES) \
   $(TEST_DEPENDENCIES)