Drop redundant -lc from a number of rules in Makefile.shared. It's
[openssl.git] / Makefile.shared
index c39c8424e6aba5c8ec0a9e734fb7eafb46a1facb..8b37a36e47fdb5a54083b567085c25053c1d1a53 100644 (file)
@@ -88,18 +88,18 @@ CALC_VERSIONS=      \
 
 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 | while read d; do echo -n $${d}:; done'`; \
-    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`
+    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) $$LDFLAGS -o $$APPNAME $(OBJECTS) $$LIBDEPS )
+    $$LDCMD $$LDFLAGS -o $$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 | while read d; do echo -n $${d}:; done'`; \
-    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`
+    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 $(SHARED_LDFLAGS) $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+    $$SHAREDCMD $$SHAREDFLAGS -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
        $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
   $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
 SYMLINK_SO=    \
@@ -138,14 +138,14 @@ 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) -lc"; \
+       LIBDEPS="$(LIBDEPS)"; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
+       SHAREDFLAGS="$(CFLAGS) -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"; \
+       LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
+       LIBDEPS="$(LIBDEPS)"; \
        APPNAME=$(APPNAME)
 
 #This is rather special.  It's a special target with which one can link
@@ -155,7 +155,7 @@ DO_GNU_APP=LDCMD=$(CC);\
 #else...
 link_app.:
        LDCMD=$(CC); \
-       LDFLAGS=""; \
+       LDFLAGS="$(CFLAGS)"; \
        LIBDEPS="$(LIBDEPS)"; \
        APPNAME="$(APPNAME)"; \
        $(LINK_APP)
@@ -167,6 +167,36 @@ link_a.gnu:
 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; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS=; \
+       ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
+       NOALLSYMSFLAGS=; \
+       SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \
+       SHAREDCMD=$(CC); \
+       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=; \
+       ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
+       NOALLSYMSFLAGS=; \
+       SHAREDFLAGS="$(CFLAGS) -shared -nostdlib"; \
+       SHAREDCMD=$(CC); \
+       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)
 link_o.darwin:
        @ $(CALC_VERSIONS); \
@@ -175,7 +205,7 @@ link_o.darwin:
        LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS='-all_load'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="-dynamiclib"; \
+       SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \
        SHAREDCMD='$(CC)'; \
        if [ -n "$(LIBVERSION)" ]; then \
                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
@@ -191,7 +221,7 @@ link_a.darwin:
        LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS='-all_load'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="-dynamiclib"; \
+       SHAREDFLAGS="$(CFLAGS) -dynamiclib"; \
        SHAREDCMD='$(CC)'; \
        if [ -n "$(LIBVERSION)" ]; then \
                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
@@ -202,7 +232,7 @@ link_a.darwin:
        $(LINK_SO_A)
 link_app.darwin:
        LDCMD=$(CC);\
-       LDFLAGS=""; \
+       LDFLAGS="$(CFLAGS)"; \
        LIBDEPS="$(LIBDEPS) -lc"; \
        APPNAME="$(APPNAME)"; \
        $(LINK_APP)
@@ -211,31 +241,33 @@ link_o.cygwin:
        @ $(CALC_VERSIONS); \
        INHIBIT_SYMLINKS=yes; \
        SHLIB=cyg$(LIBNAME); \
+       expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
        SHLIB_SUFFIX=.dll; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
+       LIBDEPS="$(LIBDEPS)"; \
        SHLIB_SOVER=-$(LIBVERSION); \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+       SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        SHAREDCMD='${CC}'; \
        $(LINK_SO_O)
 link_a.cygwin:
        @ $(CALC_VERSIONS); \
        INHIBIT_SYMLINKS=yes; \
        SHLIB=cyg$(LIBNAME); \
+       expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
        SHLIB_SUFFIX=.dll; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
+       LIBDEPS="$(LIBDEPS)"; \
        SHLIB_SOVER=; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+       SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        SHAREDCMD='${CC}'; \
        $(LINK_SO_A)
 link_app.cygwin:
        LDCMD=$(CC);\
-       LDFLAGS=""; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME="$(APPNAME).exe"
+       LDFLAGS="$(CFLAGS)"; \
+       LIBDEPS="$(LIBDEPS)"; \
+       APPNAME="$(APPNAME)"; \
        $(LINK_APP)
 
 link_o.alpha-osf1:
@@ -254,7 +286,7 @@ link_o.alpha-osf1:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared"; \
+               SHAREDFLAGS="$(CFLAGS) -shared"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
@@ -277,7 +309,7 @@ link_a.alpha-osf1:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared"; \
+               SHAREDFLAGS="$(CFLAGS) -shared"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
@@ -289,7 +321,7 @@ link_app.alpha-osf1:
                $(DO_GNU_APP); \
        else \
                LDCMD=$(CC);\
-               LDFLAGS=""; \
+               LDFLAGS="$(CFLAGS)"; \
                LIBDEPS="$(LIBDEPS) -lc"; \
                APPNAME="$(APPNAME)"
        fi; \
@@ -303,7 +335,7 @@ link_o.tru64:
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LIBDEPS="$(LIBDEPS)"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -313,7 +345,7 @@ link_o.tru64:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
@@ -326,7 +358,7 @@ link_a.tru64:
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LIBDEPS="$(LIBDEPS)"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -336,7 +368,7 @@ link_a.tru64:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
@@ -348,8 +380,8 @@ link_app.tru64:
                $(DO_GNU_APP); \
        else \
                LDCMD=$(CC);\
-               LDFLAGS="-rpath $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
+               LIBDEPS="$(LIBDEPS)"; \
                APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
@@ -362,7 +394,7 @@ link_o.tru64-rpath:
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LIBDEPS="$(LIBDEPS)"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -372,7 +404,7 @@ link_o.tru64-rpath:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
@@ -385,7 +417,7 @@ link_a.tru64-rpath:
        else \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LIBDEPS="$(LIBDEPS)"; \
                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
@@ -395,7 +427,7 @@ link_a.tru64-rpath:
                SHLIB_SOVER=; \
                ALLSYMSFLAGS='-all'; \
                NOALLSYMSFLAGS='-none'; \
-               SHAREDFLAGS="-shared -msym -rpath $(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) -shared -msym -rpath $(LIBRPATH)"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
                        SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
@@ -407,8 +439,8 @@ link_app.tru64-rpath:
                $(DO_GNU_APP); \
        else \
                LDCMD=$(CC);\
-               LDFLAGS="-rpath $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
+               LIBDEPS="$(LIBDEPS)"; \
                APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
@@ -422,10 +454,10 @@ link_o.solaris:
                (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS="$${MINUSZ}allextract"; \
                NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
-               SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -438,10 +470,10 @@ link_a.solaris:
                (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=;\
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LIBDEPS="$(LIBDEPS)"; \
                ALLSYMSFLAGS="$${MINUSZ}allextract"; \
                NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
-               SHAREDFLAGS="-G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) -G -dy -z text -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -R $(LIBRPATH) -Wl,-Bsymbolic"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A)
@@ -450,27 +482,24 @@ link_app.solaris:
                $(DO_GNU_APP); \
        else \
                LDCMD=$(CC);\
-               LDFLAGS="-R $(LIBRPATH)"; \
-               LIBDEPS="$(LIBDEPS) -lc"; \
+               LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
+               LIBDEPS="$(LIBDEPS)"; \
                APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
 
 # OpenServer 5 native compilers used
-# UnixWare 7 and OpenUNIX 8 native compilers used
 link_o.svr3:
        @ 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'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
                LIBDEPS="$(LIBDEPS) -lc"; \
                ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="$${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+               SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -479,14 +508,12 @@ link_a.svr3:
                $(DO_GNU_SO); \
        else \
                $(CALC_VERSIONS); \
-               SHARE_FLAG='-G'; \
-               (${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"; \
+               SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A_UNPACKED)
@@ -495,121 +522,142 @@ link_app.svr3:
                $(DO_GNU_APP); \
        else \
                LDCMD=$(CC);\
-               LDFLAGS=""; \
+               LDFLAGS="$(CFLAGS)"; \
                LIBDEPS="$(LIBDEPS) -lc"; \
                APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
 
-link_o.irix:
+# UnixWare 7 and OpenUNIX 8 native compilers used
+link_o.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'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
                LIBDEPS="$(LIBDEPS) -lc"; \
-               ALLSYMSFLAGS='-all'; \
+               ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
-link_a.irix:
+link_a.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'; \
                SHLIB=lib$(LIBNAME).so; \
                SHLIB_SUFFIX=; \
                LIBDEPS="$(LIBDEPS) -lc"; \
-               ALLSYMSFLAGS='-all'; \
+               ALLSYMSFLAGS=''; \
                NOALLSYMSFLAGS=''; \
-               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-rpath,$(LIBRPATH)"; \
+               SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
-       $(LINK_SO_A)
-link_app.irix:
+       $(LINK_SO_A_UNPACKED)
+link_app.svr5:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU_APP); \
        else \
                LDCMD=$(CC);\
-               LDFLAGS="-Wl,-rpath,$(LIBRPATH)"; \
+               LDFLAGS="$(CFLAGS)"; \
                LIBDEPS="$(LIBDEPS) -lc"; \
                APPNAME="$(APPNAME)"; \
        fi; \
        $(LINK_APP)
 
-# HP-UX includes the full pathname of libs we depend on, so we would get
-# ./libcrypto (with ./ as path information) compiled into libssl, hence
-# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto
-# anyway.
-# The object modules are loaded from lib$i.a using the undocumented -Fl
-# option.
-#
-# WARNING: Until DSO is fixed to support a search path, we support SHLIB_PATH
-#          by temporarily specifying "+s"!
-#
-link_o.hpux32:
-       @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).sl; \
-       SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS='-Fl'; \
-       NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \
-       SHAREDCMD='/usr/ccs/bin/ld'; \
-       $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
-link_a.hpux32:
-       @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).sl; \
-       SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS='-Fl'; \
-       NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \
-       SHAREDCMD='/usr/ccs/bin/ld'; \
-       $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
-link_app.hpux32:
-       LDCMD=$(CC);\
-       LDFLAGS="-Wl,+b,$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME="$(APPNAME)"
+link_o.irix:
+       @ if ${DETECT_GNU_LD}; then \
+               $(DO_GNU_SO); \
+       else \
+               $(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)'; \
+       fi; \
+       $(LINK_SO_O)
+link_a.irix:
+       @ if ${DETECT_GNU_LD}; then \
+               $(DO_GNU_SO); \
+       else \
+               $(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)'; \
+       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; \
        $(LINK_APP)
 
-# HP-UX includes the full pathname of libs we depend on, so we would get
-# ./libcrypto (with ./ as path information) compiled into libssl, hence
-# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto
-# anyway.
-#
-# HP-UX in 64bit mode has "+s" enabled by default; it will search for
-# shared libraries along LD_LIBRARY_PATH _and_ SHLIB_PATH.
+# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
+# we compensate for it with +cdp ../: and +cdp ./:. Yes, these rewrite
+# rules imply that we can only link one level down in catalog structure,
+# but that's what takes place for the moment of this writing. +cdp option
+# was introduced in HP-UX 11.x and applies in 32-bit PA-RISC link
+# editor context only [it's simply ignored in other cases, which are all
+# ELFs by the way].
 #
-link_o.hpux64:
-       @ $(CALC_VERSIONS); \
+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; \
        SHLIB_SUFFIX=; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       ALLSYMSFLAGS='+forceload'; \
+       LIBDEPS="$(LIBDEPS)"; \
+       ALLSYMSFLAGS='-Wl,-Fl'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \
-       SHAREDCMD='/usr/ccs/bin/ld'; \
+       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); \
+       fi; \
        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
-link_a.hpux64:
-       @ $(CALC_VERSIONS); \
+link_a.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) -lc"; \
-       ALLSYMSFLAGS='+forceload'; \
+       LIBDEPS="$(LIBDEPS)"; \
+       ALLSYMSFLAGS='-Wl,-Fl'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX +b $(LIBRPATH)"; \
-       SHAREDCMD='/usr/ccs/bin/ld'; \
+       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)'; \
+       fi; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
-link_app.hpux64:
+link_app.hpux:
+       @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
        LDCMD=$(CC);\
-       LDFLAGS="-Wl,+b,$(LIBRPATH)"; \
-       LIBDEPS="$(LIBDEPS) -lc"; \
-       APPNAME="$(APPNAME)"
+       LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
+       LIBDEPS="$(LIBDEPS)"; \
+       APPNAME="$(APPNAME)"; \
+       fi; \
        $(LINK_APP)
 
 link_o.aix:
@@ -619,7 +667,7 @@ link_o.aix:
        LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS='-bnogc'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
+       SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_O)
 link_a.aix:
@@ -629,12 +677,12 @@ link_a.aix:
        LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS='-bnogc'; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
+       SHAREDFLAGS='$(CFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE -blibpath:$(LIBRPATH)'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_A_VIA_O)
 link_app.aix:
        LDCMD=$(CC);\
-       LDFLAGS="-blibpath:$(LIBRPATH)"; \
+       LDFLAGS="$(CFLAGS) -blibpath:$(LIBRPATH)"; \
        LIBDEPS="$(LIBDEPS) -lc"; \
        APPNAME="$(APPNAME)"
        $(LINK_APP)
@@ -646,7 +694,7 @@ link_o.reliantunix:
        LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS=; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G'; \
+       SHAREDFLAGS='$(CFLAGS) -G'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_O)
 link_a.reliantunix:
@@ -656,18 +704,18 @@ link_a.reliantunix:
        LIBDEPS="$(LIBDEPS) -lc"; \
        ALLSYMSFLAGS=; \
        NOALLSYMSFLAGS=''; \
-       SHAREDFLAGS='-G'; \
+       SHAREDFLAGS='$(CFLAGS) -G'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_A_UNPACKED)
 link_app.reliantunix:
        LDCMD=$(CC);\
-       LDFLAGS=""; \
+       LDFLAGS="$(CFLAGS)"; \
        LIBDEPS="$(LIBDEPS) -lc"; \
        APPNAME="$(APPNAME)"
        $(LINK_APP)
 
 # Targets to build symbolic links when needed
-symlink.gnu symlink.solaris symlink.svr3 symlink.irix \
+symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
 symlink.aix symlink.reliantunix:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).so; \
@@ -677,9 +725,10 @@ symlink.darwin:
        SHLIB=lib$(LIBNAME); \
        SHLIB_SUFFIX=.dylib; \
        $(SYMLINK_SO)
-symlink.hpux32 symlink.hpux64:
+symlink.hpux:
        @ $(CALC_VERSIONS); \
        SHLIB=lib$(LIBNAME).sl; \
+       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:
@@ -688,7 +737,10 @@ symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 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_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
-symlink.bsd-gcc-shared symlink.linux-shared symlink.gnu-shared: symlink.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_app.bsd-shared: link_app.bsd
 link_o.darwin-shared: link_o.darwin
 link_a.darwin-shared: link_a.darwin
 link_app.darwin-shared: link_app.darwin
@@ -717,22 +769,18 @@ link_o.svr3-shared: link_o.svr3
 link_a.svr3-shared: link_a.svr3
 link_app.svr3-shared: link_app.svr3
 symlink.svr3-shared: symlink.svr3
-link_o.svr5-shared: link_o.svr3
-link_a.svr5-shared: link_a.svr3
-link_app.svr5-shared: link_app.svr3
-symlink.svr5-shared: symlink.svr3
+link_o.svr5-shared: link_o.svr5
+link_a.svr5-shared: link_a.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_app.irix-shared: link_app.irix
 symlink.irix-shared: symlink.irix
-link_o.hpux-shared: link_o.hpux32
-link_a.hpux-shared: link_a.hpux32
-link_app.hpux-shared: link_app.hpux32
-symlink.hpux-shared: symlink.hpux32
-link_o.hpux64-shared: link_o.hpux64
-link_a.hpux64-shared: link_a.hpux64
-link_app.hpux64-shared: link_app.hpux64
-symlink.hpux64-shared: symlink.hpux64
+link_o.hpux-shared: link_o.hpux
+link_a.hpux-shared: link_a.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_app.aix-shared: link_app.aix