X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6144c7c30508e5da148827cd98825452d65f7994..f02fe2efc8e0788f8d57b59527dc17fff914c40c:/distrib/msw/makefile.vc

diff --git a/distrib/msw/makefile.vc b/distrib/msw/makefile.vc
index d1d54e5d47..a1b4c10509 100644
--- a/distrib/msw/makefile.vc
+++ b/distrib/msw/makefile.vc
@@ -6,7 +6,7 @@
 #
 # "%W% %G%"
 #
-# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
+# Makefile : Builds wxWidgets library wx.lib for VC++ (32-bit)
 # Arguments:
 #
 # FINAL=1 argument to nmake to build version with no debugging info.
@@ -25,7 +25,7 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 html:	wxhtml
 htb:	$(DOCDIR)\htb\wx.htb
-wxhtml:	$(DOCDIR)\html\wx\wx.htm
+wxhtml:	$(DOCDIR)\html\wx\wx_contents.html
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -89,6 +89,7 @@ allpdfrtf: pdfrtf
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
+	-mkdir $(DOCDIR)\winhelp
         -erase wx.ph
         hc wx
         -erase $(DOCDIR)\winhelp\wx.hlp
@@ -104,6 +105,7 @@ $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/late
 
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
+	-mkdir $(DOCDIR)\pdf
         -copy *.wmf $(DOCDIR)\pdf
         -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
@@ -111,7 +113,7 @@ $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
 
 # This target does two sets of HTML: one using a style sheet, for
 # the purposes of the CHM file, and one without.
-$(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
+$(DOCDIR)\html\wx\wx_contents.html:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx
@@ -126,7 +128,7 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx.hhp
 	cd $(DOCDIR)\mshtml\wx
     copy $(DOCDIR)\latex\wx\wx.css .
 	-hhc wx.hhp
@@ -171,10 +173,10 @@ $(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
+$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx_contents.html
 	cd $(WXDIR)\docs\html\wx
     -erase wx.zip wx.htb
-    zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    zip wx.zip *.html *.gif *.hhp *.hhc *.hhk
     -mkdir $(DOCDIR)\htb
     move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
@@ -188,17 +190,29 @@ updatedocs: touchmanual alldocs
 cleandocs:
     -erase $(DOCDIR)\winhelp\wx.hlp
     -erase $(DOCDIR)\winhelp\wx.cnt
-    -erase $(DOCDIR)\html\wx\*.htm
+    -erase $(DOCDIR)\html\wx\*.html
     -erase $(DOCDIR)\pdf\wx.rtf
     -erase $(DOCDIR)\latex\wx\wx.rtf
     -erase $(DOCDIR)\latex\wx\WX.PH
     -erase $(DOCDIR)\htmlhelp\wx.chm
     -erase $(DOCDIR)\htb\wx.htb
 
+# Only clean the online help, not PDF RTF
+cleanonlinehelp:
+    -erase $(DOCDIR)\winhelp\wx.hlp
+    -erase $(DOCDIR)\winhelp\wx.cnt
+    -erase $(DOCDIR)\html\wx\*.html
+    -erase $(DOCDIR)\latex\wx\wx.rtf
+    -erase $(DOCDIR)\latex\wx\WX.PH
+    -erase $(DOCDIR)\latex\wx\wx.hpj
+    -erase $(DOCDIR)\htmlhelp\wx.chm
+    -erase $(DOCDIR)\mshtml\wx\*.html
+    -erase $(DOCDIR)\htb\wx.htb
+
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf
-    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+    start $(WAITFLAG) "winword d:\wx2\wxWidgets\docs\pdf\wx.rtf /mGeneratePDF"
 
 
 MFTYPE=vc