From 5da2c444ef6bfe006e45c15216911dfde4540fe0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 22 Jun 2001 01:31:45 +0000 Subject: [PATCH] 1. fixed wxBase RPM template 2. fixed several erros in filelist.txt 3. regenarated everything git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/baserpm.t | 2 +- distrib/msw/tmake/filelist.txt | 8 ++++---- distrib/msw/tmake/makeall.sh | 4 ++++ src/gtk/files.lst | 7 ++++++- src/gtk1/files.lst | 7 ++++++- src/motif/files.lst | 7 ++++++- src/msw/files.lst | 7 ++++++- src/msw/makefile.b32 | 2 +- src/msw/makefile.bcc | 2 +- src/msw/makefile.dos | 7 +------ src/msw/makefile.g95 | 2 +- src/msw/makefile.sc | 3 ++- src/msw/makefile.vc | 2 +- 13 files changed, 40 insertions(+), 20 deletions(-) diff --git a/distrib/msw/tmake/baserpm.t b/distrib/msw/tmake/baserpm.t index dc1b2ad0cb..fe61e79027 100644 --- a/distrib/msw/tmake/baserpm.t +++ b/distrib/msw/tmake/baserpm.t @@ -16,7 +16,7 @@ } foreach $file (sort keys %wxUNIXINCLUDE) { - next unless $wxWXINCLUDE{$file} =~ /\bB\b/; + next unless $wxUNIXINCLUDE{$file} =~ /\bB\b/; $project{"BASE_HEADERS"} .= "include/wx/unix/" . $file . " " } diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 076c29ef21..14c174afd9 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -118,7 +118,7 @@ ctrlsub.cpp C datetime.cpp C B datstrm.cpp C B db.cpp C 32,B -dbgrid.cpp C 32,B +dbgrid.cpp C 32 dbtable.cpp C 32,B dcbase.cpp C dircmn.cpp C B @@ -585,7 +585,7 @@ datetime.h W B datetime.inl W B datstrm.h W B db.h W B -dbgrid.h W B +dbgrid.h W dbtable.h W B dc.h W dcclient.h W @@ -622,7 +622,7 @@ fontenc.h W B fontenum.h W fontmap.h W B fontdlg.h W -fontutil.h W B +fontutil.h W frame.h W fs_inet.h W B fs_zip.h W B @@ -633,7 +633,7 @@ gdiobj.h W geometry.h W gifdecod.h W xpmdecod.h W -dbkeyg.h W B +dbkeyg.h W glcanvas.h W grid.h W gridctrl.h W diff --git a/distrib/msw/tmake/makeall.sh b/distrib/msw/tmake/makeall.sh index 8d40a8dcf6..b5b73cdf7f 100755 --- a/distrib/msw/tmake/makeall.sh +++ b/distrib/msw/tmake/makeall.sh @@ -50,6 +50,10 @@ do echo "Generating $topdir/src/files.lst for Configure..." tmake -t base wxwin.pro -o $topdir/src/files.lst ;; + baserpm.t) + echo "Generating $topdir/src/rpmfiles.lst for wxBase RPM..." + tmake -t baserpm wxwin.pro -o $topdir/src/rpmfiles.lst ;; + gtk.t) echo "Generating $topdir/src/gtk/files.lst for GTK and Configure..." tmake -t gtk wxwin.pro -o $topdir/src/gtk/files.lst;; diff --git a/src/gtk/files.lst b/src/gtk/files.lst index be8681977a..7baf850ba7 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -55,6 +55,7 @@ ALL_SOURCES = \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ + common/dbgrid.cpp \ common/dbtable.cpp \ common/dcbase.cpp \ common/dircmn.cpp \ @@ -274,6 +275,8 @@ ALL_HEADERS = \ datetime.inl \ datstrm.h \ db.h \ + dbgrid.h \ + dbkeyg.h \ dbtable.h \ dc.h \ dcclient.h \ @@ -589,6 +592,7 @@ COMMONOBJS = \ datetime.o \ datstrm.o \ db.o \ + dbgrid.o \ dbtable.o \ dcbase.o \ dircmn.o \ @@ -699,6 +703,7 @@ COMMONDEPS = \ datetime.d \ datstrm.d \ db.d \ + dbgrid.d \ dbtable.d \ dcbase.d \ dircmn.d \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index be8681977a..7baf850ba7 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -55,6 +55,7 @@ ALL_SOURCES = \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ + common/dbgrid.cpp \ common/dbtable.cpp \ common/dcbase.cpp \ common/dircmn.cpp \ @@ -274,6 +275,8 @@ ALL_HEADERS = \ datetime.inl \ datstrm.h \ db.h \ + dbgrid.h \ + dbkeyg.h \ dbtable.h \ dc.h \ dcclient.h \ @@ -589,6 +592,7 @@ COMMONOBJS = \ datetime.o \ datstrm.o \ db.o \ + dbgrid.o \ dbtable.o \ dcbase.o \ dircmn.o \ @@ -699,6 +703,7 @@ COMMONDEPS = \ datetime.d \ datstrm.d \ db.d \ + dbgrid.d \ dbtable.d \ dcbase.d \ dircmn.d \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 12f64ce9c8..e4e413850e 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -58,6 +58,7 @@ ALL_SOURCES = \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ + common/dbgrid.cpp \ common/dbtable.cpp \ common/dcbase.cpp \ common/dircmn.cpp \ @@ -270,6 +271,8 @@ ALL_HEADERS = \ datetime.inl \ datstrm.h \ db.h \ + dbgrid.h \ + dbkeyg.h \ dbtable.h \ dc.h \ dcclient.h \ @@ -584,6 +587,7 @@ COMMONOBJS = \ datetime.o \ datstrm.o \ db.o \ + dbgrid.o \ dbtable.o \ dcbase.o \ dircmn.o \ @@ -694,6 +698,7 @@ COMMONDEPS = \ datetime.d \ datstrm.d \ db.d \ + dbgrid.d \ dbtable.d \ dcbase.d \ dircmn.d \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 0850dd3eaa..8b4610c2ce 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -41,6 +41,7 @@ ALL_SOURCES = \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ + common/dbgrid.cpp \ common/dbtable.cpp \ common/dcbase.cpp \ common/dircmn.cpp \ @@ -293,6 +294,8 @@ ALL_HEADERS = \ datetime.inl \ datstrm.h \ db.h \ + dbgrid.h \ + dbkeyg.h \ dbtable.h \ dc.h \ dcclient.h \ @@ -638,6 +641,7 @@ COMMONOBJS = \ datetime.o \ datstrm.o \ db.o \ + dbgrid.o \ dbtable.o \ dcbase.o \ dircmn.o \ @@ -748,6 +752,7 @@ COMMONDEPS = \ datetime.d \ datstrm.d \ db.d \ + dbgrid.d \ dbtable.d \ dcbase.d \ dircmn.d \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index ee5ae396f9..a3ca0fc79a 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index bcff224380..2aeda58e4c 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # 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 daddd24345..23d41910ba 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -1372,11 +1372,6 @@ $(GENDIR)/wizard.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -test.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS2) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(COMMDIR)/y_tab.obj: $*.c $(COMMDIR)/lex_yy.c diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 142d9ec686..b28fb4cc82 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 8013b3ca6d..6c03103630 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -68,6 +68,7 @@ COMMONOBJS = \ $(COMMDIR)\datetime.obj \ $(COMMDIR)\datstrm.obj \ $(COMMDIR)\db.obj \ + $(COMMDIR)\dbgrid.obj \ $(COMMDIR)\dbtable.obj \ $(COMMDIR)\dcbase.obj \ $(COMMDIR)\dircmn.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index fbe2600a9d..6327e87a4b 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 01:55, 2001/06/09 +# This file was automatically generated by tmake at 01:54, 2001/06/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc -- 2.45.2