Ignore failure when deleting something that might not exist

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makelib.b32 b/src/makelib.b32
index cf2732bfd3c91729bad48a2949ec01f1effb1f1f..446525555e4192c1f5d58e55b41980c5e6fadb0b 100644 (file)
--- a/src/makelib.b32
+++ b/src/makelib.b32
@@ -15,7 +15,7 @@ WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 $(LIBTARGET): $(OBJECTS)
 !include $(WXDIR)\src\makeb32.env
 
 $(LIBTARGET): $(OBJECTS)

-        erase $(LIBTARGET)
+        -erase $(LIBTARGET)

        tlib $(LIBTARGET) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+)
 !
        tlib $(LIBTARGET) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+)
 !

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index b69f905ac61c496a1d0d0dd9ca8e857baa6560c2..21f1cd0b1badba38c90514270615cc8e4fa8767e 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -265,7 +265,7 @@ all:        all_libs all_execs
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)

-        erase $(LIBTARGET)
+        -erase $(LIBTARGET)

        tlib $(LIBTARGET) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
 !
        tlib $(LIBTARGET) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
 !


@@ -273,8 +273,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 !else
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 !else
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)

-       erase $(LIBTARGET)
-       erase $(WXLIBDIR)\wx.dll
+       -erase $(LIBTARGET)
+       -erase $(WXLIBDIR)\wx.dll

         tlink32 $(LINK_FLAGS) /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
         tlink32 $(LINK_FLAGS) /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx


@@ -716,13 +716,13 @@ $(WIN95FLAG)
 # -Oxt
 
 clean: $(PERIPH_CLEAN_TARGET)
 # -Oxt
 
 clean: $(PERIPH_CLEAN_TARGET)

-    erase $(LIBTARGET)
-    erase *.obj
-    erase *.pch
-    erase *.csm
-    erase *.cfg
-       erase ..\common\y_tab.c
-    erase ..\common\lex_yy.c
+    -erase $(LIBTARGET)
+    -erase *.obj
+    -erase *.pch
+    -erase *.csm
+    -erase *.cfg
+       -erase ..\common\y_tab.c
+    -erase ..\common\lex_yy.c

 
 cleanall: clean
 
 
 cleanall: clean
 

diff --git a/src/png/makefile.b32 b/src/png/makefile.b32
index c812bbcb943794c16b20d428cd8c383ae7294896..0425a7f2fb5c136bf3936d571c77958b87827ce5 100644 (file)
--- a/src/png/makefile.b32
+++ b/src/png/makefile.b32
@@ -36,7 +36,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
 all: $(WINPNGLIB)
 
 $(WINPNGLIB): $(OBJECTS) 
 all: $(WINPNGLIB)
 
 $(WINPNGLIB): $(OBJECTS) 

-        erase $(WINPNGLIB)
+        -erase $(WINPNGLIB)

        tlib $(WINPNGLIB) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+) 
 !
        tlib $(WINPNGLIB) /P512 @&&!
 -+$(OBJECTS:.obj =.obj -+) 
 !