From a4d707b593052d70d1c24a555458eac81ed28044 Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Sat, 7 Mar 2015 22:00:51 -0500 Subject: [PATCH] whoops, forgot -Wl before -soname --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 61929ef..f6f2fb8 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ cc = $(CC) $(cflags) # compatibility is broken, even if the API is backward-compatibile MAJOR=1 MINOR=2 -RELEASE=0 +PATCH=0 OS := $(shell uname) ifeq ($(OS),Darwin) # MacOS X @@ -26,7 +26,7 @@ ifeq ($(OS),Darwin) # MacOS X SHLIB_VERS_EXT = $(MAJOR).dylib else # GNU/Linux, at least (Windows should probably use cmake) SHLIB_EXT = so - SHLIB_VERS_EXT = so.$(MAJOR).$(MINOR).$(REVISION) + SHLIB_VERS_EXT = so.$(MAJOR).$(MINOR).$(PATCH) endif # installation directories (for 'make install') @@ -74,15 +74,15 @@ libutf8proc.a: utf8proc.o rm -f libutf8proc.a $(AR) rs libutf8proc.a utf8proc.o -libutf8proc.so.$(MAJOR).$(MINOR).$(REVISION): utf8proc.o - $(cc) -shared -o $@ -soname libutf8proc.so.$(MAJOR) utf8proc.o +libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH): utf8proc.o + $(cc) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o chmod a-x $@ -libutf8proc.so: libutf8proc.so.$(MAJOR).$(MINOR).$(REVISION) - ln -s libutf8proc.so.$(MAJOR).$(MINOR).$(REVISION) $@ +libutf8proc.so: libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) + ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@ libutf8proc.$(MAJOR).dylib: utf8proc.o - $(cc) -dynamiclib -o $@ $^ -install_name $(libdir)/$@ -Wl,-compatibility_version -Wl,$(MAJOR) -Wl,-current_version -Wl,$(MAJOR).$(MINOR).$(REVISION) + $(cc) -dynamiclib -o $@ $^ -install_name $(libdir)/$@ -Wl,-compatibility_version -Wl,$(MAJOR) -Wl,-current_version -Wl,$(MAJOR).$(MINOR).$(PATCH) libutf8proc.dylib: libutf8proc.$(MAJOR).dylib ln -s libutf8proc.$(MAJOR).dylib $@