From a151d5d46a8bf7de5d78492add9f94eb61e827b2 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Fri, 4 Jan 2008 15:18:15 +0000
Subject: INTEGRATION: CWS mingwport09 (1.21.4); FILE MERGED 2007/12/11
 12:37:32 vg 1.21.4.1: #i83133# catch-up fixes for MinGW port

---
 openssl/makefile.mk | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'openssl')

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 0c609b4e056d..cd559bee57c8 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.22 $
+#   $Revision: 1.23 $
 #
-#   last change: $Author: kz $ $Date: 2007-12-12 15:38:30 $
+#   last change: $Author: obo $ $Date: 2008-01-04 16:18:15 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -88,7 +88,30 @@ ADDITIONAL_FILES:= \
 .ENDIF
 
 .IF "$(OS)" == "WNT"
-.IF "$(COM)" != "gcc"
+
+.IF "$(COM)"=="GCC"
+PATCH_FILE_NAME=opensslmingw.patch
+.IF "$(USE_MINGW)" == "cygwin"
+CONFIGURE_ACTION=$(PERL) configure
+CONFIGURE_FLAGS=mingw shared 
+INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a
+OUT2LIB = libcrypto_static.*
+OUT2LIB += libssl_static.*
+OUT2LIB += libcrypto.*
+OUT2LIB += libssl.*
+OUT2BIN = ssleay32.dll
+OUT2BIN += libeay32.dll
+.ELSE
+CONFIGURE_ACTION=
+BUILD_ACTION=cmd /c "ms\mingw32"
+OUT2LIB = out/libcrypto_static.*
+OUT2LIB += out/libssl_static.*
+OUT2LIB += out/libcrypto.*
+OUT2LIB += out/libssl.*
+OUT2BIN = out/ssleay32.dll
+OUT2BIN += out/libeay32.dll
+.ENDIF
+.ELSE
 
 PATCH_FILE_NAME=openssl.patch
 .IF "$(MAKETARGETS)" == ""
-- 
cgit