X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9e4c43bebaf9ae0f490a3099cd26dae48c48e1f..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/mac/files.lst

diff --git a/src/mac/files.lst b/src/mac/files.lst
index 9747349ea6..33ddee3faf 100644
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -1,20 +1,23 @@
-# This file NOT yet automatically generated by tmake.
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
 		generic/calctrl.cpp \
 		generic/caret.cpp \
 		generic/choicdgg.cpp \
 		generic/colrdlgg.cpp \
+		generic/dcbuffer.cpp \
 		generic/dcpsg.cpp \
 		generic/dirctrlg.cpp \
+		generic/dirdlgg.cpp \
+		generic/dragimgg.cpp \
 		generic/fdrepdlg.cpp \
+		generic/fontdlgg.cpp \
 		generic/grid.cpp \
 		generic/gridctrl.cpp \
 		generic/gridsel.cpp \
 		generic/helpext.cpp \
 		generic/helphtml.cpp \
-		generic/helpwxht.cpp \
-		generic/helpxlp.cpp \
 		generic/imaglist.cpp \
 		generic/laywin.cpp \
 		generic/listctrl.cpp \
@@ -43,13 +46,17 @@ ALL_SOURCES = \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
 		common/appcmn.cpp \
+		common/artprov.cpp \
+		common/artstd.cpp \
+		common/bmpbase.cpp \
 		common/choiccmn.cpp \
 		common/clipcmn.cpp \
+		common/clntdata.cpp \
 		common/cmdline.cpp \
 		common/cmdproc.cpp \
 		common/cmndata.cpp \
-		common/containr.cpp \
 		common/config.cpp \
+		common/containr.cpp \
 		common/cshelp.cpp \
 		common/ctrlcmn.cpp \
 		common/ctrlsub.cpp \
@@ -64,8 +71,10 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
+		common/dynload.cpp \
 		common/effects.cpp \
 		common/encconv.cpp \
 		common/event.cpp \
@@ -75,6 +84,7 @@ ALL_SOURCES = \
 		common/file.cpp \
 		common/fileconf.cpp \
 		common/filefn.cpp \
+		common/filename.cpp \
 		common/filesys.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
@@ -88,12 +98,16 @@ ALL_SOURCES = \
 		common/geometry.cpp \
 		common/gifdecod.cpp \
 		common/hash.cpp \
+		common/hashmap.cpp \
 		common/helpbase.cpp \
 		common/http.cpp \
+		common/iconbndl.cpp \
 		common/imagall.cpp \
 		common/imagbmp.cpp \
 		common/image.cpp \
+		common/imagfill.cpp \
 		common/imaggif.cpp \
+		common/imagiff.cpp \
 		common/imagjpeg.cpp \
 		common/imagpcx.cpp \
 		common/imagpng.cpp \
@@ -107,6 +121,7 @@ ALL_SOURCES = \
 		common/list.cpp \
 		common/log.cpp \
 		common/longlong.cpp \
+		common/matrix.cpp \
 		common/memory.cpp \
 		common/menucmn.cpp \
 		common/mimecmn.cpp \
@@ -114,7 +129,6 @@ ALL_SOURCES = \
 		common/mstream.cpp \
 		common/nbkbase.cpp \
 		common/object.cpp \
-		common/objstrm.cpp \
 		common/odbc.cpp \
 		common/paper.cpp \
 		common/popupcmn.cpp \
@@ -128,18 +142,20 @@ ALL_SOURCES = \
 		common/sckfile.cpp \
 		common/sckipc.cpp \
 		common/sckstrm.cpp \
-		common/serbase.cpp \
 		common/sizer.cpp \
 		common/socket.cpp \
+		common/statbar.cpp \
 		common/strconv.cpp \
 		common/stream.cpp \
 		common/string.cpp \
+		common/sysopt.cpp \
 		common/tbarbase.cpp \
+		common/textbuf.cpp \
 		common/textcmn.cpp \
 		common/textfile.cpp \
 		common/timercmn.cpp \
-		common/toplvcmn.cpp \
 		common/tokenzr.cpp \
+		common/toplvcmn.cpp \
 		common/treebase.cpp \
 		common/txtstrm.cpp \
 		common/unzip.c \
@@ -156,6 +172,87 @@ ALL_SOURCES = \
 		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
+		mac/accel.cpp \
+		mac/aga.cpp \
+		mac/app.cpp \
+		mac/bitmap.cpp \
+		mac/bmpbuttn.cpp \
+		mac/brush.cpp \
+		mac/button.cpp \
+		mac/checkbox.cpp \
+		mac/checklst.cpp \
+		mac/choice.cpp \
+		mac/clipbrd.cpp \
+		mac/colordlg.cpp \
+		mac/colour.cpp \
+		mac/combobox.cpp \
+		mac/control.cpp \
+		mac/cursor.cpp \
+		mac/data.cpp \
+		mac/dataobj.cpp \
+		mac/dc.cpp \
+		mac/dcclient.cpp \
+		mac/dcmemory.cpp \
+		mac/dcprint.cpp \
+		mac/dcscreen.cpp \
+		mac/dialog.cpp \
+		mac/dirdlg.cpp \
+		mac/dirmac.cpp \
+		mac/dnd.cpp \
+		mac/filedlg.cpp \
+		mac/font.cpp \
+		mac/fontdlg.cpp \
+		mac/fontenum.cpp \
+		mac/fontutil.cpp \
+		mac/frame.cpp \
+		mac/gauge.cpp \
+		mac/gdiobj.cpp \
+		mac/gsocket.c \
+		mac/icon.cpp \
+		mac/joystick.cpp \
+		mac/listbox.cpp \
+		mac/macnotfy.cpp \
+		mac/mdi.cpp \
+		mac/menu.cpp \
+		mac/menuitem.cpp \
+		mac/metafile.cpp \
+		mac/mimetmac.cpp \
+		mac/minifram.cpp \
+		mac/msgdlg.cpp \
+		mac/notebmac.cpp \
+		mac/palette.cpp \
+		mac/pen.cpp \
+		mac/pnghand.cpp \
+		mac/print.cpp \
+		mac/printdlg.cpp \
+		mac/printmac.cpp \
+		mac/radiobox.cpp \
+		mac/radiobut.cpp \
+		mac/region.cpp \
+		mac/scrolbar.cpp \
+		mac/settings.cpp \
+		mac/slider.cpp \
+		mac/spinbutt.cpp \
+		mac/statbmp.cpp \
+		mac/statbox.cpp \
+		mac/statbrma.cpp \
+		mac/statlmac.cpp \
+		mac/stattext.cpp \
+		mac/tabctrl.cpp \
+		mac/taskbar.cpp \
+		mac/textctrl.cpp \
+		mac/thread.cpp \
+		mac/timer.cpp \
+		mac/toolbar.cpp \
+		mac/tooltip.cpp \
+		mac/toplevel.cpp \
+		mac/uma.cpp \
+		mac/utils.cpp \
+		mac/utilsexc.cpp \
+		mac/wave.cpp \
+		mac/window.cpp \
+		unix/snglinst.cpp \
+		unix/utilsunx.cpp \
 		html/helpctrl.cpp \
 		html/helpdata.cpp \
 		html/helpfrm.cpp \
@@ -174,6 +271,7 @@ ALL_SOURCES = \
 		html/m_list.cpp \
 		html/m_meta.cpp \
 		html/m_pre.cpp \
+		html/m_style.cpp \
 		html/m_tables.cpp \
 		html/winpars.cpp
 
@@ -181,6 +279,7 @@ ALL_HEADERS = \
 		accel.h \
 		app.h \
 		arrimpl.cpp \
+		artprov.h \
 		bitmap.h \
 		bmpbuttn.h \
 		brush.h \
@@ -191,9 +290,11 @@ ALL_HEADERS = \
 		caret.h \
 		checkbox.h \
 		checklst.h \
+		chkconf.h \
 		choicdlg.h \
 		choice.h \
 		clipbrd.h \
+		clntdata.h \
 		cmdline.h \
 		cmdproc.h \
 		cmndata.h \
@@ -213,8 +314,11 @@ ALL_HEADERS = \
 		datetime.inl \
 		datstrm.h \
 		db.h \
+		dbgrid.h \
+		dbkeyg.h \
 		dbtable.h \
 		dc.h \
+		dcbuffer.h \
 		dcclient.h \
 		dcmemory.h \
 		dcprint.h \
@@ -226,6 +330,7 @@ ALL_HEADERS = \
 		dialog.h \
 		dialup.h \
 		dir.h \
+		dirctrl.h \
 		dirdlg.h \
 		dnd.h \
 		docmdi.h \
@@ -233,15 +338,18 @@ ALL_HEADERS = \
 		dragimag.h \
 		dynarray.h \
 		dynlib.h \
+		dynload.h \
 		encconv.h \
 		event.h \
 		expr.h \
 		fdrepdlg.h \
+		features.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
 		filedlg.h \
 		filefn.h \
+		filename.h \
 		filesys.h \
 		font.h \
 		fontdlg.h \
@@ -262,16 +370,17 @@ ALL_HEADERS = \
 		grid.h \
 		gsocket.h \
 		hash.h \
+		hashmap.h \
 		help.h \
 		helpbase.h \
-		helpchm.h \
 		helphtml.h \
 		helpwin.h \
-		helpxlp.h \
 		icon.h \
+		iconbndl.h \
 		imagbmp.h \
 		image.h \
 		imaggif.h \
+		imagiff.h \
 		imagjpeg.h \
 		imaglist.h \
 		imagpcx.h \
@@ -297,6 +406,7 @@ ALL_HEADERS = \
 		mdi.h \
 		memconf.h \
 		memory.h \
+		memtext.h \
 		menu.h \
 		menuitem.h \
 		metafile.h \
@@ -307,13 +417,14 @@ ALL_HEADERS = \
 		mstream.h \
 		notebook.h \
 		object.h \
-		objstrm.h \
 		odbc.h \
 		ownerdrw.h \
 		palette.h \
 		panel.h \
 		paper.h \
 		pen.h \
+		platform.h \
+		popupwin.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -324,6 +435,7 @@ ALL_HEADERS = \
 		proplist.h \
 		radiobox.h \
 		radiobut.h \
+		regex.h \
 		region.h \
 		resource.h \
 		sashwin.h \
@@ -332,15 +444,16 @@ ALL_HEADERS = \
 		sckstrm.h \
 		scrolbar.h \
 		scrolwin.h \
-		serbase.h \
 		settings.h \
-		setup.h \
 		sizer.h \
 		slider.h \
+		snglinst.h \
 		socket.h \
 		spinbutt.h \
 		spinctrl.h \
+		splash.h \
 		splitter.h \
+		stack.h \
 		statbmp.h \
 		statbox.h \
 		statline.h \
@@ -349,21 +462,26 @@ ALL_HEADERS = \
 		strconv.h \
 		stream.h \
 		string.h \
+		sysopt.h \
 		tab.h \
 		tabctrl.h \
 		taskbar.h \
 		tbarbase.h \
 		tbarsmpl.h \
+		textbuf.h \
 		textctrl.h \
 		textdlg.h \
 		textfile.h \
+		tglbtn.h \
 		thread.h \
 		time.h \
 		timer.h \
 		tipdlg.h \
+		tipwin.h \
 		tokenzr.h \
 		toolbar.h \
 		tooltip.h \
+		toplevel.h \
 		treebase.h \
 		treectrl.h \
 		txtstrm.h \
@@ -374,7 +492,9 @@ ALL_HEADERS = \
 		validate.h \
 		valtext.h \
 		variant.h \
+		vector.h \
 		version.h \
+		volume.h \
 		wave.h \
 		wfstream.h \
 		window.h \
@@ -385,12 +505,94 @@ ALL_HEADERS = \
 		wx_cw_d.h \
 		wxchar.h \
 		wxexpr.h \
-		xpmdecod.h \
 		wxhtml.h \
 		wxprec.h \
-		xpmhand.h \
+		xpmdecod.h \
 		zipstrm.h \
 		zstream.h \
+		mac/accel.h \
+		mac/aga.h \
+		mac/app.h \
+		mac/bitmap.h \
+		mac/bmpbuttn.h \
+		mac/brush.h \
+		mac/button.h \
+		mac/checkbox.h \
+		mac/checklst.h \
+		mac/choice.h \
+		mac/clipbrd.h \
+		mac/colordlg.h \
+		mac/colour.h \
+		mac/combobox.h \
+		mac/control.h \
+		mac/cursor.h \
+		mac/dataform.h \
+		mac/dataobj.h \
+		mac/dataobj2.h \
+		mac/dc.h \
+		mac/dcclient.h \
+		mac/dcmemory.h \
+		mac/dcprint.h \
+		mac/dcscreen.h \
+		mac/dialog.h \
+		mac/dirdlg.h \
+		mac/dnd.h \
+		mac/filedlg.h \
+		mac/font.h \
+		mac/fontdlg.h \
+		mac/frame.h \
+		mac/gauge.h \
+		mac/gdiobj.h \
+		mac/glcanvas.h \
+		mac/gsockmac.h \
+		mac/helpxxxx.h \
+		mac/icon.h \
+		mac/imaglist.h \
+		mac/joystick.h \
+		mac/listbox.h \
+		mac/listctrl.h \
+		mac/macnotfy.h \
+		mac/macsock.h \
+		mac/mdi.h \
+		mac/menu.h \
+		mac/menuitem.h \
+		mac/metafile.h \
+		mac/mimetype.h \
+		mac/minifram.h \
+		mac/msgdlg.h \
+		mac/notebook.h \
+		mac/palette.h \
+		mac/pen.h \
+		mac/pnghand.h \
+		mac/pngread.h \
+		mac/print.h \
+		mac/printdlg.h \
+		mac/printmac.h \
+		mac/private.h \
+		mac/radiobox.h \
+		mac/radiobut.h \
+		mac/region.h \
+		mac/scrolbar.h \
+		mac/settings.h \
+		mac/slider.h \
+		mac/spinbutt.h \
+		mac/statbmp.h \
+		mac/statbox.h \
+		mac/statline.h \
+		mac/stattext.h \
+		mac/statusbr.h \
+		mac/tabctrl.h \
+		mac/taskbar.h \
+		mac/textctrl.h \
+		mac/timer.h \
+		mac/toolbar.h \
+		mac/tooltip.h \
+		mac/toplevel.h \
+		mac/treectrl.h \
+		mac/uma.h \
+		mac/wave.h \
+		mac/window.h \
+		generic/accel.h \
 		generic/calctrl.h \
 		generic/caret.h \
 		generic/choicdgg.h \
@@ -399,31 +601,40 @@ ALL_HEADERS = \
 		generic/dirctrlg.h \
 		generic/dirdlgg.h \
 		generic/dragimgg.h \
+		generic/fdrepdlg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
+		generic/gridctrl.h \
 		generic/gridg.h \
 		generic/helpext.h \
 		generic/helphtml.h \
-		generic/helpwxht.h \
-		generic/helpxlp.h \
 		generic/imaglist.h \
 		generic/laywin.h \
 		generic/listctrl.h \
 		generic/msgdlgg.h \
 		generic/notebook.h \
+		generic/paletteg.h \
 		generic/panelg.h \
 		generic/printps.h \
 		generic/prntdlgg.h \
 		generic/progdlgg.h \
 		generic/sashwin.h \
 		generic/scrolwin.h \
+		generic/spinctlg.h \
+		generic/splash.h \
 		generic/splitter.h \
 		generic/statusbr.h \
 		generic/tabg.h \
 		generic/textdlgg.h \
+		generic/timer.h \
 		generic/treectlg.h \
 		generic/wizard.h \
+		unix/execute.h \
+		unix/fontutil.h \
+		unix/gsockunx.h \
+		unix/mimetype.h \
+		unix/utilsx11.h \
 		html/forcelnk.h \
 		html/helpctrl.h \
 		html/helpdata.h \
@@ -445,8 +656,12 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		parser.o \
 		appcmn.o \
+		artprov.o \
+		artstd.o \
+		bmpbase.o \
 		choiccmn.o \
 		clipcmn.o \
+		clntdata.o \
 		cmdline.o \
 		cmdproc.o \
 		cmndata.o \
@@ -466,8 +681,10 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
+		dynload.o \
 		effects.o \
 		encconv.o \
 		event.o \
@@ -491,12 +708,16 @@ COMMONOBJS = \
 		geometry.o \
 		gifdecod.o \
 		hash.o \
+		hashmap.o \
 		helpbase.o \
 		http.o \
+		iconbndl.o \
 		imagall.o \
 		imagbmp.o \
 		image.o \
+		imagfill.o \
 		imaggif.o \
+		imagiff.o \
 		imagjpeg.o \
 		imagpcx.o \
 		imagpng.o \
@@ -518,7 +739,6 @@ COMMONOBJS = \
 		mstream.o \
 		nbkbase.o \
 		object.o \
-		objstrm.o \
 		odbc.o \
 		paper.o \
 		popupcmn.o \
@@ -532,18 +752,20 @@ COMMONOBJS = \
 		sckfile.o \
 		sckipc.o \
 		sckstrm.o \
-		serbase.o \
 		sizer.o \
 		socket.o \
+		statbar.o \
 		strconv.o \
 		stream.o \
 		string.o \
+		sysopt.o \
 		tbarbase.o \
+		textbuf.o \
 		textcmn.o \
 		textfile.o \
 		timercmn.o \
-		toplvcmn.o \
 		tokenzr.o \
+		toplvcmn.o \
 		treebase.o \
 		txtstrm.o \
 		unzip.o \
@@ -561,145 +783,24 @@ COMMONOBJS = \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmdproc.d \
-		cmndata.d \
-		config.d \
-		cshelp.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbtable.d \
-		dcbase.d \
-		dircmn.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		effects.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		fddlgcmn.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filename.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gaugecmn.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		imagxpm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		matrix.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		nbkbase.d \
-		object.d \
-		objstrm.d \
-		odbc.d \
-		paper.d \
-		popupcmn.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		quantize.d \
-		regex.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		toplvcmn.d \
-		tokenzr.d \
-		treebase.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		xpmdecod.d \
-		zipstrm.d \
-		zstream.d
-
-# Not included for Mac OS X
-#		gridg.o
 GENERICOBJS = \
 		busyinfo.o \
 		calctrl.o \
 		caret.o \
 		choicdgg.o \
 		colrdlgg.o \
+		dcbuffer.o \
 		dcpsg.o \
 		dirctrlg.o \
 		dirdlgg.o \
 		dragimgg.o \
 		fdrepdlg.o \
-		filedlgg.o \
 		fontdlgg.o \
 		grid.o \
 		gridctrl.o \
 		gridsel.o \
 		helpext.o \
 		helphtml.o \
-		helpwxht.o \
 		imaglist.o \
 		laywin.o \
 		listctrl.o \
@@ -715,9 +816,9 @@ GENERICOBJS = \
 		proplist.o \
 		sashwin.o \
 		scrlwing.o \
+		spinctlg.o \
 		splash.o \
 		splitter.o \
-		spinctlg.o \
 		statusbr.o \
 		tabg.o \
 		tbarsmpl.o \
@@ -728,58 +829,16 @@ GENERICOBJS = \
 		treelay.o \
 		wizard.o
 
-GENERICDEPS = \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		dirdlgg.d \
-		dragimgg.d \
-		fdrepdlg.d \
-		filedlgg.d \
-		fontdlgg.d \
-		grid.d \
-		gridctrl.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		numdlgg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrlwing.d \
-		spinctrl.d \
-		splash.d \
-		splitter.d \
-		statusbr.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		treectlg.d \
-		treelay.d \
-		wizard.d
-
-# Not included for Mac OS X
-#		dirmac.o
-#		filedlg.o
-#		spinctrl.o
-#		statline.o
-#		treectrl.o
 GUIOBJS = \
+		DirectoryCopy.o \
+		FSpCompat.o \
+		FileCopy.o \
+		FullPath.o \
+		IterateDirectory.o \
+		MoreDesktopMgr.o \
+		MoreFiles.o \
+		MoreFilesExtras.o \
+		Search.o \
 		accel.o \
 		aga.o \
 		app.o \
@@ -804,7 +863,10 @@ GUIOBJS = \
 		dcprint.o \
 		dcscreen.o \
 		dialog.o \
+		dirdlg.o \
+		dirmac.o \
 		dnd.o \
+		filedlg.o \
 		font.o \
 		fontdlg.o \
 		fontenum.o \
@@ -817,7 +879,6 @@ GUIOBJS = \
 		joystick.o \
 		listbox.o \
 		macnotfy.o \
-		main.o \
 		mdi.o \
 		menu.o \
 		menuitem.o \
@@ -849,115 +910,19 @@ GUIOBJS = \
 		textctrl.o \
 		thread.o \
 		timer.o \
-		toplevel.o \
 		toolbar.o \
 		tooltip.o \
+		toplevel.o \
 		uma.o \
 		utils.o \
 		utilsexc.o \
 		wave.o \
 		window.o
 
-GUIDEPS = \
-		accel.d \
-		aga.d \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colordlg.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcprint.d \
-		dcscreen.d \
-		dialog.d \
-		dnd.d \
-		font.d \
-		fontdlg.d \
-		fontenum.d \
-		fontutil.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		gsocket.d \
-		icon.d \
-		joystick.d \
-		listbox.d \
-		macnotfy.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		menuitem.d \
-		metafile.d \
-		minifram.d \
-		msgdlg.d \
-		notebmac.d \
-		palette.d \
-		pen.d \
-		pnghand.d \
-		print.d \
-		printdlg.d \
-		printmac.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		statbmp.d \
-		statbox.d \
-		statbrma.d \
-		statlmac.d \
-		stattext.d \
-		tabctrl.d \
-		taskbar.d \
-		textctrl.d \
-		thread.d \
-		timer.d \
-		toplevel.d \
-		toolbar.d \
-		tooltip.d \
-		uma.d \
-		utils.d \
-		utilsexc.d \
-		wave.d \
-		window.d
-
-# Not included for Mac OS X
-#		dir.o
-#		fontenum.o
-#		fontutil.o
-#		gsocket.o
-#		mimetype.o
-#		threadpsx.o
-#		dialup.o
 UNIXOBJS = \
-		dir.o \
+		snglinst.o \
 		utilsunx.o
 
-UNIXDEPS = \
-		dialup.d \
-		dir.d \
-		fontenum.d \
-		fontutil.d \
-		gsocket.d \
-		mimetype.d \
-		threadpsx.d \
-		utilsunx.d
-
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -977,33 +942,11 @@ HTMLOBJS = \
 		m_list.o \
 		m_meta.o \
 		m_pre.o \
+		m_style.o \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-
 MACRESOURCES = \
 		apprsrc.r \
 		carbrsrc.r \
 		corersrc.r
-