Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced "-erase" calls with "-$(RM)" calls

Browse Source 
Defined RM as "erase" if it is not already defined


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2002-01-16 13:51:12 +00:00
parent 46b8b00b5e
commit 8c71c62c87
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/src/xrc/makefile.vc
View File

@@ -19,6 +19,10 @@ THISDIR = $(WXDIR)\contrib\src\xrc
DOCDIR=$(WXDIR)\contrib\docs DOCDIR=$(WXDIR)\contrib\docs
LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml
!if "$(RM)" == ""
RM= erase
!endif
NOPCH=1 NOPCH=1
EXPAT_DIR=$(THISDIR)\expat EXPAT_DIR=$(THISDIR)\expat
@@ -86,7 +90,7 @@ touchmanual:
$(DOCDIR)\winhelp\xml.hlp: $(LOCALDOCDIR)\xml.rtf $(LOCALDOCDIR)\xml.hpj $(DOCDIR)\winhelp\xml.hlp: $(LOCALDOCDIR)\xml.rtf $(LOCALDOCDIR)\xml.hpj
cd $(LOCALDOCDIR) cd $(LOCALDOCDIR)
-erase xml.ph -$(RM) xml.ph
hc xml hc xml
move xml.hlp $(DOCDIR)\winhelp\xml.hlp move xml.hlp $(DOCDIR)\winhelp\xml.hlp
move xml.cnt $(DOCDIR)\winhelp\xml.cnt move xml.cnt $(DOCDIR)\winhelp\xml.cnt
@@ -108,9 +112,9 @@ $(DOCDIR)\html\xml\xml.htm: $(DOCSOURCES)
-mkdir $(DOCDIR)\html\xml -mkdir $(DOCDIR)\html\xml
copy *.gif $(DOCDIR)\html\xml copy *.gif $(DOCDIR)\html\xml
-start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\html\xml\xml.htm -twice -html -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\html\xml\xml.htm -twice -html
-erase $(DOCDIR)\html\xml\*.con -$(RM) $(DOCDIR)\html\xml\*.con
-erase *.con -$(RM) *.con
-erase $(DOCDIR)\html\xml\*.ref -$(RM) $(DOCDIR)\html\xml\*.ref
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hhp $(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. # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
$(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm
cd $(DOCDIR)\html\xml cd $(DOCDIR)\html\xml
-erase xml.zip xml.htb -$(RM) xml.zip xml.htb
zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk
-mkdir $(DOCDIR)\htb -mkdir $(DOCDIR)\htb
move xml.zip $(DOCDIR)\htb\xml.htb move xml.zip $(DOCDIR)\htb\xml.htb

14
src/xrc/makefile.vc
View File

@@ -19,6 +19,10 @@ THISDIR = $(WXDIR)\contrib\src\xrc
DOCDIR=$(WXDIR)\contrib\docs DOCDIR=$(WXDIR)\contrib\docs
LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\xml
!if "$(RM)" == ""
RM= erase
!endif
NOPCH=1 NOPCH=1
EXPAT_DIR=$(THISDIR)\expat EXPAT_DIR=$(THISDIR)\expat
@@ -86,7 +90,7 @@ touchmanual:
$(DOCDIR)\winhelp\xml.hlp: $(LOCALDOCDIR)\xml.rtf $(LOCALDOCDIR)\xml.hpj $(DOCDIR)\winhelp\xml.hlp: $(LOCALDOCDIR)\xml.rtf $(LOCALDOCDIR)\xml.hpj
cd $(LOCALDOCDIR) cd $(LOCALDOCDIR)
-erase xml.ph -$(RM) xml.ph
hc xml hc xml
move xml.hlp $(DOCDIR)\winhelp\xml.hlp move xml.hlp $(DOCDIR)\winhelp\xml.hlp
move xml.cnt $(DOCDIR)\winhelp\xml.cnt move xml.cnt $(DOCDIR)\winhelp\xml.cnt
@@ -108,9 +112,9 @@ $(DOCDIR)\html\xml\xml.htm: $(DOCSOURCES)
-mkdir $(DOCDIR)\html\xml -mkdir $(DOCDIR)\html\xml
copy *.gif $(DOCDIR)\html\xml copy *.gif $(DOCDIR)\html\xml
-start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\html\xml\xml.htm -twice -html -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\xml.tex $(DOCDIR)\html\xml\xml.htm -twice -html
-erase $(DOCDIR)\html\xml\*.con -$(RM) $(DOCDIR)\html\xml\*.con
-erase *.con -$(RM) *.con
-erase $(DOCDIR)\html\xml\*.ref -$(RM) $(DOCDIR)\html\xml\*.ref
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hhp $(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. # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
$(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm
cd $(DOCDIR)\html\xml cd $(DOCDIR)\html\xml
-erase xml.zip xml.htb -$(RM) xml.zip xml.htb
zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk
-mkdir $(DOCDIR)\htb -mkdir $(DOCDIR)\htb
move xml.zip $(DOCDIR)\htb\xml.htb move xml.zip $(DOCDIR)\htb\xml.htb