fix function name in error
[openssl.git] / Makefile.shared
index 4f909704623f311d0db6320b1e257934d55a12fb..1b14dd145027a0463296510a6f5f816315def3cf 100644 (file)
@@ -7,6 +7,7 @@
 
 # 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.
@@ -88,20 +89,28 @@ CALC_VERSIONS=      \
 
 LINK_APP=      \
   ( $(SET_X);   \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
     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`; \
     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-    $$LDCMD $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS )
+    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
 
 LINK_SO=       \
   ( $(SET_X);   \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
+    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
     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`; \
     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-    $$SHAREDCMD $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-       $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
-  $(SYMLINK_SO); ( $(SET_X); rm -f lib$(LIBNAME).exp )
+    $${SHAREDCMD} $${SHAREDFLAGS} \
+       -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+       $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
+  ) && $(SYMLINK_SO); \
+  ( $(SET_X); rm -f lib$(LIBNAME).exp )
+
 SYMLINK_SO=    \
        if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
                prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
@@ -120,12 +129,14 @@ SYMLINK_SO=       \
 
 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; \
   ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
   ( $(SET_X); \
     ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
   $(LINK_SO) && rm -f $(LIBNAME).o
+
 LINK_SO_A_UNPACKED=    \
   UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
   (cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \
@@ -138,15 +149,11 @@ DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
 DO_GNU_SO=$(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
-       SHAREDCMD='$(CC)'
-DO_GNU_APP=LDCMD=$(CC);\
-       LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME=$(APPNAME)
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+
+DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
 
 #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,10 +161,6 @@ DO_GNU_APP=LDCMD=$(CC);\
 #libraries.  It's mostly here to avoid a lot of conditionals everywhere
 #else...
 link_app.:
-       LDCMD=$(CC); \
-       LDFLAGS="$(CFLAGS)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
        $(LINK_APP)
 
 link_o.gnu:
@@ -172,29 +175,24 @@ link_o.bsd:
        $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS=; \
+       LIBDEPS=" "; \
        ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
        NOALLSYMSFLAGS=; \
-       SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \
-       SHAREDCMD=$(CC); \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
        fi; $(LINK_SO_O)
 link_a.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="$(CFLAGS) -shared -nostdlib"; \
-       SHAREDCMD=$(CC); \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
        fi; $(LINK_SO_A)
 link_app.bsd:
        @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
-       LDCMD=$(CC); \
        LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
        fi; $(LINK_APP)
 
 # For Darwin AKA Mac OS/X (dyld)
@@ -202,11 +200,9 @@ link_o.darwin:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME); \
        SHLIB_SUFFIX=.dylib; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-all_load'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \
-       SHAREDCMD='$(CC)'; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
        if [ -n "$(LIBVERSION)" ]; then \
                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
@@ -218,11 +214,9 @@ link_a.darwin:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME); \
        SHLIB_SUFFIX=.dylib; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-all_load'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \
-       SHAREDCMD='$(CC)'; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
        if [ -n "$(LIBVERSION)" ]; then \
                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
@@ -230,11 +224,7 @@ link_a.darwin:
                SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
        fi; \
        $(LINK_SO_A)
-link_app.darwin:
-       LDCMD=$(CC);\
-       LDFLAGS="$(CFLAGS)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
+link_app.darwin:       # is there run-path on darwin?
        $(LINK_APP)
 
 link_o.cygwin:
@@ -243,12 +233,11 @@ link_o.cygwin:
        SHLIB=cyg$(LIBNAME); \
        expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
        SHLIB_SUFFIX=.dll; \
-       LIBDEPS="$(LIBDEPS)"; \
-       SHLIB_SOVER=-$(LIBVERSION); \
+       LIBVERSION="$(LIBVERSION)"; \
+       SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
-       SHAREDCMD='${CC}'; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        $(LINK_SO_O)
 link_a.cygwin:
        @ $(CALC_VERSIONS); \
@@ -256,23 +245,17 @@ link_a.cygwin:
        SHLIB=cyg$(LIBNAME); \
        expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
        SHLIB_SUFFIX=.dll; \
-       LIBDEPS="$(LIBDEPS)"; \
-       SHLIB_SOVER=; \
+       SHLIB_SOVER=-$(LIBVERSION); \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x61200000; \
-       SHAREDFLAGS="$(CFLAGS) $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
-       SHAREDCMD='${CC}'; \
+       base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
        [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
        $(LINK_SO_A) || exit 1; \
-       cp -p $$SHLIB$$SHLIB_SUFFIX apps/; \
-       cp -p $$SHLIB$$SHLIB_SUFFIX test/
+       cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; \
+       cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/
 link_app.cygwin:
-       LDCMD=$(CC);\
-       LDFLAGS="$(CFLAGS)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
        $(LINK_APP)
 
 link_o.alpha-osf1:
@@ -281,7 +264,6 @@ link_o.alpha-osf1:
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -291,8 +273,7 @@ link_o.alpha-osf1:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="$(CFLAGS) -shared"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
@@ -304,7 +285,6 @@ link_a.alpha-osf1:
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -314,139 +294,17 @@ link_a.alpha-osf1:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="$(CFLAGS) -shared"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
 link_app.alpha-osf1:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="$(CFLAGS)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               APPNAME="$(APPNAME)"
-       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)"; \
-               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="$(CFLAGS) -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)"; \
-               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="$(CFLAGS) -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="$(CFLAGS) -rpath $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               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)"; \
-               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="$(CFLAGS) -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)"; \
-               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="$(CFLAGS) -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 \
+       @if ${DETECT_GNU_LD}; then \
                $(DO_GNU_APP); \
        else \
-               LDCMD=$(CC);\
                LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
 
@@ -456,14 +314,12 @@ link_o.solaris:
        else \
                $(CALC_VERSIONS); \
                MINUSZ='-z '; \
-               (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
+               ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS="$${MINUSZ}allextract"; \
                NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
-               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
        fi; \
        $(LINK_SO_O)
 link_a.solaris:
@@ -475,21 +331,16 @@ link_a.solaris:
                (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=;\
-               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS="$${MINUSZ}allextract"; \
                NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
-               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
-               SHAREDCMD='$(CC)'; \
+               SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
        fi; \
        $(LINK_SO_A)
 link_app.solaris:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU_APP); \
        else \
-               LDCMD=$(CC);\
                LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
 
@@ -501,11 +352,9 @@ link_o.svr3:
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
                SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
 link_a.svr3:
@@ -515,22 +364,13 @@ link_a.svr3:
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
                SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A_UNPACKED)
 link_app.svr3:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="$(CFLAGS)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
+       @${DETECT_GNU_LD} && $(DO_GNU_APP); \
        $(LINK_APP)
 
 # UnixWare 7 and OpenUNIX 8 native compilers used
@@ -540,14 +380,12 @@ link_o.svr5:
        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)"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
                SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
 link_a.svr5:
@@ -559,22 +397,13 @@ link_a.svr5:
                (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
                SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-               SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A_UNPACKED)
 link_app.svr5:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="$(CFLAGS)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
+       @${DETECT_GNU_LD} && $(DO_GNU_APP); \
        $(LINK_APP)
 
 link_o.irix:
@@ -584,13 +413,11 @@ link_o.irix:
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                MINUSWL=""; \
                ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
                ALLSYMSFLAGS="$${MINUSWL}-all"; \
                NOALLSYMSFLAGS="$${MINUSWL}-none"; \
-               SHAREDFLAGS="$(CFLAGS) -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"; \
        fi; \
        $(LINK_SO_O)
 link_a.irix:
@@ -600,24 +427,15 @@ link_a.irix:
                $(CALC_VERSIONS); \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS)"; \
                MINUSWL=""; \
                ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
                ALLSYMSFLAGS="$${MINUSWL}-all"; \
                NOALLSYMSFLAGS="$${MINUSWL}-none"; \
-               SHAREDFLAGS="$(CFLAGS) -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"; \
        fi; \
        $(LINK_SO_A)
 link_app.irix:
-       @ if ${DETECT_GNU_LD}; then \
-               $(DO_GNU_APP); \
-       else \
-               LDCMD=$(CC);\
-               LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS)"; \
-               APPNAME="$(APPNAME)"; \
-       fi; \
+       @LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
        $(LINK_APP)
 
 # 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
@@ -634,13 +452,12 @@ link_o.hpux:
        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="$(CFLAGS) -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"; \
        fi; \
+       rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux:
        @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
@@ -648,20 +465,16 @@ link_a.hpux:
        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="$(CFLAGS) -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"; \
        fi; \
+       rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_app.hpux:
        @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
-       LDCMD=$(CC);\
        LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
 
@@ -671,11 +484,9 @@ link_o.aix:
        OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-bnogc'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
-       SHAREDCMD='$(CC)'; \
+       SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \
        $(LINK_SO_O); rm -rf lib$(LIBNAME).exp
 link_a.aix:
        @ $(CALC_VERSIONS); \
@@ -683,44 +494,31 @@ link_a.aix:
        OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-bnogc'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
-       SHAREDCMD='$(CC)'; \
+       SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \
        $(LINK_SO_A_VIA_O)
 link_app.aix:
-       LDCMD=$(CC);\
        LDFLAGS="$(CFLAGS) -blibpath:$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"
        $(LINK_APP)
 
 link_o.reliantunix:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS=; \
        NOALLSYMSFLAGS=''; \
        SHAREDFLAGS='$(CFLAGS) -G'; \
-       SHAREDCMD='$(CC)'; \
        $(LINK_SO_O)
 link_a.reliantunix:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS=; \
        NOALLSYMSFLAGS=''; \
        SHAREDFLAGS='$(CFLAGS) -G'; \
-       SHAREDCMD='$(CC)'; \
        $(LINK_SO_A_UNPACKED)
 link_app.reliantunix:
-       LDCMD=$(CC);\
-       LDFLAGS="$(CFLAGS)"; \
-       LIBDEPS="$(LIBDEPS)"; \
-       APPNAME="$(APPNAME)"
        $(LINK_APP)
 
 # Targets to build symbolic links when needed