Always build hcrypto

This commit is contained in:
Nicolas Williams
2016-03-30 14:27:18 -05:00
parent 0f138cf2d5
commit 5c2a3cb25a
3 changed files with 2 additions and 10 deletions

View File

@@ -65,9 +65,7 @@ vars.texi: vars.tin Makefile
PROJECTS = base hdb hx509 gssapi krb5 ntlm wind PROJECTS = base hdb hx509 gssapi krb5 ntlm wind
if !HAVE_OPENSSL
PROJECTS += hcrypto PROJECTS += hcrypto
endif
doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy 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 {} ';' ; \ @find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \

View File

@@ -14,9 +14,6 @@ endif
if COM_ERR if COM_ERR
dir_com_err = com_err dir_com_err = com_err
endif endif
if !HAVE_OPENSSL
dir_hcrypto = hcrypto
endif
if !SQLITE3 if !SQLITE3
dir_sqlite = sqlite dir_sqlite = sqlite
endif endif
@@ -34,7 +31,7 @@ SUBDIRS = \
wind \ wind \
asn1 \ asn1 \
$(dir_sqlite) \ $(dir_sqlite) \
$(dir_hcrypto) \ hcrypto \
ipc \ ipc \
hx509 \ hx509 \
krb5 \ krb5 \

View File

@@ -36,9 +36,6 @@ dir_otp = otp
!ifdef DCE !ifdef DCE
dir_dce = kdfs dir_dce = kdfs
!endif !endif
!ifndef HAVE_OPENSSL
dir_hcrypto = hcrypto
!endif
# Third party plugins must be added to the assembly # Third party plugins must be added to the assembly
# Permit third party assembly scripts # Permit third party assembly scripts
@@ -54,7 +51,7 @@ assembly=..\packages\windows\assembly
!endif !endif
SUBDIRS = roken base vers com_err sl wind asn1 sqlite \ 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) kadm5 $(dir_45) $(dir_otp) $(dir_dce) $(plugin) $(assembly)
!include ../windows/NTMakefile.w32 !include ../windows/NTMakefile.w32