Fix nmake cleanall bugs.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15887 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/Makefile b/BaseTools/Source/C/Makefile
index 789e06f18dfe4c8a038ce0e67bc184dc59a5c708..3005a175b8b7dcd1bdb9940577d71d2ee45b542b 100644 (file)
--- a/BaseTools/Source/C/Makefile
+++ b/BaseTools/Source/C/Makefile
@@ -1,7 +1,7 @@
 ## @file\r
 # Windows makefile for C tools build.\r
 #\r
-# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -68,7 +68,6 @@ clean:
 .PHONY: cleanall\r
 cleanall:\r
   @Makefiles\NmakeSubdirs.bat cleanall $(LIBRARIES) $(APPLICATIONS)\r
-  @del /f /q $(BIN_PATH)\*.pdb $(BIN_PATH)\*.ilk\r
 \r
 !INCLUDE Makefiles\ms.rule\r
 \r

diff --git a/BaseTools/Source/C/Makefiles/ms.app b/BaseTools/Source/C/Makefiles/ms.app
index 455549c12126a06ebb824e3de2e524eb10ec01e1..c7f2bd65837d200cef27c20680f9066f70e2a873 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.app
+++ b/BaseTools/Source/C/Makefiles/ms.app
@@ -1,6 +1,6 @@
 ## @file\r
 #\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.    The full text of the license may be found at\r
@@ -28,7 +28,7 @@ clean:
        del /f /q $(OBJECTS) *.pdb > nul\r
 \r
 cleanall:\r
-       del /f /q $(OBJECTS) $(APPLICATION) *.pdb $(BIN_PATH)\*.pdb > nul\r
+       del /f /q $(OBJECTS) $(APPLICATION) *.pdb $(BIN_PATH)\$(APPNAME).pdb > nul\r
 \r
 !INCLUDE ..\Makefiles\ms.rule\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
index 8d87547a50bf965ea1bbee4d36489dd6c6251705..b30a73bb7424daade69a85c12ae3670c24e91b1d 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
@@ -29,6 +29,7 @@ SUPPORT_OBJS = set.obj
 \r
 $(EDK_TOOLS_PATH)\Bin\Win32\antlr.exe: $(ANTLR_OBJS) $(SUPPORT_OBJS)\r
     $(CC) $(CFLAGS) -Feantlr.exe $(ANTLR_OBJS) $(SUPPORT_OBJS)\r
+    -@if not exist $(EDK_TOOLS_PATH)\Bin\Win32 mkdir $(EDK_TOOLS_PATH)\Bin\Win32\r
                copy antlr.exe $(EDK_TOOLS_PATH)\Bin\Win32\r
 \r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
index 18c37d3656669b2192437d8fd6440242f521f833..2714308d4fa088bc1cb1e7b76f856f8b0f184911 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
@@ -26,8 +26,9 @@ SUPPORT_OBJS = set.obj
 \r
 # Dependencies\r
 \r
-dlg.exe: $(DLG_OBJS) $(SUPPORT_OBJS)\r
+$(EDK_TOOLS_PATH)\Bin\Win32\dlg.exe: $(DLG_OBJS) $(SUPPORT_OBJS)\r
     $(CC) $(CFLAGS) -Fedlg.exe $(DLG_OBJS) $(SUPPORT_OBJS)\r
+    -@if not exist $(EDK_TOOLS_PATH)\Bin\Win32 mkdir $(EDK_TOOLS_PATH)\Bin\Win32\r
                copy dlg.exe $(EDK_TOOLS_PATH)\Bin\Win32\r
 \r
 dlg_p.obj: $(DLG_SRC)\dlg_p.c \\r