Windows: Catch up with libheimntlm changes

This commit is contained in:
Asanka C. Herath
2010-11-24 12:59:37 -05:00
parent aa9be97d0d
commit 5e5a87555b
2 changed files with 12 additions and 3 deletions

View File

@@ -35,20 +35,26 @@ RELDIR=lib\ntlm
INCFILES= \ INCFILES= \
$(INCDIR)\heimntlm.h \ $(INCDIR)\heimntlm.h \
$(INCDIR)\heimntlm-protos.h $(INCDIR)\heimntlm-protos.h \
$(INCDIR)\ntlm_err.h
libheimntlm_la_SOURCES = ntlm.c heimntlm.h libheimntlm_la_SOURCES = ntlm.c heimntlm.h
$(OBJ)\heimntlm-protos.h: $(libheimntlm_la_SOURCES) $(OBJ)\heimntlm-protos.h: $(libheimntlm_la_SOURCES)
$(PERL) ../../cf/make-proto.pl -q -P remove -o $(OBJ)\heimntlm-protos.h $(libheimntlm_la_SOURCES) $(PERL) ../../cf/make-proto.pl -q -P remove -o $(OBJ)\heimntlm-protos.h $(libheimntlm_la_SOURCES)
$(OBJ)\ntlm_err.c $(OBJ)\ntlm_err.h: ntlm_err.et
cd $(OBJ)
$(BINDIR)\compile_et.exe $(SRCDIR)\ntlm_err.et
cd $(SRCDIR)
!ifndef STATICLIBS !ifndef STATICLIBS
RES=$(OBJ)\libheimntlm-version.res RES=$(OBJ)\libheimntlm-version.res
$(LIBHEIMNTLM): $(BINDIR)\heimntlm.dll $(LIBHEIMNTLM): $(BINDIR)\heimntlm.dll
$(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES) $(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(OBJ)\ntlm_err.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBCOMERR) $(RES)
$(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM) $(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM)
$(DLLPREP_NODIST) $(DLLPREP_NODIST)
@@ -57,7 +63,7 @@ clean::
!else !else
$(LIBHEIMNTLM): $(OBJ)\ntlm.obj $(LIBHEIMNTLM): $(OBJ)\ntlm.obj $(OBJ)\ntlm_err.obj
$(LIBCON) $(LIBCON)
!endif !endif

View File

@@ -1,5 +1,6 @@
EXPORTS EXPORTS
heim_ntlm_build_ntlm1_master heim_ntlm_build_ntlm1_master
heim_ntlm_calculate_lm2
heim_ntlm_calculate_ntlm1 heim_ntlm_calculate_ntlm1
heim_ntlm_calculate_ntlm2 heim_ntlm_calculate_ntlm2
heim_ntlm_calculate_ntlm2_sess heim_ntlm_calculate_ntlm2_sess
@@ -19,3 +20,5 @@ EXPORTS
heim_ntlm_nt_key heim_ntlm_nt_key
heim_ntlm_ntlmv2_key heim_ntlm_ntlmv2_key
heim_ntlm_verify_ntlm2 heim_ntlm_verify_ntlm2
heim_ntlm_unparse_flags
initialize_ntlm_error_table_r