regenerated makefiles

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

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index df72d456e5253d9d1f052854c3a3e2555cbcbc1e..06dc804166fb4b558ff6a672a545e3f7b9ade216 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -78,7 +78,6 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\choicdgg.obj \
-               $(MSWDIR)\extdlgg.obj \
                $(MSWDIR)\gridg.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\numdlgg.obj \
@@ -163,6 +162,7 @@ COMMONOBJS = \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
+               $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
@@ -621,6 +621,8 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
+$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
+
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 
 $(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
@@ -681,8 +683,6 @@ $(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\extdlgg.obj: $(GENDIR)\extdlgg.$(SRCSUFF)
-
 $(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 42ff996d99d7e208b897c365e3d792b2b2f28efd..0f547fdbf23e28566d066de3e6cdfcaf4f68630f 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -76,7 +76,6 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\choicdgg.obj \
                $(MSWDIR)\dirdlgg.obj \
-               $(MSWDIR)\extdlgg.obj \
                $(MSWDIR)\gridg.obj \
                $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\laywin.obj \
@@ -144,6 +143,7 @@ COMMONOBJS = \
                $(MSWDIR)\paper.obj \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\resource.obj \
+               $(MSWDIR)\sizer.obj \
                $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
@@ -516,6 +516,8 @@ $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
+$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
+
 $(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
 
 $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
@@ -576,8 +578,6 @@ $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
 $(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)
 
-$(MSWDIR)\extdlgg.obj: $(GENDIR)\extdlgg.$(SRCSUFF)
-
 $(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 2a2b41d22c31ac8485900f0c3ead6152e68e0a90..fdbd5346db3fae689c0e5f8bf44a1a47585fd9c0 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -62,7 +62,6 @@ MSWDIR=.
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\choicdgg.obj \
                $(GENDIR)\dirdlgg.obj \
-               $(GENDIR)\extdlgg.obj \
                $(GENDIR)\gridg.obj \
                $(GENDIR)\imaglist.obj \
                $(GENDIR)\laywin.obj \
@@ -132,6 +131,7 @@ COMMONOBJS = \
                $(COMMDIR)\paper.obj \
                $(COMMDIR)\prntbase.obj \
                $(COMMDIR)\resource.obj \
+               $(COMMDIR)\sizer.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
@@ -897,6 +897,11 @@ $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/sizer.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/strconv.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1027,11 +1032,6 @@ $(GENDIR)/dirdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/extdlgg.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(GENDIR)/gridg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 2f1a4fba5650f766fe85efe4c2c0df59918e0c49..6b9231f100098b74588519521ab209ccb6942d3a 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 14:17, 1999/08/10
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -40,7 +40,6 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/dirdlgg.$(OBJSUFF) \
-               $(GENDIR)/extdlgg.$(OBJSUFF) \
                $(GENDIR)/gridg.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 6e01a6dcc1737357aa4e20b97722946fafedeb04..dfcbe0e2418d50fc70454d5a3a4b6f2967dd7cee 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -28,7 +28,6 @@ MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\choicdgg.obj \
-               $(GENDIR)\extdlgg.obj \
                $(GENDIR)\gridg.obj \
                $(GENDIR)\laywin.obj \
                $(GENDIR)\numdlgg.obj \
@@ -102,6 +101,7 @@ COMMONOBJS = \
                $(COMMDIR)\sckfile.obj \
                $(COMMDIR)\sckipc.obj \
                $(COMMDIR)\sckstrm.obj \
+               $(COMMDIR)\sizer.obj \
                $(COMMDIR)\socket.obj \
                $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index ad5badcb82b67b0bdc1bc497d71a6cd7314f609c..b2be1a2fe7bacdc301d9f368d129480237ad0d85 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -80,7 +80,6 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\choicdgg.obj \
-               ..\generic\$D\extdlgg.obj \
                ..\generic\$D\gridg.obj \
                ..\generic\$D\laywin.obj \
                ..\generic\$D\numdlgg.obj \
@@ -101,6 +100,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= ..\generic\$D\caret.obj \
                ..\generic\$D\colrdlgg.obj \
+               ..\generic\$D\dcpsg.obj \
                ..\generic\$D\dirdlgg.obj \
                ..\generic\$D\fontdlgg.obj \
                ..\generic\$D\helpxlp.obj \
@@ -169,6 +169,7 @@ COMMONOBJS = \
                ..\common\$D\sckfile.obj \
                ..\common\$D\sckipc.obj \
                ..\common\$D\sckstrm.obj \
+               ..\common\$D\sizer.obj \
                ..\common\$D\socket.obj \
                ..\common\$D\strconv.obj \
                ..\common\$D\stream.obj \
@@ -306,7 +307,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 396821eb8ec8618c8f455a7dab45fdce9915d429..741085b211a257368ba638c7409ae3c459262bc8 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 22:19, 1999/08/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -34,7 +34,6 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
        choicdgg.obj &
-       extdlgg.obj &
        gridg.obj &
        laywin.obj &
        numdlgg.obj &
@@ -55,6 +54,7 @@ GENERICOBJS= busyinfo.obj &
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= caret.obj &
        colrdlgg.obj &
+       dcpsg.obj &
        dirdlgg.obj &
        fontdlgg.obj &
        helpxlp.obj &
@@ -122,6 +122,7 @@ COMMONOBJS = &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &
+       sizer.obj &
        socket.obj &
        strconv.obj &
        stream.obj &
@@ -697,6 +698,9 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+sizer.obj:     $(COMMDIR)\sizer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -795,9 +799,6 @@ busyinfo.obj:     $(GENDIR)\busyinfo.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-extdlgg.obj:     $(GENDIR)\extdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 gridg.obj:     $(GENDIR)\gridg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<