2 files changed, 121 insertions, 97 deletions
diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index 6fe376ddbb..7be5758ffb 100644
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -1,53 +1,65 @@
-
-ARCH ?= IA32
-MAKEROOT ?= ..
-
-APPNAME = VfrCompile
-
-LIBS = -lCommon
-
-TOOL_INCLUDE = -I Pccts/h
-
-#OBJECTS = VfrSyntax.o VfrServices.o DLGLexer.o EfiVfrParser.o ATokenBuffer.o DLexerBase.o AParser.o
-OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyntax.o \
-          VfrFormPkg.o VfrError.o VfrUtilityLib.o VfrCompiler.o
-
-VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS)
-
-LINKER = $(CXX)
-
-EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
-
-include $(MAKEROOT)/Makefiles/app.makefile
-
-VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g
-	Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g
-
-VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg
-	Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
-
-Pccts/antlr/antlr:
-	BIN_DIR='.' make -C Pccts/antlr
-
-Pccts/dlg/dlg:
-	BIN_DIR='.' make -C Pccts/dlg
-
-ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
-
-DLexerBase.o: Pccts/h/DLexerBase.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
-
-AParser.o: Pccts/h/AParser.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
-
-VfrSyntax.o: VfrSyntax.cpp
-	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
-	
-clean: localClean
-
-localClean:
-	BIN_DIR='.' make -C Pccts/antlr clean
-	BIN_DIR='.' make -C Pccts/dlg clean
-	rm -f $(EXTRA_CLEAN_OBJECTS)
-
+## @file
+# Windows makefile for 'VfrCompile' module build.
+#
+# Copyright (c) 2008 - 2010, Intel Corporation<BR>
+# All rights reserved. This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution.  The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+
+ARCH ?= IA32
+MAKEROOT ?= ..
+
+APPNAME = VfrCompile
+
+LIBS = -lCommon
+
+TOOL_INCLUDE = -I Pccts/h
+
+#OBJECTS = VfrSyntax.o VfrServices.o DLGLexer.o EfiVfrParser.o ATokenBuffer.o DLexerBase.o AParser.o
+OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyntax.o \
+          VfrFormPkg.o VfrError.o VfrUtilityLib.o VfrCompiler.o
+
+VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS)
+
+LINKER = $(CXX)
+
+EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
+
+include $(MAKEROOT)/Makefiles/app.makefile
+
+VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g
+	Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g
+
+VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg
+	Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
+
+Pccts/antlr/antlr:
+	BIN_DIR='.' make -C Pccts/antlr
+
+Pccts/dlg/dlg:
+	BIN_DIR='.' make -C Pccts/dlg
+
+ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp
+	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+
+DLexerBase.o: Pccts/h/DLexerBase.cpp
+	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+
+AParser.o: Pccts/h/AParser.cpp
+	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+
+VfrSyntax.o: VfrSyntax.cpp
+	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
+	
+clean: localClean
+
+localClean:
+	BIN_DIR='.' make -C Pccts/antlr clean
+	BIN_DIR='.' make -C Pccts/dlg clean
+	rm -f $(EXTRA_CLEAN_OBJECTS)
+
diff --git a/BaseTools/Source/C/VfrCompile/Makefile b/BaseTools/Source/C/VfrCompile/Makefile
index e847b762f9..bdafbf69de 100644
--- a/BaseTools/Source/C/VfrCompile/Makefile
+++ b/BaseTools/Source/C/VfrCompile/Makefile
@@ -1,44 +1,56 @@
-!INCLUDE ..\Makefiles\ms.common
-
-CPPFLAGS = $(CPPFLAGS) /WX /D PCCTS_USE_NAMESPACE_STD /D VFREXP_DEBUG
-APPNAME = VfrCompile
-
-LIBS = $(LIB_PATH)\Common.lib
-
-OBJECTS = AParser.obj DLexerBase.obj ATokenBuffer.obj \
-          EfiVfrParser.obj VfrLexer.obj VfrSyntax.obj \
-          VfrFormPkg.obj VfrError.obj VfrUtilityLib.obj VfrCompiler.obj
-
-INC = $(INC) -I $(BASE_TOOLS_PATH)\Source\C\VfrCompile\Pccts\h
-
-!INCLUDE ..\Makefiles\ms.app
-
-VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: VfrSyntax.g
-	pushd . & cd Pccts & $(MAKE) & popd
-	antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g
-#	pushd . & cd Pccts & $(MAKE) clean
-
-VfrLexer.cpp VfrLexer.h: VfrParser.dlg
-	dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
-
-ATokenBuffer.obj: Pccts\h\ATokenBuffer.cpp
-	$(CXX) -c $(CPPFLAGS) $(INC) $? -Fo$@
-
-DLexerBase.obj: Pccts\h\DLexerBase.cpp
-	$(CXX) -c $(CPPFLAGS) $(INC) $? -Fo$@
-
-AParser.obj: Pccts\h\AParser.cpp
-	$(CXX) -c $(CPPFLAGS) $(INC) $? -Fo$@
-
-EXTRA_CLEAN_OBJECTS = VfrParser.dlg EfiVfrParser.cpp EfiVfrParser.h \
-                      VfrLexer.cpp VfrLexer.h \
-                      VfrSyntax.cpp VfrTokens.h
-
-clean: localClean
-cleanall: localClean localCleanall
-
-localClean:
-	-DEL $(EXTRA_CLEAN_OBJECTS)
-
-localCleanall:
-	pushd . & cd Pccts & $(MAKE) cleanall & popd
+## @file
+# Windows makefile for 'VfrCompile' module build.
+#
+# Copyright (c) 2008 - 2010, Intel Corporation<BR>
+# All rights reserved. This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution.  The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+!INCLUDE ..\Makefiles\ms.common
+
+CPPFLAGS = $(CPPFLAGS) /WX /D PCCTS_USE_NAMESPACE_STD /D VFREXP_DEBUG
+APPNAME = VfrCompile
+
+LIBS = $(LIB_PATH)\Common.lib
+
+OBJECTS = AParser.obj DLexerBase.obj ATokenBuffer.obj \
+          EfiVfrParser.obj VfrLexer.obj VfrSyntax.obj \
+          VfrFormPkg.obj VfrError.obj VfrUtilityLib.obj VfrCompiler.obj
+
+INC = $(INC) -I $(BASE_TOOLS_PATH)\Source\C\VfrCompile\Pccts\h
+
+!INCLUDE ..\Makefiles\ms.app
+
+VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: VfrSyntax.g
+	pushd . & cd Pccts & $(MAKE) & popd
+	antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g
+#	pushd . & cd Pccts & $(MAKE) clean
+
+VfrLexer.cpp VfrLexer.h: VfrParser.dlg
+	dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
+
+ATokenBuffer.obj: Pccts\h\ATokenBuffer.cpp
+	$(CXX) -c $(CPPFLAGS) $(INC) $? -Fo$@
+
+DLexerBase.obj: Pccts\h\DLexerBase.cpp
+	$(CXX) -c $(CPPFLAGS) $(INC) $? -Fo$@
+
+AParser.obj: Pccts\h\AParser.cpp
+	$(CXX) -c $(CPPFLAGS) $(INC) $? -Fo$@
+
+EXTRA_CLEAN_OBJECTS = VfrParser.dlg EfiVfrParser.cpp EfiVfrParser.h \
+                      VfrLexer.cpp VfrLexer.h \
+                      VfrSyntax.cpp VfrTokens.h
+
+clean: localClean
+cleanall: localClean localCleanall
+
+localClean:
+	-DEL $(EXTRA_CLEAN_OBJECTS)
+
+localCleanall:
+	pushd . & cd Pccts & $(MAKE) cleanall & popd