typo

[openssl.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index af2dc8ce858ea4e47d8d9e0d1fae7e040b43dd1d..159e9ecc0eab62c5129f20b64856e9cb4e09a212 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -14,6 +14,10 @@ CFLAGS=$(CFLAG)
 LDFLAGS=$(LDFLAG)
 SHARED_LDFLAGS=$(SHARED_LDFLAG)
 
+# 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"
@@ -304,18 +308,16 @@ link_a.cygwin:
                base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
        fi; \
        dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
-       $(PERL) util/mkrc.pl $$dll_name | \
-               $(CROSS_COMPILE)windres -o rc.o; \
+       echo "$(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name |" \
+                    "$(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o"; \
+       $(PERL) $(SRCDIR)/util/mkrc.pl $$dll_name | \
+               $(CROSS_COMPILE)windres $(SHARED_RCFLAGS) -o rc.o; \
        extras="$$extras rc.o"; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
-       [ -f apps/$$dll_name ] && rm apps/$$dll_name; \
-       [ -f test/$$dll_name ] && rm test/$$dll_name; \
        $(LINK_SO_A) || exit 1; \
-       rm $$extras; \
-       cp -p $$dll_name apps/; \
-       cp -p $$dll_name test/
+       rm $$extras
 link_app.cygwin:
        @if expr "$(CFLAGS)" : '.*OPENSSL_USE_APPLINK' > /dev/null; then \
                LIBDEPS="$(SRCDIR)/crypto/applink.o $${LIBDEPS:-$(LIBDEPS)}"; \
@@ -378,12 +380,10 @@ link_o.solaris:
                $(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=; \
-               ALLSYMSFLAGS="$${MINUSZ}allextract"; \
-               NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+               ALLSYMSFLAGS="-Wl,-z,allextract"; \
+               NOALLSYMSFLAGS="-Wl,-z,defaultextract"; \
                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
        fi; \
        $(LINK_SO_O)
@@ -392,17 +392,15 @@ link_a.solaris:
                $(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=;\
                if [ $(LIBNAME) != "crypto" -a $(LIBNAME) != "ssl" ]; then \
-                       ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+                       ALLSYMSFLAGS="-Wl,-z,allextract"; \
                else \
                        $(PERL) $(SRCDIR)/util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \
-                       ALLSYMSFLAGS="$${MINUSZ}allextract,-M,$(LIBNAME).map"; \
+                       ALLSYMSFLAGS="-Wl,-z,allextract,-M,$(LIBNAME).map"; \
                fi; \
-               NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+               NOALLSYMSFLAGS="-Wl,-z,defaultextract"; \
                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
        fi; \
        $(LINK_SO_A)