fixed fl compilation after the recent tbar changes (patch 536539)

[wxWidgets.git] / src / xrc / makefile.vc

diff --git a/src/xrc/makefile.vc b/src/xrc/makefile.vc
index f5c6515f775f8b9776c0aa1ff10321508fadf6a8..ff40bb5fcb08f2bb78814b65debe64dfbf0b0237 100644 (file)
--- a/src/xrc/makefile.vc
+++ b/src/xrc/makefile.vc
@@ -19,6 +19,10 @@ THISDIR = $(WXDIR)\contrib\src\xrc
 DOCDIR=$(WXDIR)\contrib\docs
 LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml
 
+!if "$(RM)" == ""
+RM= erase
+!endif
+
 NOPCH=1
 
 EXPAT_DIR=$(THISDIR)\expat
@@ -43,7 +47,7 @@ LIBTARGET=$(WXDIR)\lib\wxxrc$(LIBEXT).lib
 EXTRATARGETS=$(D)
 
 OBJECTS=$(EXPAT_OBJS) \
-        $(D)\xml.obj $(D)\xmlbin.obj $(D)\xmlbinz.obj $(D)\xmlres.obj \
+        $(D)\xml.obj \
         $(D)\xmlrsall.obj $(D)\xh_bttn.obj $(D)\xh_chckb.obj $(D)\xh_chckl.obj \
                $(D)\xh_choic.obj $(D)\xh_combo.obj $(D)\xh_dlg.obj \
         $(D)\xh_frame.obj $(D)\xh_gauge.obj $(D)\xh_html.obj $(D)\xh_menu.obj \
@@ -53,7 +57,7 @@ OBJECTS=$(EXPAT_OBJS) \
         $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \
         $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \
         $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \
-        $(D)\xh_unkwn.obj $(D)\xmlwrite.obj $(D)\xmlexpat.obj
+        $(D)\xh_unkwn.obj
 
 !include $(WXDIR)\src\makelib.vc
 
@@ -86,7 +90,7 @@ touchmanual:
 
 $(DOCDIR)\winhelp\xml.hlp:         $(LOCALDOCDIR)\xml.rtf $(LOCALDOCDIR)\xml.hpj
         cd $(LOCALDOCDIR)
-        -erase xml.ph
+        -$(RM) xml.ph
         hc xml
         move xml.hlp $(DOCDIR)\winhelp\xml.hlp
         move xml.cnt $(DOCDIR)\winhelp\xml.cnt
@@ -108,9 +112,9 @@ $(DOCDIR)\html\xml\xml.htm:         $(DOCSOURCES)
         -mkdir $(DOCDIR)\html\xml
         copy *.gif $(DOCDIR)\html\xml
         -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\html\xml\xml.htm -twice -html
-        -erase $(DOCDIR)\html\xml\*.con
-        -erase *.con
-        -erase $(DOCDIR)\html\xml\*.ref
+        -$(RM) $(DOCDIR)\html\xml\*.con
+        -$(RM) *.con
+        -$(RM) $(DOCDIR)\html\xml\*.ref
         cd $(THISDIR)
 
 $(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hhp
@@ -125,7 +129,7 @@ $(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hh
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 $(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm
        cd $(DOCDIR)\html\xml
-    -erase xml.zip xml.htb
+    -$(RM) xml.zip xml.htb
     zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk
     -mkdir $(DOCDIR)\htb
     move xml.zip $(DOCDIR)\htb\xml.htb