Release 1.0.11

* Removed Makefile.d. Dependencies are now automatically generated at the build stage.
* Updated build scripts.
* Updated module versions in dependencies.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,11 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.11 ===
+* Removed Makefile.d. Dependencies are now automatically generated at the build stage.
+* Updated build scripts.
+* Updated module versions in dependencies.
+
 === 1.0.10 ===
 * Updated module versions in dependencies.
 

Makefile

@@ -46,9 +46,9 @@ DISTSRC_PATH                = $(BUILDDIR)/distsrc
 DISTSRC                     = $(DISTSRC_PATH)/$(ARTIFACT_NAME)
 
 .DEFAULT_GOAL              := all
-.PHONY: all compile install uninstall depend clean
+.PHONY: all compile install uninstall clean
 
-compile all install uninstall depend:
+compile all install uninstall:
 	$(CHK_CONFIG)
 	$(MAKE) -C "$(BASEDIR)/src" $(@) VERBOSE="$(VERBOSE)" CONFIG="$(CONFIG)" DESTDIR="$(DESTDIR)"
 
@@ -107,7 +107,6 @@ help:
 	echo "  all                       Build all binaries"
 	echo "  clean                     Clean all build files and configuration file"
 	echo "  config                    Configure build"
-	echo "  depend                    Update build dependencies for current project"
 	echo "  distsrc                   Make tarball with source code for packagers"
 	echo "  fetch                     Fetch all desired source code dependencies from git"
 	echo "  help                      Print this help message"

include/lsp-plug.in/r3d/base/version.h

@@ -24,7 +24,7 @@
 
 #define LSP_R3D_BASE_LIB_MAJOR          1
 #define LSP_R3D_BASE_LIB_MINOR          0
-#define LSP_R3D_BASE_LIB_MICRO          10
+#define LSP_R3D_BASE_LIB_MICRO          11
 
 #if defined(LSP_R3D_BASE_LIB_PUBLISHER)
     #define LSP_R3D_BASE_LIB_PUBLIC         LSP_EXPORT_MODIFIER

make/configure.mk

@@ -21,38 +21,28 @@ ifneq ($(VERBOSE),1)
 .SILENT:
 endif
 
-# Definitions
-PREFIX                     := /usr/local
-LIBDIR                     := $(PREFIX)/lib
-BINDIR                     := $(PREFIX)/bin
-SHAREDDIR                  := $(PREFIX)/share
-INCDIR                     := $(PREFIX)/include
-ETCDIR                     := /etc
 BASEDIR                    := $(CURDIR)
 ROOTDIR                    := $(CURDIR)
-BUILDDIR                   := $(BASEDIR)/.build
-TARGET_BUILDDIR            := $(BUILDDIR)/target
-HOST_BUILDDIR              := $(BUILDDIR)/host
-MODULES                    := $(BASEDIR)/modules
-CONFIG                     := $(BASEDIR)/.config.mk
 TEST                       := 0
 DEBUG                      := 0
 PROFILE                    := 0
 TRACE                      := 0
 
-ifeq ($(DEVEL),1)
-  X_URL_SUFFIX                = _RW
-else
-  X_URL_SUFFIX                = _RO
-endif
-
+# Configure system settings
 include $(BASEDIR)/project.mk
 include $(BASEDIR)/make/functions.mk
 include $(BASEDIR)/make/system.mk
+include $(BASEDIR)/make/paths.mk
 include $(BASEDIR)/make/tools.mk
 include $(BASEDIR)/modules.mk
 include $(BASEDIR)/dependencies.mk
 
+ifeq ($(DEVEL),1)
+  X_URL_SUFFIX                = _RW
+else
+  X_URL_SUFFIX                = _RO
+endif
+
 # Compute the full list of dependencies
 MERGED_DEPENDENCIES        := \
   $(DEPENDENCIES) \
@@ -220,6 +210,7 @@ OVERALL_DEPS := $(call uniq,$(DEPENDENCIES) $(ARTIFACT_ID))
 __tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
 
 CONFIG_VARS = \
+  $(PATH_VARS) \
   $(COMMON_VARS) \
   $(TOOL_VARS) \
   $(foreach name, $(OVERALL_DEPS), \
@@ -271,7 +262,7 @@ config: $(CONFIG_VARS)
 	echo "Features:     $(FEATURES)"
 	echo "Configured OK"
 
-help: | toolvars sysvars
+help: | pathvars toolvars sysvars
 	echo ""
 	echo "List of variables for each dependency:"
 	echo "  <ARTIFACT>_BIN            location to put all binaries when building artifact"

make/functions.mk

@@ -45,11 +45,11 @@ cquery                  = $(foreach d,$(call uniq, $3),$(if $($(d)_$(strip $1)),
 
 # Find intersection between two sets
 # $(call intersection, list1, list2)
-intersection            = $(foreach v,$1,$(if $(findstring $(v),$2),$(v)))
+intersection            = $(sort $(foreach v,$1,$(if $(findstring $(v),$2),$(v))))
 
 # Subtract the first set from second set
 # $(call subtraction, list1, list2)
-subtraction             = $(foreach v,$2,$(if $(findstring $(v),$1),,$(v)))
+subtraction             = $(sort $(foreach v,$2,$(if $(findstring $(v),$1),,$(v))))
 
 # Check feature presence in list
 # $(call fcheck, features-to-check, all-feature-list, action-if-enabled, action-if-disabled)

make/paths.mk

@@ -0,0 +1,98 @@
+#
+# 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/>.
+#
+
+# Installation prefix
+ifndef PREFIX
+  ifeq ($(PLATFORM),Windows)
+    PREFIX                     := $(BASEDIR)/INSTALL
+  else
+    PREFIX                     := /usr/local
+  endif
+endif
+
+# Path to configuration
+ifndef ETCDIR
+  ifeq ($(PLATFORM),Windows)
+    ETCDIR                     := $(PREFIX)/etc
+  else
+    ETCDIR                     := /etc
+  endif
+endif
+
+LIBDIR                     := $(PREFIX)/lib
+BINDIR                     := $(PREFIX)/bin
+SHAREDDIR                  := $(PREFIX)/share
+INCDIR                     := $(PREFIX)/include
+BUILDDIR                   := $(BASEDIR)/.build
+TARGET_BUILDDIR            := $(BUILDDIR)/target
+HOST_BUILDDIR              := $(BUILDDIR)/host
+MODULES                    := $(BASEDIR)/modules
+CONFIG                     := $(BASEDIR)/.config.mk
+
+# Library prefix
+ifndef LIBDIR
+  LIBDIR                   := $(PREFIX)/lib
+endif
+
+# Binaries prefix
+ifndef BINDIR
+  BINDIR                   := $(PREFIX)/bin
+endif
+
+# Binaries prefix
+ifndef INCDIR
+  INCDIR                   := $(PREFIX)/include
+endif
+
+# Temporary directory
+ifndef TEMPDIR
+  ifeq ($(PLATFORM),Windows)
+    TEMPDIR                  := $(TEMP)
+  else
+    TEMPDIR                  := /tmp
+  endif
+endif
+
+# Set-up list of common variables
+PATH_VARS = \
+	BINDIR \
+	BUILDDIR \
+	ETCDIR \
+	INCDIR \
+	LIBDIR \
+	PREFIX \
+	ROOTDIR \
+	SHAREDDIR \
+	TEMPDIR
+
+.PHONY: pathvars
+
+pathvars:
+	echo "List of available path variables:"
+	echo "  BINDIR                    location of the binaries"
+	echo "  BUILDDIR                  location of the build directory"
+	echo "  ETCDIR                    location of system configuration files"
+	echo "  INCDIR                    location of the header files"
+	echo "  LIBDIR                    location of the library"
+	echo "  PREFIX                    installation prefix for binary files"
+	echo "  SHAREDDIR                 location of the shared files"
+	echo "  TEMPDIR                   location of temporary directory"
+
+

make/system.mk

@@ -119,9 +119,9 @@ else ifeq ($(patsubst i%86,i586,$(BUILD_ARCH)),i586)
   ARCHITECTURE_FAMILY     = ia32
   ARCHITECTURE_CFLAGS    := -march=i586 -m32
 else ifeq ($(BUILD_ARCH),x86)
-  override ARCHITECTURE   = i586
+  override ARCHITECTURE   = i686
   ARCHITECTURE_FAMILY     = ia32
-  ARCHITECTURE_CFLAGS    := -march=i586 -m32
+  ARCHITECTURE_CFLAGS    := -march=i686 -m32
 else ifeq ($(BUILD_ARCH),riscv32)
   override ARCHITECTURE   = riscv32
   ARCHITECTURE_FAMILY     = riscv32
@@ -173,67 +173,25 @@ ifndef PKGCONFIG_EXT
   PKGCONFIG_EXT            := .pc
 endif
 
-# Installation prefix
-ifndef PREFIX
-  ifeq ($(PLATFORM),Windows)
-    PREFIX                   := $(ProgramFiles)
-  else
-    PREFIX                   := /usr/local
-  endif
-endif
-
-# Library prefix
-ifndef LIBDIR
-  LIBDIR                   := $(PREFIX)/lib
-endif
-
-# Binaries prefix
-ifndef BINDIR
-  BINDIR                   := $(PREFIX)/bin
-endif
-
-# Binaries prefix
-ifndef INCDIR
-  INCDIR                   := $(PREFIX)/include
-endif
-
-# Temporary directory
-ifndef TEMPDIR
-  ifeq ($(PLATFORM),Windows)
-    TEMPDIR                  := $(TEMP)
-  else
-    TEMPDIR                  := /tmp
-  endif
-endif
-
 TEST                       := 0
 
 # Set-up list of common variables
 COMMON_VARS = \
 	ARCHITECTURE \
 	ARCHITECTURE_FAMILY \
 	ARCHITECTURE_CFLAGS \
-	BINDIR \
-	BUILDDIR \
 	DEBUG \
-	ETCDIR \
 	EXECUTABLE_EXT \
 	EXPORT_SYMBOLS \
 	FEATURES \
-	INCDIR \
 	INSTALL_HEADERS \
-	LIBDIR \
 	LIBRARY_EXT \
 	LIBRARY_PREFIX \
 	PKGCONFIG_EXT \
 	PLATFORM \
-	PREFIX \
-	ROOTDIR \
 	ROOT_ARTIFACT_ID \
 	PROFILE \
-	SHAREDDIR \
 	STATICLIB_EXT \
-	TEMPDIR \
 	TEST \
 	TRACE
 
@@ -246,27 +204,19 @@ sysvars:
 	echo "  ARCHITECTURE_CFLAGS       compiler flags to specify architecture"
 	echo "  ARCHITECTURE_FAMILY       compiler flags to specify architecture family"
 	echo "  ARCHITECTURE_LDFLAGS      linker flags to specify architecture"
-	echo "  BINDIR                    location of the binaries"
-	echo "  BUILDDIR                  location of the build directory"
 	echo "  DEBUG                     build with debug options"
 	echo "  DEVEL                     build with modules checked out for read/write URL"
-	echo "  ETCDIR                    location of system configuration files"
 	echo "  EXECUTABLE_EXT            file extension for executable files"
 	echo "  EXPORT_SYMBOLS            make export symbols visible" 
 	echo "  FEATURES                  list of features enabled in the build"
-	echo "  INCDIR                    location of the header files"
 	echo "  INSTALL_HEADERS           install headers (enabled by default)"
-	echo "  LIBDIR                    location of the library"
 	echo "  LIBRARY_EXT               file extension for library files"
 	echo "  LIBRARY_PREFIX            prefix used for library file"
 	echo "  PKGCONFIG_EXT             file extension for pkgconfig files"
 	echo "  PLATFORM                  target software platform to perform build"
-	echo "  PREFIX                    installation prefix for binary files"
 	echo "  PROFILE                   build with profile options"
-	echo "  SHAREDDIR                 location of the shared files"
 	echo "  STATICLIB_EXT             file extension for static library files"
 	echo "  SUB_FEATURES              list of features disabled in the build as a subtraction of default"
-	echo "  TEMPDIR                   location of temporary directory"
 	echo "  TEST                      use test build"
 	echo "  TRACE                     compile with additional trace information output"
 

modules.mk

@@ -20,19 +20,19 @@
 
 #------------------------------------------------------------------------------
 # Variables that describe source code dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.27
+LSP_COMMON_LIB_VERSION     := 1.0.28
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL_RO      := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_URL_RW      := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.19
+LSP_TEST_FW_VERSION        := 1.0.20
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL_RO         := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
 LSP_TEST_FW_URL_RW         := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
 
-LSP_R3D_IFACE_VERSION      := 1.0.10
+LSP_R3D_IFACE_VERSION      := 1.0.11
 LSP_R3D_IFACE_NAME         := lsp-r3d-iface
 LSP_R3D_IFACE_TYPE         := src
 LSP_R3D_IFACE_URL_RO       := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git

project.mk

@@ -23,5 +23,5 @@ ARTIFACT_ID                 = LSP_R3D_BASE_LIB
 ARTIFACT_NAME               = lsp-r3d-base-lib
 ARTIFACT_DESC               = Base library for implementing and loading 3D rendering backend
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.10
+ARTIFACT_VERSION            = 1.0.11
 ARTIFACT_EXPORT_SYMBOLS     = 0