47 lines
1.6 KiB
Text
47 lines
1.6 KiB
Text
Index: makefiles/Makefile.top
|
|
--- makefiles/Makefile.top.orig
|
|
+++ makefiles/Makefile.top
|
|
@@ -190,8 +190,8 @@ endif
|
|
ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
|
|
ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
|
|
SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
|
|
- SONAME := $(SHAREDLIBNAME).$(major-version)
|
|
- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
|
|
+ SONAME := $(SHAREDLIBNAME).$(NS_LIB_VERSION)
|
|
+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(NS_LIB_VERSION)
|
|
else
|
|
OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
|
|
endif
|
|
@@ -206,14 +206,6 @@ endif
|
|
.PHONY: all test coverage profile docs clean distclean install uninstall \
|
|
__default __precov __partial_clean __postshared
|
|
|
|
-ifeq ($(COMPONENT_TYPE),lib-shared)
|
|
- POST_TARGETS := __postshared $(POST_TARGETS)
|
|
-
|
|
-__postshared:
|
|
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
|
|
- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SHAREDLIBNAME)
|
|
-endif
|
|
-
|
|
# Default target
|
|
all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
|
|
|
|
@@ -295,7 +287,7 @@ __libraries = $(if $(REQUIRED_LIBS),-l$(subst $(__spac
|
|
define install_pkgconfig
|
|
$(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
|
|
$(Q)$(SED) \
|
|
- -e 's#PREFIX#$(PREFIX)#' \
|
|
+ -e 's#PREFIX#$(TRUEPREFIX)#' \
|
|
-e 's#LIBDIR#$(LIBDIR)#' \
|
|
-e 's#MAJOR#$(major-version)#' \
|
|
-e 's#MINOR#$(minor-version)#' \
|
|
@@ -313,8 +305,6 @@ endef
|
|
# TODO: Is this scheme portable?
|
|
define install_shared_lib
|
|
$(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
|
|
- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
|
|
- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
|
|
|
|
endef
|
|
|