diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-18 15:52:38 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-18 15:52:38 +0200 |
| commit | 6e1f1f59263a717ffcef2ebcd70592431a02cf2f (patch) | |
| tree | 7cea224a2f57e135388bcf5b2631f90e719019ee /lib/crypto/c_src/Makefile.in | |
| parent | da2c89c6973eaa808ef56ea42168c5bae97e2787 (diff) | |
| parent | 33eba903b4bd0b18e8f8d9afacd3118c00557b39 (diff) | |
| download | otp-6e1f1f59263a717ffcef2ebcd70592431a02cf2f.tar.gz otp-6e1f1f59263a717ffcef2ebcd70592431a02cf2f.tar.bz2 otp-6e1f1f59263a717ffcef2ebcd70592431a02cf2f.zip | |
Merge branch 'pan/win_static_openssl/OTP-9280' into dev
* pan/win_static_openssl/OTP-9280:
Mend --with-ssl= in erts/configure
Update OpenSSL license text in crypto
Link OpenSSL libraries static on Windows
Diffstat (limited to 'lib/crypto/c_src/Makefile.in')
| -rw-r--r-- | lib/crypto/c_src/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in index 040adcfd09..3ace10403e 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -40,7 +40,7 @@ CFLAGS = $(DED_CFLAGS) # From erts/configure SSL_LIBDIR = @SSL_LIBDIR@ SSL_INCLUDE = @SSL_INCLUDE@ - +SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@ INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES) @@ -84,10 +84,10 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ -CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -lcrypto +CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) else SSL_DED_LD_RUNTIME_LIBRARY_PATH= -CRYPTO_LINK_LIB=$(SSL_LIBDIR)/libcrypto.a +CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a endif # ---------------------------------------------------- @@ -112,7 +112,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS) $(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS) $(INSTALL_DIR) $(LIBDIR) - $(LD) $(LDFLAGS) -o $@ $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -llibeay32 + $(LD) $(LDFLAGS) -o $@ $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME) clean: ifeq ($(findstring win32,$(TARGET)), win32) |