From ac7f7144b5e6cccc3ba5ae05be9f3ff1f4ae8ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= Date: Tue, 16 Nov 2021 16:01:54 +0000 Subject: [PATCH] Proper soversion handling --- .gitignore | 1 + Makefile.conf | 6 ++++-- src/Makefile | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2fcd28b..bb57031 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.a *.so +*.so.* *.d *.swp .DS_Store diff --git a/Makefile.conf b/Makefile.conf index 0ac2f65..47aeb97 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -7,13 +7,15 @@ HERE:=$(dir $(lastword $(MAKEFILE_LIST))) BUILD_ON:=$(shell uname) +SOVERSION=2.1.22 + ifeq ($(BUILD_ON),OS/390) TARGETS=libpEpAdapter.a libpEpAdapter.so SO_CFLAGS = -W "l,xplink,dll" -W "c,float(ieee),xplink,dll,exportall" CPPFLAGS += -W "l,xplink,dll" -W "c,float(ieee),xplink,dll,exportall" else ifeq ($(BUILD_ON),Linux) -TARGETS=libpEpAdapter.a libpEpAdapter.so -SO_CFLAGS = -shared -Wl,-soname,libpEpAdapter.so.1 +TARGETS=libpEpAdapter.a libpEpAdapter.so.$(SOVERSION) +SO_CFLAGS = -shared -Wl,-soname,libpEpAdapter.so.$(SOVERSION) else TARGETS=libpEpAdapter.a endif diff --git a/src/Makefile b/src/Makefile index 03bb6b4..479d526 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,7 +31,7 @@ endif libpEpAdapter.a: $(OBJECTS) $(AR) -rc $@ $^ -libpEpAdapter.so: $(OBJECTS) +libpEpAdapter.so.$(SOVERSION): $(OBJECTS) $(CXX) $(SO_CFLAGS) -o $@ $^ $(LDLIBS) -lpEpEngine -lpEpMIME -lsequoia_ffi -lsequoia_openpgp_ffi all: $(TARGETS)