Updated build

Author: sadko4u

dependencies.mk

@@ -18,26 +18,15 @@
 # along with lsp-r3d-base-lib.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-# Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.14
-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
+# List of dependencies
+DEPENDENCIES = \
+  LIBPTHREAD \
+  LSP_COMMON_LIB \
+  LSP_R3D_IFACE
 
-LSP_TEST_FW_VERSION        := 1.0.8
-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
+TEST_DEPENDENCIES = \
+  LSP_TEST_FW
 
-LSP_R3D_IFACE_VERSION      := 0.5.2
-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
-LSP_R3D_IFACE_URL_RW       := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
-
-LIBPTHREAD_VERSION         := system
-LIBPTHREAD_NAME            := libpthread
-LIBPTHREAD_TYPE            := opt
-LIBPTHREAD_LDFLAGS         := -lpthread
+ALL_DEPENDENCIES = \
+  $(DEPENDENCIES) \
+  $(TEST_DEPENDENCIES)

make/configure.mk

@@ -44,11 +44,12 @@ else
   X_URL_SUFFIX                = _RO
 endif
 
+include $(BASEDIR)/project.mk
+include $(BASEDIR)/modules.mk
+include $(BASEDIR)/dependencies.mk
 include $(BASEDIR)/make/functions.mk
 include $(BASEDIR)/make/system.mk
 include $(BASEDIR)/make/tools.mk
-include $(BASEDIR)/dependencies.mk
-include $(BASEDIR)/project.mk
 
 # Compute the full list of dependencies
 MERGED_DEPENDENCIES        := \

make/modules.mk

@@ -22,19 +22,17 @@ ifneq ($(VERBOSE),1)
 endif
 
 BASEDIR                := $(CURDIR)
-DEPLIST                := $(BASEDIR)/dependencies.mk
-PROJECT                := $(BASEDIR)/project.mk
 CONFIG                 := $(BASEDIR)/.config.mk
 
+include $(BASEDIR)/project.mk
+include $(BASEDIR)/dependencies.mk
 include $(BASEDIR)/make/functions.mk
 ifeq ($(TREE),1)
-  include $(DEPLIST)
+  include $(BASEDIR)/modules.mk
 else
   -include $(CONFIG)
 endif
 
-include $(PROJECT)
-
 MERGED_DEPENDENCIES        := \
   $(DEPENDENCIES) \
   $(TEST_DEPENDENCIES)

modules.mk

@@ -0,0 +1,43 @@
+#
+# 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/>.
+#
+
+# Variables that describe dependencies
+LSP_COMMON_LIB_VERSION     := 1.0.14
+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.8
+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      := 0.5.2
+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
+LSP_R3D_IFACE_URL_RW       := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
+
+LIBPTHREAD_VERSION         := system
+LIBPTHREAD_NAME            := libpthread
+LIBPTHREAD_TYPE            := opt
+LIBPTHREAD_LDFLAGS         := -lpthread

project.mk

@@ -25,16 +25,3 @@ ARTIFACT_DESC               = Base library for implementing and loading 3D rende
 ARTIFACT_HEADERS            = lsp-plug.in
 ARTIFACT_EXPORT_ALL         = 0
 ARTIFACT_VERSION            = 0.5.6-devel
-
-# List of dependencies
-DEPENDENCIES = \
-  LIBPTHREAD \
-  LSP_COMMON_LIB \
-  LSP_R3D_IFACE
-
-TEST_DEPENDENCIES = \
-  LSP_TEST_FW
-
-ALL_DEPENDENCIES = \
-  $(DEPENDENCIES) \
-  $(TEST_DEPENDENCIES)

src/Makefile

@@ -21,13 +21,13 @@ ifneq ($(VERBOSE),1)
 .SILENT:
 endif
 
-BASEDIR                 = $(CURDIR)
-CONFIG                 := $(BASEDIR)/../.config.mk
-PROJECT                := $(BASEDIR)/../project.mk
+MODDIR                  = $(CURDIR)/..
+CONFIG                 := $(MODDIR)/.config.mk
 
 include $(CONFIG)
-include $(PROJECT)
-include $(BASEDIR)/../make/functions.mk
+include $(MODDIR)/project.mk
+include $(MODDIR)/dependencies.mk
+include $(MODDIR)/make/functions.mk
 
 ifeq ($(TEST),1)
   UNIQ_DEPENDENCIES      := $(call uniq, $(DEPENDENCIES) $(TEST_DEPENDENCIES))