build crypto_lock_win.c in-place

3 files changed, 2 insertions, 3 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index c37bacf..250be82 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -669,7 +669,7 @@ if(UNIX)
 endif()
 
 if(WIN32)
-        set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock_win.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c)
         set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
         set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
         set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index e9f0f7a..6cb1b49 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -216,7 +216,7 @@ libcrypto_la_SOURCES += crypto_init.c
 if !HOST_WIN
 libcrypto_la_SOURCES += crypto_lock.c
 else
-libcrypto_la_SOURCES += crypto_lock_win.c
+libcrypto_la_SOURCES += compat/crypto_lock_win.c
 endif
 libcrypto_la_SOURCES += cversion.c
 libcrypto_la_SOURCES += ex_data.c
diff --git a/update.sh b/update.sh
index 3315311..7c656c2 100755
--- a/update.sh
+++ b/update.sh
@@ -154,7 +154,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
         fi
 done
 $CP crypto/compat/b_win.c crypto/bio
-$CP crypto/compat/crypto_lock_win.c crypto
 $CP crypto/compat/ui_openssl_win.c crypto/ui
 # add the libcrypto symbol export list
 $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym