Embed application manifest in Heimdal assembly .dlls

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)
+	$(DLLPREP_NODIST)
 
 !endif
 

lib/gssapi/NTMakefile

@@ -473,7 +473,7 @@ $(BINDIR)\gssapi.dll: $(libgssapi_OBJs) $(RES)
 $(libgssapi_OBJs: =
 )
 <<
-	$(DLLPREP)
+	$(DLLPREP_NODIST)
 
 $(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)
+	$(DLLPREP_NODIST)
 
 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)
+	$(DLLPREP_NODIST)
 
 clean::
 	-$(RM) $(BINDIR)\heimntlm.*

packages/windows/assembly/NTMakefile

@@ -82,9 +82,10 @@ $(ASMKRBDIR)\$(ASMKRBNAME).cat: $(ASMKRBDIR)\$(ASMKRBMAN).cdf
 	cd $(SRCDIR)
 
 asm-krb: \
-	$(ASMKRBBINS) \
-	$(ASMKRBDIR)\$(ASMKRBMAN) \
-	$(ASMKRBDIR)\$(ASMKRBNAME).cat
+	$(APPMANIFEST)	\
+	$(ASMKRBBINS)	\
+	$(ASMKRBDIR)\$(ASMKRBMAN)	\
+	$(ASMKRBDIR)\$(ASMKRBNAME).cat	\
 
 all:: asm-krb
 
@@ -94,6 +95,14 @@ clean::
 test::
 	$(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN) -validate_manifest
 
+{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
+	$(CP) $< $@
+	$(DLLPREP_MERGE)
+
+{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
+	$(CP) $< $@
+
+
 # ----------------------------------------------------------------------
 # Heimdal.GSSAPI Assembly
 
@@ -128,9 +137,10 @@ $(ASMGSSDIR)\$(ASMGSSNAME).cat: $(ASMGSSDIR)\$(ASMGSSMAN).cdf
 	cd $(SRCDIR)
 
 asm-gss: \
-	$(ASMGSSBINS) \
-	$(ASMGSSDIR)\$(ASMGSSMAN) \
-	$(ASMGSSDIR)\$(ASMGSSNAME).cat
+	$(APPMANIFEST)	\
+	$(ASMGSSBINS)	\
+	$(ASMGSSDIR)\$(ASMGSSMAN)	\
+	$(ASMGSSDIR)\$(ASMGSSNAME).cat	\
 
 all:: asm-gss
 
@@ -139,6 +149,7 @@ clean::
 
 {$(BINDIR)}.dll{$(ASMGSSDIR)}.dll:
 	$(CP) $< $@
+	$(DLLPREP_MERGE)
 
 {$(BINDIR)}.pdb{$(ASMGSSDIR)}.pdb:
 	$(CP) $< $@
@@ -220,12 +231,6 @@ clean::
 
 # ----------------------------------------------------------------------
 
-{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
-	$(CP) $< $@
-
-{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
-	$(CP) $< $@
-
 .SUFFIXES: .dll .pdb
 
 mk-asm-dirs: