X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89c684ef8280e2d91096da2d96ba36e24a1fb917..dbcbe229628c7667da2b6257198467d4f09ab28d:/src/msw/makefile.wat?ds=sidebyside

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 4bbe861184..cf968baeee 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,10 +1,23 @@
 #!/binb/wmake.exe
+
+# This file was automatically generated by tmake at 13:52, 2001/08/06
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
+
 #
-# File:		makefile.wat
-# Author:	Julian Smart
-# Created:	1998
+# File:     makefile.wat
+# Author:   Julian Smart
+# Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
+#
+# NOTE: This file is generated from wat.t by tmake, but not all bugs have
+# been removed from this process. If wxWindows doesn't compile,
+# check the following and edit this makefile accordingly:
+#
+# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
+#   to the path.
+# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
+#   They may also be wrongly specified as extended.cpp, etc.
 
 WXDIR = ..\..
 
@@ -16,203 +29,326 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = xpm png zlib
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
+EXTRATARGETS = png zlib jpeg tiff
+EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
-OLEDIR=ole
+JPEGDIR=$(WXDIR)\src\jpeg
+TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
+OLEDIR=$(MSWDIR)\ole
+HTMLDIR=$(WXDIR)\src\html
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= choicdgg.obj &
-  gridg.obj &
-  laywin.obj &
-  panelg.obj &
-  prop.obj &
-  propform.obj &
-  proplist.obj &
-  sashwin.obj &
-  scrolwin.obj &
-  splitter.obj &
-  statusbr.obj &
-  tabg.obj &
-  textdlgg.obj
+GENERICOBJS= busyinfo.obj &
+	calctrl.obj &
+	choicdgg.obj &
+	dirctrlg.obj &
+	dragimgg.obj &
+	grid.obj &
+	gridctrl.obj &
+	gridsel.obj &
+	laywin.obj &
+	logg.obj &
+	numdlgg.obj &
+	panelg.obj &
+	progdlgg.obj &
+	prop.obj &
+	propform.obj &
+	proplist.obj &
+	sashwin.obj &
+	scrlwing.obj &
+	spinctlg.obj &
+	splash.obj &
+	splitter.obj &
+	statusbr.obj &
+	tbarsmpl.obj &
+	textdlgg.obj &
+	tipdlg.obj &
+	tipwin.obj &
+	treectlg.obj &
+	treelay.obj &
+	wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= printps.obj &
-  prntdlgg.obj &
-  msgdlgg.obj &
-  helpxlp.obj &
-  colrdlgg.obj &
-  fontdlgg.obj
-
-COMMONOBJS = cmndata.obj &
-  config.obj &
-  docview.obj &
-  docmdi.obj &
-  dynarray.obj &
-  dynlib.obj &
-  event.obj &
-  file.obj &
-  filefn.obj &
-  fileconf.obj &
-  framecmn.obj &
-  gdicmn.obj &
-  image.obj &
-  intl.obj &
-  ipcbase.obj &
-  helpbase.obj &
-  layout.obj &
-  log.obj &
-  memory.obj &
-  mimetype.obj &
-  module.obj &
-  object.obj &
-  prntbase.obj &
-  resource.obj &
-  tbarbase.obj &
-  tbarsmpl.obj &
-  textfile.obj &
-  timercmn.obj &
-  utilscmn.obj &
-  validate.obj &
-  valgen.obj &
-  valtext.obj &
-  date.obj &
-  hash.obj &
-  list.obj &
-  string.obj &
-  socket.obj &
-  sckaddr.obj &
-  sckfile.obj &
-  sckipc.obj &
-  sckstrm.obj &
-  url.obj &
-  http.obj &
-  protocol.obj &
-  time.obj &
-  tokenzr.obj &
-  wxexpr.obj &
-  y_tab.obj &
-  extended.obj &
-  process.obj &
-  wfstream.obj &
-  mstream.obj &
-  zstream.obj &
-  stream.obj &
-  datstrm.obj &
-  objstrm.obj &
-  variant.obj &
-  wincmn.obj
-
-# Can't compile these yet under Watcom C++
-#  odbc.obj &
-#  db.obj &
-#  dbtable.obj &
-
-MSWOBJS = &
-  accel.obj &
-  app.obj &
-  bitmap.obj &
-  bmpbuttn.obj &
-  brush.obj &
-  button.obj &
-  checkbox.obj &
-  checklst.obj &
-  choice.obj &
-  clipbrd.obj &
-  colordlg.obj &
-  colour.obj &
-  combobox.obj &
-  control.obj &
-  curico.obj &
-  cursor.obj &
-  data.obj &
-  dc.obj &
-  dcmemory.obj &
-  dcclient.obj &
-  dcprint.obj &
-  dcscreen.obj &
-  dde.obj &
-  dialog.obj &
-  dib.obj &
-  dibutils.obj &
-  dirdlg.obj &
-  filedlg.obj &
-  font.obj &
-  fontdlg.obj &
-  frame.obj &
-  gauge95.obj &
-  gaugemsw.obj &
-  gdiobj.obj &
-  helpwin.obj &
-  icon.obj &
-  imaglist.obj &
-  iniconf.obj &
-  joystick.obj &
-  listbox.obj &
-  listctrl.obj &
-  main.obj &
-  mdi.obj &
-  menu.obj &
-  menuitem.obj &
-  metafile.obj &
-  minifram.obj &
-  msgdlg.obj &
-  nativdlg.obj &
-  notebook.obj &
-  ownerdrw.obj &
-  palette.obj &
-  pen.obj &
-  penwin.obj &
-  printdlg.obj &
-  printwin.obj &
-  radiobox.obj &
-  radiobut.obj &
-  region.obj &
-  registry.obj &
-  regconf.obj &
-  scrolbar.obj &
-  settings.obj &
-  slidrmsw.obj &
-  slider95.obj &
-  spinbutt.obj &
-  statbmp.obj &
-  statbox.obj &
-  statbr95.obj &
-  stattext.obj &
-  tabctrl.obj &
-  taskbar.obj &
-  tbar95.obj &
-  tbarmsw.obj &
-  textctrl.obj &
-  thread.obj &
-  timer.obj &
-  tooltip.obj &
-  treectrl.obj &
-  utils.obj &
-  utilsexc.obj &
-  wave.obj &
-  window.obj &
-  xpmhand.obj
-
-#  pnghand.obj &
-
-OLEOBJS = &
-  droptgt.obj &
-  dropsrc.obj &
-  dataobj.obj &
-  oleutils.obj &
-  uuid.obj &
-  automtn.obj
+NONESSENTIALOBJS= accel.obj &
+	caret.obj &
+	colrdlgg.obj &
+	dcpsg.obj &
+	dirdlgg.obj &
+	fdrepdlg.obj &
+	filedlgg.obj &
+	fontdlgg.obj &
+	helpext.obj &
+	helphtml.obj &
+	helpwxht.obj &
+	imaglist.obj &
+	listctrl.obj &
+	msgdlgg.obj &
+	notebook.obj &
+	paletteg.obj &
+	printps.obj &
+	prntdlgg.obj &
+	statline.obj &
+	tabg.obj
+
+COMMONOBJS = &
+	y_tab.obj &
+	appcmn.obj &
+	choiccmn.obj &
+	clipcmn.obj &
+	cmdline.obj &
+	cmdproc.obj &
+	cmndata.obj &
+	config.obj &
+	containr.obj &
+	cshelp.obj &
+	ctrlcmn.obj &
+	ctrlsub.obj &
+	datetime.obj &
+	datstrm.obj &
+	db.obj &
+	dbgrid.obj &
+	dbtable.obj &
+	dcbase.obj &
+	dircmn.obj &
+	dlgcmn.obj &
+	dndcmn.obj &
+	dobjcmn.obj &
+	docmdi.obj &
+	docview.obj &
+	dynarray.obj &
+	dynlib.obj &
+	effects.obj &
+	encconv.obj &
+	event.obj &
+	extended.obj &
+	fddlgcmn.obj &
+	ffile.obj &
+	file.obj &
+	fileconf.obj &
+	filefn.obj &
+	filename.obj &
+	filesys.obj &
+	fontcmn.obj &
+	fontmap.obj &
+	framecmn.obj &
+	fs_inet.obj &
+	fs_mem.obj &
+	fs_zip.obj &
+	ftp.obj &
+	gaugecmn.obj &
+	gdicmn.obj &
+	geometry.obj &
+	gifdecod.obj &
+	hash.obj &
+	helpbase.obj &
+	http.obj &
+	imagall.obj &
+	imagbmp.obj &
+	image.obj &
+	imaggif.obj &
+	imagjpeg.obj &
+	imagpcx.obj &
+	imagpng.obj &
+	imagpnm.obj &
+	imagtiff.obj &
+	imagxpm.obj &
+	intl.obj &
+	ipcbase.obj &
+	layout.obj &
+	lboxcmn.obj &
+	list.obj &
+	log.obj &
+	longlong.obj &
+	matrix.obj &
+	memory.obj &
+	menucmn.obj &
+	mimecmn.obj &
+	module.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 &
+	sizer.obj &
+	socket.obj &
+	strconv.obj &
+	stream.obj &
+	string.obj &
+	sysopt.obj &
+	tbarbase.obj &
+	textcmn.obj &
+	textfile.obj &
+	timercmn.obj &
+	tokenzr.obj &
+	treebase.obj &
+	txtstrm.obj &
+	unzip.obj &
+	url.obj &
+	utilscmn.obj &
+	valgen.obj &
+	validate.obj &
+	valtext.obj &
+	variant.obj &
+	wfstream.obj &
+	wincmn.obj &
+	wxchar.obj &
+	wxexpr.obj &
+	xpmdecod.obj &
+	zipstrm.obj &
+	zstream.obj
+
+MSWOBJS = accel.obj &
+	app.obj &
+	automtn.obj &
+	bitmap.obj &
+	bmpbuttn.obj &
+	brush.obj &
+	button.obj &
+	caret.obj &
+	checkbox.obj &
+	checklst.obj &
+	choice.obj &
+	clipbrd.obj &
+	colordlg.obj &
+	colour.obj &
+	combobox.obj &
+	control.obj &
+	curico.obj &
+	cursor.obj &
+	data.obj &
+	dataobj.obj &
+	dc.obj &
+	dcclient.obj &
+	dcmemory.obj &
+	dcprint.obj &
+	dcscreen.obj &
+	dde.obj &
+	dialog.obj &
+	dialup.obj &
+	dib.obj &
+	dibutils.obj &
+	dir.obj &
+	dirdlg.obj &
+	dragimag.obj &
+	dropsrc.obj &
+	droptgt.obj &
+	enhmeta.obj &
+	evtloop.obj &
+	fdrepdlg.obj &
+	filedlg.obj &
+	font.obj &
+	fontdlg.obj &
+	fontenum.obj &
+	fontutil.obj &
+	frame.obj &
+	gauge95.obj &
+	gaugemsw.obj &
+	gdiimage.obj &
+	gdiobj.obj &
+	glcanvas.obj &
+	gsocket.obj &
+	gsockmsw.obj &
+	helpchm.obj &
+	helpwin.obj &
+	icon.obj &
+	imaglist.obj &
+	iniconf.obj &
+	joystick.obj &
+	listbox.obj &
+	listctrl.obj &
+	main.obj &
+	mdi.obj &
+	menu.obj &
+	menuitem.obj &
+	metafile.obj &
+	mimetype.obj &
+	minifram.obj &
+	msgdlg.obj &
+	nativdlg.obj &
+	notebook.obj &
+	oleutils.obj &
+	ownerdrw.obj &
+	palette.obj &
+	pen.obj &
+	penwin.obj &
+	printdlg.obj &
+	printwin.obj &
+	radiobox.obj &
+	radiobut.obj &
+	regconf.obj &
+	region.obj &
+	registry.obj &
+	scrolbar.obj &
+	settings.obj &
+	slider95.obj &
+	slidrmsw.obj &
+	snglinst.obj &
+	spinbutt.obj &
+	spinctrl.obj &
+	statbmp.obj &
+	statbox.obj &
+	statbr95.obj &
+	statline.obj &
+	stattext.obj &
+	tabctrl.obj &
+	taskbar.obj &
+	tbar95.obj &
+	tbarmsw.obj &
+	textctrl.obj &
+	tglbtn.obj &
+	thread.obj &
+	timer.obj &
+	tooltip.obj &
+	treectrl.obj &
+	utils.obj &
+	utilsexc.obj &
+	uuid.obj &
+	wave.obj &
+	window.obj
+
+HTMLOBJS = helpctrl.obj &
+	helpdata.obj &
+	helpfrm.obj &
+	htmlcell.obj &
+	htmlfilt.obj &
+	htmlpars.obj &
+	htmltag.obj &
+	htmlwin.obj &
+	htmprint.obj &
+	m_dflist.obj &
+	m_fonts.obj &
+	m_hline.obj &
+	m_image.obj &
+	m_layout.obj &
+	m_links.obj &
+	m_list.obj &
+	m_meta.obj &
+	m_pre.obj &
+	m_tables.obj &
+	winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -223,8 +359,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)
@@ -240,6 +376,9 @@ accel.obj:     $(MSWDIR)\accel.cpp
 app.obj:     $(MSWDIR)\app.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+automtn.obj:     $(OLEDIR)\automtn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 bitmap.obj:     $(MSWDIR)\bitmap.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -252,7 +391,7 @@ brush.obj:     $(MSWDIR)\brush.cpp
 button.obj:     $(MSWDIR)\button.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-choice.obj:     $(MSWDIR)\choice.cpp
+caret.obj:     $(MSWDIR)\caret.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 checkbox.obj:     $(MSWDIR)\checkbox.cpp
@@ -261,6 +400,9 @@ checkbox.obj:     $(MSWDIR)\checkbox.cpp
 checklst.obj:     $(MSWDIR)\checklst.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+choice.obj:     $(MSWDIR)\choice.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 clipbrd.obj:     $(MSWDIR)\clipbrd.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -285,16 +427,16 @@ cursor.obj:     $(MSWDIR)\cursor.cpp
 data.obj:     $(MSWDIR)\data.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dde.obj:     $(MSWDIR)\dde.cpp
+dataobj.obj:     $(OLEDIR)\dataobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dc.obj:     $(MSWDIR)\dc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
+dcclient.obj:     $(MSWDIR)\dcclient.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcclient.obj:     $(MSWDIR)\dcclient.cpp
+dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dcprint.obj:     $(MSWDIR)\dcprint.cpp
@@ -303,18 +445,45 @@ dcprint.obj:     $(MSWDIR)\dcprint.cpp
 dcscreen.obj:     $(MSWDIR)\dcscreen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dde.obj:     $(MSWDIR)\dde.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dialog.obj:     $(MSWDIR)\dialog.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dialup.obj:     $(MSWDIR)\dialup.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dib.obj:     $(MSWDIR)\dib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dibutils.obj:     $(MSWDIR)\dibutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dir.obj:     $(MSWDIR)\dir.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dragimag.obj:     $(MSWDIR)\dragimag.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+droptgt.obj:     $(OLEDIR)\droptgt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+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) $<
 
@@ -324,6 +493,12 @@ font.obj:     $(MSWDIR)\font.cpp
 fontdlg.obj:     $(MSWDIR)\fontdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fontenum.obj:     $(MSWDIR)\fontenum.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontutil.obj:     $(MSWDIR)\fontutil.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 frame.obj:     $(MSWDIR)\frame.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -333,9 +508,24 @@ gauge95.obj:     $(MSWDIR)\gauge95.cpp
 gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+gdiimage.obj:     $(MSWDIR)\gdiimage.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+glcanvas.obj:     $(MSWDIR)\glcanvas.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gsocket.obj:     $(MSWDIR)\gsocket.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+gsockmsw.obj:     $(MSWDIR)\gsockmsw.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpchm.obj:     $(MSWDIR)\helpchm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -372,6 +562,9 @@ menuitem.obj:     $(MSWDIR)\menuitem.cpp
 metafile.obj:     $(MSWDIR)\metafile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mimetype.obj:     $(MSWDIR)\mimetype.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 minifram.obj:     $(MSWDIR)\minifram.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -384,6 +577,9 @@ nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
 notebook.obj:     $(MSWDIR)\notebook.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+oleutils.obj:     $(OLEDIR)\oleutils.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -396,9 +592,6 @@ pen.obj:     $(MSWDIR)\pen.cpp
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-pnghand.obj:     $(MSWDIR)\pnghand.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 printdlg.obj:     $(MSWDIR)\printdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -411,13 +604,13 @@ radiobox.obj:     $(MSWDIR)\radiobox.cpp
 radiobut.obj:     $(MSWDIR)\radiobut.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-region.obj:     $(MSWDIR)\region.cpp
+regconf.obj:     $(MSWDIR)\regconf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-registry.obj:     $(MSWDIR)\registry.cpp
+region.obj:     $(MSWDIR)\region.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-regconf.obj:     $(MSWDIR)\regconf.cpp
+registry.obj:     $(MSWDIR)\registry.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
@@ -426,15 +619,21 @@ scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
 settings.obj:     $(MSWDIR)\settings.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+slider95.obj:     $(MSWDIR)\slider95.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-slider95.obj:     $(MSWDIR)\slider95.cpp
+snglinst.obj:     $(MSWDIR)\snglinst.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+spinctrl.obj:     $(MSWDIR)\spinctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 statbmp.obj:     $(MSWDIR)\statbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -444,6 +643,9 @@ statbox.obj:     $(MSWDIR)\statbox.cpp
 statbr95.obj:     $(MSWDIR)\statbr95.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+statline.obj:     $(MSWDIR)\statline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 stattext.obj:     $(MSWDIR)\stattext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -451,7 +653,6 @@ tabctrl.obj:     $(MSWDIR)\tabctrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 taskbar.obj:     $(MSWDIR)\taskbar.cpp
-        cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tbar95.obj:     $(MSWDIR)\tbar95.cpp
@@ -463,6 +664,9 @@ tbarmsw.obj:     $(MSWDIR)\tbarmsw.cpp
 textctrl.obj:     $(MSWDIR)\textctrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+tglbtn.obj:     $(MSWDIR)\tglbtn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 thread.obj:     $(MSWDIR)\thread.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -473,7 +677,6 @@ tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 treectrl.obj:     $(MSWDIR)\treectrl.cpp
-        cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 utils.obj:     $(MSWDIR)\utils.cpp
@@ -482,63 +685,113 @@ utils.obj:     $(MSWDIR)\utils.cpp
 utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+uuid.obj:     $(OLEDIR)\uuid.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 wave.obj:     $(MSWDIR)\wave.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 window.obj:     $(MSWDIR)\window.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
+
+
+########################################################
+# Common objects (always compiled)
+
+appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-droptgt.obj:     $(OLEDIR)\droptgt.cpp
+choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
+clipcmn.obj:     $(COMMDIR)\clipcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dataobj.obj:     $(OLEDIR)\dataobj.cpp
+cmdline.obj:     $(COMMDIR)\cmdline.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-oleutils.obj:     $(OLEDIR)\oleutils.cpp
+cmdproc.obj:     $(COMMDIR)\cmdproc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-uuid.obj:     $(OLEDIR)\uuid.cpp
+cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-automtn.obj:     $(OLEDIR)\automtn.cpp
+config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-########################################################
-# Common objects (always compiled)
+containr.obj:     $(COMMDIR)\containr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-cmndata.obj:     $(COMMDIR)\cmndata.cpp
+cshelp.obj:     $(COMMDIR)\cshelp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-config.obj:     $(COMMDIR)\config.cpp
+ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+datetime.obj:     $(COMMDIR)\datetime.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+datstrm.obj:     $(COMMDIR)\datstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 db.obj:     $(COMMDIR)\db.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dbgrid.obj:     $(COMMDIR)\dbgrid.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dbtable.obj:     $(COMMDIR)\dbtable.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-docview.obj:     $(COMMDIR)\docview.cpp
+dcbase.obj:     $(COMMDIR)\dcbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dircmn.obj:     $(COMMDIR)\dircmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dndcmn.obj:     $(COMMDIR)\dndcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dobjcmn.obj:     $(COMMDIR)\dobjcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 docmdi.obj:     $(COMMDIR)\docmdi.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+docview.obj:     $(COMMDIR)\docview.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dynarray.obj:     $(COMMDIR)\dynarray.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dynlib.obj:     $(COMMDIR)\dynlib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+effects.obj:     $(COMMDIR)\effects.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+encconv.obj:     $(COMMDIR)\encconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+extended.obj:     $(COMMDIR)\extended.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+fddlgcmn.obj:     $(COMMDIR)\fddlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ffile.obj:     $(COMMDIR)\ffile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 file.obj:     $(COMMDIR)\file.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -548,153 +801,260 @@ fileconf.obj:     $(COMMDIR)\fileconf.cpp
 filefn.obj:     $(COMMDIR)\filefn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+filename.obj:     $(COMMDIR)\filename.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+filesys.obj:     $(COMMDIR)\filesys.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontmap.obj:     $(COMMDIR)\fontmap.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fs_mem.obj:     $(COMMDIR)\fs_mem.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ftp.obj:     $(COMMDIR)\ftp.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gaugecmn.obj:     $(COMMDIR)\gaugecmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+geometry.obj:     $(COMMDIR)\geometry.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+hash.obj:     $(COMMDIR)\hash.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpbase.obj:     $(COMMDIR)\helpbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+http.obj:     $(COMMDIR)\http.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagall.obj:     $(COMMDIR)\imagall.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imaggif.obj:     $(COMMDIR)\imaggif.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagpcx.obj:     $(COMMDIR)\imagpcx.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagpng.obj:     $(COMMDIR)\imagpng.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagpnm.obj:     $(COMMDIR)\imagpnm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagtiff.obj:     $(COMMDIR)\imagtiff.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imagxpm.obj:     $(COMMDIR)\imagxpm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 intl.obj:     $(COMMDIR)\intl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpbase.obj:     $(COMMDIR)\helpbase.cpp
+layout.obj:     $(COMMDIR)\layout.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-layout.obj:     $(COMMDIR)\layout.cpp
+lboxcmn.obj:     $(COMMDIR)\lboxcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+list.obj:     $(COMMDIR)\list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 log.obj:     $(COMMDIR)\log.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+longlong.obj:     $(COMMDIR)\longlong.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+matrix.obj:     $(COMMDIR)\matrix.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 memory.obj:     $(COMMDIR)\memory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mimetype.obj:     $(COMMDIR)\mimetype.cpp
+menucmn.obj:     $(COMMDIR)\menucmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mstream.obj:     $(COMMDIR)\mstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+objstrm.obj:     $(COMMDIR)\objstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prntbase.obj:     $(COMMDIR)\prntbase.cpp
+paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-resource.obj:     $(COMMDIR)\resource.cpp
+popupcmn.obj:     $(COMMDIR)\popupcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
+prntbase.obj:     $(COMMDIR)\prntbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
+process.obj:     $(COMMDIR)\process.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-textfile.obj:     $(COMMDIR)\textfile.cpp
+protocol.obj:     $(COMMDIR)\protocol.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-timercmn.obj:     $(COMMDIR)\timercmn.cpp
+quantize.obj:     $(COMMDIR)\quantize.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
+radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-validate.obj:     $(COMMDIR)\validate.cpp
+regex.obj:     $(COMMDIR)\regex.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-valgen.obj:     $(COMMDIR)\valgen.cpp
+resource.obj:     $(COMMDIR)\resource.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-valtext.obj:     $(COMMDIR)\valtext.cpp
+sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-date.obj:     $(COMMDIR)\date.cpp
+sckfile.obj:     $(COMMDIR)\sckfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+sckipc.obj:     $(COMMDIR)\sckipc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-hash.obj:     $(COMMDIR)\hash.cpp
+sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-list.obj:     $(COMMDIR)\list.cpp
+serbase.obj:     $(COMMDIR)\serbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-string.obj:     $(COMMDIR)\string.cpp
+sizer.obj:     $(COMMDIR)\sizer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
+strconv.obj:     $(COMMDIR)\strconv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sckfile.obj:     $(COMMDIR)\sckfile.cpp
+stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sckipc.obj:     $(COMMDIR)\sckipc.cpp
+string.obj:     $(COMMDIR)\string.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
+sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-url.obj:     $(COMMDIR)\url.cpp
+tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-http.obj:     $(COMMDIR)\http.cpp
+textcmn.obj:     $(COMMDIR)\textcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-protocol.obj:     $(COMMDIR)\protocol.cpp
+textfile.obj:     $(COMMDIR)\textfile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+timercmn.obj:     $(COMMDIR)\timercmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-matrix.obj:     $(COMMDIR)\matrix.cpp
+treebase.obj:     $(COMMDIR)\treebase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-time.obj:     $(COMMDIR)\time.cpp
+txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-stream.obj:     $(COMMDIR)\stream.cpp
+unzip.obj:     $(COMMDIR)\unzip.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
+url.obj:     $(COMMDIR)\url.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wfstream.obj:     $(COMMDIR)\wfstream.cpp
+utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mstream.obj:     $(COMMDIR)\mstream.cpp
+valgen.obj:     $(COMMDIR)\valgen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-zstream.obj:     $(COMMDIR)\zstream.cpp
+validate.obj:     $(COMMDIR)\validate.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-datstrm.obj:     $(COMMDIR)\datstrm.cpp
+valtext.obj:     $(COMMDIR)\valtext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-objstrm.obj:     $(COMMDIR)\objstrm.cpp
+variant.obj:     $(COMMDIR)\variant.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
+wfstream.obj:     $(COMMDIR)\wfstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-process.obj:     $(COMMDIR)\process.cpp
+wincmn.obj:     $(COMMDIR)\wincmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-variant.obj:     $(COMMDIR)\variant.cpp
+wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wincmn.obj:     $(COMMDIR)\wincmn.cpp
+wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zstream.obj:     $(COMMDIR)\zstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+
+
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
@@ -710,31 +1070,43 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 
+busyinfo.obj:     $(GENDIR)\busyinfo.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+calctrl.obj:     $(GENDIR)\calctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-colrdlgg.obj:     $(GENDIR)\colrdgg.cpp
+dirctrlg.obj:     $(GENDIR)\dirctrlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
+dragimgg.obj:     $(GENDIR)\dragimgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-gridg.obj:     $(GENDIR)\gridg.cpp
+grid.obj:     $(GENDIR)\grid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpxlp.obj:     $(GENDIR)\helpxlp.cpp
+gridctrl.obj:     $(GENDIR)\gridctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+gridsel.obj:     $(GENDIR)\gridsel.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
+logg.obj:     $(GENDIR)\logg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+numdlgg.obj:     $(GENDIR)\numdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-printps.obj:     $(GENDIR)\printps.cpp
+progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 prop.obj:     $(GENDIR)\prop.cpp
@@ -746,13 +1118,16 @@ propform.obj:     $(GENDIR)\propform.cpp
 proplist.obj:     $(GENDIR)\proplist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
+sashwin.obj:     $(GENDIR)\sashwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+scrlwing.obj:     $(GENDIR)\scrlwing.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-sashwin.obj:     $(GENDIR)\sashwin.cpp
+spinctlg.obj:     $(GENDIR)\spinctlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-scrolwin.obj:     $(GENDIR)\scrolwin.cpp
+splash.obj:     $(GENDIR)\splash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 splitter.obj:     $(GENDIR)\splitter.cpp
@@ -761,83 +1136,100 @@ splitter.obj:     $(GENDIR)\splitter.cpp
 statusbr.obj:     $(GENDIR)\statusbr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tabg.obj:     $(GENDIR)\tabg.cpp
+tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-textdlgg.obj: $(GENDIR)\textdlgg.cpp
+textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crbuffri.obj: $(XPMDIR)\crbuffri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+tipdlg.obj:     $(GENDIR)\tipdlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crbuffrp.obj: $(XPMDIR)\crbuffrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+tipwin.obj:     $(GENDIR)\tipwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crdatfri.obj: $(XPMDIR)\crdatfri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+treectlg.obj:     $(GENDIR)\treectlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crdatfrp.obj: $(XPMDIR)\crdatfrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+treelay.obj:     $(GENDIR)\treelay.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-create.obj: $(XPMDIR)\create.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+wizard.obj:     $(GENDIR)\wizard.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-crifrbuf.obj: $(XPMDIR)\crifrbuf.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-crifrdat.obj: $(XPMDIR)\crifrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-crpfrdat.obj: $(XPMDIR)\crpfrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+########################################################
+# HTML objects (always compiled)
 
-# TODO: what to do about this clash of filename????
-#data.obj: $(XPMDIR)\data.c
-#  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+helpctrl.obj:     $(HTMLDIR)\helpctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-hashtab.obj: $(XPMDIR)\hashtab.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+helpdata.obj:     $(HTMLDIR)\helpdata.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-misc.obj: $(XPMDIR)\misc.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+helpfrm.obj:     $(HTMLDIR)\helpfrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-parse.obj: $(XPMDIR)\parse.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlcell.obj:     $(HTMLDIR)\htmlcell.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rdftodat.obj: $(XPMDIR)\rdftodat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlfilt.obj:     $(HTMLDIR)\htmlfilt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rdftoi.obj: $(XPMDIR)\rdftoi.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlpars.obj:     $(HTMLDIR)\htmlpars.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rdftop.obj: $(XPMDIR)\rdftop.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmltag.obj:     $(HTMLDIR)\htmltag.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-rgb.obj: $(XPMDIR)\rgb.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmlwin.obj:     $(HTMLDIR)\htmlwin.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-scan.obj: $(XPMDIR)\scan.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+htmprint.obj:     $(HTMLDIR)\htmprint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-simx.obj: $(XPMDIR)\simx.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+m_dflist.obj:     $(HTMLDIR)\m_dflist.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_fonts.obj:     $(HTMLDIR)\m_fonts.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_hline.obj:     $(HTMLDIR)\m_hline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_image.obj:     $(HTMLDIR)\m_image.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_layout.obj:     $(HTMLDIR)\m_layout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_links.obj:     $(HTMLDIR)\m_links.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_list.obj:     $(HTMLDIR)\m_list.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_meta.obj:     $(HTMLDIR)\m_meta.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_pre.obj:     $(HTMLDIR)\m_pre.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+m_tables.obj:     $(HTMLDIR)\m_tables.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+winpars.obj:     $(HTMLDIR)\winpars.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wrffrdat.obj: $(XPMDIR)\wrffrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-wrffri.obj: $(XPMDIR)\wrffri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
-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
@@ -883,16 +1275,6 @@ uncompr.obj: uncompr.c zlib.h zconf.h
 zutil.obj: zutil.c zutil.h zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 
-xpm:   .SYMBOLIC
-    cd $(WXDIR)\src\xpm
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\msw
-
-clean_xpm:   .SYMBOLIC
-    cd $(WXDIR)\src\xpm
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\msw
-
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png
     wmake -f makefile.wat all
@@ -913,4 +1295,28 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
+jpeg:    .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_jpeg:   .SYMBOLIC
+    cd $(WXDIR)\src\jpeg
+    wmake -f makefile.wat clean
+    cd $(WXDIR)\src\msw
+
+tiff:    .SYMBOLIC
+    cd $(WXDIR)\src\tiff
+    wmake -f makefile.wat all
+    cd $(WXDIR)\src\msw
+
+clean_tiff:   .SYMBOLIC
+    cd $(WXDIR)\src\tiff
+    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
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXDIR)\src\msw