Skip to content

Commit

Permalink
Always build hcrypto
Browse files Browse the repository at this point in the history
  • Loading branch information
nicowilliams committed Apr 15, 2016
1 parent 0f138cf commit 5c2a3cb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 0 additions & 2 deletions doc/Makefile.am
Expand Up @@ -65,9 +65,7 @@ vars.texi: vars.tin Makefile

PROJECTS = base hdb hx509 gssapi krb5 ntlm wind

if !HAVE_OPENSSL
PROJECTS += hcrypto
endif

doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
@find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \
Expand Down
5 changes: 1 addition & 4 deletions lib/Makefile.am
Expand Up @@ -14,9 +14,6 @@ endif
if COM_ERR
dir_com_err = com_err
endif
if !HAVE_OPENSSL
dir_hcrypto = hcrypto
endif
if !SQLITE3
dir_sqlite = sqlite
endif
Expand All @@ -34,7 +31,7 @@ SUBDIRS = \
wind \
asn1 \
$(dir_sqlite) \
$(dir_hcrypto) \
hcrypto \
ipc \
hx509 \
krb5 \
Expand Down
5 changes: 1 addition & 4 deletions lib/NTMakefile
Expand Up @@ -36,9 +36,6 @@ dir_otp = otp
!ifdef DCE
dir_dce = kdfs
!endif
!ifndef HAVE_OPENSSL
dir_hcrypto = hcrypto
!endif

# Third party plugins must be added to the assembly
# Permit third party assembly scripts
Expand All @@ -54,7 +51,7 @@ assembly=..\packages\windows\assembly
!endif

SUBDIRS = roken base vers com_err sl wind asn1 sqlite \
$(dir_hcrypto) hx509 krb5 heimdal ntlm kafs gssapi hdb \
hcrypto hx509 krb5 heimdal ntlm kafs gssapi hdb \
kadm5 $(dir_45) $(dir_otp) $(dir_dce) $(plugin) $(assembly)

!include ../windows/NTMakefile.w32
Expand Down

0 comments on commit 5c2a3cb

Please sign in to comment.