Revision: 15887
http://sourceforge.net/p/edk2/code/15887
Author: yingke
Date: 2014-08-25 05:00:34 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Fix nmake cleanall bugs.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/C/Makefile
trunk/edk2/BaseTools/Source/C/Makefiles/ms.app
trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
Modified: trunk/edk2/BaseTools/Source/C/Makefile
===================================================================
--- trunk/edk2/BaseTools/Source/C/Makefile 2014-08-25 01:16:34 UTC (rev
15886)
+++ trunk/edk2/BaseTools/Source/C/Makefile 2014-08-25 05:00:34 UTC (rev
15887)
@@ -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 @@
.PHONY: cleanall
cleanall:
@Makefiles\NmakeSubdirs.bat cleanall $(LIBRARIES) $(APPLICATIONS)
- @del /f /q $(BIN_PATH)\*.pdb $(BIN_PATH)\*.ilk
!INCLUDE Makefiles\ms.rule
Modified: trunk/edk2/BaseTools/Source/C/Makefiles/ms.app
===================================================================
--- trunk/edk2/BaseTools/Source/C/Makefiles/ms.app 2014-08-25 01:16:34 UTC
(rev 15886)
+++ trunk/edk2/BaseTools/Source/C/Makefiles/ms.app 2014-08-25 05:00:34 UTC
(rev 15887)
@@ -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 @@
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
Modified: trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
===================================================================
--- trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
2014-08-25 01:16:34 UTC (rev 15886)
+++ trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
2014-08-25 05:00:34 UTC (rev 15887)
@@ -29,6 +29,7 @@
$(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
Modified: trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
===================================================================
--- trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
2014-08-25 01:16:34 UTC (rev 15886)
+++ trunk/edk2/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
2014-08-25 05:00:34 UTC (rev 15887)
@@ -26,8 +26,9 @@
# 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 \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
