From 06069dda0dd6eb62969f84c6ecdf85d3d26ba70c Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 1 Sep 2001 12:59:33 +0000 Subject: [PATCH] helpbest.patch - makefiles regenerated git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/files.lst | 6 +++- src/msw/makefile.b32 | 65 +++++++++++++++++++++++--------------------- src/msw/makefile.bcc | 2 +- src/msw/makefile.dos | 2 +- src/msw/makefile.sc | 3 +- src/msw/makefile.vc | 3 +- src/msw/makefile.wat | 6 +++- 7 files changed, 50 insertions(+), 37 deletions(-) diff --git a/src/msw/files.lst b/src/msw/files.lst index 7fe7fe2c75..8b8a29a2d9 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -197,6 +197,7 @@ ALL_SOURCES = \ msw/glcanvas.cpp \ msw/gsocket.c \ msw/gsockmsw.c \ + msw/helpbest.cpp \ msw/helpchm.cpp \ msw/helpwin.cpp \ msw/icon.cpp \ @@ -536,6 +537,7 @@ ALL_HEADERS = \ msw/gdiimage.h \ msw/gdiobj.h \ msw/glcanvas.h \ + msw/helpbest.h \ msw/helpchm.h \ msw/helpwin.h \ msw/icon.h \ @@ -995,6 +997,7 @@ GUIOBJS = \ glcanvas.o \ gsocket.o \ gsockmsw.o \ + helpbest.o \ helpchm.o \ helpwin.o \ icon.o \ @@ -1095,6 +1098,7 @@ GUIDEPS = \ glcanvas.d \ gsocket.d \ gsockmsw.d \ + helpbest.d \ helpchm.d \ helpwin.d \ icon.d \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index baa50c10d3..7e240bc42a 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -283,6 +283,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\glcanvas.obj \ $(MSWDIR)\gsocket.obj \ $(MSWDIR)\gsockmsw.obj \ + $(MSWDIR)\helpbest.obj \ $(MSWDIR)\helpchm.obj \ $(MSWDIR)\helpwin.obj \ $(MSWDIR)\icon.obj \ @@ -370,7 +371,7 @@ all: wx !if "$(DLL)" == "0" $(LIBTARGET): $(DUMMY).obj $(OBJECTS) - -$(RM) $(LIBTARGET) + -erase $(LIBTARGET) tlib "$(LIBTARGET)" /P1024 @&&! +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! @@ -378,8 +379,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) !else $(LIBTARGET): $(DUMMY).obj $(OBJECTS) - -$(RM) $(LIBTARGET) - -$(RM) $(WXLIBDIR)\wx.dll + -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&! c0d32.obj $(OBJECTS) $(WXLIBDIR)\wx @@ -510,6 +511,8 @@ $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c $(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c +$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF) + $(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF) $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF) @@ -1055,17 +1058,17 @@ $(WIN95FLAG) ! $(CFG) clean: $(PERIPH_CLEAN_TARGET) - -$(RM) $(LIBTARGET) - -$(RM) $(WXLIBDIR)\wx.dll - -$(RM) $(WXLIBDIR)\wx.tds - -$(RM) $(WXLIBDIR)\wx.il? - -$(RM) *.obj - -$(RM) *.pch - -$(RM) *.csm - -$(RM) *.cfg - -$(RM) "wx32.#??" - -$(RM) ..\common\y_tab.c - -$(RM) ..\common\lex_yy.c + -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll + -erase $(WXLIBDIR)\wx.tds + -erase $(WXLIBDIR)\wx.il? + -erase *.obj + -erase *.pch + -erase *.csm + -erase *.cfg + -erase "wx32.#??" + -erase ..\common\y_tab.c + -erase ..\common\lex_yy.c cleanall: clean @@ -1162,7 +1165,7 @@ allpdfrtf: pdfrtf portingpdfrtf proppdfrtf $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj cd $(DOCDIR)/latex/wx - -$(RM) wx.ph + -erase wx.ph hc wx move wx.hlp $(DOCDIR)\winhelp\wx.hlp move wx.cnt $(DOCDIR)\winhelp\wx.cnt @@ -1170,7 +1173,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 - -$(RM) porting.ph + -erase porting.ph hc porting move porting.hlp $(DOCDIR)\winhelp\porting.hlp move porting.cnt $(DOCDIR)\winhelp\porting.cnt @@ -1178,7 +1181,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 - -$(RM) prop.ph + -erase prop.ph hc prop move prop.hlp $(DOCDIR)\winhelp\prop.hlp move prop.cnt $(DOCDIR)\winhelp\prop.cnt @@ -1186,7 +1189,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 - -$(RM) techref.ph + -erase techref.ph hc techref move techref.hlp $(DOCDIR)\winhelp\techref.hlp move techref.cnt $(DOCDIR)\winhelp\techref.cnt @@ -1244,10 +1247,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 - -$(RM) $(DOCDIR)\html\wx\*.con - -$(RM) $(DOCDIR)\html\wx\*.ref - -$(RM) $(DOCDIR)\latex\wx\*.con - -$(RM) $(DOCDIR)\latex\wx\*.ref + -erase $(DOCDIR)\html\wx\*.con + -erase $(DOCDIR)\html\wx\*.ref + -erase $(DOCDIR)\latex\wx\*.con + -erase $(DOCDIR)\latex\wx\*.ref cd $(THISDIR) $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp @@ -1260,20 +1263,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 - -$(RM) $(DOCDIR)\html\porting\*.con - -$(RM) $(DOCDIR)\html\porting\*.ref - -$(RM) $(DOCDIR)\latex\porting\*.con - -$(RM) $(DOCDIR)\latex\porting\*.ref + -erase $(DOCDIR)\html\porting\*.con + -erase $(DOCDIR)\html\porting\*.ref + -erase $(DOCDIR)\latex\porting\*.con + -erase $(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 - -$(RM) $(DOCDIR)\html\proplist\*.con - -$(RM) $(DOCDIR)\html\proplist\*.ref - -$(RM) $(DOCDIR)\latex\proplist\*.con - -$(RM) $(DOCDIR)\latex\proplist\*.ref + -erase $(DOCDIR)\html\proplist\*.con + -erase $(DOCDIR)\html\proplist\*.ref + -erase $(DOCDIR)\latex\proplist\*.con + -erase $(DOCDIR)\latex\proplist\*.ref cd $(THISDIR) $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index be1b408e47..d0f52d7437 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 7c5f5fd5c0..059019a5bc 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index d8a31613d5..46e561eff6 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -227,6 +227,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\glcanvas.obj \ $(MSWDIR)\gsocket.obj \ $(MSWDIR)\gsockmsw.obj \ + $(MSWDIR)\helpbest.obj \ $(MSWDIR)\helpchm.obj \ $(MSWDIR)\helpwin.obj \ $(MSWDIR)\icon.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 25a417a77a..a60cc90e7d 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -300,6 +300,7 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \ $(MSWDIR)\$D\glcanvas.obj \ $(MSWDIR)\$D\gsocket.obj \ $(MSWDIR)\$D\gsockmsw.obj \ + $(MSWDIR)\$D\helpbest.obj \ $(MSWDIR)\$D\helpchm.obj \ $(MSWDIR)\$D\helpwin.obj \ $(MSWDIR)\$D\icon.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index cf968baeee..f111c9b4a3 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 13:52, 2001/08/06 +# This file was automatically generated by tmake at 17:00, 2001/08/30 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -266,6 +266,7 @@ MSWOBJS = accel.obj & glcanvas.obj & gsocket.obj & gsockmsw.obj & + helpbest.obj & helpchm.obj & helpwin.obj & icon.obj & @@ -523,6 +524,9 @@ gsocket.obj: $(MSWDIR)\gsocket.c gsockmsw.obj: $(MSWDIR)\gsockmsw.c *$(CC) $(CPPFLAGS) $(IFLAGS) $< +helpbest.obj: $(MSWDIR)\helpbest.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + helpchm.obj: $(MSWDIR)\helpchm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -- 2.45.2