Revert "Replace SONAME with SOVERSION in makefile"
This reverts commit 418080010a1dcc1cdcb192e603a8c3b9656dcb1a.
In preparation of merging one external contribution that supersedes this.
diff --git a/library/Makefile b/library/Makefile
index f2e553f..9a4c3fd 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -25,9 +25,9 @@
endif
endif
-SOVERSION=8
+SONAME=libmbedtls.so.7
-DLEXT=so.$(SOVERSION)
+DLEXT=so.8
# OSX shared library extension:
# DLEXT=dylib
@@ -92,14 +92,14 @@
echo " LN $@ -> $?"
ln -sf $? $@
+libmbedtls.${DLEXT}: $(OBJS)
+ echo " LD $@"
+ $(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
+
libmbedtls.so: libmbedtls.${DLEXT}
echo " LN $@ -> libmbedtls.${DLEXT}"
ln -sf libmbedtls.${DLEXT} $@
-libmbedtls.so.$(SOVERSION): $(OBJS)
- echo " LD $@"
- $(CC) ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ $(OBJS)
-
libmbedtls.dylib: $(OBJS)
echo " LD $@"
$(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)
diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
index 3ff5b60..ae74451 100755
--- a/scripts/bump_version.sh
+++ b/scripts/bump_version.sh
@@ -56,7 +56,7 @@
mv tmp library/CMakeLists.txt
[ $VERBOSE ] && echo "Bumping SOVERSION in library/Makefile"
- sed -e "s/SOVERSION=[0-9]\+/SOVERSION=$SOVERSION/g" < library/Makefile > tmp
+ sed -e "s/SONAME=libpolarssl.so.[0-9]\+/SONAME=libpolarssl.so.$SOVERSION/g" -e "s/DLEXT=so.[0-9]\+/DLEXT=so.$SOVERSION/g" < library/Makefile > tmp
mv tmp library/Makefile
fi