Replaced 'erase' with $(RM) so that the default file deletion program can be overriden

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

src/makelib.b32

@@ -17,17 +17,17 @@ WXDIR = $(WXWIN)
 lib: $(LIBTARGET)
    
 $(LIBTARGET): $(OBJECTS)
-   -erase $(LIBTARGET)
+   -$(RM) $(LIBTARGET)
    tlib "$(LIBTARGET)" /P512 @&&!
 +$(OBJECTS:.obj =.obj +)
 !
 
 clean:
-        -erase *.obj
+        -$(RM) *.obj
-        -erase *.exe
+        -$(RM) *.exe
-        -erase *.res
+        -$(RM) *.res
-        -erase *.map
+        -$(RM) *.map
-        -erase *.rws
+        -$(RM) *.rws
-        -erase $(LIBTARGET)
+        -$(RM) $(LIBTARGET)
 
 

src/msw/makefile.b32

@@ -370,7 +370,7 @@ all:	wx
 !if "$(DLL)" == "0"
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-        -erase $(LIBTARGET)
+        -$(RM) $(LIBTARGET)
 	tlib "$(LIBTARGET)" /P1024 @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
@@ -378,8 +378,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 !else
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-	-erase $(LIBTARGET)
+	-$(RM) $(LIBTARGET)
-	-erase $(WXLIBDIR)\wx.dll
+	-$(RM) $(WXLIBDIR)\wx.dll
         $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
@@ -1055,17 +1055,17 @@ $(WIN95FLAG)
 ! $(CFG)
 
 clean: $(PERIPH_CLEAN_TARGET)
-    -erase $(LIBTARGET)
+    -$(RM) $(LIBTARGET)
-    -erase $(WXLIBDIR)\wx.dll
+    -$(RM) $(WXLIBDIR)\wx.dll
-    -erase $(WXLIBDIR)\wx.tds
+    -$(RM) $(WXLIBDIR)\wx.tds
-    -erase $(WXLIBDIR)\wx.il?
+    -$(RM) $(WXLIBDIR)\wx.il?
-    -erase *.obj
+    -$(RM) *.obj
-    -erase *.pch
+    -$(RM) *.pch
-    -erase *.csm
+    -$(RM) *.csm
-    -erase *.cfg
+    -$(RM) *.cfg
-    -erase "wx32.#??"
+    -$(RM) "wx32.#??"
-    -erase ..\common\y_tab.c
+    -$(RM) ..\common\y_tab.c
-    -erase ..\common\lex_yy.c
+    -$(RM) ..\common\lex_yy.c
 
 cleanall: clean
 
@@ -1162,7 +1162,7 @@ allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
-        -erase wx.ph
+        -$(RM) wx.ph
         hc wx
         move wx.hlp $(DOCDIR)\winhelp\wx.hlp
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
@@ -1170,7 +1170,7 @@ $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
 
 $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj
         cd $(DOCDIR)/latex/porting
-        -erase porting.ph
+        -$(RM) porting.ph
         hc porting
         move porting.hlp $(DOCDIR)\winhelp\porting.hlp
         move porting.cnt $(DOCDIR)\winhelp\porting.cnt
@@ -1178,7 +1178,7 @@ $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOC
 
 $(DOCDIR)/winhelp/prop.hlp:         $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
         cd $(DOCDIR)/latex/proplist
-        -erase prop.ph
+        -$(RM) prop.ph
         hc prop
         move prop.hlp $(DOCDIR)\winhelp\prop.hlp
         move prop.cnt $(DOCDIR)\winhelp\prop.cnt
@@ -1186,7 +1186,7 @@ $(DOCDIR)/winhelp/prop.hlp:         $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/
 
 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
-        -erase techref.ph
+        -$(RM) techref.ph
         hc techref
         move techref.hlp $(DOCDIR)\winhelp\techref.hlp
         move techref.cnt $(DOCDIR)\winhelp\techref.cnt
@@ -1244,10 +1244,10 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
-        -erase $(DOCDIR)\html\wx\*.con
+        -$(RM) $(DOCDIR)\html\wx\*.con
-        -erase $(DOCDIR)\html\wx\*.ref
+        -$(RM) $(DOCDIR)\html\wx\*.ref
-        -erase $(DOCDIR)\latex\wx\*.con
+        -$(RM) $(DOCDIR)\latex\wx\*.con
-        -erase $(DOCDIR)\latex\wx\*.ref
+        -$(RM) $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
 $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
@@ -1260,20 +1260,20 @@ $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
         cd $(DOCDIR)\latex\porting
         -mkdir $(DOCDIR)\html\porting
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html
-        -erase $(DOCDIR)\html\porting\*.con
+        -$(RM) $(DOCDIR)\html\porting\*.con
-        -erase $(DOCDIR)\html\porting\*.ref
+        -$(RM) $(DOCDIR)\html\porting\*.ref
-        -erase $(DOCDIR)\latex\porting\*.con
+        -$(RM) $(DOCDIR)\latex\porting\*.con
-        -erase $(DOCDIR)\latex\porting\*.ref
+        -$(RM) $(DOCDIR)\latex\porting\*.ref
         cd $(THISDIR)
 
 $(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
         cd $(DOCDIR)\latex\proplist
         -mkdir $(DOCDIR)\html\proplist
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
-        -erase $(DOCDIR)\html\proplist\*.con
+        -$(RM) $(DOCDIR)\html\proplist\*.con
-        -erase $(DOCDIR)\html\proplist\*.ref
+        -$(RM) $(DOCDIR)\html\proplist\*.ref
-        -erase $(DOCDIR)\latex\proplist\*.con
+        -$(RM) $(DOCDIR)\latex\proplist\*.con
-        -erase $(DOCDIR)\latex\proplist\*.ref
+        -$(RM) $(DOCDIR)\latex\proplist\*.ref
         cd $(THISDIR)
 
 $(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex