Move copying of .dll to apps/ and test/ to more appropriate place.

diff --git a/Makefile.org b/Makefile.org
index afe3d43d1c264549e69bb7e4644247a1b3d4f8b8..d60d085dcc05d02db068e357d11b73981e2cbda9 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -334,11 +334,18 @@ do_cygwin-shared:
        if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
                libs="$(LIBKRB5) $$libs"; \
        fi; \
-       ( set -x; ${CC}  -shared -o cyg$$i-$(SHLIB_VERSION_NUMBER).dll \
+       shlib=cyg$${i}-$(SHLIB_VERSION_NUMBER).dll; \
+       [ "$(PLATFORM)" = "mingw" ] && shlib=$${i}eay32.dll; \
+       [ -f apps/$$shlib ] && rm apps/$$shlib; \
+       [ -f test/$$shlib ] && rm test/$$shlib; \
+       base=;  [ $$i = "crypto" ] && base=-Wl,--image-base,0xFE00000; \
+       ( set -x; ${CC} ${SHARED_LDFLAGS} \
+               -shared $$base -o $$shlib \
                -Wl,-Bsymbolic \
                -Wl,--whole-archive lib$$i.a \
                -Wl,--out-implib,lib$$i.dll.a \
-               -Wl,--no-whole-archive $$libs ) || exit 1; \
+               -Wl,--no-whole-archive $$libs ${EX_LIBS} ) || exit 1; \
+       cp -p $$shlib apps/; cp -p $$shlib test/; \
        libs="-l$$i $$libs"; \
        done
 

diff --git a/apps/Makefile b/apps/Makefile
index 4ea4ba6f73dcdea07eb21e5cd4003467f34d1205..ea1b84819aab5001e2394ccd24b86424ab5a2773 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -152,7 +152,6 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
        if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
                TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a $(EXE); \
        fi
-       @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac
        -(cd ..; \
          OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \
          $(PERL) tools/c_rehash certs)

diff --git a/test/Makefile b/test/Makefile
index 962be01b9834f8576d60a623bd5487bc66c164ce..c7f5262057fb5aafec74516912000ef826deee3d 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -585,7 +585,6 @@ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
          LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
          $(CC) -o dummytest$(EXE_EXT) $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \
        fi
-       @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.