Release 0.5.4

* Added pkg-config file generation.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 0.5.4 ===
+* Added pkg-config file generation.
+
 === 0.5.3 ===
 * Added pmin, pmax, psmin, psmax, pamin, pamax functions.
 * Added SSE optimizations for pmin, pmax, psmin, psmax, pamin, pamax functions.

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

@@ -11,7 +11,7 @@
 // Define version of headers
 #define LSP_DSP_LIB_MAJOR           0
 #define LSP_DSP_LIB_MINOR           5
-#define LSP_DSP_LIB_MICRO           3
+#define LSP_DSP_LIB_MICRO           4
 
 #ifdef LSP_DSP_LIB_BUILTIN
     #define LSP_DSP_LIB_EXPORT

make/configure.mk

@@ -59,6 +59,7 @@ define srcconfig =
   $(eval name=$(1))
   $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
   $(if $($(name)_PATH),,    $(eval $(name)_PATH    := $(MODULES)/$($(name)_NAME)))
+  $(if $($(name)_DESC),,    $(eval $(name)_DESC    := $($(name)_DESC)))
   $(if $($(name)_INC),,     $(eval $(name)_INC     := $($(name)_PATH)/include))
   $(if $($(name)_SRC),,     $(eval $(name)_SRC     := $($(name)_PATH)/src))
   $(if $($(name)_TEST),,    $(eval $(name)_TEST    := $($(name)_PATH)/test))
@@ -74,6 +75,7 @@ define hdrconfig =
   $(eval name=$(1))
   $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
   $(if $($(name)_PATH),,    $(eval $(name)_PATH    := $(MODULES)/$($(name)_NAME)))
+  $(if $($(name)_DESC),,    $(eval $(name)_DESC    := $($(name)_DESC)))
   $(if $($(name)_INC),,     $(eval $(name)_INC     := $($(name)_PATH)/include))
   $(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
   $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
@@ -94,6 +96,9 @@ endef
 ifndef $(ARTIFACT_VARS)_NAME
   $(ARTIFACT_VARS)_NAME      := $(ARTIFACT_NAME)
 endif
+ifndef $(ARTIFACT_VARS)_DESC
+  $(ARTIFACT_VARS)_DESC      := $(ARTIFACT_DESC)
+endif
 ifndef $(ARTIFACT_VARS)_VERSION 
   $(ARTIFACT_VARS)_VERSION   := $(ARTIFACT_VERSION)
 endif
@@ -112,6 +117,7 @@ CONFIG_VARS = \
   $(TOOL_VARS) \
   $(foreach name, $(OVERALL_DEPS), \
     $(name)_NAME \
+    $(name)_DESC \
     $(name)_VERSION \
     $(name)_TYPE \
     $(name)_BRANCH \
@@ -148,6 +154,7 @@ help: | toolvars sysvars
 	@echo "  <ARTIFACT>_BIN            location to put all binaries when building artifact"
 	@echo "  <ARTIFACT>_BRANCH         git branch used to checkout source code"
 	@echo "  <ARTIFACT>_CFLAGS         C/C++ flags to access headers of the artifact"
+	@echo "  <ARTIFACT>_DESC           Full description of the artifact"
 	@echo "  <ARTIFACT>_INC            path to include files of the artifact"
 	@echo "  <ARTIFACT>_LDFLAGS        linker flags to link with artifact"
 	@echo "  <ARTIFACT>_MFLAGS         artifact-specific compilation flags"

make/system.mk

@@ -73,6 +73,11 @@ ifndef EXECUTABLE_EXT
   endif
 endif
 
+# Extension of pkgconfig files
+ifndef PKGCONFIG_EXT
+  PKGCONFIG_EXT            := .pc
+endif
+
 # Installation prefix
 ifndef PREFIX
   ifeq ($(PLATFORM),Windows)
@@ -99,6 +104,7 @@ COMMON_VARS = \
 	ARCHITECTURE \
 	LIBRARY_EXT \
 	EXECUTABLE_EXT \
+	PKGCONFIG_EXT \
 	PREFIX \
 	TEMPDIR \
 	TEST \
@@ -114,6 +120,7 @@ sysvars:
 	@echo "  DEBUG                     build with debug options"
 	@echo "  EXECUTABLE_EXT            file extension for executable files"
 	@echo "  LIBRARY_EXT               file extension for library files"
+	@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"

project.mk

@@ -1,8 +1,9 @@
 # Package version
+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.3
+ARTIFACT_VERSION            = 0.5.4
 
 # List of dependencies
 TEST_DEPENDENCIES = \

src/Makefile

@@ -16,11 +16,13 @@ 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_HEADERS             = $(foreach hdr,$(ARTIFACT_HEADERS),$(call rwildcard, $($(ARTIFACT_VARS)_INC)/$(hdr), *.h))
 CXX_INSTHEADERS         = $(patsubst $($(ARTIFACT_VARS)_INC)/%,$(DESTDIR)$(PREFIX)/include/%,$(CXX_HEADERS))
 
 ARTIFACT_BIN            = $($(ARTIFACT_VARS)_BIN)
 ARTIFACT_LIB            = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-$($(ARTIFACT_VARS)_VERSION)$(LIBRARY_EXT)
+ARTIFACT_SYMLINK        = $($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)
+ARTIFACT_PC             = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)$(PKGCONFIG_EXT)
 ARTIFACT_TESTBIN        = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-test$(EXECUTABLE_EXT)
 ARTIFACT_OBJ            = $($(ARTIFACT_VARS)_OBJ)
 ARTIFACT_MFLAGS         = $($(ARTIFACT_VARS)_MFLAGS) $(foreach dep,$(DEPENDENCIES),-DUSE_$(dep))
@@ -29,7 +31,7 @@ CFLAGS_DEPS             = $(foreach dep, $(DEPENDENCIES) $(ARTIFACT_VARS), $(if
 BUILD_DEPS              = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_OBJ), $(dep)))
 LINKER_DEPS             = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_LDFLAGS), $($(dep)_LDFLAGS)))
 LINKER_OBJS             = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_OBJ), $($(dep)_OBJ)))
-BUILD_ALL               = $(ARTIFACT_LIB)
+BUILD_ALL               = $(ARTIFACT_LIB) $(ARTIFACT_PC)
 
 ifeq ($(TEST), 1)
   ifeq ($($(ARTIFACT_VARS)_TESTING),1)
@@ -137,20 +139,34 @@ $(CXX_OBJ) $(CXX_OBJEXT):
 	@mkdir -p $(dir $@)
 	@$(CXX) -o $(@) -c $(CXX_FILE) -fPIC $(CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(CFLAGS_DEPS)
 
+$(ARTIFACT_PC):
+	@echo "prefix=$(PREFIX)" > "$(ARTIFACT_PC)"
+	@echo "exec_prefix=\$${prefix}/bin" >> "$(ARTIFACT_PC)"
+	@echo "includedir=\$${prefix}/include" >> "$(ARTIFACT_PC)"
+	@echo "libdir=\$${prefix}/lib" >> "$(ARTIFACT_PC)"
+	@echo "" >> $(ARTIFACT_PC) >> "$(ARTIFACT_PC)"
+	@echo "Name: $($(ARTIFACT_VARS)_NAME)" >> "$(ARTIFACT_PC)"
+	@echo "Description: $($(ARTIFACT_VARS)_DESC)" >> "$(ARTIFACT_PC)"
+	@echo "Version: $($(ARTIFACT_VARS)_VERSION)" >> "$(ARTIFACT_PC)"
+	@echo "Cflags: -I\$${includedir}" >> "$(ARTIFACT_PC)"
+	@echo "Libs: -L\$${libdir} -l$($(ARTIFACT_VARS)_NAME)" >> "$(ARTIFACT_PC)"
+
 install: all
 	@echo "Installing $($(ARTIFACT_VARS)_NAME)"
 	@mkdir -p "$(DESTDIR)$(PREFIX)/include"
-	@mkdir -p "$(DESTDIR)$(PREFIX)/lib"
+	@mkdir -p "$(DESTDIR)$(PREFIX)/lib/pkgconfig"
 	@cp -r $($(ARTIFACT_VARS)_INC)/* "$(DESTDIR)$(PREFIX)/include/"
+	@cp $(ARTIFACT_PC) "$(DESTDIR)$(PREFIX)/lib/pkgconfig/"
 	@echo $(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(PREFIX)/lib"
 	@$(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(PREFIX)/lib"
-	@ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(PREFIX)/lib/$($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)"
+	@ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(PREFIX)/lib/$(ARTIFACT_SYMLINK)"
 	@echo "Install OK"
 
 uninstall:
 	@echo "Uninstalling $($(ARTIFACT_VARS)_NAME)"
 	@-rm -f "$(DESTDIR)$(PREFIX)/lib/$(notdir $(ARTIFACT_LIB))"
-	@-rm -f "$(DESTDIR)$(PREFIX)/lib/$($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)"
+	@-rm -f "$(DESTDIR)$(PREFIX)/lib/$(ARTIFACT_SYMLINK)"
+	@-rm -f "$(DESTDIR)$(PREFIX)/lib/pkgconfig/$(notdir $(ARTIFACT_PC))"
 	@echo rm -f $(CXX_INSTHEADERS)
 	@-rm -f $(CXX_INSTHEADERS)
 	@echo "Uninstall OK"