From: Robin Dunn <robin@alldunn.com>
Date: Fri, 23 Jul 1999 21:26:57 +0000 (+0000)
Subject: Added a rule to the tmake templates so the makefiles know how to
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9be9b97445f6e28b1ef9fd1fefdc28f40da51b24

Added a rule to the tmake templates so the makefiles know how to
rebuild themselves (if you have tmake).


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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index d63783965c..9bf8f45b09 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -253,7 +253,7 @@ clean_wxxpm:	$(CFG)
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.b32 
+        make -f makefile.b32
         cd $(WXDIR)\src\msw
 
 clean_png:
@@ -273,7 +273,7 @@ clean_zlib:
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        make -f makefile.b32 
+        make -f makefile.b32
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -322,3 +322,9 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
+MFTYPE=b32
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+
diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 97b91352a0..3a3659ff20 100644
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -234,7 +234,7 @@ wxxpm:	$(CFG)
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.bcc 
+        make -f makefile.bcc
         cd $(WXDIR)\src\msw
 
 clean_png:
@@ -301,3 +301,8 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
+MFTYPE=bcc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 0b92a431af..70e95a02e1 100644
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -253,3 +253,8 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
+MFTYPE=dos
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 7ba3b7d772..af071b17cc 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -251,3 +251,8 @@ clean:
 
 cleanall: clean
 
+MFTYPE=g95
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/distrib/msw/tmake/sc.t b/distrib/msw/tmake/sc.t
index f79733cfd8..eca10fb8f7 100644
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -112,3 +112,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 # $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
 #	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
 
+MFTYPE=sc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index e157c70522..136bb44a50 100644
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -155,7 +155,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) 
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
@@ -629,3 +629,10 @@ updatedocs: touchmanual alldocs
 updatepdf:  # touchmanual pdfrtf
     start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
 
+
+MFTYPE=vc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+
diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 4fb9b6452a..fbf3f0ff26 100644
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -104,8 +104,8 @@ $(LIBTARGET) : $(OBJECTS)
 #    %create tmp.lbc
 #    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc
-	
-	
+
+
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
     -erase *.obj
     -erase $(LIBTARGET)
@@ -241,9 +241,9 @@ wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O) 
+  trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O) 
+  infutil$(O) inffast$(O)
 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
@@ -319,3 +319,8 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
+MFTYPE=wat
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 5543dae5df..b4f3439cca 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,8 +1,6 @@
 
 
-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -83,6 +81,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\extdlgg.obj \
 		$(MSWDIR)\gridg.obj \
 		$(MSWDIR)\laywin.obj \
+		$(MSWDIR)\numdlgg.obj \
 		$(MSWDIR)\panelg.obj \
 		$(MSWDIR)\printps.obj \
 		$(MSWDIR)\progdlgg.obj \
@@ -92,6 +91,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\sashwin.obj \
 		$(MSWDIR)\scrolwin.obj \
 		$(MSWDIR)\splitter.obj \
+		$(MSWDIR)\statusbr.obj \
 		$(MSWDIR)\tabg.obj \
 		$(MSWDIR)\textdlgg.obj \
 		$(MSWDIR)\tipdlg.obj
@@ -109,7 +109,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 
 COMMONOBJS = \
 		$(MSWDIR)\y_tab.obj \
-		$(MSWDIR)\extended.obj \
 		$(MSWDIR)\cmndata.obj \
 		$(MSWDIR)\config.obj \
 		$(MSWDIR)\date.obj \
@@ -123,6 +122,8 @@ COMMONOBJS = \
 		$(MSWDIR)\dynarray.obj \
 		$(MSWDIR)\dynlib.obj \
 		$(MSWDIR)\event.obj \
+		$(MSWDIR)\extended.obj \
+		$(MSWDIR)\ffile.obj \
 		$(MSWDIR)\file.obj \
 		$(MSWDIR)\fileconf.obj \
 		$(MSWDIR)\filefn.obj \
@@ -159,7 +160,6 @@ COMMONOBJS = \
 		$(MSWDIR)\resource.obj \
 		$(MSWDIR)\sckaddr.obj \
 		$(MSWDIR)\sckfile.obj \
-		$(MSWDIR)\sckint.obj \
 		$(MSWDIR)\sckipc.obj \
 		$(MSWDIR)\sckstrm.obj \
 		$(MSWDIR)\socket.obj \
@@ -167,6 +167,7 @@ COMMONOBJS = \
 		$(MSWDIR)\string.obj \
 		$(MSWDIR)\tbarbase.obj \
 		$(MSWDIR)\tbarsmpl.obj \
+		$(MSWDIR)\textcmn.obj \
 		$(MSWDIR)\textfile.obj \
 		$(MSWDIR)\time.obj \
 		$(MSWDIR)\timercmn.obj \
@@ -224,13 +225,13 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\fontdlg.obj \
 		$(MSWDIR)\frame.obj \
 		$(MSWDIR)\gauge95.obj \
-		$(MSWDIR)\gaugemsw.obj \
 		$(MSWDIR)\gdiobj.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
-		$(MSWDIR)\iniconf.obj \
+		$(MSWDIR)\imaglist.obj \
 		$(MSWDIR)\joystick.obj \
 		$(MSWDIR)\listbox.obj \
+		$(MSWDIR)\listctrl.obj \
 		$(MSWDIR)\main.obj \
 		$(MSWDIR)\mdi.obj \
 		$(MSWDIR)\menu.obj \
@@ -239,6 +240,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\minifram.obj \
 		$(MSWDIR)\msgdlg.obj \
 		$(MSWDIR)\nativdlg.obj \
+		$(MSWDIR)\notebook.obj \
 		$(MSWDIR)\oleutils.obj \
 		$(MSWDIR)\ownerdrw.obj \
 		$(MSWDIR)\palette.obj \
@@ -255,7 +257,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\scrolbar.obj \
 		$(MSWDIR)\settings.obj \
 		$(MSWDIR)\slider95.obj \
-		$(MSWDIR)\slidrmsw.obj \
 		$(MSWDIR)\spinbutt.obj \
 		$(MSWDIR)\statbmp.obj \
 		$(MSWDIR)\statbox.obj \
@@ -265,11 +266,11 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\tabctrl.obj \
 		$(MSWDIR)\taskbar.obj \
 		$(MSWDIR)\tbar95.obj \
-		$(MSWDIR)\tbarmsw.obj \
 		$(MSWDIR)\textctrl.obj \
 		$(MSWDIR)\thread.obj \
 		$(MSWDIR)\timer.obj \
 		$(MSWDIR)\tooltip.obj \
+		$(MSWDIR)\treectrl.obj \
 		$(MSWDIR)\utils.obj \
 		$(MSWDIR)\utilsexc.obj \
 		$(MSWDIR)\uuid.obj \
@@ -402,20 +403,20 @@ $(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
 $(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
 
-$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
-
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
-$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
+$(MSWDIR)\imaglist.obj: $(MSWDIR)\imaglist.$(SRCSUFF)
 
 $(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
 $(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
 
+$(MSWDIR)\listctrl.obj: $(MSWDIR)\listctrl.$(SRCSUFF)
+
 $(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
 
 $(MSWDIR)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF)
@@ -432,6 +433,8 @@ $(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
 $(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
+$(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
+
 $(MSWDIR)\oleutils.obj: $(MSWDIR)\oleutils.$(SRCSUFF)
 
 $(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
@@ -464,8 +467,6 @@ $(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
 $(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
 
-$(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF)
-
 $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
 $(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
@@ -484,8 +485,6 @@ $(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
 
 $(MSWDIR)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF)
 
-$(MSWDIR)\tbarmsw.obj: $(MSWDIR)\tbarmsw.$(SRCSUFF)
-
 $(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
 $(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
@@ -494,6 +493,8 @@ $(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
 $(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
 
+$(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF)
+
 $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
@@ -537,6 +538,10 @@ $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
 $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
+$(MSWDIR)\extended.obj: $(COMMDIR)\extended.$(SRCSUFF)
+
+$(MSWDIR)\ffile.obj: $(COMMDIR)\ffile.$(SRCSUFF)
+
 $(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
 
 $(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
@@ -609,8 +614,6 @@ $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
 $(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
 
-$(MSWDIR)\sckint.obj: $(COMMDIR)\sckint.$(SRCSUFF)
-
 $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
@@ -625,6 +628,8 @@ $(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
 $(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(SRCSUFF)
 
+$(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
+
 $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
 $(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
@@ -677,6 +682,8 @@ $(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
+$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
+
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
 $(MSWDIR)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
@@ -695,6 +702,8 @@ $(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
+$(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
+
 $(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
 
 $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
@@ -731,7 +740,7 @@ clean_wxxpm:	$(CFG)
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.b32 
+        make -f makefile.b32
         cd $(WXDIR)\src\msw
 
 clean_png:
@@ -751,7 +760,7 @@ clean_zlib:
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        make -f makefile.b32 
+        make -f makefile.b32
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
@@ -800,3 +809,9 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
+MFTYPE=b32
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 5a0eb1858e..07a754e869 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 01:04, 1999/07/17
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -82,6 +82,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\laywin.obj \
 		$(MSWDIR)\listctrl.obj \
 		$(MSWDIR)\notebook.obj \
+		$(MSWDIR)\numdlgg.obj \
 		$(MSWDIR)\panelg.obj \
 		$(MSWDIR)\progdlgg.obj \
 		$(MSWDIR)\prop.obj \
@@ -578,6 +579,8 @@ $(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
 
 $(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
 
+$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
+
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
@@ -643,7 +646,7 @@ wxxpm:	$(CFG)
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.bcc 
+        make -f makefile.bcc
         cd $(WXDIR)\src\msw
 
 clean_png:
@@ -710,3 +713,8 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
+MFTYPE=bcc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 4b3c8e0350..b1b40e57d4 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,8 +1,6 @@
 
 
-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -70,6 +68,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\listctrl.obj \
 		$(GENDIR)\notebook.obj \
+		$(GENDIR)\numdlgg.obj \
 		$(GENDIR)\panelg.obj \
 		$(GENDIR)\prntdlgg.obj \
 		$(GENDIR)\progdlgg.obj \
@@ -87,7 +86,6 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 
 COMMONOBJS = \
 		$(COMMDIR)\y_tab.obj \
-		$(COMMDIR)\extended.obj \
 		$(COMMDIR)\cmndata.obj \
 		$(COMMDIR)\config.obj \
 		$(COMMDIR)\date.obj \
@@ -101,6 +99,8 @@ COMMONOBJS = \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
 		$(COMMDIR)\event.obj \
+		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\ffile.obj \
 		$(COMMDIR)\file.obj \
 		$(COMMDIR)\fileconf.obj \
 		$(COMMDIR)\filefn.obj \
@@ -134,6 +134,7 @@ COMMONOBJS = \
 		$(COMMDIR)\string.obj \
 		$(COMMDIR)\tbarbase.obj \
 		$(COMMDIR)\tbarsmpl.obj \
+		$(COMMDIR)\textcmn.obj \
 		$(COMMDIR)\textfile.obj \
 		$(COMMDIR)\time.obj \
 		$(COMMDIR)\timercmn.obj \
@@ -199,7 +200,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\minifram.obj \
 		$(MSWDIR)\msgdlg.obj \
 		$(MSWDIR)\nativdlg.obj \
-		$(MSWDIR)\notebook.obj \
 		$(MSWDIR)\ownerdrw.obj \
 		$(MSWDIR)\palette.obj \
 		$(MSWDIR)\pen.obj \
@@ -529,11 +529,6 @@ $(MSWDIR)/nativdlg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/notebook.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/ownerdrw.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -734,6 +729,16 @@ $(COMMDIR)/event.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/extended.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/ffile.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/file.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -899,6 +904,11 @@ $(COMMDIR)/tbarsmpl.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/textcmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/textfile.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1029,6 +1039,11 @@ $(GENDIR)/notebook.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/numdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/panelg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1101,11 +1116,6 @@ $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 
 
 
-$(COMMDIR)/extended.obj:     $*.c
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tp $*.c
-<<
-
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
         cl @<<
 $(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c
@@ -1174,3 +1184,8 @@ clean: $(PERIPH_CLEAN_TARGET)
 cleanall: clean
 
 
+MFTYPE=dos
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 04190303e5..298fdd64b5 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:53, 1999/07/23
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -43,6 +43,7 @@ GENERICOBJS = \
 		$(GENDIR)/extdlgg.$(OBJSUFF) \
 		$(GENDIR)/gridg.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
+		$(GENDIR)/numdlgg.$(OBJSUFF) \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
 		$(GENDIR)/prop.$(OBJSUFF) \
@@ -172,7 +173,6 @@ MSWOBJS     = \
 		helpwin.$(OBJSUFF) \
 		icon.$(OBJSUFF) \
 		imaglist.$(OBJSUFF) \
-		iniconf.$(OBJSUFF) \
 		joystick.$(OBJSUFF) \
 		listbox.$(OBJSUFF) \
 		listctrl.$(OBJSUFF) \
@@ -378,3 +378,8 @@ clean:
 
 cleanall: clean
 
+MFTYPE=g95
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 6c72597921..49e1ff8b0d 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,8 +1,6 @@
 
 
-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -33,6 +31,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\extdlgg.obj \
 		$(GENDIR)\gridg.obj \
 		$(GENDIR)\laywin.obj \
+		$(GENDIR)\numdlgg.obj \
 		$(GENDIR)\panelg.obj \
 		$(GENDIR)\progdlgg.obj \
 		$(GENDIR)\prop.obj \
@@ -41,13 +40,13 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\sashwin.obj \
 		$(GENDIR)\scrolwin.obj \
 		$(GENDIR)\splitter.obj \
+		$(GENDIR)\statusbr.obj \
 		$(GENDIR)\tabg.obj \
 		$(GENDIR)\textdlgg.obj \
 		$(GENDIR)\tipdlg.obj
 
 COMMONOBJS = \
 		$(COMMDIR)\y_tab.obj \
-		$(COMMDIR)\extended.obj \
 		$(COMMDIR)\cmndata.obj \
 		$(COMMDIR)\config.obj \
 		$(COMMDIR)\date.obj \
@@ -61,6 +60,8 @@ COMMONOBJS = \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
 		$(COMMDIR)\event.obj \
+		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\ffile.obj \
 		$(COMMDIR)\file.obj \
 		$(COMMDIR)\fileconf.obj \
 		$(COMMDIR)\filefn.obj \
@@ -97,7 +98,6 @@ COMMONOBJS = \
 		$(COMMDIR)\resource.obj \
 		$(COMMDIR)\sckaddr.obj \
 		$(COMMDIR)\sckfile.obj \
-		$(COMMDIR)\sckint.obj \
 		$(COMMDIR)\sckipc.obj \
 		$(COMMDIR)\sckstrm.obj \
 		$(COMMDIR)\socket.obj \
@@ -105,6 +105,7 @@ COMMONOBJS = \
 		$(COMMDIR)\string.obj \
 		$(COMMDIR)\tbarbase.obj \
 		$(COMMDIR)\tbarsmpl.obj \
+		$(COMMDIR)\textcmn.obj \
 		$(COMMDIR)\textfile.obj \
 		$(COMMDIR)\time.obj \
 		$(COMMDIR)\timercmn.obj \
@@ -249,3 +250,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 # $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
 #	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
 
+MFTYPE=sc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 2e1c14e2a4..3ff4d9c34d 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:54, 1999/07/19
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -83,6 +83,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\extdlgg.obj \
 		..\generic\$D\gridg.obj \
 		..\generic\$D\laywin.obj \
+		..\generic\$D\numdlgg.obj \
 		..\generic\$D\panelg.obj \
 		..\generic\$D\progdlgg.obj \
 		..\generic\$D\prop.obj \
@@ -163,7 +164,6 @@ COMMONOBJS = \
 		..\common\$D\resource.obj \
 		..\common\$D\sckaddr.obj \
 		..\common\$D\sckfile.obj \
-		..\common\$D\sckint.obj \
 		..\common\$D\sckipc.obj \
 		..\common\$D\sckstrm.obj \
 		..\common\$D\socket.obj \
@@ -232,7 +232,6 @@ MSWOBJS = ..\msw\$D\accel.obj \
 		..\msw\$D\helpwin.obj \
 		..\msw\$D\icon.obj \
 		..\msw\$D\imaglist.obj \
-		..\msw\$D\iniconf.obj \
 		..\msw\$D\joystick.obj \
 		..\msw\$D\listbox.obj \
 		..\msw\$D\listctrl.obj \
@@ -303,7 +302,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) 
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
@@ -777,3 +776,10 @@ updatedocs: touchmanual alldocs
 updatepdf:  # touchmanual pdfrtf
     start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
 
+
+MFTYPE=vc
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 725af9a4db..e9a635815c 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,8 +1,6 @@
 
 
-
-
-# This file was automatically generated by tmake at 21:00, 1999/07/14
+# This file was automatically generated by tmake at 14:25, 1999/07/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -39,6 +37,7 @@ GENERICOBJS= busyinfo.obj &
 	extdlgg.obj &
 	gridg.obj &
 	laywin.obj &
+	numdlgg.obj &
 	panelg.obj &
 	progdlgg.obj &
 	prop.obj &
@@ -47,6 +46,7 @@ GENERICOBJS= busyinfo.obj &
 	sashwin.obj &
 	scrolwin.obj &
 	splitter.obj &
+	statusbr.obj &
 	tabg.obj &
 	textdlgg.obj &
 	tipdlg.obj
@@ -63,12 +63,10 @@ NONESSENTIALOBJS= colrdlgg.obj &
 	notebook.obj &
 	printps.obj &
 	prntdlgg.obj &
-	statusbr.obj &
 	treectrl.obj
 
 COMMONOBJS = &
 	y_tab.obj &
-	extended.obj &
 	cmndata.obj &
 	config.obj &
 	date.obj &
@@ -82,6 +80,8 @@ COMMONOBJS = &
 	dynarray.obj &
 	dynlib.obj &
 	event.obj &
+	extended.obj &
+	ffile.obj &
 	file.obj &
 	fileconf.obj &
 	filefn.obj &
@@ -117,7 +117,6 @@ COMMONOBJS = &
 	resource.obj &
 	sckaddr.obj &
 	sckfile.obj &
-	sckint.obj &
 	sckipc.obj &
 	sckstrm.obj &
 	socket.obj &
@@ -125,6 +124,7 @@ COMMONOBJS = &
 	string.obj &
 	tbarbase.obj &
 	tbarsmpl.obj &
+	textcmn.obj &
 	textfile.obj &
 	time.obj &
 	timercmn.obj &
@@ -248,8 +248,8 @@ $(LIBTARGET) : $(OBJECTS)
 #    %create tmp.lbc
 #    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc
-	
-	
+
+
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
     -erase *.obj
     -erase $(LIBTARGET)
@@ -570,6 +570,12 @@ dynlib.obj:     $(COMMDIR)\dynlib.cpp
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+extended.obj:     $(COMMDIR)\extended.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ffile.obj:     $(COMMDIR)\ffile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 file.obj:     $(COMMDIR)\file.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -675,9 +681,6 @@ sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
 sckfile.obj:     $(COMMDIR)\sckfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sckint.obj:     $(COMMDIR)\sckint.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sckipc.obj:     $(COMMDIR)\sckipc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -699,6 +702,9 @@ tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
 tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+textcmn.obj:     $(COMMDIR)\textcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -755,9 +761,6 @@ zstream.obj:     $(COMMDIR)\zstream.cpp
 
 
 
-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
-
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
@@ -788,6 +791,9 @@ gridg.obj:     $(GENDIR)\gridg.cpp
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+numdlgg.obj:     $(GENDIR)\numdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -812,6 +818,9 @@ scrolwin.obj:     $(GENDIR)\scrolwin.cpp
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+statusbr.obj:     $(GENDIR)\statusbr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -891,9 +900,9 @@ wrffrp.obj: $(XPMDIR)\wrffrp.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O) 
+  trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O) 
+  infutil$(O) inffast$(O)
 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
@@ -969,3 +978,8 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
+MFTYPE=wat
+makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw