fix EC_GROUP_copy for EC_GFp_nist_method()

[openssl.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index e91804fcb007f5499a8f0859f6f89e735f2e3790..a3acc9877aa508402f7bd0adef1bf5f257657567 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -21,7 +21,7 @@ SHARED_LDFLAGS=
 LIBNAME=
 
 # LIBEXTRAS contains extra modules to link together with the library.
-# For example, if a seond library, say libbar.a needs to be linked into
+# 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
@@ -64,7 +64,7 @@ CALC_VERSIONS=        \
        if [ -n "$(LIBVERSION)$(LIBCOMPATVERSIONS)" ]; then \
                prev=""; \
                for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
-                       SHLIB_SOVER_NODOT=$$v \
+                       SHLIB_SOVER_NODOT=$$v; \
                        SHLIB_SOVER=.$$v; \
                        if [ -n "$$prev" ]; then \
                                SHLIB_COMPAT="$$SHLIB_COMPAT .$$prev"; \
@@ -80,23 +80,26 @@ LINK_SO=    \
        $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
   $(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
 SYMLINK_SO=    \
-       prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
-       if [ -n "$$SHLIB_COMPAT" ]; then \
-               for x in $$SHLIB_COMPAT; do \
-                       ( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
-                         ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
-                       prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
-               done; \
-       fi; \
-       if [ -n "$$SHLIB_SOVER" ]; then \
-               ( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
-                 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+       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 ); \
+                               prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
+                       done; \
+               fi; \
+               if [ -n "$$SHLIB_SOVER" ]; then \
+                       ( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+                         ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+               fi; \
        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 ALL=$$ALLSYMSFLAGS ALLSYMSFLAGS= NOALLSYMSFLAGS=; \
+  SHOBJECTS=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
@@ -106,17 +109,15 @@ LINK_SO_A_UNPACKED=       \
   SHOBJECTS=$$UNPACKDIR/*.o; \
   $(LINK_SO) && rm -rf $$UNPACKDIR
 
-DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \
-       my_ld=`gcc -print-prog-name=ld 2>&1` && \
-       [ -n "$$my_ld" ] && \
-       $$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1
+DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
+
 DO_GNU=$(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='-Wl,--whole-archive' \
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" \
+       SHLIB=lib$(LIBNAME).so; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-Wl,--whole-archive'; \
+       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        SHAREDCMD='$(CC)'
 
 link_o.gnu:
@@ -127,55 +128,59 @@ link_a.gnu:
 # For Darwin AKA Mac OS/X (dyld)
 link_o.darwin:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME) \
-       SHLIB_SUFFIX=.dylib \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='-all_load' \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS="-dynamiclib" \
+       SHLIB=lib$(LIBNAME); \
+       SHLIB_SUFFIX=.dylib; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-all_load'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS="-dynamiclib"; \
        SHAREDCMD='$(CC)'; \
        if [ -n "$(LIBVERSION)" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -current_version $(LIBVERSION)"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
        fi; \
        $(LINK_SO_O)
 link_a.darwin:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME) \
-       SHLIB_SUFFIX=.dylib \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='-all_load' \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS="-dynamiclib" \
+       SHLIB=lib$(LIBNAME); \
+       SHLIB_SUFFIX=.dylib; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-all_load'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS="-dynamiclib"; \
        SHAREDCMD='$(CC)'; \
        if [ -n "$(LIBVERSION)" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -current_version $(LIBVERSION)"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
        fi; \
        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
-               SHAREDFLAGS="$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
+               SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
        fi; \
        $(LINK_SO_A)
 
 link_o.cygwin:
-       @ SHLIB=cyg$(LIBNAME).dll \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       SHLIB_SOVER= \
-       ALLSYMSFLAGS='-Wl,--whole-archive' \
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a" \
+       @ $(CALC_VERSIONS); \
+       INHIBIT_SYMLINKS=yes; \
+       SHLIB=cyg$(LIBNAME); \
+       SHLIB_SUFFIX=.dll; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       SHLIB_SOVER=-$(LIBVERSION); \
+       ALLSYMSFLAGS='-Wl,--whole-archive'; \
+       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        SHAREDCMD='${CC}'; \
        $(LINK_SO_O)
 link_a.cygwin:
-       @ SHLIB=cyg$(LIBNAME).dll \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       SHLIB_SOVER= \
-       ALLSYMSFLAGS='-Wl,--whole-archive' \
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
-       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a" \
+       @ $(CALC_VERSIONS); \
+       INHIBIT_SYMLINKS=yes; \
+       SHLIB=cyg$(LIBNAME); \
+       SHLIB_SUFFIX=.dll; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       SHLIB_SOVER=; \
+       ALLSYMSFLAGS='-Wl,--whole-archive'; \
+       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+       SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
        SHAREDCMD='${CC}'; \
        $(LINK_SO_A)
 
@@ -183,22 +188,22 @@ link_o.alpha-osf1:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU); \
        else \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
+               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" \
+               fi; \
+               SHLIB_SOVER=; \
+               ALLSYMSFLAGS='-all'; \
+               NOALLSYMSFLAGS='-none'; \
+               SHAREDFLAGS="-shared"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_O)
@@ -206,22 +211,22 @@ link_a.alpha-osf1:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU); \
        else \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
+               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" \
+               fi; \
+               SHLIB_SOVER=; \
+               ALLSYMSFLAGS='-all'; \
+               NOALLSYMSFLAGS='-none'; \
+               SHAREDFLAGS="-shared"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
@@ -232,22 +237,22 @@ link_o.tru64:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU); \
        else \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
+               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" \
+               fi; \
+               SHLIB_SOVER=; \
+               ALLSYMSFLAGS='-all'; \
+               NOALLSYMSFLAGS='-none'; \
+               SHAREDFLAGS="-shared -msym"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_O)
@@ -255,22 +260,22 @@ link_a.tru64:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU); \
        else \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
+               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" \
+               fi; \
+               SHLIB_SOVER=; \
+               ALLSYMSFLAGS='-all'; \
+               NOALLSYMSFLAGS='-none'; \
+               SHAREDFLAGS="-shared -msym"; \
                SHAREDCMD='$(CC)'; \
                if [ -n "$$SHLIB_HIST" ]; then \
-                       SHAREDFLAGS="$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
@@ -281,22 +286,22 @@ link_o.tru64-rpath:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU); \
        else \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
+               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)" \
+               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\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_O)
@@ -304,22 +309,22 @@ link_a.tru64-rpath:
        @ if ${DETECT_GNU_LD}; then \
                $(DO_GNU); \
        else \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
+               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)" \
+               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\""; \
+                       SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
                fi; \
        fi; \
        $(LINK_SO_A)
@@ -329,12 +334,14 @@ link_o.solaris:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-z allextract' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               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"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -343,12 +350,14 @@ link_a.solaris:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-z allextract' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               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"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A)
@@ -360,12 +369,12 @@ link_o.svr3:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-z allextract' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHLIB=lib$(LIBNAME).so; \
+               SHLIB_SUFFIX=; \
+               LIBDEPS="$(LIBDEPS) -lc"; \
+               ALLSYMSFLAGS='-z allextract'; \
+               NOALLSYMSFLAGS=''; \
+               SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -374,12 +383,12 @@ link_a.svr3:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-z allextract' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHLIB=lib$(LIBNAME).so; \
+               SHLIB_SUFFIX=; \
+               LIBDEPS="$(LIBDEPS) -lc"; \
+               ALLSYMSFLAGS='-z allextract'; \
+               NOALLSYMSFLAGS=''; \
+               SHAREDFLAGS="-G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A_UNPACKED)
@@ -389,12 +398,12 @@ link_o.irix:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-all' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHLIB=lib$(LIBNAME).so; \
+               SHLIB_SUFFIX=; \
+               LIBDEPS="$(LIBDEPS) -lc"; \
+               ALLSYMSFLAGS='-all'; \
+               NOALLSYMSFLAGS=''; \
+               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_O)
@@ -403,12 +412,12 @@ link_a.irix:
                $(DO_GNU); \
        else \
                $(CALC_VERSIONS); \
-               SHLIB=lib$(LIBNAME).so \
-               SHLIB_SUFFIX= \
-               LIBDEPS="$(LIBDEPS) -lc" \
-               ALLSYMSFLAGS='-all' \
-               NOALLSYMSFLAGS='' \
-               SHAREDFLAGS='-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+               SHLIB=lib$(LIBNAME).so; \
+               SHLIB_SUFFIX=; \
+               LIBDEPS="$(LIBDEPS) -lc"; \
+               ALLSYMSFLAGS='-all'; \
+               NOALLSYMSFLAGS=''; \
+               SHAREDFLAGS="-shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
                SHAREDCMD='$(CC)'; \
        fi; \
        $(LINK_SO_A)
@@ -425,22 +434,22 @@ link_a.irix:
 #
 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' \
+       SHLIB=lib$(LIBNAME).sl; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-Fl'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        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' \
+       SHLIB=lib$(LIBNAME).sl; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-Fl'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS="+vnocompatwarnings -b -z +s +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 
@@ -454,64 +463,64 @@ link_a.hpux32:
 #
 link_o.hpux64:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).sl \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='+forceload' \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+       SHLIB=lib$(LIBNAME).sl; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='+forceload'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux64:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).sl \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='+forceload' \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX' \
+       SHLIB=lib$(LIBNAME).sl; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='+forceload'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS="-b -z +h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
        SHAREDCMD='/usr/ccs/bin/ld'; \
        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 
 link_o.aix:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='-bnogc' \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE' \
+       SHLIB=lib$(LIBNAME).so; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-bnogc'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_O)
 link_a.aix:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS='-bnogc' \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE' \
+       SHLIB=lib$(LIBNAME).so; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS='-bnogc'; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS='-G -bE:lib$(LIBNAME).exp -bM:SRE'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_A_VIA_O)
 
 link_o.reliantunix:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so \
-       SHLIB_SUFFIX= \
-       LIBDEPS="$(LIBDEPS) -lc" \
-       ALLSYMSFLAGS= \
-       NOALLSYMSFLAGS='' \
-       SHAREDFLAGS='-G' \
+       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' \
+       SHLIB=lib$(LIBNAME).so; \
+       SHLIB_SUFFIX=; \
+       LIBDEPS="$(LIBDEPS) -lc"; \
+       ALLSYMSFLAGS=; \
+       NOALLSYMSFLAGS=''; \
+       SHAREDFLAGS='-G'; \
        SHAREDCMD='$(CC)'; \
        $(LINK_SO_A_UNPACKED)
 
@@ -519,18 +528,19 @@ link_a.reliantunix:
 symlink.gnu symlink.solaris symlink.svr3 symlink.irix \
 symlink.aix symlink.reliantunix:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).so \
+       SHLIB=lib$(LIBNAME).so; \
        $(SYMLINK_SO)
 symlink.darwin:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME) \
-       SHLIB_SUFFIX=.dylib \
+       SHLIB=lib$(LIBNAME); \
+       SHLIB_SUFFIX=.dylib; \
        $(SYMLINK_SO)
-symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 symlink.hpux32 symlink.hpux64:
        @ $(CALC_VERSIONS); \
-       SHLIB=lib$(LIBNAME).sl \
+       SHLIB=lib$(LIBNAME).sl; \
        $(SYMLINK_SO)
+# The following lines means those specific architectures do no symlinks
+symlink.cygwin symlib.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