Windows: Merge in application manifest when building assemblies

2010-11-22 03:36:33 -05:00
parent 402afa0e0d
commit 29383b4cd0
5 changed files with 5 additions and 4 deletions
--- a/lib/com_err/NTMakefile
+++ b/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

--- a/lib/gssapi/NTMakefile
+++ b/lib/gssapi/NTMakefile
@@ -477,7 +477,7 @@ $(BINDIR)\gssapi.dll: $(libgssapi_OBJs) $(RES)
 $(libgssapi_OBJs: =
 )
 <<
-	$(DLLPREP)
+	$(DLLPREP_NODIST)

 $(LIBGSSAPI): $(BINDIR)\gssapi.dll

--- a/lib/heimdal/NTMakefile
+++ b/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.*
--- a/lib/ntlm/NTMakefile
+++ b/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.*
--- a/packages/windows/assembly/NTMakefile
+++ b/packages/windows/assembly/NTMakefile
@@ -99,6 +99,7 @@ test::

 {$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
 	$(CP) $< $@
+	$(DLLPREP_MERGE)

 {$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
 	$(CP) $< $@