Release 0.5.8

* Fixed excessive header installation with proper one.
* Fixed installation and deinstallation of shared object and library files.
* Added `make distsrc` target to build tarball with all required source code.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,11 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 0.5.8 ===
+* Fixed excessive header installation with proper one.
+* Fixed installation and deinstallation of shared object and library files.
+* Added `make distsrc` target to build tarball with all required source code.
+
 === 0.5.7 ===
 * Updated makefiles: added `make tree` target.
 

Makefile

@@ -37,9 +37,11 @@ include $(BASEDIR)/project.mk
 
 # Setup paths
 CHK_CONFIG                  = test -f "$(CONFIG)" || (echo "System not properly configured. Please launch 'make config' first" && exit 1)
+DISTSRC_PATH                = $(BUILDDIR)/.distsrc
+DISTSRC                     = $(DISTSRC_PATH)/$(ARTIFACT_NAME)
 
 .DEFAULT_GOAL              := all
-.PHONY: all compile install uninstall depend clean chkconfig
+.PHONY: all compile install uninstall depend clean
 
 compile all install uninstall depend:
 	@$(CHK_CONFIG)
@@ -60,7 +62,7 @@ fetch:
 
 tree:
 	@echo "Fetching all possible source code dependencies"
-	@$(MAKE) -s -f "make/modules.mk" $(@) BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)" TREE="1"
+	@$(MAKE) -s -f "make/modules.mk" $(@) BASEDIR="$(BASEDIR)" TREE="1"
 	@echo "Fetch OK"
 
 prune: clean
@@ -71,20 +73,39 @@ prune: clean
 	@echo "Prune OK"
 
 # Configuration-related targets
-.PHONY: config help
+.PHONY: config help chkconfig
 
 testconfig:
 	@$(MAKE) -s -f "$(BASEDIR)/make/configure.mk" $(@) CONFIG="$(CONFIG)" TEST="1" $(MAKEFLAGS)
 
 config:
 	@$(MAKE) -s -f "$(BASEDIR)/make/configure.mk" $(@) CONFIG="$(CONFIG)" $(MAKEFLAGS)
 
+# Release-related targets
+.PHONY: distsrc
+distsrc:
+	@echo "Building source code archive"
+	@mkdir -p "$(DISTSRC)/modules"
+	@$(MAKE) -s -f "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 {}
+	@find "$(DISTSRC)" -iname '.gitignore' | xargs -exec rm -rf {}
+	@tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz" "$(ARTIFACT_NAME)"
+	@echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz"
+	@ln -sf "$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz" "$(BUILDDIR)/$(ARTIFACT_NAME)-src.tar.gz"
+	@echo "Created symlink: $(BUILDDIR)/$(ARTIFACT_NAME)-src.tar.gz"
+	@rm -rf $(DISTSRC_PATH)
+	@echo "Build OK"
+
+# Help
 help:
 	@echo "Available targets:"
 	@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"
 	@echo "  info                      Output build configuration"

README.md

@@ -105,6 +105,12 @@ different architectures and platforms, run:
 make tree
 ```
 
+To build source code archive with all possible dependencies, run:
+
+```bash
+make distsrc
+```
+
 Usage
 ======
 

include/lsp-plug.in/dsp/version.h

@@ -25,7 +25,7 @@
 // Define version of headers
 #define LSP_DSP_LIB_MAJOR           0
 #define LSP_DSP_LIB_MINOR           5
-#define LSP_DSP_LIB_MICRO           7
+#define LSP_DSP_LIB_MICRO           8
 
 #ifdef LSP_DSP_LIB_BUILTIN
     #define LSP_DSP_LIB_CPPEXPORT

make/modules.mk

@@ -22,7 +22,9 @@ BASEDIR            := $(CURDIR)
 CONFIG             := $(CURDIR)/.config.mk
 
 include $(BASEDIR)/dependencies.mk
--include $(CONFIG)
+ifneq ($(TREE),1)
+  include $(CONFIG)
+endif
 include $(BASEDIR)/project.mk
 
 SYS_DEPENDENCIES    = $(DEPENDENCIES) $(TEST_DEPENDENCIES)

project.mk

@@ -23,7 +23,7 @@ ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_NAME               = lsp-dsp-lib
 ARTIFACT_VARS               = LSP_DSP_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 0.5.7
+ARTIFACT_VERSION            = 0.5.8
 
 # List of dependencies
 DEPENDENCIES = \

src/Makefile

@@ -36,7 +36,8 @@ CXX_OBJEXT              = $(patsubst %.cpp, $($(ARTIFACT_VARS)_BIN)/%.o, $(CXX_S
 
 ALL_HEADERS             = $(call rwildcard, $($(ARTIFACT_VARS)_INC), *.h)
 CXX_FILE                = $(patsubst $($(ARTIFACT_VARS)_BIN)/%.o,%.cpp, $(@))
-CXX_HEADERS             = $(foreach hdr,$(ARTIFACT_HEADERS),$(call rwildcard, $($(ARTIFACT_VARS)_INC)/$(hdr), *.h))
+CXX_HDR_PATHS           = $(foreach hdr,$(ARTIFACT_HEADERS),$($(ARTIFACT_VARS)_INC)/$(hdr))
+CXX_HEADERS             = $(foreach path,$(CXX_HDR_PATHS),$(call rwildcard, $(path), *.h))
 CXX_INSTHEADERS         = $(patsubst $($(ARTIFACT_VARS)_INC)/%,$(DESTDIR)$(INCDIR)/%,$(CXX_HEADERS))
 
 ARTIFACT_BIN            = $($(ARTIFACT_VARS)_BIN)
@@ -181,21 +182,23 @@ install: all
 	@echo "Installing $($(ARTIFACT_VARS)_NAME)"
 	@mkdir -p "$(DESTDIR)$(INCDIR)"
 	@mkdir -p "$(DESTDIR)$(LIBDIR)/pkgconfig"
-	@cp -r $($(ARTIFACT_VARS)_INC)/* "$(DESTDIR)$(INCDIR)/"
+	@cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/"
 	@cp $(ARTIFACT_PC) "$(DESTDIR)$(LIBDIR)/pkgconfig/"
-	@echo $(INSTALL) $(ARTIFACT_LIB) $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
-	@$(INSTALL) $(ARTIFACT_LIB) $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
+	@echo $(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(LIBDIR)"
+	@$(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(LIBDIR)"
+	@echo cp $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
+	@cp $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
 	@ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
 	@ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
 	@echo "Install OK"
 
 uninstall:
 	@echo "Uninstalling $($(ARTIFACT_VARS)_NAME)"
 	@-rm -f "$(DESTDIR)$(LIBDIR)/$(notdir $(ARTIFACT_LIB))"
+	@-rm -f "$(DESTDIR)$(LIBDIR)/$(notdir $(ARTIFACT_SLIB))"
 	@-rm -f "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
 	@-rm -f "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
 	@-rm -f "$(DESTDIR)$(LIBDIR)/pkgconfig/$(notdir $(ARTIFACT_PC))"
-	@echo rm -f $(CXX_INSTHEADERS)
 	@-rm -f $(CXX_INSTHEADERS)
 	@echo "Uninstall OK"