From 8d36e7dfccf3f8ae857ae69e34d71d4868260c33 Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Fri, 1 Oct 2010 13:32:28 -0400
Subject: [PATCH] Support for merging application manifest

---
 windows/NTMakefile.w32 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 50609abfa..121b444ec 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -433,6 +433,12 @@ _VC_MANIFEST_EMBED_EXE_NOHEIM= \
 _VC_MANIFEST_EMBED_DLL= \
 ( if exist $@.manifest $(MT) -outputresource:$@;2 -manifest $@.manifest )
 
+_MERGE_MANIFEST_DLL= \
+( $(MT) -inputresource:$@;2 -manifest $(APPMANIFEST) -outputresource:$@;2 )
+
+_INSERT_APPMANIFEST_DLL= \
+( $(MT) -manifest $(APPMANIFEST) -outputresource:$@;2 )
+
 # Note that if you are merging manifests, then the VS generated
 # manifest should be cleaned up after calling _VC_MANIFEST_EMBED_???.
 # This ensures that even if the DLL or EXE is executed in-place, the
@@ -492,6 +498,9 @@ DLLPREP=\
 DLLPREP_NODIST=\
 ( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
 
+DLLPREP_MERGE=\
+( ( $(_MERGE_MANIFEST_DLL) || $(_INSERT_APPMANIFEST_DLL) ) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
+
 #----------------------------------------------------------------------
 # Convenience macros for import libraries and assemblies
 #