Windows: Make Heimdal a single assembly

lib/com_err/NTMakefile

@@ -54,7 +54,7 @@ $(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res
 	$(DLLGUILINK_C) -out:$(COMERRDLL) -implib:$(LIBCOMERR) $** \
 		$(LIBROKEN) \
 		-def:libcom_err-exports.def
-	$(DLLPREP_NODIST)
+	$(DLLPREP)
 
 !endif
 

lib/gssapi/NTMakefile

@@ -477,7 +477,7 @@ $(BINDIR)\gssapi.dll: $(libgssapi_OBJs) $(RES)
 $(libgssapi_OBJs: =
 )
 <<
-	$(DLLPREP_NODIST)
+	$(DLLPREP)
 
 $(LIBGSSAPI): $(BINDIR)\gssapi.dll
 

lib/heimdal/NTMakefile

@@ -73,7 +73,7 @@ $(DLL): $(DLLDEPS) $(DEF) $(RES)
 	$(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) $(RES) \
 		-def:$(DEF) -out:$(DLL) \
 		-implib:$(LIBHEIMDAL)
-	$(DLLPREP_NODIST)
+	$(DLLPREP)
 
 clean::
 	-$(RM) $(BINDIR)\heimdal.*

lib/ntlm/NTMakefile

@@ -50,7 +50,7 @@ $(LIBHEIMNTLM): $(BINDIR)\heimntlm.dll
 
 $(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES)
 	$(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM)
-	$(DLLPREP_NODIST)
+	$(DLLPREP)
 
 clean::
 	-$(RM) $(BINDIR)\heimntlm.*