X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e8d2f694e532c2bdce5e7ecc6b3709fdf6c3d68..8480b297e70a29b785421ded6db22ae024e35038:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 962e8a9924..b89ed941b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 17:48, 2000/01/03
+# This file was automatically generated by tmake at 18:29, 2000/01/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -47,7 +47,10 @@ 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)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+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) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -96,6 +99,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -114,9 +119,11 @@ 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
+DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
@@ -126,14 +133,18 @@ DOCDIR = $(WXDIR)/docs
 
 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
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
 
 BASE_HEADERS = \
 		app.h \
+		buffer.h \
+		cmdline.h \
 		date.h \
 		datetime.h \
+		datetime.inl \
 		debug.h \
 		defs.h \
 		dir.h \
@@ -145,14 +156,16 @@ BASE_HEADERS = \
 		fileconf.h \
 		hash.h \
 		intl.h \
+		ioswrap.h \
 		list.h \
 		log.h \
 		longlong.h \
+		memconf.h \
+		memory.h \
 		mimetype.h \
 		module.h \
 		object.h \
 		process.h \
-		setup.h \
 		strconv.h \
 		stream.h \
 		string.h \
@@ -165,6 +178,7 @@ BASE_HEADERS = \
 		utils.h \
 		variant.h \
 		version.h \
+		wfstream.h \
 		wx.h \
 		wxchar.h \
 		wxprec.h
@@ -186,6 +200,7 @@ WX_HEADERS = \
 		choicdlg.h \
 		choice.h \
 		clipbrd.h \
+		cmdline.h \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -198,6 +213,7 @@ WX_HEADERS = \
 		dataobj.h \
 		date.h \
 		datetime.h \
+		datetime.inl \
 		datstrm.h \
 		db.h \
 		dbtable.h \
@@ -240,6 +256,7 @@ WX_HEADERS = \
 		gauge.h \
 		gdicmn.h \
 		gdiobj.h \
+		geometry.h \
 		gifdecod.h \
 		grid.h \
 		gsocket.h \
@@ -262,6 +279,8 @@ WX_HEADERS = \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
+		isql.h \
+		isqlext.h \
 		joystick.h \
 		layout.h \
 		laywin.h \
@@ -273,6 +292,7 @@ WX_HEADERS = \
 		longlong.h \
 		matrix.h \
 		mdi.h \
+		memconf.h \
 		memory.h \
 		menu.h \
 		menuitem.h \
@@ -291,6 +311,7 @@ WX_HEADERS = \
 		panel.h \
 		paper.h \
 		pen.h \
+		plot.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -519,6 +540,7 @@ MSW_HEADERS = \
 		msw/dibutils.h \
 		msw/dirdlg.h \
 		msw/dragimag.h \
+		msw/enhmeta.h \
 		msw/filedlg.h \
 		msw/font.h \
 		msw/fontdlg.h \
@@ -539,6 +561,7 @@ MSW_HEADERS = \
 		msw/menu.h \
 		msw/menuitem.h \
 		msw/metafile.h \
+		msw/mimetype.h \
 		msw/minifram.h \
 		msw/msgdlg.h \
 		msw/msvcrt.h \
@@ -578,9 +601,85 @@ 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
+		unix/fontutil.h \
+		unix/gsockunx.h \
+		unix/mimetype.h
 
 GENERIC_HEADERS = \
 		generic/calctrl.h \
@@ -603,6 +702,7 @@ GENERIC_HEADERS = \
 		generic/msgdlgg.h \
 		generic/notebook.h \
 		generic/panelg.h \
+		generic/plot.h \
 		generic/printps.h \
 		generic/prntdlgg.h \
 		generic/progdlgg.h \
@@ -656,6 +756,7 @@ GTK_GENERICOBJS = \
 		msgdlgg.o \
 		numdlgg.o \
 		panelg.o \
+		plot.o \
 		printps.o \
 		prntdlgg.o \
 		progdlgg.o \
@@ -693,6 +794,7 @@ GTK_GENERICDEPS = \
 		msgdlgg.d \
 		numdlgg.d \
 		panelg.d \
+		plot.d \
 		printps.d \
 		prntdlgg.d \
 		progdlgg.d \
@@ -715,6 +817,7 @@ GTK_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
@@ -725,6 +828,7 @@ GTK_COMMONOBJS = \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dndcmn.o \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
@@ -745,6 +849,7 @@ GTK_COMMONOBJS = \
 		fs_zip.o \
 		ftp.o \
 		gdicmn.o \
+		geometry.o \
 		gifdecod.o \
 		hash.o \
 		helpbase.o \
@@ -767,7 +872,7 @@ GTK_COMMONOBJS = \
 		longlong.o \
 		memory.o \
 		menucmn.o \
-		mimetype.o \
+		mimecmn.o \
 		module.o \
 		mstream.o \
 		object.o \
@@ -812,6 +917,7 @@ GTK_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
@@ -822,6 +928,7 @@ GTK_COMMONDEPS = \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dndcmn.d \
 		dobjcmn.d \
 		docmdi.d \
 		docview.d \
@@ -842,6 +949,7 @@ GTK_COMMONDEPS = \
 		fs_zip.d \
 		ftp.d \
 		gdicmn.d \
+		geometry.d \
 		gifdecod.d \
 		hash.d \
 		helpbase.d \
@@ -864,7 +972,7 @@ GTK_COMMONDEPS = \
 		longlong.d \
 		memory.d \
 		menucmn.d \
-		mimetype.d \
+		mimecmn.d \
 		module.d \
 		mstream.d \
 		object.d \
@@ -1046,6 +1154,7 @@ MOTIF_GENERICOBJS = \
 		notebook.o \
 		numdlgg.o \
 		panelg.o \
+		plot.o \
 		printps.o \
 		prntdlgg.o \
 		progdlgg.o \
@@ -1086,6 +1195,7 @@ MOTIF_GENERICDEPS = \
 		notebook.d \
 		numdlgg.d \
 		panelg.d \
+		plot.d \
 		printps.d \
 		prntdlgg.d \
 		progdlgg.d \
@@ -1109,6 +1219,7 @@ MOTIF_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
@@ -1119,6 +1230,7 @@ MOTIF_COMMONOBJS = \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dndcmn.o \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
@@ -1139,6 +1251,7 @@ MOTIF_COMMONOBJS = \
 		fs_zip.o \
 		ftp.o \
 		gdicmn.o \
+		geometry.o \
 		gifdecod.o \
 		hash.o \
 		helpbase.o \
@@ -1161,7 +1274,7 @@ MOTIF_COMMONOBJS = \
 		longlong.o \
 		memory.o \
 		menucmn.o \
-		mimetype.o \
+		mimecmn.o \
 		module.o \
 		mstream.o \
 		object.o \
@@ -1206,6 +1319,7 @@ MOTIF_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
@@ -1216,6 +1330,7 @@ MOTIF_COMMONDEPS = \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dndcmn.d \
 		dobjcmn.d \
 		docmdi.d \
 		docview.d \
@@ -1236,6 +1351,7 @@ MOTIF_COMMONDEPS = \
 		fs_zip.d \
 		ftp.d \
 		gdicmn.d \
+		geometry.d \
 		gifdecod.d \
 		hash.d \
 		helpbase.d \
@@ -1258,7 +1374,7 @@ MOTIF_COMMONDEPS = \
 		longlong.d \
 		memory.d \
 		menucmn.d \
-		mimetype.d \
+		mimecmn.d \
 		module.d \
 		mstream.d \
 		object.d \
@@ -1418,6 +1534,7 @@ MSW_GENERICOBJS = \
 		logg.o \
 		numdlgg.o \
 		panelg.o \
+		plot.o \
 		progdlgg.o \
 		prop.o \
 		propform.o \
@@ -1441,6 +1558,7 @@ MSW_GENERICDEPS = \
 		logg.d \
 		numdlgg.d \
 		panelg.d \
+		plot.d \
 		progdlgg.d \
 		prop.d \
 		propform.d \
@@ -1459,6 +1577,7 @@ MSW_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
@@ -1469,6 +1588,7 @@ MSW_COMMONOBJS = \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dndcmn.o \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
@@ -1489,6 +1609,7 @@ MSW_COMMONOBJS = \
 		fs_zip.o \
 		ftp.o \
 		gdicmn.o \
+		geometry.o \
 		gifdecod.o \
 		hash.o \
 		helpbase.o \
@@ -1511,7 +1632,7 @@ MSW_COMMONOBJS = \
 		longlong.o \
 		memory.o \
 		menucmn.o \
-		mimetype.o \
+		mimecmn.o \
 		module.o \
 		mstream.o \
 		object.o \
@@ -1557,6 +1678,7 @@ MSW_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
@@ -1567,6 +1689,7 @@ MSW_COMMONDEPS = \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dndcmn.d \
 		dobjcmn.d \
 		docmdi.d \
 		docview.d \
@@ -1587,6 +1710,7 @@ MSW_COMMONDEPS = \
 		fs_zip.d \
 		ftp.d \
 		gdicmn.d \
+		geometry.d \
 		gifdecod.d \
 		hash.d \
 		helpbase.d \
@@ -1609,7 +1733,7 @@ MSW_COMMONDEPS = \
 		longlong.d \
 		memory.d \
 		menucmn.d \
-		mimetype.d \
+		mimecmn.d \
 		module.d \
 		mstream.d \
 		object.d \
@@ -1681,6 +1805,7 @@ MSW_GUIOBJS = \
 		dibutils.o \
 		dir.o \
 		dragimag.o \
+		enhmeta.o \
 		filedlg.o \
 		font.o \
 		fontdlg.o \
@@ -1702,6 +1827,7 @@ MSW_GUIOBJS = \
 		menu.o \
 		menuitem.o \
 		metafile.o \
+		mimetype.o \
 		minifram.o \
 		msgdlg.o \
 		nativdlg.o \
@@ -1772,6 +1898,7 @@ MSW_GUIDEPS = \
 		dibutils.d \
 		dir.d \
 		dragimag.d \
+		enhmeta.d \
 		filedlg.d \
 		font.d \
 		fontdlg.d \
@@ -1793,6 +1920,7 @@ MSW_GUIDEPS = \
 		menu.d \
 		menuitem.d \
 		metafile.d \
+		mimetype.d \
 		minifram.d \
 		msgdlg.d \
 		nativdlg.d \
@@ -1832,9 +1960,442 @@ 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 \
+		plot.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 \
+		plot.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 \
+		dndcmn.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 \
+		geometry.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 \
+		mimecmn.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 \
+		dndcmn.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 \
+		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 \
+		intl.d \
+		ipcbase.d \
+		layout.d \
+		lboxcmn.d \
+		list.d \
+		log.d \
+		longlong.d \
+		memory.d \
+		menucmn.d \
+		mimecmn.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 \
+		dir.o \
+		dirdlg.o \
+		dnd.o \
+		filedlg.o \
+		font.o \
+		fontdlg.o \
+		fontenum.o \
+		fontutil.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 \
+		mimetype.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 \
+		dir.d \
+		dirdlg.d \
+		dnd.d \
+		filedlg.d \
+		font.d \
+		fontdlg.d \
+		fontenum.d \
+		fontutil.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 \
+		mimetype.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 \
 		datetime.o \
 		dynarray.o \
@@ -1851,7 +2412,7 @@ BASE_OBJS = \
 		list.o \
 		log.o \
 		longlong.o \
-		mimetype.o \
+		mimecmn.o \
 		module.o \
 		object.o \
 		process.o \
@@ -1864,14 +2425,17 @@ BASE_OBJS = \
 		txtstrm.o \
 		utilscmn.o \
 		variant.o \
+		wfstream.o \
 		wxchar.o \
 		dir.o \
+		mimetype.o \
 		threadpsx.o \
 		utilsunx.o
 
 BASE_DEPS = \
 		init.d \
 		appcmn.d \
+		cmdline.d \
 		config.d \
 		datetime.d \
 		dynarray.d \
@@ -1888,7 +2452,7 @@ BASE_DEPS = \
 		list.d \
 		log.d \
 		longlong.d \
-		mimetype.d \
+		mimecmn.d \
 		module.d \
 		object.d \
 		process.d \
@@ -1901,8 +2465,10 @@ BASE_DEPS = \
 		txtstrm.d \
 		utilscmn.d \
 		variant.d \
+		wfstream.d \
 		wxchar.d \
 		dir.d \
+		mimetype.d \
 		threadpsx.d \
 		utilsunx.d
 
@@ -1923,6 +2489,7 @@ HTMLOBJS = \
 		m_layout.o \
 		m_links.o \
 		m_list.o \
+		m_meta.o \
 		m_pre.o \
 		m_tables.o \
 		winpars.o
@@ -1944,6 +2511,7 @@ HTMLDEPS = \
 		m_layout.d \
 		m_links.d \
 		m_list.d \
+		m_meta.d \
 		m_pre.d \
 		m_tables.d \
 		winpars.d
@@ -1954,6 +2522,7 @@ UNIX_OBJS = \
 		fontenum.o \
 		fontutil.o \
 		gsocket.o \
+		mimetype.o \
 		threadpsx.o \
 		utilsunx.o
 
@@ -1963,6 +2532,7 @@ UNIX_DEPS = \
 		fontenum.d \
 		fontutil.d \
 		gsocket.d \
+		mimetype.d \
 		threadpsx.d \
 		utilsunx.d
 
@@ -2163,14 +2733,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..."
@@ -2179,7 +2757,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@
@@ -2190,25 +2767,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"
@@ -2221,7 +2790,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 " "
@@ -2368,18 +2937,52 @@ MSW_DIST:
 	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
+DEMOS_DIST:
+	mkdir $(DISTDIR)/demos
+	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
+
+	mkdir $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
+	
+	mkdir $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
+	
+	mkdir $(DISTDIR)/demos/life
+	mkdir $(DISTDIR)/demos/life/bitmaps
+	cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
+	
+	mkdir $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
+    
+	mkdir $(DISTDIR)/demos/fractal
+	cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
+	cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
+	cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
+	
 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
@@ -2463,24 +3066,21 @@ SAMPLES_DIST:
 	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/exec
+	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
+	cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
+	
+	mkdir $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
 	
 	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
@@ -2542,6 +3142,7 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
+	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
     
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
@@ -2563,14 +3164,6 @@ 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
@@ -2615,10 +3208,10 @@ SAMPLES_DIST:
 	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/makefile.unx $(DISTDIR)/samples/nettest
-	cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+	mkdir $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
 	
 	mkdir $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
@@ -2733,17 +3326,10 @@ SAMPLES_DIST:
 	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
-	cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
+	mkdir $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
 
 UTILS_DIST:
 	mkdir $(DISTDIR)/utils
@@ -2782,10 +3368,12 @@ MISC_DIST:
 	mkdir $(DISTDIR)/misc/gs_afm
 	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 	
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_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) ../..
+	mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos
+	cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../..
 	$(RM) -r _dist_dir
 
 clean: