From: Andy Polyakov <appro@openssl.org>
Date: Sat, 12 Mar 2005 09:28:18 +0000 (+0000)
Subject: Move copying of .dll to apps/ and test/ to more appropriate place.
X-Git-Tag: OpenSSL_0_9_7f~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa0d4ed5fac931cbd652d9f1557bcf68e4ecec44;p=oweals%2Fopenssl.git

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

diff --git a/Makefile.org b/Makefile.org
index afe3d43d1c..d60d085dcc 100644
--- 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 4ea4ba6f73..ea1b84819a 100644
--- 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 962be01b98..c7f5262057 100644
--- 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.