Windows: Build a single heimdal.dll

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

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
-	$(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
+all:: $(OBJ)\libkrb5-exports.def
 
 clean::
-	-$(RM) $(BINDIR)\libkrb5.dll
-	-$(RM) $(LIBKRB5)
+	-$(RM) $(OBJ)\libkrb5-exports.def
 
-!endif
-
-all:: $(BINDIR)\verify_krb5_conf.exe
+all-tools:: $(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
-
-