From cf3b8b52f113d187040c60690f12d097e34bc202 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 11 Oct 2002 11:14:41 +0000 Subject: [PATCH] Make sure it's properly detected when there's no version information at all, and in all other cases, make sure foo.so is linked to foo.so.{soversion}. --- Makefile.shared | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.shared b/Makefile.shared index d5bafc339f..ddc5bcc604 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -61,7 +61,7 @@ top: CALC_VERSIONS= \ SHLIB_COMPAT=; SHLIB_SOVER=; \ - if [ -n "$(LIBVERSION) $(LIBCOMPATVERSIONS)" ]; then \ + if [ -n "$(LIBVERSION)$(LIBCOMPATVERSIONS)" ]; then \ prev=""; \ for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \ SHLIB_SOVER_NODOT=$$v \ @@ -80,14 +80,19 @@ LINK_SO= \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \ $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp ) SYMLINK_SO= \ + prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ if [ -n "$$SHLIB_COMPAT"]; then \ - prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ for x in $$SHLIB_COMPAT; do \ ( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \ ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \ prev=$$SHLIB$$x$$SHLIB_SUFFIX; \ done; \ + fi; \ + if [ -n "$$SHLIB_SOVER" ]; then \ + ( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \ + ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ fi + LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO) LINK_SO_O= SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO) LINK_SO_A_VIA_O= \ -- 2.25.1