diff options
| author | Yingke Liu <yingke.d.liu@intel.com> | 2014-08-25 05:00:34 +0000 |
|---|---|---|
| committer | yingke <yingke@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-25 05:00:34 +0000 |
| commit | b69fd59e6f1a884e1f3e42f4fd07e59060782cc1 (patch) | |
| tree | af00c239af26c60567c016d84b13e0031ee8a257 | |
| parent | b3d07ff8d21ecab5a8060815e9abe73c904e3ed9 (diff) | |
| download | edk2-b69fd59e6f1a884e1f3e42f4fd07e59060782cc1.tar.gz edk2-b69fd59e6f1a884e1f3e42f4fd07e59060782cc1.tar.bz2 edk2-b69fd59e6f1a884e1f3e42f4fd07e59060782cc1.zip | |
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
| -rw-r--r-- | BaseTools/Source/C/Makefile | 3 | ||||
| -rw-r--r-- | BaseTools/Source/C/Makefiles/ms.app | 4 | ||||
| -rw-r--r-- | BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak | 1 | ||||
| -rw-r--r-- | BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/BaseTools/Source/C/Makefile b/BaseTools/Source/C/Makefile index 789e06f18d..3005a175b8 100644 --- a/BaseTools/Source/C/Makefile +++ b/BaseTools/Source/C/Makefile @@ -1,7 +1,7 @@ ## @file
# Windows makefile for C tools build.
#
-# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
# 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
@@ -68,7 +68,6 @@ clean: .PHONY: cleanall
cleanall:
@Makefiles\NmakeSubdirs.bat cleanall $(LIBRARIES) $(APPLICATIONS)
- @del /f /q $(BIN_PATH)\*.pdb $(BIN_PATH)\*.ilk
!INCLUDE Makefiles\ms.rule
diff --git a/BaseTools/Source/C/Makefiles/ms.app b/BaseTools/Source/C/Makefiles/ms.app index 455549c121..c7f2bd6583 100644 --- a/BaseTools/Source/C/Makefiles/ms.app +++ b/BaseTools/Source/C/Makefiles/ms.app @@ -1,6 +1,6 @@ ## @file
#
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
# 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
@@ -28,7 +28,7 @@ clean: del /f /q $(OBJECTS) *.pdb > nul
cleanall:
- del /f /q $(OBJECTS) $(APPLICATION) *.pdb $(BIN_PATH)\*.pdb > nul
+ del /f /q $(OBJECTS) $(APPLICATION) *.pdb $(BIN_PATH)\$(APPNAME).pdb > nul
!INCLUDE ..\Makefiles\ms.rule
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak index 8d87547a50..b30a73bb74 100644 --- 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 $(EDK_TOOLS_PATH)\Bin\Win32\antlr.exe: $(ANTLR_OBJS) $(SUPPORT_OBJS)
$(CC) $(CFLAGS) -Feantlr.exe $(ANTLR_OBJS) $(SUPPORT_OBJS)
+ -@if not exist $(EDK_TOOLS_PATH)\Bin\Win32 mkdir $(EDK_TOOLS_PATH)\Bin\Win32
copy antlr.exe $(EDK_TOOLS_PATH)\Bin\Win32
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak index 18c37d3656..2714308d4f 100644 --- 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 # Dependencies
-dlg.exe: $(DLG_OBJS) $(SUPPORT_OBJS)
+$(EDK_TOOLS_PATH)\Bin\Win32\dlg.exe: $(DLG_OBJS) $(SUPPORT_OBJS)
$(CC) $(CFLAGS) -Fedlg.exe $(DLG_OBJS) $(SUPPORT_OBJS)
+ -@if not exist $(EDK_TOOLS_PATH)\Bin\Win32 mkdir $(EDK_TOOLS_PATH)\Bin\Win32
copy dlg.exe $(EDK_TOOLS_PATH)\Bin\Win32
dlg_p.obj: $(DLG_SRC)\dlg_p.c \
|