tmake update.

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

diff --git a/src/msw/files.lst b/src/msw/files.lst
index edae29e67d4da0d35867a907b117265859029c02..ff8f90d8a36adb568ba34d2e0920c2f49b1dc46d 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -111,6 +111,7 @@ ALL_SOURCES = \
                common/mstream.cpp \
                common/nbkbase.cpp \
                common/object.cpp \
                common/mstream.cpp \
                common/nbkbase.cpp \
                common/object.cpp \

+               common/odbc.cpp \

                common/paper.cpp \
                common/popupcmn.cpp \
                common/prntbase.cpp \
                common/paper.cpp \
                common/popupcmn.cpp \
                common/prntbase.cpp \


@@ -755,6 +756,7 @@ COMMONOBJS = \
                mstream.o \
                nbkbase.o \
                object.o \
                mstream.o \
                nbkbase.o \
                object.o \

+               odbc.o \

                paper.o \
                popupcmn.o \
                prntbase.o \
                paper.o \
                popupcmn.o \
                prntbase.o \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 46d97d18617d416ec8fbbb379e906f71d3a1eecc..842b28ac72dff2091631c3639f9737d24e20d221 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #


@@ -372,7 +372,13 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:       wx
 
 
 default:       wx
 

-wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+# TODO: put the setup.h under lib
+setuph:
+     cd $(WXDIR)\include\wx\msw
+     if not exist setup.h copy setup0.h setup.h
+     cd $(WXDIR)\src\msw

 
 all:   wx
 
 
 all:   wx
 

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 57c9439004ff7cac311664d50da59ec2c0ad7ef7..bdbc667a9e69694c53d5cdf23f24ffad51c2f094 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
 # 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 d0496d8727f92c1eea89ac9b6e597bf7bceffaa4..657335adff19abbe40fd73af3c222311d1df799e 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
 # 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 620f3415407e9852adc036a3993cba54e4a7ac63..921389e58c1dfbaa289862d11a9d3f503cd2d203 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 104e6ae5bea6f224cb0c4ffcd8b7769c51f4bcd6..f4062f56b6d65e6a792ac8a581799bfd2f1834be 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc


@@ -735,17 +735,14 @@ docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp

-refhlp: $(DOCDIR)/winhelp/techref.hlp

 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf

-refpdfrtf: $(DOCDIR)/pdf/techref.rtf

 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm

-ps:     wxps referencps
+ps:     wxps

 wxps:  $(WXDIR)\docs\ps\wx.ps
 wxps:  $(WXDIR)\docs\ps\wx.ps

-referencps:    $(WXDIR)\docs\ps\referenc.ps

 
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src
 
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src


@@ -762,7 +759,6 @@ allhtml: wxhtml
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc html
         cd $(WXDIR)\contrib\src\fl
         cd $(WXDIR)\utils\tex2rtf\src
         nmake -f makefile.vc html
         cd $(WXDIR)\contrib\src\fl

-        nmake -f makefile.vc html

         cd $(THISDIR)
 
 allhtmlhelp: htmlhelp
         cd $(THISDIR)
 
 allhtmlhelp: htmlhelp


@@ -811,24 +807,11 @@ $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 
         move wx.cnt $(DOCDIR)\winhelp\wx.cnt
         cd $(THISDIR)
 

-$(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
-        cd $(DOCDIR)/latex/techref
-        -erase techref.ph
-        hc techref
-        move techref.hlp $(DOCDIR)\winhelp\techref.hlp
-        move techref.cnt $(DOCDIR)\winhelp\techref.cnt
-        cd $(THISDIR)
-

 $(DOCDIR)/latex/wx/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
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 
 $(DOCDIR)/latex/wx/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
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
         cd $(THISDIR)
 

-$(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
-        cd $(DOCDIR)\latex\techref
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
-        cd $(THISDIR)
-

 $(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
         -copy *.wmf $(DOCDIR)\pdf
 $(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
         -copy *.wmf $(DOCDIR)\pdf


@@ -836,13 +819,6 @@ $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         cd $(THISDIR)
 

-$(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
-        cd $(DOCDIR)\latex\techref
-        -copy *.wmf $(DOCDIR)\pdf
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
-        cd $(THISDIR)
-

 $(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
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
 $(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
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index cc553f349c78bb45ffde9bc2ba5caffbf65924e8..7f9244b131095e3c6c2bdddd9fc413015a0223ed 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
 #!/binb/wmake.exe
 

-# This file was automatically generated by tmake at 22:26, 2002/01/29
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #