diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-10-06 11:53:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-10-06 11:53:52 +0200 |
| commit | 00202339445daae6ed931f28f932089d5c3dd455 (patch) | |
| tree | c08c4bb7b615ccb1b3325ce7ad65179a5f15be2a /lib/ssl/src/Makefile | |
| parent | 811e0de29d02031acb0771e1fa74d8f4f97574a6 (diff) | |
| parent | 64a3651b3ece1a1e3195f20e37247f929d179f61 (diff) | |
| download | otp-00202339445daae6ed931f28f932089d5c3dd455.tar.gz otp-00202339445daae6ed931f28f932089d5c3dd455.tar.bz2 otp-00202339445daae6ed931f28f932089d5c3dd455.zip | |
Merge branch 'ia/ssl/remove-old-ssl/OTP-7048'
* ia/ssl/remove-old-ssl/OTP-7048:
Remove old ssl implementation and deprecated function ssl:peercert/1
Conflicts:
lib/ssl/test/Makefile
Diffstat (limited to 'lib/ssl/src/Makefile')
| -rw-r--r-- | lib/ssl/src/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 9c40d4ea53..dc69b53b28 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -41,13 +41,8 @@ MODULES= \ ssl \ ssl_alert \ ssl_app \ - ssl_broker \ - ssl_broker_sup \ ssl_dist_sup\ - ssl_server \ ssl_sup \ - ssl_prim \ - inet_ssl_dist \ inet_tls_dist \ ssl_certificate\ ssl_certificate_db\ @@ -67,7 +62,7 @@ MODULES= \ ssl_tls_dist_proxy INTERNAL_HRL_FILES = \ - ssl_int.hrl ssl_broker_int.hrl ssl_debug.hrl \ + ssl_debug.hrl \ ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_internal.hrl \ ssl_record.hrl |