diff options
| author | Adriaan de Jong <dejong@fox-it.com> | 2011-10-24 10:46:01 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-10-24 12:35:51 +0200 |
| commit | 31ea2ee4ca642a4d8bbdac3dadb44eca11f52e35 (patch) | |
| tree | 0998f1d80063a45ceedc7d1587251ca6ea28bd45 /Makefile.am | |
| parent | 7c785a27bfe5267ee4aac12fe6d0a24c42e388d6 (diff) | |
| download | openvpn-31ea2ee4ca642a4d8bbdac3dadb44eca11f52e35.tar.gz openvpn-31ea2ee4ca642a4d8bbdac3dadb44eca11f52e35.tar.xz openvpn-31ea2ee4ca642a4d8bbdac3dadb44eca11f52e35.zip | |
Fixed disabling crypto and SSL
Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 3228798..075270f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,8 @@ openvpn_SOURCES = \ common.h \ config-win32.h \ crypto.c crypto.h crypto_backend.h \ + crypto_openssl.c crypto_openssl.h \ + crypto_polarssl.c crypto_polarssl.h \ dhcp.c dhcp.h \ errlevel.h \ error.c error.h \ @@ -115,6 +117,8 @@ openvpn_SOURCES = \ ntlm.c ntlm.h \ occ.c occ.h occ-inline.h \ pkcs11.c pkcs11.h pkcs11_backend.h \ + pkcs11_openssl.c \ + pkcs11_polarssl.c \ openvpn.c openvpn.h \ openvpn-plugin.h \ options.c options.h \ @@ -139,7 +143,11 @@ openvpn_SOURCES = \ socket.c socket.h \ socks.c socks.h \ ssl.c ssl.h ssl_backend.h \ + ssl_openssl.c ssl_openssl.h \ + ssl_polarssl.c ssl_polarssl.h \ ssl_verify.c ssl_verify.h ssl_verify_backend.h \ + ssl_verify_openssl.c ssl_verify_openssl.h \ + ssl_verify_polarssl.c ssl_verify_polarssl.h \ status.c status.h \ syshead.h \ tun.c tun.h \ @@ -153,21 +161,6 @@ configure.h: Makefile awk -f $(srcdir)/configure_h.awk config.h > $@ awk -f $(srcdir)/configure_log.awk config.log >> $@ -if USE_OPENSSL -openvpn_SOURCES += \ - crypto_openssl.c crypto_openssl.h \ - pkcs11_openssl.c \ - ssl_openssl.c ssl_openssl.h \ - ssl_verify_openssl.c ssl_verify_openssl.h -endif -if USE_POLARSSL -openvpn_SOURCES += \ - crypto_polarssl.c crypto_polarssl.h \ - pkcs11_polarssl.c \ - ssl_polarssl.c ssl_polarssl.h \ - ssl_verify_polarssl.c ssl_verify_polarssl.h -endif - dist-hook: cd $(distdir) && for i in $(EXTRA_DIST) $(SUBDIRS) ; do find $$i -name .svn -type d -prune -exec rm -rf '{}' ';' ; rm -f `find $$i -type f | grep -E '(^|\/)\.?\#|\~$$|\.s?o$$'` ; done |