Skip to content

Commit ab469e9

Browse files
committed
Updated final name of the library
1 parent d688dd3 commit ab469e9

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

make/system.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ ifndef LIBRARY_EXT
8484
endif
8585
endif
8686

87+
# Extension of libraries
88+
ifndef LIBRARY_PREFIX
89+
ifeq ($(PLATFORM),Windows)
90+
LIBRARY_PREFIX :=
91+
else
92+
LIBRARY_PREFIX := lib
93+
endif
94+
endif
95+
8796
# Extension of executables
8897
ifndef EXECUTABLE_EXT
8998
ifeq ($(PLATFORM),Windows)
@@ -143,6 +152,7 @@ COMMON_VARS = \
143152
PLATFORM \
144153
ARCHITECTURE \
145154
LIBRARY_EXT \
155+
LIBRARY_PREFIX \
146156
STATICLIB_EXT \
147157
EXECUTABLE_EXT \
148158
PKGCONFIG_EXT \
@@ -167,6 +177,7 @@ sysvars:
167177
@echo " INCDIR location of the header files"
168178
@echo " LIBDIR location of the library"
169179
@echo " LIBRARY_EXT file extension for library files"
180+
@echo " LIBRARY_PREFIX prefix used for library file"
170181
@echo " PKGCONFIG_EXT file extension for pkgconfig files"
171182
@echo " PLATFORM target software platform to perform build"
172183
@echo " PREFIX installation prefix for binary files"

src/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ CXX_HEADERS = $(foreach hdr,$(ARTIFACT_HEADERS),$(call rwildcard, $(
4040
CXX_INSTHEADERS = $(patsubst $($(ARTIFACT_VARS)_INC)/%,$(DESTDIR)$(INCDIR)/%,$(CXX_HEADERS))
4141

4242
ARTIFACT_BIN = $($(ARTIFACT_VARS)_BIN)
43-
ARTIFACT_LIB = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-$($(ARTIFACT_VARS)_VERSION)$(LIBRARY_EXT)
44-
ARTIFACT_SLIB = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-$($(ARTIFACT_VARS)_VERSION)$(STATICLIB_EXT)
45-
ARTIFACT_LIBLINK = $($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)
46-
ARTIFACT_SLIBLINK = $($(ARTIFACT_VARS)_NAME)$(STATICLIB_EXT)
43+
ARTIFACT_LIB = $(ARTIFACT_BIN)/$(LIBRARY_PREFIX)$($(ARTIFACT_VARS)_NAME)-$($(ARTIFACT_VARS)_VERSION)$(LIBRARY_EXT)
44+
ARTIFACT_SLIB = $(ARTIFACT_BIN)/$(LIBRARY_PREFIX)$($(ARTIFACT_VARS)_NAME)-$($(ARTIFACT_VARS)_VERSION)$(STATICLIB_EXT)
45+
ARTIFACT_LIBLINK = $(LIBRARY_PREFIX)$($(ARTIFACT_VARS)_NAME)$(LIBRARY_EXT)
46+
ARTIFACT_SLIBLINK = $(LIBRARY_PREFIX)$($(ARTIFACT_VARS)_NAME)$(STATICLIB_EXT)
4747
ARTIFACT_PC = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)$(PKGCONFIG_EXT)
4848
ARTIFACT_TESTBIN = $(ARTIFACT_BIN)/$($(ARTIFACT_VARS)_NAME)-test$(EXECUTABLE_EXT)
4949
ARTIFACT_OBJ = $($(ARTIFACT_VARS)_OBJ)
@@ -175,7 +175,7 @@ $(ARTIFACT_PC):
175175
@echo "Description: $($(ARTIFACT_VARS)_DESC)" >> "$(ARTIFACT_PC)"
176176
@echo "Version: $($(ARTIFACT_VARS)_VERSION)" >> "$(ARTIFACT_PC)"
177177
@echo "Cflags: -I\$${includedir}" >> "$(ARTIFACT_PC)"
178-
@echo "Libs: -L\$${libdir} -l:$(notdir $(ARTIFACT_LIBLINK))" >> "$(ARTIFACT_PC)"
178+
@echo "Libs: -L\$${libdir} -l$(notdir $($(ARTIFACT_VARS)_NAME))" >> "$(ARTIFACT_PC)"
179179

180180
install: all
181181
@echo "Installing $($(ARTIFACT_VARS)_NAME)"

0 commit comments

Comments
 (0)