X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b1c4437193e2cdecd6c179789eb9e0cccec90c4..6411a32c16cde6aaa143235f6f1100ed6a87f21d:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a69e429835..f7b9d611b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,3 @@
-#
-# This file was automatically generated by tmake at 14:36, 1999/09/03
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
-
 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
@@ -43,9 +39,33 @@ 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
-
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)
+VP9 = @top_srcdir@/src/tiff
+VP10 = @top_srcdir@/src/zlib
+VP11 = @top_srcdir@/src/iodbc
+
+FTVP01 = @top_srcdir@/src/freetype/unix
+FTVP02 = @top_srcdir@/src/freetype/autohint
+FTVP03 = @top_srcdir@/src/freetype/base
+FTVP04 = @top_srcdir@/src/freetype/cff
+FTVP05 = @top_srcdir@/src/freetype/cid
+FTVP06 = @top_srcdir@/src/freetype/macfond
+FTVP07 = @top_srcdir@/src/freetype/otlayout
+FTVP08 = @top_srcdir@/src/freetype/psnames
+FTVP09 = @top_srcdir@/src/freetype/raster1
+FTVP10 = @top_srcdir@/src/freetype/sfnt
+FTVP11 = @top_srcdir@/src/freetype/smooth
+FTVP12 = @top_srcdir@/src/freetype/truetype
+FTVP13 = @top_srcdir@/src/freetype/type1
+FTVP14 = @top_srcdir@/src/freetype/type1z
+FTVP15 = @top_srcdir@/src/freetype/winfonts
+
+VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
+
+# 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)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -66,6 +86,8 @@ oldincludedir = /usr/include
 
 DESTDIR =
 
+localedir = $(datadir)/locale
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -78,7 +100,7 @@ INSTALL_DATA = @INSTALL_DATA@
 # my autoconf doesn't set this
 #INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # maybe do an additional chmod if needed?
-INSTALL_SCRIPT = @INSTALL@ 
+INSTALL_SCRIPT = @INSTALL@
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -94,6 +116,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -107,1603 +131,57 @@ 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
+PMDIR    = $(WXDIR)/src/os2
+ODBCDIR  = $(WXDIR)/src/iodbc
+FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
+DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
-DOCDIR = $(WXDIR)/docs
+DOCDIR   = $(WXDIR)/docs
+INTLDIR  = $(WXDIR)/locale
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
-DISTDIR = ./_dist_dir/wx$(TOOLKIT)
+WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
+
+WXARCHIVE_BZIP = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
+
+DISTDIR = ./_dist_dir/@DISTDIR@
+
 
 ############################## Files ##################################
 
-WX_HEADERS = \
-		accel.h \
-		app.h \
-		arrimpl.cpp \
-		bitmap.h \
-		bmpbuttn.h \
-		brush.h \
-		buffer.h \
-		busyinfo.h \
-		button.h \
-		caret.h \
-		checkbox.h \
-		checklst.h \
-		choicdlg.h \
-		choice.h \
-		clipbrd.h \
-		cmndata.h \
-		colordlg.h \
-		colour.h \
-		combobox.h \
-		confbase.h \
-		config.h \
-		control.h \
-		cursor.h \
-		dataobj.h \
-		date.h \
-		datstrm.h \
-		db.h \
-		dbtable.h \
-		dc.h \
-		dcclient.h \
-		dcmemory.h \
-		dcprint.h \
-		dcps.h \
-		dcscreen.h \
-		dde.h \
-		debug.h \
-		defs.h \
-		dialog.h \
-		dirdlg.h \
-		dnd.h \
-		docmdi.h \
-		docview.h \
-		dragimag.h \
-		dynarray.h \
-		dynlib.h \
-		event.h \
-		expr.h \
-		ffile.h \
-		file.h \
-		fileconf.h \
-		filedlg.h \
-		filefn.h \
-		filesys.h \
-		font.h \
-		fontdlg.h \
-		frame.h \
-		fs_inet.h \
-		fs_zip.h \
-		gauge.h \
-		gdicmn.h \
-		gdiobj.h \
-		gifdecod.h \
-		grid.h \
-		gsocket.h \
-		hash.h \
-		help.h \
-		helpbase.h \
-		helphtml.h \
-		helpwin.h \
-		helpxlp.h \
-		icon.h \
-		image.h \
-		imaglist.h \
-		intl.h \
-		ioswrap.h \
-		ipcbase.h \
-		joystick.h \
-		layout.h \
-		laywin.h \
-		list.h \
-		listbox.h \
-		listctrl.h \
-		listimpl.cpp \
-		log.h \
-		longlong.h \
-		matrix.h \
-		mdi.h \
-		memory.h \
-		menu.h \
-		menuitem.h \
-		metafile.h \
-		mimetype.h \
-		minifram.h \
-		module.h \
-		msgdlg.h \
-		mstream.h \
-		notebook.h \
-		object.h \
-		objstrm.h \
-		odbc.h \
-		ownerdrw.h \
-		palette.h \
-		panel.h \
-		paper.h \
-		pen.h \
-		pnghand.h \
-		print.h \
-		printdlg.h \
-		prntbase.h \
-		process.h \
-		progdlg.h \
-		prop.h \
-		propform.h \
-		proplist.h \
-		radiobox.h \
-		radiobut.h \
-		region.h \
-		resource.h \
-		sashwin.h \
-		sckaddr.h \
-		sckipc.h \
-		sckstrm.h \
-		scrolbar.h \
-		scrolwin.h \
-		serbase.h \
-		settings.h \
-		setup.h \
-		sizer.h \
-		slider.h \
-		socket.h \
-		spinbutt.h \
-		splitter.h \
-		statbmp.h \
-		statbox.h \
-		statline.h \
-		stattext.h \
-		statusbr.h \
-		strconv.h \
-		stream.h \
-		string.h \
-		tab.h \
-		tabctrl.h \
-		taskbar.h \
-		tbar95.h \
-		tbarbase.h \
-		tbarmsw.h \
-		tbarsmpl.h \
-		textctrl.h \
-		textdlg.h \
-		textfile.h \
-		thread.h \
-		time.h \
-		timer.h \
-		tipdlg.h \
-		tokenzr.h \
-		toolbar.h \
-		tooltip.h \
-		treectrl.h \
-		txtstrm.h \
-		types.h \
-		url.h \
-		utils.h \
-		valgen.h \
-		validate.h \
-		valtext.h \
-		variant.h \
-		version.h \
-		wave.h \
-		wfstream.h \
-		window.h \
-		wx.h \
-		wx_cw.h \
-		wx_cw_cm.h \
-		wx_cw_d.h \
-		wxchar.h \
-		wxexpr.h \
-		wxhtml.h \
-		wxprec.h \
-		xpmhand.h \
-		zipstrm.h \
-		zstream.h
-
-GTK_HEADERS = \
-		gtk/accel.h \
-		gtk/app.h \
-		gtk/bitmap.h \
-		gtk/bmpbuttn.h \
-		gtk/brush.h \
-		gtk/button.h \
-		gtk/checkbox.h \
-		gtk/checklst.h \
-		gtk/choice.h \
-		gtk/clipbrd.h \
-		gtk/colour.h \
-		gtk/combobox.h \
-		gtk/control.h \
-		gtk/cursor.h \
-		gtk/dataobj.h \
-		gtk/dc.h \
-		gtk/dcclient.h \
-		gtk/dcmemory.h \
-		gtk/dcscreen.h \
-		gtk/dialog.h \
-		gtk/dnd.h \
-		gtk/filedlg.h \
-		gtk/font.h \
-		gtk/fontdlg.h \
-		gtk/frame.h \
-		gtk/gauge.h \
-		gtk/gdiobj.h \
-		gtk/icon.h \
-		gtk/joystick.h \
-		gtk/listbox.h \
-		gtk/mdi.h \
-		gtk/menu.h \
-		gtk/menuitem.h \
-		gtk/minifram.h \
-		gtk/notebook.h \
-		gtk/palette.h \
-		gtk/pen.h \
-		gtk/radiobox.h \
-		gtk/radiobut.h \
-		gtk/region.h \
-		gtk/scrolbar.h \
-		gtk/settings.h \
-		gtk/slider.h \
-		gtk/spinbutt.h \
-		gtk/statbmp.h \
-		gtk/statbox.h \
-		gtk/statline.h \
-		gtk/stattext.h \
-		gtk/tbargtk.h \
-		gtk/textctrl.h \
-		gtk/timer.h \
-		gtk/tooltip.h \
-		gtk/treectrl.h \
-		gtk/wave.h \
-		gtk/win_gtk.h \
-		gtk/window.h
-
-MOTIF_HEADERS = \
-		motif/accel.h \
-		motif/app.h \
-		motif/bitmap.h \
-		motif/bmpbuttn.h \
-		motif/brush.h \
-		motif/button.h \
-		motif/checkbox.h \
-		motif/checklst.h \
-		motif/choice.h \
-		motif/clipbrd.h \
-		motif/colordlg.h \
-		motif/colour.h \
-		motif/combobox.h \
-		motif/control.h \
-		motif/cursor.h \
-		motif/dataobj.h \
-		motif/dc.h \
-		motif/dcclient.h \
-		motif/dcmemory.h \
-		motif/dcprint.h \
-		motif/dcscreen.h \
-		motif/dialog.h \
-		motif/dnd.h \
-		motif/filedlg.h \
-		motif/font.h \
-		motif/fontdlg.h \
-		motif/frame.h \
-		motif/gauge.h \
-		motif/gdiobj.h \
-		motif/icon.h \
-		motif/joystick.h \
-		motif/listbox.h \
-		motif/mdi.h \
-		motif/menu.h \
-		motif/menuitem.h \
-		motif/metafile.h \
-		motif/minifram.h \
-		motif/msgdlg.h \
-		motif/palette.h \
-		motif/pen.h \
-		motif/print.h \
-		motif/printdlg.h \
-		motif/private.h \
-		motif/radiobox.h \
-		motif/radiobut.h \
-		motif/region.h \
-		motif/scrolbar.h \
-		motif/settings.h \
-		motif/slider.h \
-		motif/spinbutt.h \
-		motif/statbmp.h \
-		motif/statbox.h \
-		motif/stattext.h \
-		motif/textctrl.h \
-		motif/timer.h \
-		motif/toolbar.h \
-		motif/window.h
-
-MSW_HEADERS = \
-		msw/accel.h \
-		msw/app.h \
-		msw/bitmap.h \
-		msw/bmpbuttn.h \
-		msw/brush.h \
-		msw/button.h \
-		msw/caret.h \
-		msw/checkbox.h \
-		msw/checklst.h \
-		msw/choice.h \
-		msw/clipbrd.h \
-		msw/colordlg.h \
-		msw/colour.h \
-		msw/combobox.h \
-		msw/control.h \
-		msw/curico.h \
-		msw/curicop.h \
-		msw/cursor.h \
-		msw/dc.h \
-		msw/dcclient.h \
-		msw/dcmemory.h \
-		msw/dcprint.h \
-		msw/dcscreen.h \
-		msw/dde.h \
-		msw/dialog.h \
-		msw/dib.h \
-		msw/dibutils.h \
-		msw/dirdlg.h \
-		msw/dragimag.h \
-		msw/filedlg.h \
-		msw/font.h \
-		msw/fontdlg.h \
-		msw/frame.h \
-		msw/gauge.h \
-		msw/gauge95.h \
-		msw/gaugemsw.h \
-		msw/gdiobj.h \
-		msw/helpwin.h \
-		msw/icon.h \
-		msw/imaglist.h \
-		msw/iniconf.h \
-		msw/joystick.h \
-		msw/listbox.h \
-		msw/listctrl.h \
-		msw/mdi.h \
-		msw/menu.h \
-		msw/menuitem.h \
-		msw/metafile.h \
-		msw/minifram.h \
-		msw/msgdlg.h \
-		msw/msvcrt.h \
-		msw/notebook.h \
-		msw/palette.h \
-		msw/pen.h \
-		msw/pnghand.h \
-		msw/pngread.h \
-		msw/printdlg.h \
-		msw/printwin.h \
-		msw/private.h \
-		msw/radiobox.h \
-		msw/radiobut.h \
-		msw/regconf.h \
-		msw/region.h \
-		msw/registry.h \
-		msw/scrolbar.h \
-		msw/settings.h \
-		msw/setup0.h \
-		msw/slider.h \
-		msw/slider95.h \
-		msw/slidrmsw.h \
-		msw/spinbutt.h \
-		msw/statbmp.h \
-		msw/statbox.h \
-		msw/statbr95.h \
-		msw/statline.h \
-		msw/stattext.h \
-		msw/tabctrl.h \
-		msw/taskbar.h \
-		msw/tbar95.h \
-		msw/tbarmsw.h \
-		msw/textctrl.h \
-		msw/timer.h \
-		msw/tooltip.h \
-		msw/treectrl.h \
-		msw/wave.h \
-		msw/window.h \
-		msw/winundef.h \
-		msw/xpmhand.h
-
-UNIX_HEADERS = \
-		unix/execute.h \
-		unix/gsockunx.h
-
-GENERIC_HEADERS = \
-		generic/caret.h \
-		generic/choicdgg.h \
-		generic/colrdlgg.h \
-		generic/dcpsg.h \
-		generic/dirdlgg.h \
-		generic/filedlgg.h \
-		generic/fontdlgg.h \
-		generic/gridg.h \
-		generic/helpext.h \
-		generic/helphtml.h \
-		generic/helpwxht.h \
-		generic/helpxlp.h \
-		generic/imaglist.h \
-		generic/laywin.h \
-		generic/listctrl.h \
-		generic/msgdlgg.h \
-		generic/notebook.h \
-		generic/panelg.h \
-		generic/printps.h \
-		generic/prntdlgg.h \
-		generic/progdlgg.h \
-		generic/sashwin.h \
-		generic/scrolwin.h \
-		generic/splitter.h \
-		generic/statusbr.h \
-		generic/tabg.h \
-		generic/textdlgg.h \
-		generic/treectrl.h
-
-PROTOCOL_HEADERS = \
-		protocol/file.h \
-		protocol/ftp.h \
-		protocol/http.h \
-		protocol/protocol.h
-
-HTML_HEADERS = \
-		html/forcelink.h \
-		html/htmlcell.h \
-		html/htmldefs.h \
-		html/htmlfilter.h \
-		html/htmlhelp.h \
-		html/htmlparser.h \
-		html/htmltag.h \
-		html/htmlwin.h \
-		html/htmlwinparser.h \
-		html/mod_templ.h \
-		html/version.h
-
-GTK_GENERICOBJS = \
-		busyinfo.o \
-		caret.o \
-		choicdgg.o \
-		colrdlgg.o \
-		dcpsg.o \
-		dirdlgg.o \
-		filedlgg.o \
-		gridg.o \
-		helphtml.o \
-		helpwxht.o \
-		imaglist.o \
-		laywin.o \
-		listctrl.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 \
-		textdlgg.o \
-		tipdlg.o \
-		treectrl.o \
-		wizard.o
-
-GTK_GENERICDEPS = \
-		busyinfo.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirdlgg.d \
-		filedlgg.d \
-		gridg.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.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 \
-		textdlgg.d \
-		tipdlg.d \
-		treectrl.d \
-		wizard.d
-
-GTK_COMMONOBJS = \
-		parser.o \
-		cmndata.o \
-		config.o \
-		date.o \
-		datstrm.o \
-		db.o \
-		dbtable.o \
-		dcbase.o \
-		dlgcmn.o \
-		docmdi.o \
-		docview.o \
-		dynarray.o \
-		dynlib.o \
-		event.o \
-		extended.o \
-		ffile.o \
-		file.o \
-		fileconf.o \
-		filefn.o \
-		filesys.o \
-		framecmn.o \
-		fs_inet.o \
-		fs_zip.o \
-		ftp.o \
-		gdicmn.o \
-		gifdecod.o \
-		hash.o \
-		helpbase.o \
-		http.o \
-		imagbmp.o \
-		image.o \
-		imaggif.o \
-		imagjpeg.o \
-		imagpcx.o \
-		imagpng.o \
-		imagpnm.o \
-		intl.o \
-		ipcbase.o \
-		layout.o \
-		list.o \
-		log.o \
-		memory.o \
-		mimetype.o \
-		module.o \
-		mstream.o \
-		object.o \
-		objstrm.o \
-		paper.o \
-		prntbase.o \
-		process.o \
-		protocol.o \
-		resource.o \
-		sckaddr.o \
-		sckfile.o \
-		sckipc.o \
-		sckstrm.o \
-		sizer.o \
-		socket.o \
-		strconv.o \
-		stream.o \
-		string.o \
-		tbarbase.o \
-		tbarsmpl.o \
-		textcmn.o \
-		textfile.o \
-		time.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
-
-GTK_COMMONDEPS = \
-		parser.d \
-		cmndata.d \
-		config.d \
-		date.d \
-		datstrm.d \
-		db.d \
-		dbtable.d \
-		dcbase.d \
-		dlgcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		event.d \
-		extended.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filesys.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_zip.d \
-		ftp.d \
-		gdicmn.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		list.d \
-		log.d \
-		memory.d \
-		mimetype.d \
-		module.d \
-		mstream.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		tbarbase.d \
-		tbarsmpl.d \
-		textcmn.d \
-		textfile.d \
-		time.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
-
-GTK_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 \
-		dcscreen.o \
-		dialog.o \
-		dnd.o \
-		font.o \
-		fontdlg.o \
-		frame.o \
-		gauge.o \
-		gdiobj.o \
-		gsockgtk.o \
-		icon.o \
-		listbox.o \
-		main.o \
-		mdi.o \
-		menu.o \
-		minifram.o \
-		notebook.o \
-		palette.o \
-		pen.o \
-		radiobox.o \
-		radiobut.o \
-		region.o \
-		scrolbar.o \
-		settings.o \
-		slider.o \
-		spinbutt.o \
-		statbmp.o \
-		statbox.o \
-		statline.o \
-		stattext.o \
-		tbargtk.o \
-		textctrl.o \
-		timer.o \
-		tooltip.o \
-		utilsgtk.o \
-		utilsres.o \
-		wave.o \
-		win_gtk.o \
-		window.o
-
-GTK_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 \
-		dcscreen.d \
-		dialog.d \
-		dnd.d \
-		font.d \
-		fontdlg.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		gsockgtk.d \
-		icon.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		minifram.d \
-		notebook.d \
-		palette.d \
-		pen.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		statbmp.d \
-		statbox.d \
-		statline.d \
-		stattext.d \
-		tbargtk.d \
-		textctrl.d \
-		timer.d \
-		tooltip.d \
-		utilsgtk.d \
-		utilsres.d \
-		wave.d \
-		win_gtk.d \
-		window.d
-
-MOTIF_GENERICOBJS = \
-		busyinfo.o \
-		caret.o \
-		choicdgg.o \
-		colrdlgg.o \
-		dcpsg.o \
-		dirdlgg.o \
-		fontdlgg.o \
-		gridg.o \
-		helphtml.o \
-		helpwxht.o \
-		helpxlp.o \
-		imaglist.o \
-		laywin.o \
-		listctrl.o \
-		msgdlgg.o \
-		notebook.o \
-		numdlgg.o \
-		panelg.o \
-		printps.o \
-		prntdlgg.o \
-		progdlgg.o \
-		prop.o \
-		propform.o \
-		proplist.o \
-		sashwin.o \
-		scrolwin.o \
-		splitter.o \
-		statline.o \
-		statusbr.o \
-		tabg.o \
-		textdlgg.o \
-		tipdlg.o \
-		treectrl.o \
-		wizard.o
-
-MOTIF_GENERICDEPS = \
-		busyinfo.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirdlgg.d \
-		fontdlgg.d \
-		gridg.d \
-		helphtml.d \
-		helpwxht.d \
-		helpxlp.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		msgdlgg.d \
-		notebook.d \
-		numdlgg.d \
-		panelg.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrolwin.d \
-		splitter.d \
-		statline.d \
-		statusbr.d \
-		tabg.d \
-		textdlgg.d \
-		tipdlg.d \
-		treectrl.d \
-		wizard.d
-
-MOTIF_COMMONOBJS = \
-		parser.o \
-		choiccmn.o \
-		cmndata.o \
-		config.o \
-		ctrlcmn.o \
-		date.o \
-		datstrm.o \
-		db.o \
-		dbtable.o \
-		dcbase.o \
-		dlgcmn.o \
-		docmdi.o \
-		docview.o \
-		dynarray.o \
-		dynlib.o \
-		event.o \
-		extended.o \
-		ffile.o \
-		file.o \
-		fileconf.o \
-		filefn.o \
-		filesys.o \
-		framecmn.o \
-		fs_inet.o \
-		fs_zip.o \
-		ftp.o \
-		gdicmn.o \
-		gifdecod.o \
-		hash.o \
-		helpbase.o \
-		http.o \
-		imagbmp.o \
-		image.o \
-		imaggif.o \
-		imagjpeg.o \
-		imagpcx.o \
-		imagpng.o \
-		imagpnm.o \
-		intl.o \
-		ipcbase.o \
-		layout.o \
-		list.o \
-		log.o \
-		memory.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 \
-		sizer.o \
-		socket.o \
-		strconv.o \
-		stream.o \
-		string.o \
-		tbarbase.o \
-		tbarsmpl.o \
-		textcmn.o \
-		textfile.o \
-		time.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
-
-MOTIF_COMMONDEPS = \
-		parser.d \
-		choiccmn.d \
-		cmndata.d \
-		config.d \
-		ctrlcmn.d \
-		date.d \
-		datstrm.d \
-		db.d \
-		dbtable.d \
-		dcbase.d \
-		dlgcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		event.d \
-		extended.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filesys.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_zip.d \
-		ftp.d \
-		gdicmn.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		list.d \
-		log.d \
-		memory.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 \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		tbarbase.d \
-		tbarsmpl.d \
-		textcmn.d \
-		textfile.d \
-		time.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
-
-MOTIF_GUIOBJS = \
-		xmcombo.o \
-		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 \
-		dcscreen.o \
-		dialog.o \
-		filedlg.o \
-		font.o \
-		frame.o \
-		gauge.o \
-		gdiobj.o \
-		gsockmot.o \
-		icon.o \
-		listbox.o \
-		main.o \
-		mdi.o \
-		menu.o \
-		menuitem.o \
-		minifram.o \
-		msgdlg.o \
-		palette.o \
-		pen.o \
-		radiobox.o \
-		radiobut.o \
-		region.o \
-		scrolbar.o \
-		settings.o \
-		slider.o \
-		spinbutt.o \
-		statbmp.o \
-		statbox.o \
-		stattext.o \
-		textctrl.o \
-		timer.o \
-		toolbar.o \
-		utils.o \
-		window.o
-
-MOTIF_GUIDEPS = \
-		xmcombo.d \
-		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 \
-		dcscreen.d \
-		dialog.d \
-		filedlg.d \
-		font.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		gsockmot.d \
-		icon.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		menuitem.d \
-		minifram.d \
-		msgdlg.d \
-		palette.d \
-		pen.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		statbmp.d \
-		statbox.d \
-		stattext.d \
-		textctrl.d \
-		timer.d \
-		toolbar.d \
-		utils.d \
-		window.d
-
-MSW_GENERICOBJS = \
-		busyinfo.o \
-		choicdgg.o \
-		dirdlgg.o \
-		gridg.o \
-		laywin.o \
-		numdlgg.o \
-		panelg.o \
-		progdlgg.o \
-		prop.o \
-		propform.o \
-		proplist.o \
-		sashwin.o \
-		scrolwin.o \
-		splitter.o \
-		statusbr.o \
-		tabg.o \
-		textdlgg.o \
-		tipdlg.o \
-		wizard.o
-
-MSW_GENERICDEPS = \
-		busyinfo.d \
-		choicdgg.d \
-		dirdlgg.d \
-		gridg.d \
-		laywin.d \
-		numdlgg.d \
-		panelg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrolwin.d \
-		splitter.d \
-		statusbr.d \
-		tabg.d \
-		textdlgg.d \
-		tipdlg.d \
-		wizard.d
-
-MSW_COMMONOBJS = \
-		parser.o \
-		choiccmn.o \
-		cmndata.o \
-		config.o \
-		ctrlcmn.o \
-		date.o \
-		datstrm.o \
-		db.o \
-		dbtable.o \
-		dcbase.o \
-		dlgcmn.o \
-		docmdi.o \
-		docview.o \
-		dynarray.o \
-		dynlib.o \
-		event.o \
-		extended.o \
-		ffile.o \
-		file.o \
-		fileconf.o \
-		filefn.o \
-		filesys.o \
-		framecmn.o \
-		fs_inet.o \
-		fs_zip.o \
-		ftp.o \
-		gdicmn.o \
-		gifdecod.o \
-		hash.o \
-		helpbase.o \
-		http.o \
-		imagbmp.o \
-		image.o \
-		imaggif.o \
-		imagjpeg.o \
-		imagpcx.o \
-		imagpng.o \
-		imagpnm.o \
-		intl.o \
-		ipcbase.o \
-		layout.o \
-		list.o \
-		log.o \
-		memory.o \
-		mimetype.o \
-		module.o \
-		mstream.o \
-		object.o \
-		objstrm.o \
-		paper.o \
-		prntbase.o \
-		process.o \
-		protocol.o \
-		resource.o \
-		sckaddr.o \
-		sckfile.o \
-		sckipc.o \
-		sckstrm.o \
-		sizer.o \
-		socket.o \
-		strconv.o \
-		stream.o \
-		string.o \
-		tbarbase.o \
-		textcmn.o \
-		textfile.o \
-		time.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
-
-MSW_COMMONDEPS = \
-		parser.d \
-		choiccmn.d \
-		cmndata.d \
-		config.d \
-		ctrlcmn.d \
-		date.d \
-		datstrm.d \
-		db.d \
-		dbtable.d \
-		dcbase.d \
-		dlgcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		event.d \
-		extended.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filesys.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_zip.d \
-		ftp.d \
-		gdicmn.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		list.d \
-		log.d \
-		memory.d \
-		mimetype.d \
-		module.d \
-		mstream.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		time.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
-
-MSW_GUIOBJS = \
-		accel.o \
-		app.o \
-		bitmap.o \
-		bmpbuttn.o \
-		brush.o \
-		button.o \
-		caret.o \
-		checkbox.o \
-		checklst.o \
-		choice.o \
-		clipbrd.o \
-		colordlg.o \
-		colour.o \
-		combobox.o \
-		control.o \
-		curico.o \
-		cursor.o \
-		data.o \
-		dc.o \
-		dcclient.o \
-		dcmemory.o \
-		dcprint.o \
-		dcscreen.o \
-		dde.o \
-		dialog.o \
-		dib.o \
-		dibutils.o \
-		dragimag.o \
-		filedlg.o \
-		font.o \
-		fontdlg.o \
-		frame.o \
-		gauge95.o \
-		gdiobj.o \
-		helpwin.o \
-		icon.o \
-		imaglist.o \
-		joystick.o \
-		listbox.o \
-		listctrl.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 \
-		penwin.o \
-		pnghand.o \
-		printdlg.o \
-		printwin.o \
-		radiobox.o \
-		radiobut.o \
-		regconf.o \
-		region.o \
-		registry.o \
-		scrolbar.o \
-		settings.o \
-		slider95.o \
-		spinbutt.o \
-		statbmp.o \
-		statbox.o \
-		statbr95.o \
-		statline.o \
-		stattext.o \
-		tabctrl.o \
-		taskbar.o \
-		tbar95.o \
-		textctrl.o \
-		thread.o \
-		timer.o \
-		tooltip.o \
-		treectrl.o \
-		utils.o \
-		utilsexc.o \
-		wave.o \
-		window.o \
-		xpmhand.o
-
-MSW_GUIDEPS = \
-		accel.d \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		caret.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colordlg.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		curico.d \
-		cursor.d \
-		data.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcprint.d \
-		dcscreen.d \
-		dde.d \
-		dialog.d \
-		dib.d \
-		dibutils.d \
-		dragimag.d \
-		filedlg.d \
-		font.d \
-		fontdlg.d \
-		frame.d \
-		gauge95.d \
-		gdiobj.d \
-		helpwin.d \
-		icon.d \
-		imaglist.d \
-		joystick.d \
-		listbox.d \
-		listctrl.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 \
-		penwin.d \
-		pnghand.d \
-		printdlg.d \
-		printwin.d \
-		radiobox.d \
-		radiobut.d \
-		regconf.d \
-		region.d \
-		registry.d \
-		scrolbar.d \
-		settings.d \
-		slider95.d \
-		spinbutt.d \
-		statbmp.d \
-		statbox.d \
-		statbr95.d \
-		statline.d \
-		stattext.d \
-		tabctrl.d \
-		taskbar.d \
-		tbar95.d \
-		textctrl.d \
-		thread.d \
-		timer.d \
-		tooltip.d \
-		treectrl.d \
-		utils.d \
-		utilsexc.d \
-		wave.d \
-		window.d \
-		xpmhand.d
-
-HTMLOBJS = \
-		htmlcell.o \
-		htmlfilter.o \
-		htmlhelp.o \
-		htmlhelp_io.o \
-		htmlparser.o \
-		htmltag.o \
-		htmlwin.o \
-		htmlwinparser.o \
-		mod_fonts.o \
-		mod_hline.o \
-		mod_image.o \
-		mod_layout.o \
-		mod_links.o \
-		mod_list.o \
-		mod_pre.o \
-		mod_tables.o \
-		search.o
-
-HTMLDEPS = \
-		htmlcell.d \
-		htmlfilter.d \
-		htmlhelp.d \
-		htmlhelp_io.d \
-		htmlparser.d \
-		htmltag.d \
-		htmlwin.d \
-		htmlwinparser.d \
-		mod_fonts.d \
-		mod_hline.d \
-		mod_image.d \
-		mod_layout.d \
-		mod_links.d \
-		mod_list.d \
-		mod_pre.d \
-		mod_tables.d \
-		search.d
-
-UNIXOBJS = \
-		gsocket.o \
-		threadpsx.o \
-		utilsunx.o
-
-UNIXDEPS = \
-		gsocket.d \
-		threadpsx.d \
-		utilsunx.d
+WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//p'`
+
+# this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
+# ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
+# .d and .h/.inl files for the current toolkit
+include $(top_srcdir)/@PORT_FILES@
 
+SOURCES = $(ALL_SOURCES)
+HEADERS = $(ALL_HEADERS)
+
+# for the objects and depfiles, we might be bulding only part of them
+# depending on configure arguments, so select a subset of ALL
+OBJECTS = @ALL_OBJECTS@
+DEPFILES = @ALL_DEPFILES@
+
+# the object files of sublibraries (we assume that they don't change [often],
+# so we don't generate these lists with tmake but embed them here)
 ZLIBOBJS    = \
 		adler32.o \
 		compress.o \
@@ -1737,6 +215,24 @@ PNGOBJS     = \
 		pngget.o \
 		pngset.o
 
+FREETYPEOBJS = \
+		ftsystem.o \
+		autohint.o \
+		ftbase.o \
+		ftdebug.o \
+		ftglyph.o \
+		ftinit.o \
+		ftmm.o \
+		cff.o \
+		type1cid.o \
+		psnames.o \
+		psmodule.o \
+		raster1.o \
+		sfnt.o \
+		smooth.o \
+		truetype.o \
+		type1z.o \
+		winfnt.o
 
 JPEGOBJS    = \
 		jcomapi.o \
@@ -1786,43 +282,120 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o
 
-
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
-
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-	  $(GENERIC_HEADERS) $(WX_HEADERS)
-
-all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+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
+
+IODBCOBJS = \
+		catalog.o \
+		connect.o \
+		dlf.o \
+		dlproc.o \
+		execute.o \
+		fetch.o \
+		hdbc.o \
+		henv.o \
+		herr.o \
+		hstmt.o \
+		info.o \
+		itrace.o \
+		misc.o \
+		prepare.o \
+		result.o
+        
+############################## Rules ##################################
+
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@
+
+all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
 	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
 	$(RANLIB) ./lib/$@
 
+@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
+	$(RANLIB) ./lib/$@
+
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
-	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
+@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+	
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+	cd lib \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+	
+CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+	cd lib \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
 	
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
+CREATE_INSTALLED_LINKS: preinstall
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
 	
-$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
+	
+$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
 	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -1839,15 +412,25 @@ 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)
 
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+afminstall: preinstall
+	$(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
+
+# this is the real install target: copies the library, wx-config and the
+# headers to the installation directory
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -1855,50 +438,56 @@ 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_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
 	$(INSTALL) -d $(libdir)/wx
 	$(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) -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 $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
 	
 	$(INSTALL) -d $(includedir)/wx
-	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/gtk
-	$(INSTALL) -d $(includedir)/wx/motif
-	$(INSTALL) -d $(includedir)/wx/html
+	@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/generic; fi
 	$(INSTALL) -d $(includedir)/wx/protocol
 	$(INSTALL) -d $(includedir)/wx/unix
-	$(INSTALL) -d $(includedir)/wx/generic
 	@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:
+
+	$(INSTALL) -d $(localedir)
+	@for p in $(WX_LINGUAS); do \
+	  $(INSTALL) -d $(localedir)/$$p; \
+	  $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
+	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
+	done
+
+preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
+	@echo " "
+	@echo " Installing wxWindows OpenGl add-on..."
+	@echo " "
+	$(INSTALL) -d $(libdir)
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@
 	@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 and also modify"
+	@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
 	@echo " "
-	@echo " wxWindows comes with  no guarantees  and doesn't claim"
+	@echo " wxWindows comes with no guarantees and doesn't claim"
 	@echo " to be suitable for any purpose."
 	@echo " "
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "
 
-install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message
-
 uninstall:
 	@echo " "
 	@echo " Uninstalling wxWindows..."
@@ -1908,20 +497,34 @@ uninstall:
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+	@echo " Removing GL library..."
+	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	@echo " Removing helper files..."
-	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
 	@$(RM) $(bindir)/wx-config
+	@$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
 	@$(RM) $(datadir)/wx/afm/*
 	@$(RM) $(datadir)/wx/gs_afm/*
-	@rmdir $(datadir)/wx/gs_afm
-	@rmdir $(datadir)/wx/afm
-	@rmdir $(datadir)/wx
+# FIXME: wxBase doesnt install these next 3 dirs.
+	@-rmdir $(datadir)/wx/gs_afm
+	@-rmdir $(datadir)/wx/afm
+	@-rmdir $(datadir)/wx
 	@echo " Removing headers..."
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(RM) $(includedir)/wx/$$p; \
 	done
+	@echo " Removing i18n files..."
+	@-for p in $(WX_LINGUAS); do \
+	  $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+	  rmdir $(localedir)/$$p/LC_MESSAGES; \
+	  rmdir $(localedir)/$$p; \
+	done
 	@echo " Removing directories..."
-	@if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+	@-rmdir $(localedir)
+	@if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi
 	@if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
 	@if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
 	@if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
@@ -1934,10 +537,12 @@ uninstall:
 	@if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
 	@if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
-ALL_DIST:
+# this target should copy only the files common to really all ports (including
+# wxBase) to the dist dir
+ALL_DIST: distclean
 	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)
@@ -1945,38 +550,59 @@ ALL_DIST:
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
+	cp $(WXDIR)/setup.h_vms $(DISTDIR)
+	cp $(WXDIR)/descrip.mms $(DISTDIR)
 	cp $(WXDIR)/Makefile.in $(DISTDIR)
 	cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
 	cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+	mkdir $(DISTDIR)/lib
+	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
+	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+	mkdir $(DISTDIR)/src
+	mkdir $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
+
+# this target is the common part of distribution script for all GUI toolkits,
+# but is not used when building wxBase distribution
+ALL_GUI_DIST: ALL_DIST
+	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
+	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/wxBASE.todo
+	cp $(DOCDIR)/base/install.txt $(DISTDIR)/wxBASE.install
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
 	mkdir $(DISTDIR)/include/wx/generic
 	mkdir $(DISTDIR)/include/wx/html
-	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/protocol
-	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+	mkdir $(DISTDIR)/include/wx/unix
+	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
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-	mkdir $(DISTDIR)/src
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
 	mkdir $(DISTDIR)/src/html/bitmaps
 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
-	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
-	mkdir $(DISTDIR)/src/zlib
+	mkdir $(DISTDIR)/src/tiff
+	mkdir $(DISTDIR)/src/iodbc
+	mkdir $(DISTDIR)/src/unix
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -1984,32 +610,79 @@ ALL_DIST:
 	cp $(COMMDIR)/*.l $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.h $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.y $(DISTDIR)/src/common
+	cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
+	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
+	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
+	cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
+	cp $(GENDIR)/*.mms $(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
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
-	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
 	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
+
+BASE_DIST: ALL_DIST
+	mkdir $(DISTDIR)/include
+	mkdir $(DISTDIR)/include/wx
+	mkdir $(DISTDIR)/include/wx/protocol
+	mkdir $(DISTDIR)/include/wx/unix
+	mkdir $(DISTDIR)/src/common
+	mkdir $(DISTDIR)/src/unix
+	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
+	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
+	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
+	cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt
+	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt
+	cp $(SRCDIR)/*.in $(DISTDIR)/src
+	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
+	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
+	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
+	list='$(HEADERS)'; for p in $$list; do \
+	  cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
+	done
+	list='$(SOURCES)'; for p in $$list; do \
+	  cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \
+	done
+
+	mkdir $(DISTDIR)/samples
+	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+	cp $(SAMPDIR)/configure $(DISTDIR)/samples
+	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
+
+	mkdir $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
-GTK_DIST:
-	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
+GTK_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
+	cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
-MOTIF_DIST:
+MOTIF_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
 	cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
 	cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
@@ -2019,7 +692,7 @@ MOTIF_DIST:
 	cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
-MSW_DIST:
+MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
@@ -2032,66 +705,179 @@ MSW_DIST:
 	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
-SAMPLES_DIST:
+DEMOS_DIST: ALL_GUI_DIST
+	mkdir $(DISTDIR)/demos
+	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
+	cp $(DEMODIR)/configure $(DISTDIR)/demos
+	cp $(DEMODIR)/configure.in $(DISTDIR)/demos
+	
+	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+	    
+	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/*.inc $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.lif $(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/*.h $(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: ALL_GUI_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/*.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
+	cp $(SAMPDIR)/configure $(DISTDIR)/samples
+	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
+
+	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/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/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
+	cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
+
 	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
+	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/*.mms $(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/*.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/*.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
+	cp $(SAMPDIR)/dialogs/*.mms $(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/dragimag
+	cp $(SAMPDIR)/dragimag/Makefile.in $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/makefile.unx $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag
+
 	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
+	cp $(SAMPDIR)/drawing/*.bmp $(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/exec
+	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
+	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
+	cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
+
+	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/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
+	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
@@ -2105,18 +891,20 @@ 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
 	cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
+	cp $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
 	mkdir $(DISTDIR)/samples/html/virtual
@@ -2132,136 +920,413 @@ 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/*.mms $(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
+	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/*.mo $(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/*.po $(DISTDIR)/samples/internat/de
+
+	mkdir $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/makefile.unx $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
+
+	mkdir $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
+
 	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
+	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
+
+	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
+	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/opengl
+	cp $(SAMPDIR)/opengl/Makefile.in $(DISTDIR)/samples/opengl
+	mkdir $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/Makefile.in $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/makefile.unx $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin
+	mkdir $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/*.cpp $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/*.h $(DISTDIR)/samples/opengl/cube
+	mkdir $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/Makefile.in $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
+
+	mkdir $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
+
+	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
+
+	mkdir $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+    
+	mkdir $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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/sockets
+	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
+
 	mkdir $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
+	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+    
+	mkdir $(DISTDIR)/samples/statbar
+	cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
+	cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
+	cp $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar
+	cp $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar
+
 	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/makefile.unx $(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/makefile.unx $(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/treectrl/bitmaps
+	cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
+    
+	mkdir $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
+    
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
+	cp $(SAMPDIR)/typetest/makefile.unx $(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/makefile.unx $(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/makefile.unx $(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
-	cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
-
-UTILS_DIST:
+    
+UTILS_DIST: ALL_GUI_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
-	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
-	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)
-	
-MISC_DIST:
+	cp $(UTILSDIR)/configure $(DISTDIR)/utils
+	cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
+
+	mkdir $(DISTDIR)/utils/tex2rtf
+	mkdir $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
+	cp $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
+
+	mkdir $(DISTDIR)/utils/makegen
+	mkdir $(DISTDIR)/utils/makegen/templates
+	cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
+	cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen
+	cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates
+
+	mkdir $(DISTDIR)/utils/hhp2cached
+	cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
+
+	mkdir $(DISTDIR)/utils/HelpGen
+	mkdir $(DISTDIR)/utils/HelpGen/src
+	cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
+	cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
+
+	cp -R $(UTILSDIR)/dialoged $(DISTDIR)/utils/dialoged
+
+MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc
 	mkdir $(DISTDIR)/misc/afm
 	cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
 	mkdir $(DISTDIR)/misc/gs_afm
 	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
-	
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
-	cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+
+INTL_DIST:
+	mkdir $(DISTDIR)/locale
+	cp $(INTLDIR)/Makefile $(DISTDIR)/locale
+	cp $(INTLDIR)/*.po $(DISTDIR)/locale
+	-cp $(INTLDIR)/*.mo $(DISTDIR)/locale
+
+MANUAL_DIST:
+	mkdir $(DISTDIR)/docs
+	mkdir $(DISTDIR)/docs/latex
+	mkdir $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
+
+# this target does not generate a complete wxPython dist, it only includes
+# those files needed for the Debian source package.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
+PYTHON_DIST:
+	mkdir $(DISTDIR)/wxPython
+	mkdir $(DISTDIR)/wxPython/contrib
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/stc
+	mkdir $(DISTDIR)/wxPython/demo
+	mkdir $(DISTDIR)/wxPython/demo/bitmaps
+	mkdir $(DISTDIR)/wxPython/demo/data
+	mkdir $(DISTDIR)/wxPython/distrib
+	mkdir $(DISTDIR)/wxPython/src
+	mkdir $(DISTDIR)/wxPython/src/gtk
+	mkdir $(DISTDIR)/wxPython/wxPython
+	mkdir $(DISTDIR)/wxPython/wxPython/lib
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers
+
+	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/contrib/buildall.py $(DISTDIR)/wxPython/contrib
+	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	cp $(WXDIR)/wxPython/distrib/build.py $(DISTDIR)/wxPython/distrib
+	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+	cp $(WXDIR)/wxPython/wxPython/lib/sizers/*.py $(DISTDIR)/wxPython/wxPython/lib/sizers
+
+distclean:
 	$(RM) -r _dist_dir
 
+dist: @GUIDIST@
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+	@if test "$(USE_GUI)" = 1; then \
+	cd $(DISTDIR); \
+	mv samples wxSamples; \
+	tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
+	mv wxSamples samples; \
+	mv demos wxDemos; \
+	tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
+	mv wxDemos demos; \
+	fi
+
+bzip-dist: @GUIDIST@
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@if test "$(USE_GUI)" = 1; then \
+	cd $(DISTDIR); \
+	mv samples wxSamples; \
+	tar ch wxSamples | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
+	mv wxSamples samples; \
+	mv demos wxDemos; \
+	tar ch wxDemos | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
+	mv wxDemos demos; \
+	fi
+
+debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+	mkdir $(DISTDIR)/debian
+	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+	cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
+	cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+	cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+	rm -f $(DISTDIR)/*.spec
+	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+
 clean:
 	$(RM) *.o
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	$(RM) ./lib/*.a ./lib/*.so*
+	$(RM) -r ./lib/wx/*
+	$(RM) ./lib/lib*
 
 cleanall: clean