From 78feabe1f768dcb0d8aafd10880858c4418e4916 Mon Sep 17 00:00:00 2001 From: Loup Vaillant Date: Mon, 12 Feb 2018 21:52:30 +0100 Subject: [PATCH] Bumped soname (libmonocypher.so.2) Related to #89 Also provides a `libmonocypher.so` symbolic link. Removes every shared libraries and symbolic links upon uninstallation. Note: this bump should have happened earlier, for version 1.1.0, whose ABI is incompatible with 1.0.1. Sorry. --- .gitignore | 1 + makefile | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 60b16d5..41c97b5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o *.a *.so +*.so.* *.out *.vec *.gch diff --git a/makefile b/makefile index 1f68acb..02d211c 100644 --- a/makefile +++ b/makefile @@ -21,7 +21,7 @@ install: library src/monocypher.h install-doc mkdir -p $(DESTDIR)/$(PREFIX)/include mkdir -p $(DESTDIR)/$(PREFIX)/lib mkdir -p $(PKGCONFIG) - cp lib/libmonocypher.a lib/libmonocypher.so $(DESTDIR)/$(PREFIX)/lib + cp lib/libmonocypher.a lib/libmonocypher.so* $(DESTDIR)/$(PREFIX)/lib cp src/monocypher.h $(DESTDIR)/$(PREFIX)/include @echo "Creating $(PKGCONFIG)/monocypher.pc" @echo "prefix=/$(PREFIX)" > $(PKGCONFIG)/monocypher.pc @@ -43,7 +43,7 @@ install-doc: library: static-library dynamic-library static-library : lib/libmonocypher.a -dynamic-library: lib/libmonocypher.so +dynamic-library: lib/libmonocypher.so lib/libmonocypher.so.2 clean: rm -rf lib/ @@ -51,7 +51,7 @@ clean: uninstall: rm -f $(DESTDIR)/$(PREFIX)/lib/libmonocypher.a - rm -f $(DESTDIR)/$(PREFIX)/lib/libmonocypher.so + rm -f $(DESTDIR)/$(PREFIX)/lib/libmonocypher.so* rm -f $(DESTDIR)/$(PREFIX)/include/monocypher.h rm -f $(PKGCONFIG)/monocypher.pc rm -f $(MAN_DIR)/*.3monocypher @@ -67,7 +67,10 @@ test speed speed-sodium speed-tweetnacl: # Monocypher libraries lib/libmonocypher.a: lib/monocypher.o ar cr $@ $^ -lib/libmonocypher.so: lib/monocypher.o +lib/libmonocypher.so: lib/libmonocypher.so.2 + @mkdir -p $(@D) + ln -s $$(basename $<) $@ +lib/libmonocypher.so.2: lib/monocypher.o @mkdir -p $(@D) $(CC) $(CFLAGS) -shared -o $@ $^ lib/sha512.o : src/optional/sha512.c src/optional/sha512.o -- 2.47.3