X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..54c7aaca2355973dd33359210b280b4d79d54593:/src/msw/makefile.wat

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index b1ee5e5bdd..cef1a7df01 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 21:02, 2001/06/26
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -29,8 +29,8 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = png zlib jpeg tiff
-EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
+EXTRATARGETS = png zlib jpeg tiff regex
+EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 JPEGDIR=$(WXDIR)\src\jpeg
@@ -44,6 +44,8 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= busyinfo.obj &
 	calctrl.obj &
 	choicdgg.obj &
+	dcbuffer.obj &
+	dcpsg.obj &
 	dirctrlg.obj &
 	dragimgg.obj &
 	grid.obj &
@@ -58,7 +60,8 @@ GENERICOBJS= busyinfo.obj &
 	propform.obj &
 	proplist.obj &
 	sashwin.obj &
-	scrolwin.obj &
+	scrlwing.obj &
+	spinctlg.obj &
 	splash.obj &
 	splitter.obj &
 	statusbr.obj &
@@ -75,14 +78,12 @@ GENERICOBJS= busyinfo.obj &
 NONESSENTIALOBJS= accel.obj &
 	caret.obj &
 	colrdlgg.obj &
-	dcpsg.obj &
 	dirdlgg.obj &
+	fdrepdlg.obj &
 	filedlgg.obj &
 	fontdlgg.obj &
 	helpext.obj &
 	helphtml.obj &
-	helpwxht.obj &
-	helpxlp.obj &
 	imaglist.obj &
 	listctrl.obj &
 	msgdlgg.obj &
@@ -91,17 +92,22 @@ NONESSENTIALOBJS= accel.obj &
 	printps.obj &
 	prntdlgg.obj &
 	statline.obj &
-	tabg.obj
+	tabg.obj &
+	timer.obj
 
 COMMONOBJS = &
 	y_tab.obj &
 	appcmn.obj &
+	artprov.obj &
+	artstd.obj &
 	choiccmn.obj &
 	clipcmn.obj &
+	clntdata.obj &
 	cmdline.obj &
 	cmdproc.obj &
 	cmndata.obj &
 	config.obj &
+	containr.obj &
 	cshelp.obj &
 	ctrlcmn.obj &
 	ctrlsub.obj &
@@ -117,12 +123,15 @@ COMMONOBJS = &
 	dobjcmn.obj &
 	docmdi.obj &
 	docview.obj &
+	dseldlg.obj &
 	dynarray.obj &
 	dynlib.obj &
+	dynload.obj &
 	effects.obj &
 	encconv.obj &
 	event.obj &
 	extended.obj &
+	fddlgcmn.obj &
 	ffile.obj &
 	file.obj &
 	fileconf.obj &
@@ -136,16 +145,21 @@ COMMONOBJS = &
 	fs_mem.obj &
 	fs_zip.obj &
 	ftp.obj &
+	gaugecmn.obj &
 	gdicmn.obj &
 	geometry.obj &
 	gifdecod.obj &
 	hash.obj &
+	hashmap.obj &
 	helpbase.obj &
 	http.obj &
+	iconbndl.obj &
 	imagall.obj &
 	imagbmp.obj &
 	image.obj &
+	imagfill.obj &
 	imaggif.obj &
+	imagiff.obj &
 	imagjpeg.obj &
 	imagpcx.obj &
 	imagpng.obj &
@@ -164,31 +178,39 @@ COMMONOBJS = &
 	menucmn.obj &
 	mimecmn.obj &
 	module.obj &
+	msgout.obj &
 	mstream.obj &
+	nbkbase.obj &
 	object.obj &
-	objstrm.obj &
 	odbc.obj &
 	paper.obj &
+	popupcmn.obj &
 	prntbase.obj &
 	process.obj &
 	protocol.obj &
 	quantize.obj &
+	radiocmn.obj &
+	regex.obj &
 	resource.obj &
 	sckaddr.obj &
 	sckfile.obj &
 	sckipc.obj &
 	sckstrm.obj &
-	serbase.obj &
+	settcmn.obj &
 	sizer.obj &
 	socket.obj &
+	statbar.obj &
 	strconv.obj &
 	stream.obj &
 	string.obj &
+	sysopt.obj &
 	tbarbase.obj &
+	textbuf.obj &
 	textcmn.obj &
 	textfile.obj &
 	timercmn.obj &
 	tokenzr.obj &
+	toplvcmn.obj &
 	treebase.obj &
 	txtstrm.obj &
 	unzip.obj &
@@ -242,6 +264,8 @@ MSWOBJS = accel.obj &
 	dropsrc.obj &
 	droptgt.obj &
 	enhmeta.obj &
+	evtloop.obj &
+	fdrepdlg.obj &
 	filedlg.obj &
 	font.obj &
 	fontdlg.obj &
@@ -255,6 +279,7 @@ MSWOBJS = accel.obj &
 	glcanvas.obj &
 	gsocket.obj &
 	gsockmsw.obj &
+	helpbest.obj &
 	helpchm.obj &
 	helpwin.obj &
 	icon.obj &
@@ -271,6 +296,7 @@ MSWOBJS = accel.obj &
 	mimetype.obj &
 	minifram.obj &
 	msgdlg.obj &
+	mslu.obj &
 	nativdlg.obj &
 	notebook.obj &
 	oleutils.obj &
@@ -278,6 +304,7 @@ MSWOBJS = accel.obj &
 	palette.obj &
 	pen.obj &
 	penwin.obj &
+	popupwin.obj &
 	printdlg.obj &
 	printwin.obj &
 	radiobox.obj &
@@ -306,10 +333,12 @@ MSWOBJS = accel.obj &
 	thread.obj &
 	timer.obj &
 	tooltip.obj &
+	toplevel.obj &
 	treectrl.obj &
 	utils.obj &
 	utilsexc.obj &
 	uuid.obj &
+	volume.obj &
 	wave.obj &
 	window.obj
 
@@ -331,13 +360,24 @@ HTMLOBJS = helpctrl.obj &
 	m_list.obj &
 	m_meta.obj &
 	m_pre.obj &
+	m_style.obj &
 	m_tables.obj &
 	winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+ARCHINCDIR=$(WXDIR)\lib\msw
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\msw\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -467,6 +507,12 @@ droptgt.obj:     $(OLEDIR)\droptgt.cpp
 enhmeta.obj:     $(MSWDIR)\enhmeta.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+evtloop.obj:     $(MSWDIR)\evtloop.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fdrepdlg.obj:     $(MSWDIR)\fdrepdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 filedlg.obj:     $(MSWDIR)\filedlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -506,6 +552,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) $<
 
@@ -554,6 +603,9 @@ minifram.obj:     $(MSWDIR)\minifram.cpp
 msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mslu.obj:     $(MSWDIR)\mslu.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -575,6 +627,9 @@ pen.obj:     $(MSWDIR)\pen.cpp
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+popupwin.obj:     $(MSWDIR)\popupwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 printdlg.obj:     $(MSWDIR)\printdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -659,6 +714,9 @@ timer.obj:     $(MSWDIR)\timer.cpp
 tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+toplevel.obj:     $(MSWDIR)\toplevel.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 treectrl.obj:     $(MSWDIR)\treectrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -671,6 +729,9 @@ utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
 uuid.obj:     $(OLEDIR)\uuid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+volume.obj:     $(MSWDIR)\volume.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 wave.obj:     $(MSWDIR)\wave.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -685,12 +746,21 @@ window.obj:     $(MSWDIR)\window.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+artprov.obj:     $(COMMDIR)\artprov.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+artstd.obj:     $(COMMDIR)\artstd.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 clipcmn.obj:     $(COMMDIR)\clipcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+clntdata.obj:     $(COMMDIR)\clntdata.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 cmdline.obj:     $(COMMDIR)\cmdline.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -703,6 +773,9 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+containr.obj:     $(COMMDIR)\containr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 cshelp.obj:     $(COMMDIR)\cshelp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -748,12 +821,18 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dynarray.obj:     $(COMMDIR)\dynarray.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dynlib.obj:     $(COMMDIR)\dynlib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dynload.obj:     $(COMMDIR)\dynload.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 effects.obj:     $(COMMDIR)\effects.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -766,6 +845,9 @@ event.obj:     $(COMMDIR)\event.cpp
 extended.obj:     $(COMMDIR)\extended.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
+fddlgcmn.obj:     $(COMMDIR)\fddlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 ffile.obj:     $(COMMDIR)\ffile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -805,6 +887,9 @@ fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
 ftp.obj:     $(COMMDIR)\ftp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+gaugecmn.obj:     $(COMMDIR)\gaugecmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -817,12 +902,18 @@ gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
 hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+hashmap.obj:     $(COMMDIR)\hashmap.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpbase.obj:     $(COMMDIR)\helpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+iconbndl.obj:     $(COMMDIR)\iconbndl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -832,9 +923,15 @@ imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagfill.obj:     $(COMMDIR)\imagfill.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagiff.obj:     $(COMMDIR)\imagiff.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -889,13 +986,16 @@ mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+msgout.obj:     $(COMMDIR)\msgout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-object.obj:     $(COMMDIR)\object.cpp
+nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-objstrm.obj:     $(COMMDIR)\objstrm.cpp
+object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 odbc.obj:     $(COMMDIR)\odbc.cpp
@@ -904,6 +1004,9 @@ odbc.obj:     $(COMMDIR)\odbc.cpp
 paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+popupcmn.obj:     $(COMMDIR)\popupcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 prntbase.obj:     $(COMMDIR)\prntbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -916,6 +1019,12 @@ protocol.obj:     $(COMMDIR)\protocol.cpp
 quantize.obj:     $(COMMDIR)\quantize.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+regex.obj:     $(COMMDIR)\regex.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 resource.obj:     $(COMMDIR)\resource.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -931,7 +1040,7 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-serbase.obj:     $(COMMDIR)\serbase.cpp
+settcmn.obj:     $(COMMDIR)\settcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sizer.obj:     $(COMMDIR)\sizer.cpp
@@ -940,6 +1049,9 @@ sizer.obj:     $(COMMDIR)\sizer.cpp
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+statbar.obj:     $(COMMDIR)\statbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 strconv.obj:     $(COMMDIR)\strconv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -949,9 +1061,15 @@ stream.obj:     $(COMMDIR)\stream.cpp
 string.obj:     $(COMMDIR)\string.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+sysopt.obj:     $(COMMDIR)\sysopt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+textbuf.obj:     $(COMMDIR)\textbuf.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 textcmn.obj:     $(COMMDIR)\textcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -964,6 +1082,9 @@ timercmn.obj:     $(COMMDIR)\timercmn.cpp
 tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+toplvcmn.obj:     $(COMMDIR)\toplvcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 treebase.obj:     $(COMMDIR)\treebase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1038,6 +1159,12 @@ calctrl.obj:     $(GENDIR)\calctrl.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dcpsg.obj:     $(GENDIR)\dcpsg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dirctrlg.obj:     $(GENDIR)\dirctrlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1080,7 +1207,10 @@ proplist.obj:     $(GENDIR)\proplist.cpp
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-scrolwin.obj:     $(GENDIR)\scrolwin.cpp
+scrlwing.obj:     $(GENDIR)\scrlwing.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+spinctlg.obj:     $(GENDIR)\spinctlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 splash.obj:     $(GENDIR)\splash.cpp
@@ -1173,6 +1303,9 @@ m_meta.obj:     $(HTMLDIR)\m_meta.cpp
 m_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+m_style.obj:     $(HTMLDIR)\m_style.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 m_tables.obj:     $(HTMLDIR)\m_tables.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1181,56 +1314,6 @@ winpars.obj:     $(HTMLDIR)\winpars.cpp
 
 
 
-
-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
-
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-compress.obj: compress.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
-   infcodes.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
-
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
-   infcodes.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-	$(CC) -c $(CFLAGS) $*.c
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-	$(CC) -c $(CFLAGS) $*.c
-
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
-
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png
     wmake -f makefile.wat all
@@ -1271,6 +1354,16 @@ clean_tiff:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
+regex:    .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_regex:   .SYMBOLIC
+    cd $(WXDIR)\src\regex
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
 MFTYPE=wat
 self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
 	cd $(WXDIR)\distrib\msw\tmake