Windows: Build a single heimdal.dll

Heimdal.dll is a combination of libasn1, libwind, libhcrypto, libhx509
and libkrb5.

admin/NTMakefile

@@ -49,11 +49,10 @@ KTUTIL_OBJS= \
 	$(OBJ)\rename.obj
 
 KTUTIL_LIBS= \
-	$(LIBKRB5)	\
+	$(LIBHEIMDAL)	\
 	$(LIBKADM5SRV)	\
 	$(LIBSL)	\
 	$(LIBROKEN)	\
-	$(LIBHCRYPTO)	\
 	$(LIBVERS)
 
 $(SBINDIR)\ktutil.exe: $(KTUTIL_OBJS) $(KTUTIL_LIBS)

kadmin/NTMakefile

@@ -42,9 +42,7 @@ SBIN_PROGRAMS=$(SBINDIR)\kadmin.exe
 
 COMMON_LIBS=		\
 	$(LIBHDB)	\
-	$(LIBKRB5)	\
+	$(LIBHEIMDAL)	\
-	$(LIBHCRYPTO)	\
-	$(LIBASN1)	\
 	$(LIBROKEN)
 
 KADMIN_OBJS=			    \

kdc/NTMakefile

@@ -59,9 +59,7 @@ clean::
 
 BIN_LIBS=\
 	$(LIBHDB)	\
-	$(LIBKRB5)	\
+	$(LIBHEIMDAL)	\
-	$(LIBHCRYPTO)	\
-	$(LIBASN1)	\
 	$(LIBROKEN)	\
 	$(LIBVERS)
 
@@ -117,16 +115,10 @@ LIBKDC_OBJS=$(LIBKDC_OBJS) \
 
 LIBKDC_LIBS=\
 	$(LIBHDB)	\
-	$(LIBKRB5)	\
+	$(LIBHEIMDAL)	\
 	$(LIBHEIMNTLM)	\
-	$(LIBHCRYPTO)	\
-	$(LIBASN1)	\
 	$(LIBROKEN)
 
-!ifdef PKINIT
-LIBKDC_LIBS=$(LIBKDC_LIBS) $(LIBHX509)
-!endif
-
 $(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS)
 	$(DLLGUILINK) -implib:$(LIBKDC) -def:libkdc-exports.def
 	$(DLLPREP)

kuser/NTMakefile

@@ -51,10 +51,8 @@ NOINSTPROGRAMS=\
 	$(OBJ)\copy_cred_cache.exe
 
 BINLIBS=\
-	$(LIBKRB5)	\
+	$(LIBHEIMDAL)	\
 	$(LIBHEIMNTLM)	\
-	$(LIBHCRYPTO)	\
-	$(LIBASN1)	\
 	$(LIBROKEN)	\
 	$(LIBVERS)
 

lib/NTMakefile

@@ -44,11 +44,30 @@ dir_hcrypto = hcrypto
 !endif
 
 SUBDIRS = roken vers editline com_err sl wind asn1 sqlite \
-	$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
+	$(dir_hcrypto) hx509 krb5 heimdal ntlm kafs gssapi hdb \
-	auth $(dir_45) $(dir_otp) $(dir_dce)
+	kadm5 auth $(dir_45) $(dir_otp) $(dir_dce)
 
 !include ../windows/NTMakefile.w32
 
-all:: subdirs
+# We can't build some of the lib tools until after we have LIBHEIMDAL.
+# So we build tools in a separate build step:
+
+all:: all-tools
+
+all-tools:: asn1-tools hx509-tools krb5-tools
+
+asn1-tools:
+	cd asn1
+	$(RMAKE) all-tools
+	cd ..
+
+hx509-tools:
+	cd hx509
+	$(RMAKE) all-tools
+	cd ..
+
+krb5-tools:
+	cd krb5
+	$(RMAKE) all-tools
+	cd ..
 
-clean:: clean-subdirs

lib/asn1/NTMakefile

@@ -494,9 +494,7 @@ gen_files_kx509 =					    \
 	$(OBJ)\asn1_Kx509Request.x
 
 ASN1_BINARIES =						    \
-	$(LIBEXECDIR)\asn1_compile.exe			    \
+	$(LIBEXECDIR)\asn1_compile.exe
-	$(LIBEXECDIR)\asn1_print.exe			    \
-	$(BINDIR)\asn1_gen.exe
 
 $(BINDIR)\asn1_compile.exe:				    \
 	$(OBJ)\asn1parse.obj				    \
@@ -527,11 +525,11 @@ $(OBJ)\asn1_err.c $(OBJ)\asn1_err.h: asn1_err.et
 	$(BINDIR)\compile_et.exe $(SRCDIR)\asn1_err.et
 	cd $(SRCDIR)
 
-$(BINDIR)\asn1_print.exe: $(OBJ)\asn1_print.obj $(LIBASN1)
+$(BINDIR)\asn1_print.exe: $(OBJ)\asn1_print.obj $(LIBHEIMDAL)
 	$(EXECONLINK) $(LIBVERS) $(LIBROKEN) $(LIBCOMERR)
 	$(EXEPREP)
 
-$(BINDIR)\asn1_gen.exe: $(OBJ)\asn1_gen.obj $(LIBASN1)
+$(BINDIR)\asn1_gen.exe: $(OBJ)\asn1_gen.obj $(LIBHEIMDAL)
 	$(EXECONLINK) $(LIBVERS) $(LIBROKEN)
 	$(EXEPREP)
 
@@ -557,34 +555,12 @@ LIBASN1_OBJS=	\
 	$(gen_files_kx509:.x=.obj)	\
 	$(OBJ)\asn1_err.obj
 
-LIBASN1_LIBS=\
-	$(LIBROKEN)	\
-	$(LIBCOMERR)
-
-!ifndef STATICLIBS
-
-$(LIBASN1): $(BINDIR)\libasn1.dll
-
-$(BINDIR)\libasn1.dll: $(LIBASN1_OBJS) $(LIBASN1_LIBS)
-	$(DLLGUILINK_C) -out:$@ -def:libasn1-exports.def -implib:$(LIBASN1) @<<
-$(**: =
-)
-<<
-	$(DLLPREP)
-
-clean::
-	-$(RM) $(BINDIR)\libasn1.dll
-
-!else
-
 $(LIBASN1): $(LIBASN1_OBJS)
 	$(LIBCON_C) -out:$@ @<<
 $(**: =
 )
 <<
 
-!endif
-
 clean::
 	-$(RM) $(LIBASN1)
 
@@ -753,6 +729,8 @@ clean::
 
 all:: $(INCFILES) $(GENINCFILES) $(ASN1_BINARIES) $(LIBASN1)
 
+all-tools:: $(LIBEXECDIR)\asn1_print.exe $(BINDIR)\asn1_gen.exe
+
 TEST_BINARIES=\
 	$(OBJ)\check-der.exe	\
 	$(OBJ)\check-gen.exe	\

lib/gssapi/NTMakefile

@@ -454,9 +454,7 @@ GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB
 
 LIBGSSAPI_LIBS=\
 	$(LIBROKEN)	\
-	$(LIBASN1)	\
+	$(LIBHEIMDAL)	\
-	$(LIBKRB5)	\
-	$(LIBHCRYPTO)	\
 	$(LIBHEIMNTLM)	\
 	$(LIBCOMERR)
 

lib/hcrypto/NTMakefile

@@ -124,21 +124,9 @@ libhcrypto_OBJs = 			\
 	$(OBJ)\sha256.obj		\
 	$(OBJ)\ui.obj
 
-!ifndef STATICLIBS
-
-$(LIBHCRYPTO): $(BINDIR)\libhcrypto.dll
-
-$(BINDIR)\libhcrypto.dll: $(libhcrypto_OBJs) $(LIBROKEN) $(LIBASN1) $(LIBTFM)
-	$(DLLGUILINK) -def:libhcrypto-exports.def -implib:$(LIBHCRYPTO)
-	$(DLLPREP)
-
-!else
-
 $(LIBHCRYPTO): $(libhcrypto_OBJs)
 	$(LIBCON)
 
-!endif
-
 {imath/}.c{$(OBJ)}.obj::
 	$(C2OBJ_P)
 
@@ -179,31 +167,31 @@ $(OBJ)\destest.exe: $(OBJ)\destest.obj $(TESTLIB) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\mdtest.exe: $(OBJ)\mdtest.obj $(LIBHCRYPTO) $(LIBROKEN)
+$(OBJ)\mdtest.exe: $(OBJ)\mdtest.obj $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\rc2test.exe: $(OBJ)\rc2test.obj $(LIBHCRYPTO) $(LIBROKEN)
+$(OBJ)\rc2test.exe: $(OBJ)\rc2test.obj $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\rctest.exe: $(OBJ)\rctest.obj $(LIBHCRYPTO) $(LIBROKEN)
+$(OBJ)\rctest.exe: $(OBJ)\rctest.obj $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_bn.exe: $(OBJ)\test_bn.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1)
+$(OBJ)\test_bn.exe: $(OBJ)\test_bn.obj $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_cipher.exe: $(OBJ)\test_cipher.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBVERS)
+$(OBJ)\test_cipher.exe: $(OBJ)\test_cipher.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_engine_dso.exe: $(OBJ)\test_engine_dso.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
+$(OBJ)\test_engine_dso.exe: $(OBJ)\test_engine_dso.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_hmac.exe: $(OBJ)\test_hmac.obj $(LIBHCRYPTO)
+$(OBJ)\test_hmac.exe: $(OBJ)\test_hmac.obj $(LIBHEIMDAL)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
@@ -211,23 +199,23 @@ $(OBJ)\test_imath.exe: $(OBJ)\test_imath.obj $(TESTLIB) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_pkcs5.exe: $(OBJ)\test_pkcs5.obj $(LIBHCRYPTO) $(LIBROKEN)
+$(OBJ)\test_pkcs5.exe: $(OBJ)\test_pkcs5.obj $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_pkcs12.exe: $(OBJ)\test_pkcs12.obj $(LIBHCRYPTO) $(LIBASN1) $(LIBROKEN)
+$(OBJ)\test_pkcs12.exe: $(OBJ)\test_pkcs12.obj $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_rsa.exe: $(OBJ)\test_rsa.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
+$(OBJ)\test_rsa.exe: $(OBJ)\test_rsa.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_dh.exe: $(OBJ)\test_dh.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
+$(OBJ)\test_dh.exe: $(OBJ)\test_dh.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_rand.exe: $(OBJ)\test_rand.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
+$(OBJ)\test_rand.exe: $(OBJ)\test_rand.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 

lib/hdb/NTMakefile

@@ -142,7 +142,7 @@ INCFILES=			\
 
 $(LIBHDB): $(BINDIR)\libhdb.dll
 
-$(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBKRB5) $(LIBASN1) $(LIBSQLITE) $(LIBCOMERR) $(LIBROKEN)
+$(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBHEIMDAL) $(LIBSQLITE) $(LIBCOMERR) $(LIBROKEN)
 	$(DLLGUILINK) -def:libhdb-exports.def -implib:$(LIBHDB)
 	$(DLLPREP)
 
@@ -163,11 +163,11 @@ test:: test-binaries test-run
 
 test-binaries: $(OBJ)\test_dbinfo.exe $(OBJ)\test_hdbkeys.exe
 
-$(OBJ)\test_dbinfo.exe: $(OBJ)\test_dbinfo.obj $(LIBHDB) $(LIBKRB5) $(LIBROKEN) $(LIBVERS)
+$(OBJ)\test_dbinfo.exe: $(OBJ)\test_dbinfo.obj $(LIBHDB) $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 
-$(OBJ)\test_hdbkeys.exe: $(OBJ)\test_hdbkeys.obj $(LIBHDB) $(LIBKRB5) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
+$(OBJ)\test_hdbkeys.exe: $(OBJ)\test_hdbkeys.obj $(LIBHDB) $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 

lib/heimdal/NTMakefile

@@ -0,0 +1,89 @@
+########################################################################
+#
+# Copyright (c) 2009, 2010 Secure Endpoints Inc.
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
+
+RELDIR = lib\heimdal
+
+!include ../../windows/NTMakefile.w32
+
+!ifndef STATICLIBS
+
+DLLDEPS= \
+	$(LIBASN1)	\
+	$(LIBCOMERR)	\
+	$(LIBHCRYPTO)	\
+	$(LIBHX509)	\
+	$(LIBKRB5)	\
+	$(LIBROKEN)	\
+	$(LIBSQLITE)	\
+	$(LIBWIND)	\
+	$(LIBTFM)
+
+DLLSDKDEPS= \
+	$(PTHREAD_LIB)	\
+	secur32.lib	\
+	shell32.lib	\
+	dnsapi.lib
+
+DEF=$(OBJ)\heimdal.def
+
+DEFSRC= ..\asn1\libasn1-exports.def \
+	..\wind\libwind-exports.def \
+	..\hcrypto\libhcrypto-exports.def \
+	..\hx509\libhx509-exports.def \
+	$(OBJDIR)\lib\krb5\libkrb5-exports.def
+
+$(DEF): $(DEFSRC)
+	copy $(DEFSRC:  = + ) $(DEF)
+
+DLL=$(BINDIR)\heimdal.dll
+
+$(LIBHEIMDAL): $(BINDIR)\heimdal.dll
+
+$(DLL): $(DLLDEPS) $(DEF)
+	$(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) \
+		-def:$(DEF) -out:$(DLL) \
+		-implib:$(LIBHEIMDAL)
+	$(DLLPREP)
+
+clean::
+	-$(RM) $(BINDIR)\heimdal.dll
+
+!else
+
+$(LIBHEIMDAL): $(LIBASN1) $(LIBWIND) $(LIBHCRYPTO) $(LIBHX509) $(LIBKRB5)
+	$(LIBCON)
+
+!endif
+
+all:: $(LIBHEIMDAL)
+
+clean::
+	-$(RM) $(LIBHEIMDAL)

lib/hx509/NTMakefile

@@ -103,21 +103,9 @@ libhx509_la_OBJS = \
 	$(gen_files_ocsp:.x=.obj)	\
 	$(gen_files_pkcs10:.x=.obj)
 
-!ifndef STATICLIBS
-
-$(LIBHX509): $(BINDIR)\libhx509.dll
-
-$(BINDIR)\libhx509.dll: $(libhx509_la_OBJS) $(LIBHCRYPTO) $(LIBASN1) $(LIBWIND) $(LIBROKEN) $(LIBCOMERR)
-	$(DLLGUILINK) -def:libhx509-exports.def -implib:$(LIBHX509) shell32.lib
-	$(DLLPREP)
-
-!else
-
 $(LIBHX509): $(libhx509_la_OBJS)
 	$(LIBCON)
 
-!endif
-
 dist_libhx509_la_SOURCES = \
 	$(SRCDIR)\ca.c \
 	$(SRCDIR)\cert.c \
@@ -237,7 +225,9 @@ $(OBJ)\sel-gram.c: sel-gram.y
 $(OBJ)\sel-lex.c: sel-lex.l
 	$(LEX) -o$@ sel-lex.l
 
-all:: $(INCFILES) $(LIBHX509) $(BINDIR)\hxtool.exe
+all:: $(INCFILES) $(LIBHX509)
+
+all-tools:: $(BINDIR)\hxtool.exe
 
 clean::
 	-$(RM) $(BINDIR)\hxtool.exe

lib/kadm5/NTMakefile

@@ -187,9 +187,8 @@ LIBEXECPROGRAMS=$(LIBEXECDIR)\ipropd-master.exe $(LIBEXECDIR)\ipropd-slave.exe
 EXELIBDEPS= \
 	$(LIBKADM5SRV) \
 	$(LIBROKEN) \
-	$(LIBKRB5) \
+	$(LIBHEIMDAL) \
 	$(LIBHDB) \
-	$(LIBASN1) \
 	$(LIBSQLITE) \
 	$(LIBSL) \
 	$(LIBCOMERR) \
@@ -212,7 +211,7 @@ $(LIBKADM5CLNT): $(LIBKADM5CLNT_OBJS)
 
 $(LIBKADM5SRV): $(BINDIR)\libkadm5srv.dll
 
-$(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBKRB5) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBASN1) $(LIBSQLITE)
+$(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBHEIMDAL) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBSQLITE)
 	$(DLLGUILINK) -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def
 	$(DLLPREP)
 

lib/krb5/NTMakefile

@@ -293,8 +293,6 @@ $(OBJ)\k524_err.c $(OBJ)\k524_err.h: k524_err.et
 #----------------------------------------------------------------------
 # libkrb5
 
-!ifdef STATICLIBS
-
 $(LIBKRB5): $(libkrb5_OBJS) $(libkrb5_gen_OBJS)
 	$(LIBCON)
 
@@ -303,54 +301,20 @@ all:: $(LIBKRB5)
 clean::
 	-$(RM) $(LIBKRB5)
 
-!else
-
-DLLDEPS= \
-	$(LIBROKEN)	\
-	$(LIBASN1)	\
-	$(LIBSQLITE)	\
-	$(LIBCOMERR)	\
-	$(LIBHCRYPTO)	\
-	$(LIBHX509)	\
-	$(LIBWIND)
-
-DLLSDKDEPS= \
-	$(PTHREAD_LIB)	\
-	secur32.lib	\
-	shell32.lib	\
-	dnsapi.lib
-
-$(LIBKRB5): $(BINDIR)\libkrb5.dll
-
 $(OBJ)\libkrb5-exports.def: libkrb5-exports.def.in $(INCDIR)\config.h
 	$(CPREPROCESSOUT) libkrb5-exports.def.in > $@ || $(RM) $@
 
-$(BINDIR)\libkrb5.dll: $(libkrb5_OBJS) $(libkrb5_gen_OBJS) $(DLLDEPS) $(OBJ)\libkrb5-exports.def
+all:: $(OBJ)\libkrb5-exports.def
-	$(DLLGUILINK_C) -out:$(BINDIR)\libkrb5.dll -implib:$(LIBKRB5) \
-		$(DLLDEPS) $(DLLSDKDEPS) -def:$(OBJ)\libkrb5-exports.def @<<
-$(libkrb5_OBJS: =
-)
-$(libkrb5_gen_OBJS: =
-)
-<<
-	$(_VC_MANIFEST_EMBED_DLL)
-	$(_VC_MANIFEST_CLEAN)
-	$(_CODESIGN)
-
-all:: $(BINDIR)\libkrb5.dll
 
 clean::
-	-$(RM) $(BINDIR)\libkrb5.dll
+	-$(RM) $(OBJ)\libkrb5-exports.def
-	-$(RM) $(LIBKRB5)
 
-!endif
+all-tools:: $(BINDIR)\verify_krb5_conf.exe
-
-all:: $(BINDIR)\verify_krb5_conf.exe
 
 clean::
 	-$(RM) $(BINDIR)\verify_krb5_conf.exe
 
-$(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBKRB5) $(LIBROKEN) $(LIBVERS)
+$(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS)
 	$(EXECONLINK)
 	$(EXEPREP)
 
@@ -430,11 +394,8 @@ test-run:
 	cd $(SRCDIR)
 
 $(test_binaries): $$(@R).obj
-	$(EXECONLINK) $(LIBKRB5) $(LIBVERS) $(LIBROKEN) $(LIBHCRYPTO) $(LIBASN1)
 	$(EXECONLINK) $(LIBHEIMDAL) $(LIBVERS) $(LIBROKEN)
 	$(EXEPREP_NODIST)
 
 $(test_binaries:.exe=.obj): $$(@B).c
 	$(C2OBJ_C) -Fo$@ -Fd$(@D)\ $** -DBlah
-
-

lib/ntlm/NTMakefile

@@ -46,7 +46,7 @@ $(OBJ)\heimntlm-protos.h: $(libheimntlm_la_SOURCES)
 
 $(LIBHEIMNTLM): $(BINDIR)\libheimntlm.dll
 
-$(BINDIR)\libheimntlm.dll: $(OBJ)\ntlm.obj $(LIBKRB5) $(LIBHCRYPTO)
+$(BINDIR)\libheimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL)
 	$(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM)
 	$(DLLPREP)
 
@@ -67,7 +67,7 @@ test-run:
 	test_ntlm.exe
 	cd $(SRCDIR)
 
-$(OBJ)\test_ntlm.exe: $(OBJ)\test_ntlm.obj $(LIBHEIMNTLM) $(LIBKRB5) $(LIBVERS) $(LIBROKEN) $(LIBHCRYPTO) $(LIBASN1)
+$(OBJ)\test_ntlm.exe: $(OBJ)\test_ntlm.obj $(LIBHEIMNTLM) $(LIBHEIMDAL) $(LIBVERS) $(LIBROKEN)
 	$(EXECONLINK)
 	$(EXEPREP_NODIST)
 

lib/wind/NTMakefile

@@ -50,21 +50,9 @@ libwind_OBJs=	\
 	$(OBJ)\wind_err.obj			\
 	$(OBJ)\utf8.obj
 
-!ifndef STATICLIBS
-
-$(LIBWIND): $(BINDIR)\libwind.dll
-
-$(BINDIR)\libwind.dll: $(libwind_OBJs) $(LIBCOMERR)
-	$(DLLGUILINK) -def:libwind-exports.def -implib:$(LIBWIND)
-	$(DLLPREP)
-
-!else
-
 $(LIBWIND): $(libwind_OBJs)
 	$(LIBCON)
 
-!endif
-
 INCFILES=	\
 	$(INCDIR)\wind.h	\
 	$(INCDIR)\wind_err.h	\
@@ -124,7 +112,6 @@ TEST_BINARIES=\
 	$(C2OBJ_P) -I$(SRCDIR)
 
 {$(OBJ)}.obj{$(OBJ)}.exe:
-	$(EXECONLINK) $(LIBWIND) $(LIBROKEN)
 	$(EXECONLINK) $(LIBHEIMDAL) $(LIBROKEN)
 	$(EXEPREP_NODIST)
 

windows/NTMakefile.w32

@@ -463,23 +463,24 @@ $(_VC_MANIFEST_CLEAN)
 # Convenience macros for import libraries
 #
 
-LIBROKEN    =$(LIBDIR)\libroken.lib
-LIBVERS	    =$(LIBDIR)\libvers.lib
-LIBEDITLINE =$(LIBDIR)\libeditline.lib
-LIBCOMERR   =$(LIBDIR)\libcom_err.lib
-LIBSL	    =$(LIBDIR)\libsl.lib
-LIBWIND	    =$(LIBDIR)\libwind.lib
 LIBASN1	    =$(LIBDIR)\libasn1.lib
-LIBSQLITE   =$(LIBDIR)\libsqlite.lib
+LIBCOMERR   =$(LIBDIR)\libcom_err.lib
+LIBEDITLINE =$(LIBDIR)\libeditline.lib
+LIBGSSAPI   =$(LIBDIR)\libgssapi.lib
 LIBHCRYPTO  =$(LIBDIR)\libhcrypto.lib
-LIBHX509    =$(LIBDIR)\libhx509.lib
+LIBHDB	    =$(LIBDIR)\libhdb.lib
-LIBKRB5	    =$(LIBDIR)\libkrb5.lib
+LIBHEIMDAL  =$(LIBDIR)\heimdal.lib
-LIBHEIMNTLM =$(LIBDIR)\libheimntlm.lib
 LIBHEIMIPCC =$(LIBDIR)\libheim-ipcc.lib
 LIBHEIMIPCS =$(LIBDIR)\libheim-ipcs.lib
-LIBGSSAPI   =$(LIBDIR)\libgssapi.lib
+LIBHEIMNTLM =$(LIBDIR)\libheimntlm.lib
-LIBHDB	    =$(LIBDIR)\libhdb.lib
+LIBHX509    =$(LIBDIR)\libhx509.lib
-LIBKADM5SRV =$(LIBDIR)\libkadm5srv.lib
 LIBKADM5CLNT=$(LIBDIR)\libkadm5clnt.lib
+LIBKADM5SRV =$(LIBDIR)\libkadm5srv.lib
 LIBKDC	    =$(LIBDIR)\libkdc.lib
 LIBLTM	    =$(LIBDIR)\libltm.lib
+LIBKRB5	    =$(LIBDIR)\libkrb5.lib
+LIBROKEN    =$(LIBDIR)\libroken.lib
+LIBSL	    =$(LIBDIR)\libsl.lib
+LIBSQLITE   =$(LIBDIR)\libsqlite.lib
+LIBVERS	    =$(LIBDIR)\libvers.lib
+LIBWIND	    =$(LIBDIR)\libwind.lib