Fix no-ec
[openssl.git] / Makefile.shared
index 878530b..c86a370 100644 (file)
@@ -7,11 +7,19 @@
 
 # CC contains the current compiler.  This one MUST be defined
 CC=cc
+CFLAGS=$(CFLAG)
 # LDFLAGS contains flags to be used when temporary object files (when building
 # shared libraries) are created, or when an application is linked.
 # SHARED_LDFLAGS contains flags to be used when the shared library is created.
-LDFLAGS=
-SHARED_LDFLAGS=
+LDFLAGS=$(LDFLAG)
+SHARED_LDFLAGS=$(SHARED_LDFLAG)
+
+RC=windres
+# SHARED_RCFLAGS are flags used with windres, i.e. when build for Cygwin
+# or Mingw.
+SHARED_RCFLAGS=$(SHARED_RCFLAG)
+
+NM=nm
 
 # LIBNAME contains just the name of the library, without prefix ("lib"
 # on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
@@ -28,6 +36,12 @@ LIBNAME=
 #APPNAME=foo
 APPNAME=
 
+# DSTDIR is the directory where the built file should end up in.
+DSTDIR=.
+
+# SRCDIR is the top directory of the source tree.
+SRCDIR=.
+
 # OBJECTS contains all the object files to link together into the application.
 # This must contain at least one object file.
 #OBJECTS=foo.o
@@ -37,8 +51,8 @@ OBJECTS=
 # For example, if a second library, say libbar.a needs to be linked into
 # libfoo.so, you need to do the following:
 #LIBEXTRAS=libbar.a
-# Note that this MUST be used when using the link_o targets, to hold the
-# names of all object files that go into the target library.
+# Note that this MUST be used when using the link_dso targets, to hold the
+# names of all object files that go into the target shared object.
 LIBEXTRAS=
 
 # LIBVERSION contains the current version of the library.
@@ -66,8 +80,8 @@ LIBDEPS=
 #------------------------------------------------------------------------------
 # The rest is private to this makefile.
 
-#DEBUG=:
-DEBUG=set -x
+SET_X=:
+#SET_X=set -x
 
 top:
        echo "Trying to use this makefile interactively?  Don't."
@@ -87,66 +101,82 @@ CALC_VERSIONS=     \
        fi
 
 LINK_APP=      \
-  ( $(DEBUG);   \
-    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+  ( $(SET_X);   \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS) $(LDFLAGS)}"; \
+    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+    echo LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+        $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS}; \
     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-    $$LDCMD $(LDFLAGS) $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS )
+    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
 
 LINK_SO=       \
-  ( $(DEBUG);   \
-    nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
-    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+  ( $(SET_X);   \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
+    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+    echo LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+         $${SHAREDCMD} $${SHAREDFLAGS} \
+            -o $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+            $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS; \
     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-    $$SHAREDCMD $(SHARED_LDFLAGS) $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-       $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
-  $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
+    $${SHAREDCMD} $${SHAREDFLAGS} \
+       -o $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+       $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
+  ) && $(SYMLINK_SO)
+
 SYMLINK_SO=    \
        if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
                prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
                if [ -n "$$SHLIB_COMPAT" ]; then \
                        for x in $$SHLIB_COMPAT; do \
-                               ( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
-                                 ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
+                               ( $(SET_X); rm -f $(DSTDIR)/$$SHLIB$$x$$SHLIB_SUFFIX; \
+                                 ln -s $$prev $(DSTDIR)/$$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 ); \
+                       ( $(SET_X); rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX; \
+                         ln -s $$prev $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX ); \
                fi; \
        fi
 
-LINK_SO_A=     SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
-LINK_SO_O=     SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
-LINK_SO_A_VIA_O=       \
-  SHOBJECTS=lib$(LIBNAME).o; \
+LINK_SO_SHLIB= SHOBJECTS="$(DSTDIR)/lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
+LINK_SO_DSO=   INHIBIT_SYMLINKS=yes; SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
+
+LINK_SO_SHLIB_VIA_O=   \
+  SHOBJECTS=$(DSTDIR)/lib$(LIBNAME).o; \
   ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
-  ( $(DEBUG); \
-    ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
-  $(LINK_SO) && rm -f $(LIBNAME).o
-LINK_SO_A_UNPACKED=    \
+  ( echo ld $(LDFLAGS) -r -o $$SHOBJECTS $$ALL lib$(LIBNAME).a $(LIBEXTRAS); \
+    ld $(LDFLAGS) -r -o $$SHOBJECTS $$ALL $(DSTDIR)/lib$(LIBNAME).a $(LIBEXTRAS) ); \
+  $(LINK_SO) && ( echo rm -f $$SHOBJECTS; rm -f $$SHOBJECTS )
+
+LINK_SO_SHLIB_UNPACKED=        \
   UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
-  (cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \
+  (cd $$UNPACKDIR; ar x ../$(DSTDIR)/lib$(LIBNAME).a) && \
   ([ -z "$(LIBEXTRAS)" ] || cp $(LIBEXTRAS) $$UNPACKDIR) && \
   SHOBJECTS=$$UNPACKDIR/*.o; \
   $(LINK_SO) && rm -rf $$UNPACKDIR
 
-DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
+DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
 
-DO_GNU_SO=$(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so; \
+DO_GNU_SO_COMMON=\
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+DO_GNU_DSO=\
+       SHLIB=$(LIBNAME).so; \
+       SHLIB_SOVER=; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
+       $(DO_GNU_SO_COMMON)
+DO_GNU_SO=\
+       $(CALC_VERSIONS); \
+       SHLIB=lib$(LIBNAME).so; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
-       SHAREDCMD='$(CC)'
-DO_GNU_APP=LDCMD=$(CC);\
-       LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME=$(APPNAME)
+       $(DO_GNU_SO_COMMON)
+DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS)"
 
 #This is rather special.  It's a special target with which one can link
 #applications without bothering with any features that have anything to
@@ -154,152 +184,154 @@ DO_GNU_APP=LDCMD=$(CC);\
 #libraries.  It's mostly here to avoid a lot of conditionals everywhere
 #else...
 link_app.:
-       LDCMD=$(CC); \
-       LDFLAGS=""; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
        $(LINK_APP)
 
-link_o.gnu:
-       @ $(DO_GNU_SO); $(LINK_SO_O)
-link_a.gnu:
-       @ $(DO_GNU_SO); $(LINK_SO_A)
+link_dso.gnu:
+       @ $(DO_GNU_DSO); $(LINK_SO_DSO)
+link_shlib.gnu:
+       @ $(DO_GNU_SO); $(LINK_SO_SHLIB)
 link_app.gnu:
        @ $(DO_GNU_APP); $(LINK_APP)
 
-link_o.bsd:
-       @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
-       $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so; \
+link_shlib.linux-shared:
+       @$(PERL) $(SRCDIR)/util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \
+       $(DO_GNU_SO); \
+       ALLSYMSFLAGS='-Wl,--whole-archive,--version-script=$(LIBNAME).map'; \
+       $(LINK_SO_SHLIB)
+
+link_dso.bsd:
+       @if $(DETECT_GNU_LD); then $(DO_GNU_DSO); else \
+       SHLIB=$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS=; \
-       ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
+       LIBDEPS=" "; \
+       ALLSYMSFLAGS=; \
        NOALLSYMSFLAGS=; \
-       SHAREDFLAGS="-shared -nostdlib"; \
-       SHAREDCMD=$(CC); \
-       fi; $(LINK_SO_O)
-link_a.bsd:
-       @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
+       fi; $(LINK_SO_DSO)
+link_shlib.bsd:
+       @if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
        $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS=; \
+       LIBDEPS=" "; \
        ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
        NOALLSYMSFLAGS=; \
-       SHAREDFLAGS="-shared -nostdlib"; \
-       SHAREDCMD=$(CC); \
-       fi; $(LINK_SO_A)
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
+       fi; $(LINK_SO_SHLIB)
 link_app.bsd:
-       @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
-       LDCMD=$(CC); \
-       LDFLAGS="-Wl,-rpath,$(LIBPATH)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
+       @if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
+       LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
        fi; $(LINK_APP)
 
 # For Darwin AKA Mac OS/X (dyld)
-link_o.darwin:
-       @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME); \
+# Originally link_dso.darwin produced .so, because it was hard-coded
+# in dso_dlfcn module. At later point dso_dlfcn switched to .dylib
+# extension in order to allow for run-time linking with vendor-
+# supplied shared libraries such as libz, so that link_dso.darwin had
+# to be harmonized with it. This caused minor controversy, because
+# it was believed that dlopen can't be used to dynamically load
+# .dylib-s, only so called bundle modules (ones linked with -bundle
+# flag). The belief seems to be originating from pre-10.4 release,
+# where dlfcn functionality was emulated by dlcompat add-on. In
+# 10.4 dlopen was rewritten as native part of dyld and is documented
+# to be capable of loading both dynamic libraries and bundles. In
+# order to provide compatibility with pre-10.4 dlopen, modules are
+# linked with -bundle flag, which makes .dylib extension misleading.
+# It works, because dlopen is [and always was] extension-agnostic.
+# Alternative to this heuristic approach is to develop specific
+# MacOS X dso module relying on whichever "native" dyld interface.
+link_dso.darwin:
+       @ SHLIB=$(LIBNAME); \
        SHLIB_SUFFIX=.dylib; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS='-all_load'; \
+       ALLSYMSFLAGS=''; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="-dynamiclib"; \
-       SHAREDCMD='$(CC)'; \
-       if [ -n "$(LIBVERSION)" ]; then \
-               SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
-       fi; \
-       if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
-               SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
-       fi; \
-       $(LINK_SO_O)
-link_a.darwin:
+       SHAREDFLAGS="$(CFLAGS) `echo $(SHARED_LDFLAGS) | sed s/dynamiclib/bundle/`"; \
+       $(LINK_SO_DSO)
+link_shlib.darwin:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME); \
        SHLIB_SUFFIX=.dylib; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS='-all_load'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="-dynamiclib"; \
-       SHAREDCMD='$(CC)'; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
        if [ -n "$(LIBVERSION)" ]; then \
                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
                SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
        fi; \
-       $(LINK_SO_A)
-link_app.darwin:
-       LDCMD=$(CC);\
-       LDFLAGS=""; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME="$(APPNAME)"; \
+       SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/$(LIBDIR)/$$SHLIB$(SHLIB_EXT)"; \
+       $(LINK_SO_SHLIB)
+link_app.darwin:       # is there run-path on darwin?
        $(LINK_APP)
 
-link_o.cygwin:
+link_dso.cygwin:
+       @SHLIB=$(LIBNAME); \
+       SHLIB_SUFFIX=.dll; \
+       ALLSYMSFLAGS=''; \
+       NOALLSYMSFLAGS=''; \
+       base=-Wl,--enable-auto-image-base; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic"; \
+       $(LINK_SO_DSO)
+link_shlib.cygwin:
        @ $(CALC_VERSIONS); \
        INHIBIT_SYMLINKS=yes; \
-       SHLIB=cyg$(LIBNAME); \
-       expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
-       SHLIB_SUFFIX=.dll; \
-       LIBDEPS="$(LIBDEPS)"; \
-       SHLIB_SOVER=-$(LIBVERSION); \
+       SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \
+       dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+       echo "$(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name |" \
+                    "$(RC) $(SHARED_RCFLAGS) -o rc.o"; \
+       $(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name | \
+               $(RC) $(SHARED_RCFLAGS) -o rc.o; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="-Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
-       SHAREDCMD='${CC}'; \
-       $(LINK_SO_O)
-link_a.cygwin:
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,--enable-auto-image-base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a rc.o"; \
+       $(LINK_SO_SHLIB) || exit 1; \
+       rm rc.o
+link_app.cygwin:
+       $(LINK_APP)
+
+# link_dso.mingw-shared and link_app.mingw-shared are mapped to the
+# corresponding cygwin targets, as they do the exact same thing.
+link_shlib.mingw:
        @ $(CALC_VERSIONS); \
        INHIBIT_SYMLINKS=yes; \
-       SHLIB=cyg$(LIBNAME); \
-       expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
+       arch=; \
+       if expr $(PLATFORM) : mingw64 > /dev/null; then arch=-x64; fi; \
+       sover=`echo $(LIBVERSION) | sed -e 's/\./_/g'` ; \
+       SHLIB=lib$(LIBNAME); \
+       SHLIB_SOVER=-$$sover$$arch; \
        SHLIB_SUFFIX=.dll; \
-       LIBDEPS="$(LIBDEPS)"; \
-       SHLIB_SOVER=; \
+       dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+       $(PERL) $(SRCDIR)/util/mkdef.pl 32 $(LIBNAME) \
+               | sed -e 's|^\(LIBRARY  *\)$(LIBNAME)32|\1'"$$dll_name"'|' \
+               > $(LIBNAME).def; \
+       echo "$(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name |" \
+               "$(RC) $(SHARED_RCFLAGS) -o rc.o"; \
+       $(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name | \
+               $(RC) $(SHARED_RCFLAGS) -o rc.o; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="-Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
-       SHAREDCMD='${CC}'; \
-       $(LINK_SO_A)
-link_app.cygwin:
-       LDCMD=$(CC);\
-       LDFLAGS=""; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
-       $(LINK_APP)
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $(LIBNAME).def rc.o"; \
+       $(LINK_SO_SHLIB) || exit 1; \
+       rm $(LIBNAME).def rc.o
 
-link_o.alpha-osf1:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
+link_dso.alpha-osf1:
+       @ if $(DETECT_GNU_LD); then \
+               $(DO_GNU_DSO); \
        else \
-               SHLIB=lib$(LIBNAME).so; \
+               SHLIB=$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
-               else \
-                       SHLIB_HIST="$(LIBVERSION)"; \
-               fi; \
-               SHLIB_SOVER=; \
-               ALLSYMSFLAGS='-all'; \
-               NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared"; \
-               SHAREDCMD='$(CC)'; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
-               fi; \
+               ALLSYMSFLAGS=''; \
+               NOALLSYMSFLAGS=''; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
        fi; \
-       $(LINK_SO_O)
-link_a.alpha-osf1:
-       @ if ${DETECT_GNU_LD}; then \
+       $(LINK_SO_DSO)
+link_shlib.alpha-osf1:
+       @ if $(DETECT_GNU_LD); then \
                $(DO_GNU_SO); \
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -309,310 +341,141 @@ link_a.alpha-osf1:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
                fi; \
        fi; \
-       $(LINK_SO_A)
+       $(LINK_SO_SHLIB)
 link_app.alpha-osf1:
-       @ if ${DETECT_GNU_LD}; then \
+       @if $(DETECT_GNU_LD); then \
                $(DO_GNU_APP); \
        else \
-               LDCMD=$(CC);\
-               LDFLAGS=""; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"
+               LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
        fi; \
        $(LINK_APP)
 
-# The difference between alpha-osf1-shared and tru64-shared is the `-msym'
-# option passed to the linker.
-link_o.tru64:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
-       else \
-               SHLIB=lib$(LIBNAME).so; \
-               SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
-               else \
-                       SHLIB_HIST="$(LIBVERSION)"; \
-               fi; \
-               SHLIB_SOVER=; \
-               ALLSYMSFLAGS='-all'; \
-               NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
-               SHAREDCMD='$(CC)'; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
-               fi; \
-       fi; \
-       $(LINK_SO_O)
-link_a.tru64:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
-       else \
-               SHLIB=lib$(LIBNAME).so; \
-               SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
-               else \
-                       SHLIB_HIST="$(LIBVERSION)"; \
-               fi; \
-               SHLIB_SOVER=; \
-               ALLSYMSFLAGS='-all'; \
-               NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
-               SHAREDCMD='$(CC)'; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
-               fi; \
-       fi; \
-       $(LINK_SO_A)
-link_app.tru64:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="-rpath $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
-       $(LINK_APP)
-
-# The difference between tru64-shared and tru64-shared-rpath is the
-# -rpath ${LIBRPATH} passed to the linker.
-link_o.tru64-rpath:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
-       else \
-               SHLIB=lib$(LIBNAME).so; \
-               SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
-               else \
-                       SHLIB_HIST="$(LIBVERSION)"; \
-               fi; \
-               SHLIB_SOVER=; \
-               ALLSYMSFLAGS='-all'; \
-               NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
-               SHAREDCMD='$(CC)'; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
-               fi; \
-       fi; \
-       $(LINK_SO_O)
-link_a.tru64-rpath:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
-       else \
-               SHLIB=lib$(LIBNAME).so; \
-               SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
-               else \
-                       SHLIB_HIST="$(LIBVERSION)"; \
-               fi; \
-               SHLIB_SOVER=; \
-               ALLSYMSFLAGS='-all'; \
-               NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
-               SHAREDCMD='$(CC)'; \
-               if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
-               fi; \
-       fi; \
-       $(LINK_SO_A)
-link_app.tru64-rpath:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="-rpath $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
-       $(LINK_APP)
-
-link_o.solaris:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
+link_dso.solaris:
+       @ if $(DETECT_GNU_LD); then \
+               $(DO_GNU_DSO); \
        else \
                $(CALC_VERSIONS); \
-               MINUSZ='-z '; \
-               (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
-               SHLIB=lib$(LIBNAME).so; \
+               SHLIB=$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               ALLSYMSFLAGS="$${MINUSZ}allextract"; \
-               NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
-               SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
-               SHAREDCMD='$(CC)'; \
+               ALLSYMSFLAGS=""; \
+               NOALLSYMSFLAGS=""; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
        fi; \
-       $(LINK_SO_O)
-link_a.solaris:
-       @ if ${DETECT_GNU_LD}; then \
+       $(LINK_SO_DSO)
+link_shlib.solaris:
+       @ if $(DETECT_GNU_LD); then \
                $(DO_GNU_SO); \
        else \
                $(CALC_VERSIONS); \
-               MINUSZ='-z '; \
-               (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=;\
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               ALLSYMSFLAGS="$${MINUSZ}allextract"; \
-               NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
-               SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
-               SHAREDCMD='$(CC)'; \
+               $(PERL) $(SRCDIR)/util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \
+               ALLSYMSFLAGS="-Wl,-z,allextract,-M,$(LIBNAME).map"; \
+               NOALLSYMSFLAGS="-Wl,-z,defaultextract"; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
        fi; \
-       $(LINK_SO_A)
+       $(LINK_SO_SHLIB)
 link_app.solaris:
-       @ if ${DETECT_GNU_LD}; then \
+       @ if $(DETECT_GNU_LD); then \
                $(DO_GNU_APP); \
        else \
-               LDCMD=$(CC);\
-               LDFLAGS="-R $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"; \
+               LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
        fi; \
        $(LINK_APP)
 
 # OpenServer 5 native compilers used
-link_o.svr3:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
+link_dso.svr3:
+       @ if $(DETECT_GNU_LD); then \
+               $(DO_GNU_DSO); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so; \
+               SHLIB=$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SUFFIX"; \
        fi; \
-       $(LINK_SO_O)
-link_a.svr3:
-       @ if ${DETECT_GNU_LD}; then \
+       $(LINK_SO_DSO)
+link_shlib.svr3:
+       @ if $(DETECT_GNU_LD); then \
                $(DO_GNU_SO); \
        else \
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        fi; \
-       $(LINK_SO_A_UNPACKED)
+       $(LINK_SO_SHLIB_UNPACKED)
 link_app.svr3:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS=""; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
+       @$(DETECT_GNU_LD) && $(DO_GNU_APP); \
        $(LINK_APP)
 
 # UnixWare 7 and OpenUNIX 8 native compilers used
-link_o.svr5:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
+link_dso.svr5:
+       @ if $(DETECT_GNU_LD); then \
+               $(DO_GNU_DSO); \
        else \
-               $(CALC_VERSIONS); \
                SHARE_FLAG='-G'; \
-               (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
-               SHLIB=lib$(LIBNAME).so; \
+               ($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
+               SHLIB=$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SUFFIX"; \
        fi; \
-       $(LINK_SO_O)
-link_a.svr5:
-       @ if ${DETECT_GNU_LD}; then \
+       $(LINK_SO_DSO)
+link_shlib.svr5:
+       @ if $(DETECT_GNU_LD); then \
                $(DO_GNU_SO); \
        else \
                $(CALC_VERSIONS); \
                SHARE_FLAG='-G'; \
-               (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
+               ($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        fi; \
-       $(LINK_SO_A_UNPACKED)
+       $(LINK_SO_SHLIB_UNPACKED)
 link_app.svr5:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS=""; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
+       @$(DETECT_GNU_LD) && $(DO_GNU_APP); \
        $(LINK_APP)
 
-link_o.irix:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_SO); \
+link_dso.irix:
+       @ if $(DETECT_GNU_LD); then \
+               $(DO_GNU_DSO); \
        else \
-               $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so; \
+               SHLIB=$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               MINUSWL=""; \
-               ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
-               ALLSYMSFLAGS="$${MINUSWL}-all"; \
-               NOALLSYMSFLAGS="$${MINUSWL}-none"; \
-               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
-               SHAREDCMD='$(CC)'; \
+               ALLSYMSFLAGS=""; \
+               NOALLSYMSFLAGS=""; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SUFFIX,-B,symbolic"; \
        fi; \
-       $(LINK_SO_O)
-link_a.irix:
-       @ if ${DETECT_GNU_LD}; then \
+       $(LINK_SO_DSO)
+link_shlib.irix:
+       @ if $(DETECT_GNU_LD); then \
                $(DO_GNU_SO); \
        else \
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
                MINUSWL=""; \
                ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
                ALLSYMSFLAGS="$${MINUSWL}-all"; \
                NOALLSYMSFLAGS="$${MINUSWL}-none"; \
-               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
        fi; \
-       $(LINK_SO_A)
+       $(LINK_SO_SHLIB)
 link_app.irix:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
+       @LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
        $(LINK_APP)
 
 # 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
@@ -623,100 +486,66 @@ link_app.irix:
 # editor context only [it's simply ignored in other cases, which are all
 # ELFs by the way].
 #
-link_o.hpux:
-       @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
-       $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).sl; \
-       expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+link_dso.hpux:
+       @if $(DETECT_GNU_LD); then $(DO_GNU_DSO); else \
+       SHLIB=$(LIBNAME).sl; \
+       expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
-       ALLSYMSFLAGS='-Wl,-Fl'; \
+       ALLSYMSFLAGS=''; \
        NOALLSYMSFLAGS=''; \
        expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
-       SHAREDFLAGS="-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
-       SHAREDCMD=$(CC); \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
        fi; \
-       $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
-link_a.hpux:
-       @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
+       rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX || :; \
+       $(LINK_SO_DSO) && chmod a=rx $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX
+link_shlib.hpux:
+       @if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
        $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).sl; \
        expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-Wl,-Fl'; \
        NOALLSYMSFLAGS=''; \
        expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
-       SHAREDFLAGS="-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+b,$(LIBRPATH)"; \
-       SHAREDCMD='$(CC)'; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
        fi; \
-       $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
+       rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
+       $(LINK_SO_SHLIB) && chmod a=rx $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_app.hpux:
-       @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
-       LDCMD=$(CC);\
-       LDFLAGS="-Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
+       @if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
+       LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:"; \
        fi; \
        $(LINK_APP)
 
-link_o.aix:
-       @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so; \
+link_dso.aix:
+       @OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \
+       OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
+       SHLIB=$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS='-bnogc'; \
+       ALLSYMSFLAGS=''; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
-       SHAREDCMD='$(CC)'; \
-       $(LINK_SO_O)
-link_a.aix:
+       SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+       rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \
+       $(LINK_SO_DSO);
+link_shlib.aix:
        @ $(CALC_VERSIONS); \
+       OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \
+       OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS='-bnogc'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
-       SHAREDCMD='$(CC)'; \
-       $(LINK_SO_A_VIA_O)
+       SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+       rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \
+       $(LINK_SO_SHLIB_VIA_O)
 link_app.aix:
-       LDCMD=$(CC);\
-       LDFLAGS="-blibpath:$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME="$(APPNAME)"
+       LDFLAGS="$(CFLAGS) -Wl,-bsvr4 $(LDFLAGS)"; \
        $(LINK_APP)
 
-link_o.reliantunix:
-       @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so; \
-       SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS=; \
-       NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G'; \
-       SHAREDCMD='$(CC)'; \
-       $(LINK_SO_O)
-link_a.reliantunix:
-       @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so; \
-       SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS=; \
-       NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G'; \
-       SHAREDCMD='$(CC)'; \
-       $(LINK_SO_A_UNPACKED)
-link_app.reliantunix:
-       LDCMD=$(CC);\
-       LDFLAGS=""; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME="$(APPNAME)"
-       $(LINK_APP)
 
 # Targets to build symbolic links when needed
 symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
-symlink.aix symlink.reliantunix:
+symlink.aix:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
        $(SYMLINK_SO)
@@ -731,61 +560,62 @@ symlink.hpux:
        expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
        $(SYMLINK_SO)
 # The following lines means those specific architectures do no symlinks
-symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
+symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 
 # Compatibility targets
-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
+link_dso.bsd-gcc-shared link_dso.linux-shared link_dso.gnu-shared: link_dso.gnu
+link_shlib.bsd-gcc-shared: link_shlib.linux-shared
+link_shlib.gnu-shared: link_shlib.gnu
 link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
 symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
-link_o.bsd-shared: link_o.bsd
-link_a.bsd-shared: link_a.bsd
+link_dso.bsd-shared: link_dso.bsd
+link_shlib.bsd-shared: link_shlib.bsd
 link_app.bsd-shared: link_app.bsd
-link_o.darwin-shared: link_o.darwin
-link_a.darwin-shared: link_a.darwin
+link_dso.darwin-shared: link_dso.darwin
+link_shlib.darwin-shared: link_shlib.darwin
 link_app.darwin-shared: link_app.darwin
 symlink.darwin-shared: symlink.darwin
-link_o.cygwin-shared: link_o.cygwin
-link_a.cygwin-shared: link_a.cygwin
+link_dso.cygwin-shared: link_dso.cygwin
+link_shlib.cygwin-shared: link_shlib.cygwin
 link_app.cygwin-shared: link_app.cygwin
 symlink.cygwin-shared: symlink.cygwin
-link_o.alpha-osf1-shared: link_o.alpha-osf1
-link_a.alpha-osf1-shared: link_a.alpha-osf1
+link_dso.mingw-shared: link_dso.cygwin
+link_shlib.mingw-shared: link_shlib.mingw
+link_app.mingw-shared: link_app.cygwin
+symlink.mingw-shared: symlink.cygwin
+link_dso.alpha-osf1-shared: link_dso.alpha-osf1
+link_shlib.alpha-osf1-shared: link_shlib.alpha-osf1
 link_app.alpha-osf1-shared: link_app.alpha-osf1
 symlink.alpha-osf1-shared: symlink.alpha-osf1
-link_o.tru64-shared: link_o.tru64
-link_a.tru64-shared: link_a.tru64
+link_dso.tru64-shared: link_dso.tru64
+link_shlib.tru64-shared: link_shlib.tru64
 link_app.tru64-shared: link_app.tru64
 symlink.tru64-shared: symlink.tru64
-link_o.tru64-shared-rpath: link_o.tru64-rpath
-link_a.tru64-shared-rpath: link_a.tru64-rpath
+link_dso.tru64-shared-rpath: link_dso.tru64-rpath
+link_shlib.tru64-shared-rpath: link_shlib.tru64-rpath
 link_app.tru64-shared-rpath: link_app.tru64-rpath
 symlink.tru64-shared-rpath: symlink.tru64-rpath
-link_o.solaris-shared: link_o.solaris
-link_a.solaris-shared: link_a.solaris
+link_dso.solaris-shared: link_dso.solaris
+link_shlib.solaris-shared: link_shlib.solaris
 link_app.solaris-shared: link_app.solaris
 symlink.solaris-shared: symlink.solaris
-link_o.svr3-shared: link_o.svr3
-link_a.svr3-shared: link_a.svr3
+link_dso.svr3-shared: link_dso.svr3
+link_shlib.svr3-shared: link_shlib.svr3
 link_app.svr3-shared: link_app.svr3
 symlink.svr3-shared: symlink.svr3
-link_o.svr5-shared: link_o.svr5
-link_a.svr5-shared: link_a.svr5
+link_dso.svr5-shared: link_dso.svr5
+link_shlib.svr5-shared: link_shlib.svr5
 link_app.svr5-shared: link_app.svr5
 symlink.svr5-shared: symlink.svr5
-link_o.irix-shared: link_o.irix
-link_a.irix-shared: link_a.irix
+link_dso.irix-shared: link_dso.irix
+link_shlib.irix-shared: link_shlib.irix
 link_app.irix-shared: link_app.irix
 symlink.irix-shared: symlink.irix
-link_o.hpux-shared: link_o.hpux
-link_a.hpux-shared: link_a.hpux
+link_dso.hpux-shared: link_dso.hpux
+link_shlib.hpux-shared: link_shlib.hpux
 link_app.hpux-shared: link_app.hpux
 symlink.hpux-shared: symlink.hpux
-link_o.aix-shared: link_o.aix
-link_a.aix-shared: link_a.aix
+link_dso.aix-shared: link_dso.aix
+link_shlib.aix-shared: link_shlib.aix
 link_app.aix-shared: link_app.aix
 symlink.aix-shared: symlink.aix
-link_o.reliantunix-shared: link_o.reliantunix
-link_a.reliantunix-shared: link_a.reliantunix
-link_app.reliantunix-shared: link_app.reliantunix
-symlink.reliantunix-shared: symlink.reliantunix