X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e694c22c31908a1fe35736e8f3d687a83d8b4892..02b6f53109f46b32a1f0d482ad3190874d277423:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b8fce3c2cc..69e475d840 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 16:18, 1999/12/08
+# This file was automatically generated by tmake at 17:13, 2000/01/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -47,7 +47,7 @@ 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):$(VP11)
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -96,6 +96,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -114,6 +116,7 @@ ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+PMDIR    = $(WXDIR)/src/os2
 ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
@@ -132,7 +135,10 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 BASE_HEADERS = \
 		app.h \
+		buffer.h \
+		cmdline.h \
 		date.h \
+		datetime.h \
 		debug.h \
 		defs.h \
 		dir.h \
@@ -144,14 +150,15 @@ BASE_HEADERS = \
 		fileconf.h \
 		hash.h \
 		intl.h \
+		ioswrap.h \
 		list.h \
 		log.h \
 		longlong.h \
+		memory.h \
 		mimetype.h \
 		module.h \
 		object.h \
 		process.h \
-		setup.h \
 		strconv.h \
 		stream.h \
 		string.h \
@@ -164,6 +171,7 @@ BASE_HEADERS = \
 		utils.h \
 		variant.h \
 		version.h \
+		wfstream.h \
 		wx.h \
 		wxchar.h \
 		wxprec.h
@@ -178,12 +186,14 @@ WX_HEADERS = \
 		buffer.h \
 		busyinfo.h \
 		button.h \
+		calctrl.h \
 		caret.h \
 		checkbox.h \
 		checklst.h \
 		choicdlg.h \
 		choice.h \
 		clipbrd.h \
+		cmdline.h \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -195,6 +205,7 @@ WX_HEADERS = \
 		cursor.h \
 		dataobj.h \
 		date.h \
+		datetime.h \
 		datstrm.h \
 		db.h \
 		dbtable.h \
@@ -217,6 +228,7 @@ WX_HEADERS = \
 		dragimag.h \
 		dynarray.h \
 		dynlib.h \
+		encconv.h \
 		event.h \
 		expr.h \
 		ffile.h \
@@ -246,8 +258,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 \
@@ -280,7 +299,6 @@ WX_HEADERS = \
 		panel.h \
 		paper.h \
 		pen.h \
-		pnghand.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -319,9 +337,7 @@ WX_HEADERS = \
 		tab.h \
 		tabctrl.h \
 		taskbar.h \
-		tbar95.h \
 		tbarbase.h \
-		tbarmsw.h \
 		tbarsmpl.h \
 		textctrl.h \
 		textdlg.h \
@@ -537,8 +553,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 \
@@ -572,11 +586,86 @@ MSW_HEADERS = \
 		msw/winundef.h \
 		msw/xpmhand.h
 
+PM_HEADERS = \
+		os2/accel.h \
+		os2/app.h \
+		os2/bitmap.h \
+		os2/bmpbuttn.h \
+		os2/brush.h \
+		os2/button.h \
+		os2/checkbox.h \
+		os2/checklst.h \
+		os2/choice.h \
+		os2/clipbrd.h \
+		os2/colour.h \
+		os2/combobox.h \
+		os2/control.h \
+		os2/cursor.h \
+		os2/dataform.h \
+		os2/dataobj.h \
+		os2/dataobj2.h \
+		os2/dc.h \
+		os2/dcclient.h \
+		os2/dcmemory.h \
+		os2/dcprint.h \
+		os2/dcscreen.h \
+		os2/dialog.h \
+		os2/dirdlg.h \
+		os2/dnd.h \
+		os2/filedlg.h \
+		os2/font.h \
+		os2/fontdlg.h \
+		os2/frame.h \
+		os2/gauge.h \
+		os2/gdiimage.h \
+		os2/gdiobj.h \
+		os2/gsockos2.h \
+		os2/helpwin.h \
+		os2/icon.h \
+		os2/iniconf.h \
+		os2/joystick.h \
+		os2/listbox.h \
+		os2/mdi.h \
+		os2/menu.h \
+		os2/menuitem.h \
+		os2/metafile.h \
+		os2/minifram.h \
+		os2/msgdlg.h \
+		os2/notebook.h \
+		os2/palette.h \
+		os2/pen.h \
+		os2/pnghand.h \
+		os2/pngread.h \
+		os2/print.h \
+		os2/private.h \
+		os2/radiobox.h \
+		os2/radiobut.h \
+		os2/region.h \
+		os2/scrolbar.h \
+		os2/settings.h \
+		os2/setup0.h \
+		os2/slider.h \
+		os2/spinbutt.h \
+		os2/spinctrl.h \
+		os2/statbmp.h \
+		os2/statbox.h \
+		os2/statline.h \
+		os2/stattext.h \
+		os2/tabctrl.h \
+		os2/taskbar.h \
+		os2/textctrl.h \
+		os2/timer.h \
+		os2/toolbar.h \
+		os2/tooltip.h \
+		os2/wave.h \
+		os2/window.h
+
 UNIX_HEADERS = \
 		unix/execute.h \
 		unix/fontutil.h
 
 GENERIC_HEADERS = \
+		generic/calctrl.h \
 		generic/caret.h \
 		generic/choicdgg.h \
 		generic/colrdlgg.h \
@@ -605,7 +694,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 \
@@ -630,6 +720,7 @@ HTML_HEADERS = \
 
 GTK_GENERICOBJS = \
 		busyinfo.o \
+		calctrl.o \
 		caret.o \
 		choicdgg.o \
 		colrdlgg.o \
@@ -658,6 +749,7 @@ GTK_GENERICOBJS = \
 		splitter.o \
 		statusbr.o \
 		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -665,6 +757,7 @@ GTK_GENERICOBJS = \
 
 GTK_GENERICDEPS = \
 		busyinfo.d \
+		calctrl.d \
 		caret.d \
 		choicdgg.d \
 		colrdlgg.d \
@@ -693,6 +786,7 @@ GTK_GENERICDEPS = \
 		splitter.d \
 		statusbr.d \
 		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -703,11 +797,12 @@ GTK_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
@@ -718,6 +813,7 @@ GTK_COMMONOBJS = \
 		docview.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -751,6 +847,7 @@ GTK_COMMONOBJS = \
 		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
 		menucmn.o \
 		mimetype.o \
@@ -774,10 +871,8 @@ GTK_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -800,11 +895,12 @@ GTK_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
@@ -815,6 +911,7 @@ GTK_COMMONDEPS = \
 		docview.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -848,6 +945,7 @@ GTK_COMMONDEPS = \
 		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
 		menucmn.d \
 		mimetype.d \
@@ -871,10 +969,8 @@ GTK_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1014,6 +1110,7 @@ GTK_GUIDEPS = \
 
 MOTIF_GENERICOBJS = \
 		busyinfo.o \
+		calctrl.o \
 		caret.o \
 		choicdgg.o \
 		colrdlgg.o \
@@ -1045,6 +1142,7 @@ MOTIF_GENERICOBJS = \
 		statline.o \
 		statusbr.o \
 		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -1052,6 +1150,7 @@ MOTIF_GENERICOBJS = \
 
 MOTIF_GENERICDEPS = \
 		busyinfo.d \
+		calctrl.d \
 		caret.d \
 		choicdgg.d \
 		colrdlgg.d \
@@ -1083,6 +1182,7 @@ MOTIF_GENERICDEPS = \
 		statline.d \
 		statusbr.d \
 		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -1093,11 +1193,12 @@ MOTIF_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
@@ -1108,6 +1209,7 @@ MOTIF_COMMONOBJS = \
 		docview.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -1141,6 +1243,7 @@ MOTIF_COMMONOBJS = \
 		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
 		menucmn.o \
 		mimetype.o \
@@ -1164,10 +1267,8 @@ MOTIF_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1190,11 +1291,12 @@ MOTIF_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
@@ -1205,6 +1307,7 @@ MOTIF_COMMONDEPS = \
 		docview.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -1238,6 +1341,7 @@ MOTIF_COMMONDEPS = \
 		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
 		menucmn.d \
 		mimetype.d \
@@ -1261,10 +1365,8 @@ MOTIF_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1394,6 +1496,7 @@ MOTIF_GUIDEPS = \
 
 MSW_GENERICOBJS = \
 		busyinfo.o \
+		calctrl.o \
 		choicdgg.o \
 		dirdlgg.o \
 		grid.o \
@@ -1409,13 +1512,14 @@ MSW_GENERICOBJS = \
 		scrolwin.o \
 		splitter.o \
 		statusbr.o \
-		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		wizard.o
 
 MSW_GENERICDEPS = \
 		busyinfo.d \
+		calctrl.d \
 		choicdgg.d \
 		dirdlgg.d \
 		grid.d \
@@ -1431,7 +1535,7 @@ MSW_GENERICDEPS = \
 		scrolwin.d \
 		splitter.d \
 		statusbr.d \
-		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		wizard.d
@@ -1441,11 +1545,12 @@ MSW_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
@@ -1456,6 +1561,7 @@ MSW_COMMONOBJS = \
 		docview.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -1489,6 +1595,7 @@ MSW_COMMONOBJS = \
 		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
 		menucmn.o \
 		mimetype.o \
@@ -1513,10 +1620,8 @@ MSW_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1539,11 +1644,12 @@ MSW_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
@@ -1554,6 +1660,7 @@ MSW_COMMONDEPS = \
 		docview.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -1587,6 +1694,7 @@ MSW_COMMONDEPS = \
 		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
 		menucmn.d \
 		mimetype.d \
@@ -1611,10 +1719,8 @@ MSW_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1692,7 +1798,6 @@ MSW_GUIOBJS = \
 		palette.o \
 		pen.o \
 		penwin.o \
-		pnghand.o \
 		printdlg.o \
 		printwin.o \
 		radiobox.o \
@@ -1784,7 +1889,6 @@ MSW_GUIDEPS = \
 		palette.d \
 		pen.d \
 		penwin.d \
-		pnghand.d \
 		printdlg.d \
 		printwin.d \
 		radiobox.d \
@@ -1816,11 +1920,430 @@ MSW_GUIDEPS = \
 		window.d \
 		xpmhand.d
 
+PM_GENERICOBJS = \
+		busyinfo.o \
+		calctrl.o \
+		caret.o \
+		choicdgg.o \
+		colrdlgg.o \
+		dcpsg.o \
+		grid.o \
+		helpext.o \
+		helphtml.o \
+		helpwxht.o \
+		helpxlp.o \
+		imaglist.o \
+		laywin.o \
+		listctrl.o \
+		logg.o \
+		msgdlgg.o \
+		numdlgg.o \
+		panelg.o \
+		printps.o \
+		prntdlgg.o \
+		progdlgg.o \
+		prop.o \
+		propform.o \
+		proplist.o \
+		sashwin.o \
+		scrolwin.o \
+		splitter.o \
+		statusbr.o \
+		tbarsmpl.o \
+		textdlgg.o \
+		tipdlg.o \
+		treectrl.o \
+		wizard.o
+
+PM_GENERICDEPS = \
+		busyinfo.d \
+		calctrl.d \
+		caret.d \
+		choicdgg.d \
+		colrdlgg.d \
+		dcpsg.d \
+		grid.d \
+		helpext.d \
+		helphtml.d \
+		helpwxht.d \
+		helpxlp.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 \
+		scrolwin.d \
+		splitter.d \
+		statusbr.d \
+		tbarsmpl.d \
+		textdlgg.d \
+		tipdlg.d \
+		treectrl.d \
+		wizard.d
+
+PM_COMMONOBJS = \
+		parser.o \
+		appcmn.o \
+		choiccmn.o \
+		clipcmn.o \
+		cmdline.o \
+		cmndata.o \
+		config.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 \
+		dynlib.o \
+		encconv.o \
+		event.o \
+		extended.o \
+		ffile.o \
+		file.o \
+		fileconf.o \
+		filefn.o \
+		filesys.o \
+		fontcmn.o \
+		fontmap.o \
+		framecmn.o \
+		fs_inet.o \
+		fs_zip.o \
+		ftp.o \
+		gdicmn.o \
+		gifdecod.o \
+		hash.o \
+		helpbase.o \
+		http.o \
+		imagall.o \
+		imagbmp.o \
+		image.o \
+		imaggif.o \
+		imagjpeg.o \
+		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 \
+		protocol.o \
+		resource.o \
+		sckaddr.o \
+		sckfile.o \
+		sckipc.o \
+		sckstrm.o \
+		serbase.o \
+		sizer.o \
+		socket.o \
+		strconv.o \
+		stream.o \
+		string.o \
+		tbarbase.o \
+		textcmn.o \
+		textfile.o \
+		timercmn.o \
+		tokenzr.o \
+		txtstrm.o \
+		unzip.o \
+		url.o \
+		utilscmn.o \
+		valgen.o \
+		validate.o \
+		valtext.o \
+		variant.o \
+		wfstream.o \
+		wincmn.o \
+		wxchar.o \
+		wxexpr.o \
+		zipstrm.o \
+		zstream.o
+
+PM_COMMONDEPS = \
+		parser.d \
+		appcmn.d \
+		choiccmn.d \
+		clipcmn.d \
+		cmdline.d \
+		cmndata.d \
+		config.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 \
+		dynlib.d \
+		encconv.d \
+		event.d \
+		extended.d \
+		ffile.d \
+		file.d \
+		fileconf.d \
+		filefn.d \
+		filesys.d \
+		fontcmn.d \
+		fontmap.d \
+		framecmn.d \
+		fs_inet.d \
+		fs_zip.d \
+		ftp.d \
+		gdicmn.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 \
+		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 \
+		protocol.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 \
+		tokenzr.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 \
+		zipstrm.d \
+		zstream.d
+
+PM_GUIOBJS = \
+		accel.o \
+		app.o \
+		bitmap.o \
+		bmpbuttn.o \
+		brush.o \
+		button.o \
+		checkbox.o \
+		checklst.o \
+		choice.o \
+		clipbrd.o \
+		colour.o \
+		combobox.o \
+		control.o \
+		cursor.o \
+		data.o \
+		dataobj.o \
+		dc.o \
+		dcclient.o \
+		dcmemory.o \
+		dcprint.o \
+		dcscreen.o \
+		dialog.o \
+		dirdlg.o \
+		dnd.o \
+		filedlg.o \
+		font.o \
+		fontdlg.o \
+		frame.o \
+		gauge.o \
+		gdiimage.o \
+		gdiobj.o \
+		gsocket.o \
+		helpwin.o \
+		icon.o \
+		iniconf.o \
+		joystick.o \
+		listbox.o \
+		main.o \
+		mdi.o \
+		menu.o \
+		menuitem.o \
+		metafile.o \
+		minifram.o \
+		msgdlg.o \
+		nativdlg.o \
+		notebook.o \
+		ownerdrw.o \
+		palette.o \
+		pen.o \
+		print.o \
+		radiobox.o \
+		radiobut.o \
+		region.o \
+		scrolbar.o \
+		settings.o \
+		slider.o \
+		spinbutt.o \
+		spinctrl.o \
+		statbmp.o \
+		statbox.o \
+		statline.o \
+		stattext.o \
+		tabctrl.o \
+		taskbar.o \
+		textctrl.o \
+		thread.o \
+		timer.o \
+		toolbar.o \
+		tooltip.o \
+		utils.o \
+		utilsexc.o \
+		wave.o \
+		window.o
+
+PM_GUIDEPS = \
+		accel.d \
+		app.d \
+		bitmap.d \
+		bmpbuttn.d \
+		brush.d \
+		button.d \
+		checkbox.d \
+		checklst.d \
+		choice.d \
+		clipbrd.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 \
+		dirdlg.d \
+		dnd.d \
+		filedlg.d \
+		font.d \
+		fontdlg.d \
+		frame.d \
+		gauge.d \
+		gdiimage.d \
+		gdiobj.d \
+		gsocket.d \
+		helpwin.d \
+		icon.d \
+		iniconf.d \
+		joystick.d \
+		listbox.d \
+		main.d \
+		mdi.d \
+		menu.d \
+		menuitem.d \
+		metafile.d \
+		minifram.d \
+		msgdlg.d \
+		nativdlg.d \
+		notebook.d \
+		ownerdrw.d \
+		palette.d \
+		pen.d \
+		print.d \
+		radiobox.d \
+		radiobut.d \
+		region.d \
+		scrolbar.d \
+		settings.d \
+		slider.d \
+		spinbutt.d \
+		spinctrl.d \
+		statbmp.d \
+		statbox.d \
+		statline.d \
+		stattext.d \
+		tabctrl.d \
+		taskbar.d \
+		textctrl.d \
+		thread.d \
+		timer.d \
+		toolbar.d \
+		tooltip.d \
+		utils.d \
+		utilsexc.d \
+		wave.d \
+		window.d
+
 BASE_OBJS = \
 		init.o \
 		appcmn.o \
+		cmdline.o \
 		config.o \
-		date.o \
+		datetime.o \
 		dynarray.o \
 		dynlib.o \
 		event.o \
@@ -1834,6 +2357,7 @@ BASE_OBJS = \
 		intl.o \
 		list.o \
 		log.o \
+		longlong.o \
 		mimetype.o \
 		module.o \
 		object.o \
@@ -1842,12 +2366,12 @@ BASE_OBJS = \
 		stream.o \
 		string.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
 		utilscmn.o \
 		variant.o \
+		wfstream.o \
 		wxchar.o \
 		dir.o \
 		threadpsx.o \
@@ -1856,8 +2380,9 @@ BASE_OBJS = \
 BASE_DEPS = \
 		init.d \
 		appcmn.d \
+		cmdline.d \
 		config.d \
-		date.d \
+		datetime.d \
 		dynarray.d \
 		dynlib.d \
 		event.d \
@@ -1871,6 +2396,7 @@ BASE_DEPS = \
 		intl.d \
 		list.d \
 		log.d \
+		longlong.d \
 		mimetype.d \
 		module.d \
 		object.d \
@@ -1879,12 +2405,12 @@ BASE_DEPS = \
 		stream.d \
 		string.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
 		utilscmn.d \
 		variant.d \
+		wfstream.d \
 		wxchar.d \
 		dir.d \
 		threadpsx.d \
@@ -1900,6 +2426,7 @@ HTMLOBJS = \
 		htmltag.o \
 		htmlwin.o \
 		htmprint.o \
+		m_dflist.o \
 		m_fonts.o \
 		m_hline.o \
 		m_image.o \
@@ -1920,6 +2447,7 @@ HTMLDEPS = \
 		htmltag.d \
 		htmlwin.d \
 		htmprint.d \
+		m_dflist.d \
 		m_fonts.d \
 		m_hline.d \
 		m_image.d \
@@ -2145,14 +2673,22 @@ parser.c:	$(COMMDIR)/parser.y lexer.c
 
 lexer.c:	$(COMMDIR)/lexer.l
 	$(LEX) $(COMMDIR)/lexer.l
-	@sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+	@sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
 	sed -e "s/yy/PROIO_yy/g"            | \
 	sed -e "s/input/PROIO_input/g"      | \
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
-	@$(RM) lex.yy.c
+	@$(RM) @LEX_STEM@.c
 
 -include $(DEPFILES)
 
+afminstall:
+	$(INSTALL) -d $(datadir)
+	$(INSTALL) -d $(datadir)/wx
+	$(INSTALL) -d $(datadir)/wx/afm
+	$(INSTALL) -d $(datadir)/wx/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+	
 preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	@echo " "
 	@echo " Installing wxWindows..."
@@ -2161,7 +2697,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(prefix)
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(libdir)
-	$(INSTALL) -d $(datadir)
 
 	$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -2172,25 +2707,17 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
 	$(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
-	$(INSTALL) -d $(datadir)/wx/gs_afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-	
 	$(INSTALL) -d $(includedir)/wx
-	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/gtk
-	$(INSTALL) -d $(includedir)/wx/motif
-	$(INSTALL) -d $(includedir)/wx/html
-	$(INSTALL) -d $(includedir)/wx/protocol
-	$(INSTALL) -d $(includedir)/wx/unix
-	$(INSTALL) -d $(includedir)/wx/generic
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
 	done
-	
+
 write_message:
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
@@ -2203,7 +2730,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "
 
-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
 
 uninstall:
 	@echo " "
@@ -2268,6 +2795,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/protocol
 	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx 
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
@@ -2367,11 +2895,21 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
 	
+	mkdir $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
+	
 	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/console
+	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
+	
 	mkdir $(DISTDIR)/samples/controls
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
@@ -2386,14 +2924,6 @@ SAMPLES_DIST:
 	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
@@ -2450,11 +2980,21 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
 	
+	mkdir $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
+	
 	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/grid
+	cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
+	
 	mkdir $(DISTDIR)/samples/help
 	mkdir $(DISTDIR)/samples/help/doc
 	cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
@@ -2510,7 +3050,8 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
-	
+	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
+    
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
@@ -2531,6 +3072,14 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
 	
+	mkdir $(DISTDIR)/samples/life
+	mkdir $(DISTDIR)/samples/life/bitmaps
+	cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps
+	
 	mkdir $(DISTDIR)/samples/listctrl
 	mkdir $(DISTDIR)/samples/listctrl/bitmaps
 	cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
@@ -2577,26 +3126,39 @@ SAMPLES_DIST:
 	
 	mkdir $(DISTDIR)/samples/nettest
 	cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/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/resource
 	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
@@ -2608,65 +3170,85 @@ SAMPLES_DIST:
 	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
 	cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+    
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+	cp $(SAMPDIR)/scroll/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
+    
 	mkdir $(DISTDIR)/samples/splitter
+	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+    
 	mkdir $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
+	cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
+    
 	mkdir $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
+	cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
+    
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
 	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
 	cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+    
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
+    
 	mkdir $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
+    
 	mkdir $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
+    
 	mkdir $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem
+    
 	mkdir $(DISTDIR)/samples/wxsocket
 	cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
 	cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket