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}.
This commit is contained in:
Richard Levitte 2002-10-11 11:14:41 +00:00
parent 42b06fbaca
commit cf3b8b52f1

View File

@ -61,7 +61,7 @@ top:
CALC_VERSIONS= \ CALC_VERSIONS= \
SHLIB_COMPAT=; SHLIB_SOVER=; \ SHLIB_COMPAT=; SHLIB_SOVER=; \
if [ -n "$(LIBVERSION) $(LIBCOMPATVERSIONS)" ]; then \ if [ -n "$(LIBVERSION)$(LIBCOMPATVERSIONS)" ]; then \
prev=""; \ prev=""; \
for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \ for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
SHLIB_SOVER_NODOT=$$v \ SHLIB_SOVER_NODOT=$$v \
@ -80,14 +80,19 @@ LINK_SO= \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
$(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp ) $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
SYMLINK_SO= \ SYMLINK_SO= \
if [ -n "$$SHLIB_COMPAT"]; then \
prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
if [ -n "$$SHLIB_COMPAT"]; then \
for x in $$SHLIB_COMPAT; do \ for x in $$SHLIB_COMPAT; do \
( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \ ( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \ ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
prev=$$SHLIB$$x$$SHLIB_SUFFIX; \ prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
done; \ done; \
fi; \
if [ -n "$$SHLIB_SOVER" ]; then \
( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
fi fi
LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO) LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
LINK_SO_O= SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO) LINK_SO_O= SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
LINK_SO_A_VIA_O= \ LINK_SO_A_VIA_O= \