From 9fd109a0e19e0bd3a3db7c3d8f433f607580827f Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Thu, 14 Oct 2010 17:29:42 -0400
Subject: [PATCH] Windows: Support for additional build tools

---
 windows/NTMakefile.w32 | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 121b444ec..177e7748a 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -110,22 +110,34 @@ RM=del /q
 ECHO=echo
 RC=rc
 
-AWK=gawk.exe
-YACC=bison.exe -y
-LEX=flex.exe
+#----------------------------------------------------------------
+# Program macros
+
+AWK_CMD=gawk.exe
+YACC_CMD=bison.exe
+LEX_CMD=flex.exe
 PYTHON=python.exe
 PERL=perl.exe
 CMP=cmp.exe
 SIGNTOOL=signtool.exe
 MAKECAT=makecat.exe
+HHC=hhc.exe
+MAKEINFO=makeinfo.exe
 
-CANDLE=candle.exe
-LIGHT=light.exe
+CANDLE_CMD=candle.exe
+LIGHT_CMD=light.exe
 
 # Only used for tests
 SH=sh.exe
 SED=sed.exe
 
+# Commands
+AWK=$(AWK_CMD)
+YACC=$(YACC_CMD) -y
+LEX=$(LEX_CMD)
+CANDLE=$(CANDLE_CMD) -nologo
+LIGHT=$(LIGHT_CMD) -nologo
+
 #----------------------------------------------------------------
 # External dependencies
 
@@ -227,7 +239,7 @@ RC2RES = $(RC2RES_C) -fo $@ $**
 !ifndef RECURSE
 
 check-utils:
-	@for %%g in ( "$(AWK)" "$(YACC)" "$(LEX)" "$(PYTHON)" "$(PERL)" "$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(CANDLE)" "$(LIGHT)") do @( \
+	@for %%g in ( "$(AWK_CMD)" "$(YACC_CMD)" "$(LEX_CMD)" "$(PYTHON)" "$(PERL)" "$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(CANDLE_CMD)" "$(LIGHT_CMD)" "$(MAKEINFO)" "$(HHC)") do @( \
 	for /f %%f in ( "%%g" ) do @( \
 		if exist %%f @( \
 			echo Found %%f \