X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e115e77131d5a7a68d0cfb2fb41fcb98deefdd29..f3314fbcb44e8840cd3353a7f8e22207bf26c03d:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3be6793df7..dc715e5b5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 14:12, 1999/10/09
+# This file was automatically generated by tmake at 16:50, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -43,10 +43,11 @@ VP5 = @top_srcdir@/src/unix
 VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
-VP9 = @top_srcdir@/src/zlib
-VP10 = @top_srcdir@/src/iodbc
+VP9 = @top_srcdir@/src/tiff
+VP10 = @top_srcdir@/src/zlib
+VP11 = @top_srcdir@/src/iodbc
 
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -108,10 +109,12 @@ HTMLDIR  = $(WXDIR)/src/html
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
+TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
@@ -121,7 +124,8 @@ DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -129,8 +133,10 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 BASE_HEADERS = \
 		app.h \
 		date.h \
+		datetime.h \
 		debug.h \
 		defs.h \
+		dir.h \
 		dynarray.h \
 		dynlib.h \
 		event.h \
@@ -186,9 +192,11 @@ WX_HEADERS = \
 		confbase.h \
 		config.h \
 		control.h \
+		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
 		date.h \
+		datetime.h \
 		datstrm.h \
 		db.h \
 		dbtable.h \
@@ -202,6 +210,8 @@ WX_HEADERS = \
 		debug.h \
 		defs.h \
 		dialog.h \
+		dialup.h \
+		dir.h \
 		dirdlg.h \
 		dnd.h \
 		docmdi.h \
@@ -219,6 +229,9 @@ WX_HEADERS = \
 		filesys.h \
 		font.h \
 		fontdlg.h \
+		fontenum.h \
+		fontmap.h \
+		fontutil.h \
 		frame.h \
 		fs_inet.h \
 		fs_zip.h \
@@ -235,8 +248,15 @@ WX_HEADERS = \
 		helpwin.h \
 		helpxlp.h \
 		icon.h \
+		imagbmp.h \
 		image.h \
+		imaggif.h \
+		imagjpeg.h \
 		imaglist.h \
+		imagpcx.h \
+		imagpng.h \
+		imagpnm.h \
+		imagtiff.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@@ -269,7 +289,6 @@ WX_HEADERS = \
 		panel.h \
 		paper.h \
 		pen.h \
-		pnghand.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -295,6 +314,7 @@ WX_HEADERS = \
 		slider.h \
 		socket.h \
 		spinbutt.h \
+		spinctrl.h \
 		splitter.h \
 		statbmp.h \
 		statbox.h \
@@ -307,9 +327,7 @@ WX_HEADERS = \
 		tab.h \
 		tabctrl.h \
 		taskbar.h \
-		tbar95.h \
 		tbarbase.h \
-		tbarmsw.h \
 		tbarsmpl.h \
 		textctrl.h \
 		textdlg.h \
@@ -334,6 +352,7 @@ WX_HEADERS = \
 		wave.h \
 		wfstream.h \
 		window.h \
+		wizard.h \
 		wx.h \
 		wx_cw.h \
 		wx_cw_cm.h \
@@ -361,7 +380,9 @@ GTK_HEADERS = \
 		gtk/combobox.h \
 		gtk/control.h \
 		gtk/cursor.h \
+		gtk/dataform.h \
 		gtk/dataobj.h \
+		gtk/dataobj2.h \
 		gtk/dc.h \
 		gtk/dcclient.h \
 		gtk/dcmemory.h \
@@ -391,6 +412,7 @@ GTK_HEADERS = \
 		gtk/settings.h \
 		gtk/slider.h \
 		gtk/spinbutt.h \
+		gtk/spinctrl.h \
 		gtk/statbmp.h \
 		gtk/statbox.h \
 		gtk/statline.h \
@@ -420,7 +442,9 @@ MOTIF_HEADERS = \
 		motif/combobox.h \
 		motif/control.h \
 		motif/cursor.h \
+		motif/dataform.h \
 		motif/dataobj.h \
+		motif/dataobj2.h \
 		motif/dc.h \
 		motif/dcclient.h \
 		motif/dcmemory.h \
@@ -500,6 +524,7 @@ MSW_HEADERS = \
 		msw/gauge.h \
 		msw/gauge95.h \
 		msw/gaugemsw.h \
+		msw/gdiimage.h \
 		msw/gdiobj.h \
 		msw/helpwin.h \
 		msw/icon.h \
@@ -518,8 +543,6 @@ MSW_HEADERS = \
 		msw/notebook.h \
 		msw/palette.h \
 		msw/pen.h \
-		msw/pnghand.h \
-		msw/pngread.h \
 		msw/printdlg.h \
 		msw/printwin.h \
 		msw/private.h \
@@ -554,7 +577,8 @@ MSW_HEADERS = \
 		msw/xpmhand.h
 
 UNIX_HEADERS = \
-		unix/execute.h
+		unix/execute.h \
+		unix/fontutil.h
 
 GENERIC_HEADERS = \
 		generic/caret.h \
@@ -565,6 +589,7 @@ GENERIC_HEADERS = \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
+		generic/gridg.h \
 		generic/helpext.h \
 		generic/helphtml.h \
 		generic/helpwxht.h \
@@ -584,7 +609,8 @@ GENERIC_HEADERS = \
 		generic/statusbr.h \
 		generic/tabg.h \
 		generic/textdlgg.h \
-		generic/treectrl.h
+		generic/treectrl.h \
+		generic/wizard.h
 
 PROTOCOL_HEADERS = \
 		protocol/file.h \
@@ -603,8 +629,8 @@ HTML_HEADERS = \
 		html/htmlpars.h \
 		html/htmltag.h \
 		html/htmlwin.h \
+		html/htmprint.h \
 		html/m_templ.h \
-		html/version.h \
 		html/winpars.h
 
 GTK_GENERICOBJS = \
@@ -616,6 +642,7 @@ GTK_GENERICOBJS = \
 		dirdlgg.o \
 		filedlgg.o \
 		grid.o \
+		helpext.o \
 		helphtml.o \
 		helpwxht.o \
 		imaglist.o \
@@ -635,6 +662,8 @@ GTK_GENERICOBJS = \
 		scrolwin.o \
 		splitter.o \
 		statusbr.o \
+		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -649,6 +678,7 @@ GTK_GENERICDEPS = \
 		dirdlgg.d \
 		filedlgg.d \
 		grid.d \
+		helpext.d \
 		helphtml.d \
 		helpwxht.d \
 		imaglist.d \
@@ -668,6 +698,8 @@ GTK_GENERICDEPS = \
 		scrolwin.d \
 		splitter.d \
 		statusbr.d \
+		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -675,14 +707,20 @@ GTK_GENERICDEPS = \
 
 GTK_COMMONOBJS = \
 		parser.o \
+		appcmn.o \
+		choiccmn.o \
+		clipcmn.o \
 		cmndata.o \
 		config.o \
-		date.o \
+		ctrlcmn.o \
+		ctrlsub.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dobjcmn.o \
 		docmdi.o \
 		docview.o \
 		dynarray.o \
@@ -695,6 +733,7 @@ GTK_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -712,12 +751,16 @@ GTK_COMMONOBJS = \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
+		imagtiff.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
+		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
@@ -739,10 +782,8 @@ GTK_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -762,14 +803,20 @@ GTK_COMMONOBJS = \
 
 GTK_COMMONDEPS = \
 		parser.d \
+		appcmn.d \
+		choiccmn.d \
+		clipcmn.d \
 		cmndata.d \
 		config.d \
-		date.d \
+		ctrlcmn.d \
+		ctrlsub.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dobjcmn.d \
 		docmdi.d \
 		docview.d \
 		dynarray.d \
@@ -782,6 +829,7 @@ GTK_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -799,12 +847,16 @@ GTK_COMMONDEPS = \
 		imagpcx.d \
 		imagpng.d \
 		imagpnm.d \
+		imagtiff.d \
 		intl.d \
 		ipcbase.d \
 		layout.d \
+		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
@@ -826,10 +878,8 @@ GTK_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -892,6 +942,7 @@ GTK_GUIOBJS = \
 		settings.o \
 		slider.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statline.o \
@@ -951,6 +1002,7 @@ GTK_GUIDEPS = \
 		settings.d \
 		slider.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statline.d \
@@ -974,6 +1026,7 @@ MOTIF_GENERICOBJS = \
 		dirdlgg.o \
 		fontdlgg.o \
 		grid.o \
+		helpext.o \
 		helphtml.o \
 		helpwxht.o \
 		helpxlp.o \
@@ -997,6 +1050,7 @@ MOTIF_GENERICOBJS = \
 		statline.o \
 		statusbr.o \
 		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -1011,6 +1065,7 @@ MOTIF_GENERICDEPS = \
 		dirdlgg.d \
 		fontdlgg.d \
 		grid.d \
+		helpext.d \
 		helphtml.d \
 		helpwxht.d \
 		helpxlp.d \
@@ -1034,6 +1089,7 @@ MOTIF_GENERICDEPS = \
 		statline.d \
 		statusbr.d \
 		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -1041,16 +1097,20 @@ MOTIF_GENERICDEPS = \
 
 MOTIF_COMMONOBJS = \
 		parser.o \
+		appcmn.o \
 		choiccmn.o \
+		clipcmn.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
-		date.o \
+		ctrlsub.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dobjcmn.o \
 		docmdi.o \
 		docview.o \
 		dynarray.o \
@@ -1063,6 +1123,7 @@ MOTIF_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1080,18 +1141,21 @@ MOTIF_COMMONOBJS = \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
+		imagtiff.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
+		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
 		object.o \
 		objstrm.o \
-		odbc.o \
 		paper.o \
 		prntbase.o \
 		process.o \
@@ -1108,10 +1172,8 @@ MOTIF_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1131,16 +1193,20 @@ MOTIF_COMMONOBJS = \
 
 MOTIF_COMMONDEPS = \
 		parser.d \
+		appcmn.d \
 		choiccmn.d \
+		clipcmn.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
-		date.d \
+		ctrlsub.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dobjcmn.d \
 		docmdi.d \
 		docview.d \
 		dynarray.d \
@@ -1153,6 +1219,7 @@ MOTIF_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1170,18 +1237,21 @@ MOTIF_COMMONDEPS = \
 		imagpcx.d \
 		imagpng.d \
 		imagpnm.d \
+		imagtiff.d \
 		intl.d \
 		ipcbase.d \
 		layout.d \
+		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
 		object.d \
 		objstrm.d \
-		odbc.d \
 		paper.d \
 		prntbase.d \
 		process.d \
@@ -1198,10 +1268,8 @@ MOTIF_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1244,7 +1312,6 @@ MOTIF_GUIOBJS = \
 		dialog.o \
 		filedlg.o \
 		font.o \
-		fontenum.o \
 		frame.o \
 		gauge.o \
 		gdiobj.o \
@@ -1300,7 +1367,6 @@ MOTIF_GUIDEPS = \
 		dialog.d \
 		filedlg.d \
 		font.d \
-		fontenum.d \
 		frame.d \
 		gauge.d \
 		gdiobj.d \
@@ -1348,7 +1414,7 @@ MSW_GENERICOBJS = \
 		scrolwin.o \
 		splitter.o \
 		statusbr.o \
-		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		wizard.o
@@ -1370,23 +1436,27 @@ MSW_GENERICDEPS = \
 		scrolwin.d \
 		splitter.d \
 		statusbr.d \
-		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		wizard.d
 
 MSW_COMMONOBJS = \
 		parser.o \
+		appcmn.o \
 		choiccmn.o \
+		clipcmn.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
-		date.o \
+		ctrlsub.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dobjcmn.o \
 		docmdi.o \
 		docview.o \
 		dynarray.o \
@@ -1399,6 +1469,7 @@ MSW_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1416,12 +1487,16 @@ MSW_COMMONOBJS = \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
+		imagtiff.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
+		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
@@ -1444,10 +1519,8 @@ MSW_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1467,16 +1540,20 @@ MSW_COMMONOBJS = \
 
 MSW_COMMONDEPS = \
 		parser.d \
+		appcmn.d \
 		choiccmn.d \
+		clipcmn.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
-		date.d \
+		ctrlsub.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dobjcmn.d \
 		docmdi.d \
 		docview.d \
 		dynarray.d \
@@ -1489,6 +1566,7 @@ MSW_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1506,12 +1584,16 @@ MSW_COMMONDEPS = \
 		imagpcx.d \
 		imagpng.d \
 		imagpnm.d \
+		imagtiff.d \
 		intl.d \
 		ipcbase.d \
 		layout.d \
+		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
@@ -1534,10 +1616,8 @@ MSW_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1581,14 +1661,19 @@ MSW_GUIOBJS = \
 		dcscreen.o \
 		dde.o \
 		dialog.o \
+		dialup.o \
 		dib.o \
 		dibutils.o \
+		dir.o \
 		dragimag.o \
 		filedlg.o \
 		font.o \
 		fontdlg.o \
+		fontenum.o \
+		fontutil.o \
 		frame.o \
 		gauge95.o \
+		gdiimage.o \
 		gdiobj.o \
 		gsocket.o \
 		helpwin.o \
@@ -1610,7 +1695,6 @@ MSW_GUIOBJS = \
 		palette.o \
 		pen.o \
 		penwin.o \
-		pnghand.o \
 		printdlg.o \
 		printwin.o \
 		radiobox.o \
@@ -1622,6 +1706,7 @@ MSW_GUIOBJS = \
 		settings.o \
 		slider95.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statbr95.o \
@@ -1667,14 +1752,19 @@ MSW_GUIDEPS = \
 		dcscreen.d \
 		dde.d \
 		dialog.d \
+		dialup.d \
 		dib.d \
 		dibutils.d \
+		dir.d \
 		dragimag.d \
 		filedlg.d \
 		font.d \
 		fontdlg.d \
+		fontenum.d \
+		fontutil.d \
 		frame.d \
 		gauge95.d \
+		gdiimage.d \
 		gdiobj.d \
 		gsocket.d \
 		helpwin.d \
@@ -1696,7 +1786,6 @@ MSW_GUIDEPS = \
 		palette.d \
 		pen.d \
 		penwin.d \
-		pnghand.d \
 		printdlg.d \
 		printwin.d \
 		radiobox.d \
@@ -1708,6 +1797,7 @@ MSW_GUIDEPS = \
 		settings.d \
 		slider95.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statbr95.d \
@@ -1728,8 +1818,10 @@ MSW_GUIDEPS = \
 		xpmhand.d
 
 BASE_OBJS = \
+		init.o \
+		appcmn.o \
 		config.o \
-		date.o \
+		datetime.o \
 		dynarray.o \
 		dynlib.o \
 		event.o \
@@ -1740,10 +1832,10 @@ BASE_OBJS = \
 		filefn.o \
 		filesys.o \
 		hash.o \
-		init.o \
 		intl.o \
 		list.o \
 		log.o \
+		longlong.o \
 		mimetype.o \
 		module.o \
 		object.o \
@@ -1752,18 +1844,21 @@ BASE_OBJS = \
 		stream.o \
 		string.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
 		utilscmn.o \
 		variant.o \
 		wxchar.o \
+		dir.o \
+		threadpsx.o \
 		utilsunx.o
 
 BASE_DEPS = \
+		init.d \
+		appcmn.d \
 		config.d \
-		date.d \
+		datetime.d \
 		dynarray.d \
 		dynlib.d \
 		event.d \
@@ -1774,10 +1869,10 @@ BASE_DEPS = \
 		filefn.d \
 		filesys.d \
 		hash.d \
-		init.d \
 		intl.d \
 		list.d \
 		log.d \
+		longlong.d \
 		mimetype.d \
 		module.d \
 		object.d \
@@ -1786,13 +1881,14 @@ BASE_DEPS = \
 		stream.d \
 		string.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
 		utilscmn.d \
 		variant.d \
 		wxchar.d \
+		dir.d \
+		threadpsx.d \
 		utilsunx.d
 
 HTMLOBJS = \
@@ -1804,6 +1900,8 @@ HTMLOBJS = \
 		htmlpars.o \
 		htmltag.o \
 		htmlwin.o \
+		htmprint.o \
+		m_dflist.o \
 		m_fonts.o \
 		m_hline.o \
 		m_image.o \
@@ -1812,7 +1910,6 @@ HTMLOBJS = \
 		m_list.o \
 		m_pre.o \
 		m_tables.o \
-		search.o \
 		winpars.o
 
 HTMLDEPS = \
@@ -1824,6 +1921,8 @@ HTMLDEPS = \
 		htmlpars.d \
 		htmltag.d \
 		htmlwin.d \
+		htmprint.d \
+		m_dflist.d \
 		m_fonts.d \
 		m_hline.d \
 		m_image.d \
@@ -1832,17 +1931,22 @@ HTMLDEPS = \
 		m_list.d \
 		m_pre.d \
 		m_tables.d \
-		search.d \
 		winpars.d
 
 UNIX_OBJS = \
 		dialup.o \
+		dir.o \
+		fontenum.o \
+		fontutil.o \
 		gsocket.o \
 		threadpsx.o \
 		utilsunx.o
 
 UNIX_DEPS = \
 		dialup.d \
+		dir.d \
+		fontenum.d \
+		fontutil.d \
 		gsocket.d \
 		threadpsx.d \
 		utilsunx.d
@@ -1929,7 +2033,42 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o
 
-IODBCOBJS = \
+TIFFOBJS	= \
+		tif_aux.o \
+		tif_close.o \
+		tif_codec.o \
+		tif_compress.o \
+		tif_dir.o \
+		tif_dirinfo.o \
+		tif_dirread.o \
+		tif_dirwrite.o \
+		tif_dumpmode.o \
+		tif_error.o \
+		tif_fax3.o \
+		tif_fax3sm.o \
+		tif_getimage.o \
+		tif_jpeg.o \
+		tif_flush.o \
+		tif_lzw.o \
+		tif_luv.o \
+		tif_next.o \
+		tif_open.o \
+		tif_packbits.o \
+		tif_pixarlog.o \
+		tif_predict.o \
+		tif_print.o \
+		tif_read.o \
+		tif_swab.o \
+		tif_strip.o \
+		tif_thunder.o \
+		tif_tile.o \
+		tif_unix.o \
+		tif_version.o \
+		tif_warning.o \
+		tif_write.o \
+		tif_zip.o
+
+IODBC_OBJS = \
 		catalog.o \
 		connect.o \
 		dlf.o \
@@ -1955,13 +2094,16 @@ GENERICOBJS = @GENERICOBJS@
 GENERICDEPS = @GENERICDEPS@
 UNIXOBJS = @UNIXOBJS@
 UNIXDEPS = @UNIXDEPS@
+IODBCOBJS = @IODBCOBJS@
 
-OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
+OBJECTS = @ALL_OBJECTS@
 
 DEPFILES = @ALL_DEPFILES@
 
 HEADERS = @ALL_HEADERS@
 
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+
 all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
@@ -1971,7 +2113,7 @@ all: @WX_ALL@
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
-	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 	
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
@@ -1989,7 +2131,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
 	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
 	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
 	
-$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
+$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
 	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -2014,7 +2156,7 @@ lexer.c:	$(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -2031,7 +2173,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 	$(INSTALL) -d $(libdir)/wx/include
 	$(INSTALL) -d $(libdir)/wx/include/wx
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-	$(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
 	
 	$(INSTALL) -d $(datadir)/wx
 	$(INSTALL) -d $(datadir)/wx/afm
@@ -2055,8 +2197,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 write_message:
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
-	@echo " platforms (e.g. Linux, Solaris) you'll now have to run"
-	@echo " ldconfig if you installed a shared library."
+	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+	@echo " if you installed a shared library."
 	@echo " "
 	@echo " wxWindows comes with  no guarantees  and doesn't claim"
 	@echo " to be suitable for any purpose."
@@ -2105,6 +2247,7 @@ ALL_DIST:
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
 	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+	cp $(WXDIR)/configure.in $(DISTDIR)
 	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
 	cp $(WXDIR)/config.guess $(DISTDIR)
@@ -2143,7 +2286,9 @@ ALL_DIST:
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
+	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/zlib
+	mkdir $(DISTDIR)/src/iodbc
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -2153,9 +2298,7 @@ ALL_DIST:
 	cp $(COMMDIR)/*.y $(DISTDIR)/src/common
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
 	cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-	cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
 	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-	cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -2167,6 +2310,16 @@ ALL_DIST:
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
+	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
 GTK_DIST:
 	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
@@ -2202,63 +2355,117 @@ MSW_DIST:
 SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples
 	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+	
 	mkdir $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
+	cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
+	
 	mkdir $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
+	cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
+	
 	mkdir $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
+	cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
+	
 	mkdir $(DISTDIR)/samples/controls
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
+	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
+	
 	mkdir $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
+	cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
+	
 	mkdir $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+	
+	mkdir $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
+	
 	mkdir $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+	cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+	
 	mkdir $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+	cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
+	cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+	
 	mkdir $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+	cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+	
 	mkdir $(DISTDIR)/samples/docvwmdi
 	cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+	cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
 	cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
 	cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+	
 	mkdir $(DISTDIR)/samples/drawing
 	cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+	cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
 	cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
 	cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+	
 	mkdir $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
+	cp $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+	
+	mkdir $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/makefile.unx $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.h $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+	
+	mkdir $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
+	
+	mkdir $(DISTDIR)/samples/help
+	mkdir $(DISTDIR)/samples/help/doc
+	cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
+	
 	mkdir $(DISTDIR)/samples/html
 	cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
 	mkdir $(DISTDIR)/samples/html/about
@@ -2272,12 +2479,13 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
 	mkdir $(DISTDIR)/samples/html/help/helpfiles
 	cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+	mkdir $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
 	mkdir $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
 	mkdir $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
@@ -2299,49 +2507,118 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
 	cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
 	cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+	
 	mkdir $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
+	cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+	
+	mkdir $(DISTDIR)/samples/internat
+	mkdir $(DISTDIR)/samples/internat/de
+	mkdir $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+	
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
+	cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+	
 	mkdir $(DISTDIR)/samples/listctrl
+	mkdir $(DISTDIR)/samples/listctrl/bitmaps
 	cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
+	cp $(SAMPDIR)/listctrl/makefile.unx $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-	mkdir $(DISTDIR)/samples/listctrl/bitmap
-	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+	cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+	
 	mkdir $(DISTDIR)/samples/mdi
+	mkdir $(DISTDIR)/samples/mdi/bitmaps
 	cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
+	cp $(SAMPDIR)/mdi/makefile.unx $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
+	cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
+	
+	mkdir $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck
+	
+	mkdir $(DISTDIR)/samples/menu
+	cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu
+	cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu
+	cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu
+	
 	mkdir $(DISTDIR)/samples/minifram
+	mkdir $(DISTDIR)/samples/minifram/bitmaps
 	cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
+	cp $(SAMPDIR)/minifram/makefile.unx $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-	mkdir $(DISTDIR)/samples/minifram/bitmap
-	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+	cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+	
 	mkdir $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
+	cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+	
+	mkdir $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+	
 	mkdir $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
+	
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+	
+	mkdir $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+	
+	mkdir $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+	
+	mkdir $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+	mkdir $(DISTDIR)/samples/propsize
+	cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
+	cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
+	cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
 	mkdir $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
@@ -2349,6 +2626,9 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+	mkdir $(DISTDIR)/samples/scrollsub
+	cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
+	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
 	mkdir $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
@@ -2362,10 +2642,9 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-	cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
-	mkdir $(DISTDIR)/samples/toolbar/bitmap
-	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+	mkdir $(DISTDIR)/samples/toolbar/bitmaps
+	cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
@@ -2399,24 +2678,33 @@ SAMPLES_DIST:
 UTILS_DIST:
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+	
 	mkdir $(DISTDIR)/utils/wxMMedia2
-	cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
 	mkdir $(DISTDIR)/utils/wxMMedia2/lib
+	mkdir $(DISTDIR)/utils/wxMMedia2/sample
+	cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
 	cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
-	mkdir $(DISTDIR)/utils/wxMMedia2/sample
 	cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
 	cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+	
 	mkdir $(DISTDIR)/utils/glcanvas
+	mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
 	cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
-	mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	
+	mkdir $(DISTDIR)/utils/ogl
+	mkdir $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
+	cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
+	
 MISC_DIST:
 	mkdir $(DISTDIR)/misc
 	mkdir $(DISTDIR)/misc/afm
@@ -2426,6 +2714,8 @@ MISC_DIST:
 	
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
 	cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+	mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples
+	cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../..
 	$(RM) -r _dist_dir
 
 clean: