Updated makefiles

Author: sadko4u

Makefile

@@ -100,18 +100,18 @@ testconfig: CONFIG_FLAGS=TEST=1
 devel: CONFIG_FLAGS=TEST=1 DEVEL=1
 
 config testconfig devel:
-	$(MAKE) -f "make/configure.mk" config VERBOSE="$(VERBOSE)" CONFIG="$(CONFIG)" -$(MAKEFLAGS)
+	$(MAKE) -f "$(BASEDIR)/make/configure.mk" config VERBOSE="$(VERBOSE)" CONFIG="$(CONFIG)" -$(MAKEFLAGS)
 
 # Release-related targets
 .PHONY: distsrc
 distsrc:
 	echo "Building source code archive"
 	mkdir -p "$(DISTSRC)/modules"
-	$(MAKE) -f "make/modules.mk" tree VERBOSE="$(VERBOSE)" BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules" TREE="1"
+	$(MAKE) -f "make/modules.mk" tree TREE="1" BUILD_FEATURES="$(FEATURES)" VERBOSE="$(VERBOSE)" BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules"
 	$(if $(DISTSRC_DIRS), cp -R $(DISTSRC_DIRS) "$(DISTSRC)/")
 	$(if $(DISTSRC_FILES), cp $(DISTSRC_FILES) "$(DISTSRC)/")
-	find "$(DISTSRC)" -iname '.git' | xargs rm -rf {}
-	find "$(DISTSRC)" -iname '.gitignore' | xargs rm -rf {}
+	find "$(DISTSRC)" -iname '.git' | xargs -exec rm -rf {}
+	find "$(DISTSRC)" -iname '.gitignore' | xargs -exec rm -rf {}
 	tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz" "$(ARTIFACT_NAME)"
 	echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz"
 	rm -rf $(DISTSRC_PATH)
@@ -139,13 +139,14 @@ help:
 	$(MAKE) -f "$(BASEDIR)/make/configure.mk" $(@) VERBOSE="$(VERBOSE)"
 	echo ""
 	echo "Available FEATURES:"
-	echo "  clap                      CLAP plugin format binaries"
+	echo "  clap                      CLAP plugins"
 	echo "  doc                       Generate standalone HTML documentation"
 	echo "  gst                       GStreamer plugins"
-	echo "  jack                      Standalone JACK plugins"
+	echo "  jack                      JACK audio backend for standalone plugins"
 	echo "  ladspa                    LADSPA plugins"
+	echo "  launcher                  Build launcher application for standalone plugin applications"
 	echo "  lv2                       LV2 plugins"
-	echo "  ui                        Build plugins with UI"
+	echo "  standalone                Standalone plugin applications"
 	echo "  vst2                      VST 2.x plugin binaries"
 	echo "  vst3                      VST 3.x plugin binaries"
 	echo "  xdg                       Desktop integration icons"

dependencies.mk

@@ -21,18 +21,19 @@
 #------------------------------------------------------------------------------
 # List of all dependencies
 DEPENDENCIES = \
+  LSP_3RD_PARTY \
   LSP_COMMON_LIB \
+  LSP_AUDIO_IFACE \
   LSP_DSP_LIB \
   LSP_DSP_UNITS \
   LSP_LLTL_LIB \
-  LSP_RUNTIME_LIB \
-  LSP_PLUGINS_SHARED \
-  LSP_3RD_PARTY \
   LSP_PLUGIN_FW \
+  LSP_PLUGINS_SHARED \
+  LSP_R3D_BASE_LIB \
   LSP_R3D_IFACE \
-  LSP_WS_LIB \
+  LSP_RUNTIME_LIB \
   LSP_TK_LIB \
-  LSP_R3D_BASE_LIB
+  LSP_WS_LIB
 
 TEST_DEPENDENCIES = \
   LSP_TEST_FW
@@ -54,14 +55,15 @@ LINUX_DEPENDENCIES = \
   LIBSNDFILE \
   LIBX11 \
   LIBXRANDR \
+  LSP_AUDIO_JACK_LIB \
   LSP_R3D_GLX_LIB
 
 LINUX_TEST_DEPENDENCIES =
 
 ifeq ($(PLATFORM),Linux)
   DEPENDENCIES             += $(LINUX_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(LINUX_TEST_DEPENDENCIES)
-  DEFAULT_FEATURES         += jack gst xdg
+  DEFAULT_FEATURES         += standalone gst xdg jack
 endif
 
 #------------------------------------------------------------------------------
@@ -80,37 +82,39 @@ BSD_DEPENDENCIES = \
   LIBSNDFILE \
   LIBX11 \
   LIBXRANDR \
+  LSP_AUDIO_JACK_LIB \
   LSP_R3D_GLX_LIB
 
 BSD_TEST_DEPENDENCIES = 
 
 ifeq ($(PLATFORM),BSD)
   DEPENDENCIES             += $(BSD_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(BSD_TEST_DEPENDENCIES)
-  DEFAULT_FEATURES         += jack gst xdg
+  DEFAULT_FEATURES         += standalone gst xdg jack
 endif
 
 #------------------------------------------------------------------------------
 # Windows dependencies
 WINDOWS_DEPENDENCIES = \
-  LIBSHLWAPI \
-  LIBWINMM \
-  LIBMSACM \
-  LIBMPR \
-  LIBGDI32 \
   LIBD2D1 \
-  LIBOLE \
-  LIBWINCODEC \
   LIBDWRITE \
-  LIBUUID \
+  LIBGDI32 \
+  LIBMPR \
+  LIBMSACM \
+  LIBOLE \
   LIBOPENGL32 \
+  LIBSHLWAPI \
+  LIBUUID \
+  LIBWINCODEC \
+  LIBWINMM \
   LSP_R3D_WGL_LIB
 
 WINDOWS_TEST_DEPENDENCIES = 
 
 ifeq ($(PLATFORM),Windows)
   DEPENDENCIES             += $(WINDOWS_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(WINDOWS_TEST_DEPENDENCIES)
+  DEFAULT_FEATURES         += 
 endif
 
 #------------------------------------------------------------------------------
@@ -123,13 +127,14 @@ MACOS_DEPENDENCIES = \
   LIBFONTCONFIG \
   LIBFREETYPE \
   LIBICONV \
-  LIBJACK  
+  LIBJACK
 
 MACOS_TEST_DEPENDENCIES =
 
 ifeq ($(PLATFORM),MacOS)
   DEPENDENCIES             += $(MACOS_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(MACOS_TEST_DEPENDENCIES)
+  DEFAULT_FEATURES         += 
 endif
 
 #------------------------------------------------------------------------------
@@ -145,4 +150,4 @@ ALL_DEPENDENCIES = \
   $(BSD_TEST_DEPENDENCIES) \
   $(WINDOWS_TEST_DEPENDENCIES) \
   $(MACOS_TEST_DEPENDENCIES)
-
+  

make/configure.mk

@@ -24,10 +24,7 @@ endif
 BASEDIR                    := $(CURDIR)
 ROOTDIR                    := $(CURDIR)
 PLUGINS                    := $(BASEDIR)/plugins.mk
-TEST                       := 0
-DEBUG                      := 0
-PROFILE                    := 0
-TRACE                      := 0
+BUILD_FEATURES              = $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))           
 
 # Configure system settings
 include $(BASEDIR)/project.mk
@@ -39,7 +36,7 @@ include $(BASEDIR)/modules.mk
 include $(BASEDIR)/dependencies.mk
 include $(PLUGINS)
 
-ifeq ($(DEVEL),1)
+ifeq ($(call fcheck,devel,$(BUILD_FEATURES),ON),ON)
   X_URL_SUFFIX                = _RW
 else
   X_URL_SUFFIX                = _RO
@@ -53,7 +50,6 @@ MERGED_DEPENDENCIES        := \
   $(PLUGIN_SHARED)
 UNIQ_MERGED_DEPENDENCIES   := $(call uniq, $(MERGED_DEPENDENCIES))
 DEPENDENCIES                = $(UNIQ_MERGED_DEPENDENCIES)
-BUILD_FEATURES             := $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))
 
 # Determine versions
 ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -256,10 +252,10 @@ ifndef HOST_$(ARTIFACT_ID)_PATH
 endif
 
 ROOT_ARTIFACT_ID           := $(ARTIFACT_ID)
-$(ARTIFACT_ID)_TESTING      = $(TEST)
+$(ARTIFACT_ID)_TESTING      = $(call fcheck,test,$(BUILD_FEATURES),1,0)
 
 OVERALL_DEPS := $(call uniq,$(DEPENDENCIES) $(ARTIFACT_ID))
-__tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
+override __tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
 
 CONFIG_VARS = \
   $(PATH_VARS) \
@@ -318,6 +314,7 @@ $(CONFIG_VARS): prepare
 	echo "$(@)=$($(@))" >> "$(CONFIG)"
 
 config: $(CONFIG_VARS)
+	echo "Platform:          $(PLATFORM)"
 	echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
 	echo "Architecture:      $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
 	echo "Features:          $(BUILD_FEATURES)"
@@ -354,4 +351,4 @@ help: | pathvars toolvars sysvars
 	echo ""
 	echo "Plugins used for build:"
 	echo "  $(PLUGINS_DEPENDENCIES)"
-
+	echo ""

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            = $(sort $(foreach v,$1,$(if $(findstring $(v),$2),$(v))))
+intersection            = $(sort $(foreach v,$1,$(if $(filter $(v),$2),$(v))))
 
 # Subtract the first set from second set
 # $(call subtraction, list1, list2)
-subtraction             = $(sort $(foreach v,$2,$(if $(findstring $(v),$1),,$(v))))
+subtraction             = $(sort $(foreach v,$2,$(if $(filter $(v),$1),,$(v))))
 
 # Check feature presence in list
 # $(call fcheck, features-to-check, all-feature-list, action-if-enabled, action-if-disabled)

make/modules.mk

@@ -48,7 +48,7 @@ UNIQ_ALL_DEPENDENCIES      := $(filter-out $(ARTIFACT_ID),$(call uniq, $(ALL_DEP
 MODULES                    ?= $(BASEDIR)/modules
 GIT                        ?= git
 
-ifeq ($(DEVEL),1)
+ifeq ($(call fcheck,devel,$(BUILD_FEATURES),ON),ON)
   X_URL_SUFFIX                = _RW
 else
   X_URL_SUFFIX                = _RO

make/paths.mk

@@ -22,7 +22,7 @@
 ifndef PREFIX
   ifeq ($(PLATFORM),Windows)
     PREFIX                     := $(BASEDIR)/INSTALL
-  else ifeq ($(CROSS_COMPILE),1)
+  else ifeq ($(call fcheck,crosscompile,$(BUILD_FEATURES),ON),ON)
     PREFIX                     := $(BASEDIR)/INSTALL
   else
     PREFIX                     := /usr/local
@@ -43,7 +43,7 @@ BINDIR                     := $(PREFIX)/bin
 INCDIR                     := $(PREFIX)/include
 BUILDDIR                   := $(BASEDIR)/.build
 TARGET_BUILDDIR            := $(BUILDDIR)/target
-ifeq ($(CROSS_COMPILE),1)
+ifeq ($(call fcheck,crosscompile,$(BUILD_FEATURES),ON),ON)
   HOST_BUILDDIR              := $(BUILDDIR)/host
 else
   HOST_BUILDDIR              := $(TARGET_BUILDDIR)

make/system.mk

@@ -224,16 +224,12 @@ ifndef PKGCONFIG_EXT
   PKGCONFIG_EXT            := .pc
 endif
 
-TEST                       := 0
-
 # Set-up list of common variables
 COMMON_VARS = \
 	ARCHITECTURE \
 	ARCHITECTURE_FAMILY \
 	ARCHITECTURE_CFLAGS \
 	BUILD_FEATURES \
-	CROSS_COMPILE \
-	DEBUG \
 	EXECUTABLE_EXT \
 	EXPORT_SYMBOLS \
 	HOST_ARCHITECTURE \
@@ -245,11 +241,7 @@ COMMON_VARS = \
 	PKGCONFIG_EXT \
 	PLATFORM \
 	ROOT_ARTIFACT_ID \
-	PROFILE \
-	STATICLIB_EXT \
-	STRICT \
-	TEST \
-	TRACE
+	STATICLIB_EXT
 
 .PHONY: sysvars
 
@@ -260,9 +252,6 @@ 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 "  CROSS_COMPILE             enable/disable cross-compilation"
-	echo "  DEBUG                     build with debug options"
-	echo "  DEVEL                     build with modules checked out for read/write URL"
 	echo "  EXECUTABLE_EXT            file extension for executable files"
 	echo "  EXPORT_SYMBOLS            make export symbols visible" 
 	echo "  FEATURES                  list of features enabled in the build"
@@ -271,10 +260,6 @@ sysvars:
 	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 "  PROFILE                   build with profile options"
 	echo "  STATICLIB_EXT             file extension for static library files"
-	echo "  STRICT                    strict compilation: treat compilation warnings as errors"
 	echo "  SUB_FEATURES              list of features disabled in the build as a subtraction of default"
-	echo "  TEST                      use test build"
-	echo "  TRACE                     compile with additional trace information output"
-
+	

make/tools.mk

@@ -63,7 +63,7 @@ PHP                ?= $(X_PHP_TOOL)
 PKG_CONFIG         ?= $(X_PKG_CONFIG)
 
 # Define tool variables for host build
-ifeq ($(CROSS_COMPILE),1)
+ifeq ($(call fcheck,crosscompile,$(BUILD_FEATURES),ON),ON)
   HOST_CC            ?= $(X_CC_TOOL)
   HOST_CXX           ?= $(X_CXX_TOOL)
   HOST_AS            ?= $(X_AS_TOOL)
@@ -118,37 +118,37 @@ else ifeq ($(PLATFORM),BSD)
   NOARCH_SO_FLAGS    += -L/usr/local/lib
 endif
 
-ifeq ($(DEBUG),1)
+ifeq ($(call fcheck,debug,$(BUILD_FEATURES),ON),ON)
   NOARCH_CFLAGS      += -Og -g3 -DLSP_DEBUG -falign-functions=16
   NOARCH_CXXFLAGS    += -Og -g3 -DLSP_DEBUG -falign-functions=16
 else
   NOARCH_CFLAGS      += -O2
   NOARCH_CXXFLAGS    += -O2
 endif
 
-ifeq ($(ASAN),1)
+ifeq ($(call fcheck,asan,$(BUILD_FEATURES),ON),ON)
   NOARCH_CFLAGS      += -fsanitize=address
   NOARCH_CXXFLAGS    += -fsanitize=address
   NOARCH_EXE_FLAGS   += -fsanitize=address
   NOARCH_SO_FLAGS    += -fsanitize=address
 endif
 
-ifeq ($(PROFILE),1)
+ifeq ($(call fcheck,profile,$(BUILD_FEATURES),ON),ON)
   NOARCH_CFLAGS      += -pg -DLSP_PROFILE
   NOARCH_CXXFLAGS    += -pg -DLSP_PROFILE
 endif
 
-ifeq ($(TRACE),1)
+ifeq ($(call fcheck,trace,$(BUILD_FEATURES),ON),ON)
   NOARCH_CFLAGS      += -DLSP_TRACE
   NOARCH_CXXFLAGS    += -DLSP_TRACE
 endif
 
-ifeq ($(STRICT),1)
+ifeq ($(call fcheck,strict,$(BUILD_FEATURES),ON),ON)
   NOARCH_CFLAGS      += -Werror
   NOARCH_CXXFLAGS    += -Werror
 endif
 
-ifeq ($(TEST),1)
+ifeq ($(call fcheck,test,$(BUILD_FEATURES),ON),ON)
   NOARCH_CFLAGS      += -DLSP_TESTING
   NOARCH_CXXFLAGS    += -DLSP_TESTING
   EXPORT_SYMBOLS     ?= 1
@@ -222,6 +222,7 @@ TOOL_VARS := \
 
 .PHONY: toolvars
 toolvars:
+	echo ""
 	echo "List of tool variables:"
 	echo "  AR                        Archiver tool for target build"
 	echo "  AS                        Assembler tool for target build"
@@ -254,4 +255,13 @@ toolvars:
 	echo "  PKG_CONFIG                Installed package management tool for target build"
 	echo "  SO_FLAGS                  Flags to link shared object/library files for target build"
 	echo ""
-
+	echo "Available compilation FEATURES:"
+	echo "  asan                      Build with address sanitizer enabled"
+	echo "  crosscompile              Build with additional debug information and debug logs enabled"
+	echo "  debug                     Build with additional debug information and debug logs enabled"
+	echo "  devel                     Use development (SSH) links for remote repositories instead of HTTPS"
+	echo "  profile                   Build with gprof profiling options"
+	echo "  strict                    Strict compilation: treat all compilation warning as errors"
+	echo "  test                      Enable tests and build test binary"
+	echo "  trace                     Enable output of additional trace logs"
+	echo ""