]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Always send an erase event to satisfy some users...
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index ea7706a8d2d4d69fd2aadfc32f745ba28134a6b0..5394eb0c220c1dc7485839a3263a67b62d9d36c4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,80 +1,79 @@
-
-#
-# This file was automatically generated by tmake at 14:38, 1999/08/13
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
-
-#
+#####################################################################
 # File:     makefile.unx
 # File:     makefile.unx
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Purpose:  Makefile for Unix wxWindows ports (both GUI and wxBase)
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Created:  1993
-# Updated:  1999
+# Version:  $Id$
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
-#
-# Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a
-
-###################################################################
+# Copyright:(c) 2001, Ron Lee
+#####################################################################
 
 include ./src/make.env
 
 
 include ./src/make.env
 
-############## override make.env for PIC ##########################
+#################### the implicit rules #############################
 
 
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c .cxx
+# NB: we use the old style suffix rules (.c.o) and not the GNU make
+#     implicit rules (%.o: %.c) because they are more portable, in
+#     particular the BSD make understands the former but not the
+#     latter
+.SUFFIXES: .o .c .cpp .cxx .rsrc .r
 
 
-.c.o :
-       $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
+.c.o:
+       $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
 
-.cpp.o :
-       $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 
-.cxx.o :
-       $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+.cxx.o:
+       $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 
-########################### Paths #################################
+.rsrc.r:
+       $(DEREZ) $^ Carbon.r -useDF > $@
+
+############################# Paths #################################
 
 srcdir = @srcdir@
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 
 
-VPATH = :@top_srcdir@
+VP1 = @TOOLKIT_VPATH@
+VP2 = @top_srcdir@/src/common
+VP3 = @top_srcdir@/src/generic
+VP4 = @top_srcdir@/src/unix
+VP5 = @top_srcdir@/src/html
+VP6 = @top_srcdir@/src/png
+VP7 = @top_srcdir@/src/jpeg
+VP8 = @top_srcdir@/src/tiff
+VP9 = @top_srcdir@/src/zlib
+VPA = @top_srcdir@/src/regex
+VP10 = @top_srcdir@/src/iodbc
+VP11 = @top_srcdir@/src/msw/ole
+
+# 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@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
 
 
-top_srcdir = @top_srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 bindir = @bindir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
 datadir = @datadir@
 datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
 libdir = @libdir@
 libdir = @libdir@
-infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 mandir = @mandir@
 includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
 
 
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
+localedir = $(datadir)/locale
 
 top_builddir = .
 
 top_builddir = .
+build_libdir = $(top_builddir)/lib
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
+INSTALL_SCRIPT = @INSTALL@
+
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
@@ -82,6 +81,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -95,1147 +96,255 @@ HTMLDIR  = $(WXDIR)/src/html
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
+TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 ZLIBDIR  = $(WXDIR)/src/zlib
+REGEXDIR = $(WXDIR)/src/regex
 GTKDIR   = $(WXDIR)/src/gtk
 GTKDIR   = $(WXDIR)/src/gtk
+X11DIR   = $(WXDIR)/src/x11
+MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+PMDIR    = $(WXDIR)/src/os2
+MACDIR   = $(WXDIR)/src/mac
+ODBCDIR  = $(WXDIR)/src/iodbc
+FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 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 ###############################
 
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-DISTDIR = ./_dist_dir/wx$(TOOLKIT)
+# append a version suffix x.y.z to all file names
+VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
+WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+
+WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+
+DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR=./_dist_dir/$(DISTDIRNAME)
+
 
 ############################## Files ##################################
 
 
 ############################## 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 \
-               grid.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/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
-
-GENERIC_HEADERS = \
-               generic/caret.h \
-               generic/choicdgg.h \
-               generic/colrdlgg.h \
-               generic/dcpsg.h \
-               generic/dirdlgg.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 = \
-               src/generic/busyinfo.o \
-               src/generic/caret.o \
-               src/generic/choicdgg.o \
-               src/generic/colrdlgg.o \
-               src/generic/dcpsg.o \
-               src/generic/dirdlgg.o \
-               src/generic/fontdlgg.o \
-               src/generic/gridg.o \
-               src/generic/imaglist.o \
-               src/generic/laywin.o \
-               src/generic/listctrl.o \
-               src/generic/msgdlgg.o \
-               src/generic/numdlgg.o \
-               src/generic/panelg.o \
-               src/generic/printps.o \
-               src/generic/prntdlgg.o \
-               src/generic/progdlgg.o \
-               src/generic/prop.o \
-               src/generic/propform.o \
-               src/generic/proplist.o \
-               src/generic/sashwin.o \
-               src/generic/scrolwin.o \
-               src/generic/splitter.o \
-               src/generic/statusbr.o \
-               src/generic/textdlgg.o \
-               src/generic/tipdlg.o \
-               src/generic/treectrl.o
-
-GTK_COMMONOBJS = \
-               parser.o \
-               src/common/cmndata.o \
-               src/common/config.o \
-               src/common/date.o \
-               src/common/datstrm.o \
-               src/common/db.o \
-               src/common/dbtable.o \
-               src/common/dcbase.o \
-               src/common/dlgcmn.o \
-               src/common/docmdi.o \
-               src/common/docview.o \
-               src/common/dynarray.o \
-               src/common/dynlib.o \
-               src/common/event.o \
-               src/common/extended.o \
-               src/common/ffile.o \
-               src/common/file.o \
-               src/common/fileconf.o \
-               src/common/filefn.o \
-               src/common/filesys.o \
-               src/common/framecmn.o \
-               src/common/fs_inet.o \
-               src/common/fs_zip.o \
-               src/common/ftp.o \
-               src/common/gdicmn.o \
-               src/common/hash.o \
-               src/common/helpbase.o \
-               src/common/http.o \
-               src/common/imagbmp.o \
-               src/common/image.o \
-               src/common/imaggif.o \
-               src/common/imagjpeg.o \
-               src/common/imagpng.o \
-               src/common/intl.o \
-               src/common/ipcbase.o \
-               src/common/layout.o \
-               src/common/list.o \
-               src/common/log.o \
-               src/common/memory.o \
-               src/common/mimetype.o \
-               src/common/module.o \
-               src/common/mstream.o \
-               src/common/object.o \
-               src/common/objstrm.o \
-               src/common/paper.o \
-               src/common/prntbase.o \
-               src/common/process.o \
-               src/common/protocol.o \
-               src/common/resource.o \
-               src/common/sckaddr.o \
-               src/common/sckfile.o \
-               src/common/sckipc.o \
-               src/common/sckstrm.o \
-               src/common/sizer.o \
-               src/common/socket.o \
-               src/common/strconv.o \
-               src/common/stream.o \
-               src/common/string.o \
-               src/common/tbarbase.o \
-               src/common/tbarsmpl.o \
-               src/common/textcmn.o \
-               src/common/textfile.o \
-               src/common/time.o \
-               src/common/timercmn.o \
-               src/common/tokenzr.o \
-               src/common/txtstrm.o \
-               src/common/unzip.o \
-               src/common/url.o \
-               src/common/utilscmn.o \
-               src/common/valgen.o \
-               src/common/validate.o \
-               src/common/valtext.o \
-               src/common/variant.o \
-               src/common/wfstream.o \
-               src/common/wincmn.o \
-               src/common/wxchar.o \
-               src/common/wxexpr.o \
-               src/common/zipstrm.o \
-               src/common/zstream.o
-
-GTK_GUIOBJS = \
-               src/gtk/accel.o \
-               src/gtk/app.o \
-               src/gtk/bitmap.o \
-               src/gtk/bmpbuttn.o \
-               src/gtk/brush.o \
-               src/gtk/button.o \
-               src/gtk/checkbox.o \
-               src/gtk/checklst.o \
-               src/gtk/choice.o \
-               src/gtk/clipbrd.o \
-               src/gtk/colour.o \
-               src/gtk/combobox.o \
-               src/gtk/control.o \
-               src/gtk/cursor.o \
-               src/gtk/data.o \
-               src/gtk/dataobj.o \
-               src/gtk/dc.o \
-               src/gtk/dcclient.o \
-               src/gtk/dcmemory.o \
-               src/gtk/dcscreen.o \
-               src/gtk/dialog.o \
-               src/gtk/dnd.o \
-               src/gtk/filedlg.o \
-               src/gtk/font.o \
-               src/gtk/frame.o \
-               src/gtk/gauge.o \
-               src/gtk/gdiobj.o \
-               src/gtk/gsockgtk.o \
-               src/gtk/icon.o \
-               src/gtk/listbox.o \
-               src/gtk/main.o \
-               src/gtk/mdi.o \
-               src/gtk/menu.o \
-               src/gtk/minifram.o \
-               src/gtk/notebook.o \
-               src/gtk/palette.o \
-               src/gtk/pen.o \
-               src/gtk/radiobox.o \
-               src/gtk/radiobut.o \
-               src/gtk/region.o \
-               src/gtk/scrolbar.o \
-               src/gtk/settings.o \
-               src/gtk/slider.o \
-               src/gtk/spinbutt.o \
-               src/gtk/statbmp.o \
-               src/gtk/statbox.o \
-               src/gtk/statline.o \
-               src/gtk/stattext.o \
-               src/gtk/tbargtk.o \
-               src/gtk/textctrl.o \
-               src/gtk/timer.o \
-               src/gtk/tooltip.o \
-               src/gtk/utilsgtk.o \
-               src/gtk/utilsres.o \
-               src/gtk/wave.o \
-               src/gtk/win_gtk.o \
-               src/gtk/window.o
-
-MOTIF_GENERICOBJS = \
-               src/generic/busyinfo.o \
-               src/generic/caret.o \
-               src/generic/choicdgg.o \
-               src/generic/colrdlgg.o \
-               src/generic/dcpsg.o \
-               src/generic/dirdlgg.o \
-               src/generic/fontdlgg.o \
-               src/generic/gridg.o \
-               src/generic/helpxlp.o \
-               src/generic/imaglist.o \
-               src/generic/laywin.o \
-               src/generic/listctrl.o \
-               src/generic/msgdlgg.o \
-               src/generic/notebook.o \
-               src/generic/numdlgg.o \
-               src/generic/panelg.o \
-               src/generic/printps.o \
-               src/generic/prntdlgg.o \
-               src/generic/progdlgg.o \
-               src/generic/prop.o \
-               src/generic/propform.o \
-               src/generic/proplist.o \
-               src/generic/sashwin.o \
-               src/generic/scrolwin.o \
-               src/generic/splitter.o \
-               src/generic/statusbr.o \
-               src/generic/tabg.o \
-               src/generic/textdlgg.o \
-               src/generic/tipdlg.o \
-               src/generic/treectrl.o
-
-MOTIF_COMMONOBJS = \
-               parser.o \
-               src/common/choiccmn.o \
-               src/common/cmndata.o \
-               src/common/config.o \
-               src/common/ctrlcmn.o \
-               src/common/date.o \
-               src/common/datstrm.o \
-               src/common/db.o \
-               src/common/dbtable.o \
-               src/common/dcbase.o \
-               src/common/dlgcmn.o \
-               src/common/docmdi.o \
-               src/common/docview.o \
-               src/common/dynarray.o \
-               src/common/dynlib.o \
-               src/common/event.o \
-               src/common/extended.o \
-               src/common/ffile.o \
-               src/common/file.o \
-               src/common/fileconf.o \
-               src/common/filefn.o \
-               src/common/filesys.o \
-               src/common/framecmn.o \
-               src/common/fs_inet.o \
-               src/common/fs_zip.o \
-               src/common/ftp.o \
-               src/common/gdicmn.o \
-               src/common/hash.o \
-               src/common/helpbase.o \
-               src/common/http.o \
-               src/common/imagbmp.o \
-               src/common/image.o \
-               src/common/imaggif.o \
-               src/common/imagjpeg.o \
-               src/common/imagpng.o \
-               src/common/intl.o \
-               src/common/ipcbase.o \
-               src/common/layout.o \
-               src/common/list.o \
-               src/common/log.o \
-               src/common/memory.o \
-               src/common/mimetype.o \
-               src/common/module.o \
-               src/common/mstream.o \
-               src/common/object.o \
-               src/common/objstrm.o \
-               src/common/odbc.o \
-               src/common/paper.o \
-               src/common/prntbase.o \
-               src/common/process.o \
-               src/common/protocol.o \
-               src/common/resource.o \
-               src/common/sckaddr.o \
-               src/common/sckfile.o \
-               src/common/sckipc.o \
-               src/common/sckstrm.o \
-               src/common/sizer.o \
-               src/common/socket.o \
-               src/common/strconv.o \
-               src/common/stream.o \
-               src/common/string.o \
-               src/common/tbarbase.o \
-               src/common/tbarsmpl.o \
-               src/common/textcmn.o \
-               src/common/textfile.o \
-               src/common/time.o \
-               src/common/timercmn.o \
-               src/common/tokenzr.o \
-               src/common/txtstrm.o \
-               src/common/unzip.o \
-               src/common/url.o \
-               src/common/utilscmn.o \
-               src/common/valgen.o \
-               src/common/validate.o \
-               src/common/valtext.o \
-               src/common/variant.o \
-               src/common/wfstream.o \
-               src/common/wincmn.o \
-               src/common/wxchar.o \
-               src/common/wxexpr.o \
-               src/common/zipstrm.o \
-               src/common/zstream.o
-
-MOTIF_GUIOBJS = \
-               src/motif/xmcombo/xmcombo.o \
-               src/motif/accel.o \
-               src/motif/app.o \
-               src/motif/bitmap.o \
-               src/motif/bmpbuttn.o \
-               src/motif/brush.o \
-               src/motif/button.o \
-               src/motif/checkbox.o \
-               src/motif/choice.o \
-               src/motif/clipbrd.o \
-               src/motif/colour.o \
-               src/motif/combobox.o \
-               src/motif/control.o \
-               src/motif/cursor.o \
-               src/motif/data.o \
-               src/motif/dataobj.o \
-               src/motif/dc.o \
-               src/motif/dcclient.o \
-               src/motif/dcmemory.o \
-               src/motif/dcscreen.o \
-               src/motif/dialog.o \
-               src/motif/filedlg.o \
-               src/motif/font.o \
-               src/motif/frame.o \
-               src/motif/gauge.o \
-               src/motif/gdiobj.o \
-               src/motif/gsockmot.o \
-               src/motif/icon.o \
-               src/motif/listbox.o \
-               src/motif/main.o \
-               src/motif/mdi.o \
-               src/motif/menu.o \
-               src/motif/menuitem.o \
-               src/motif/minifram.o \
-               src/motif/msgdlg.o \
-               src/motif/palette.o \
-               src/motif/pen.o \
-               src/motif/radiobox.o \
-               src/motif/radiobut.o \
-               src/motif/region.o \
-               src/motif/scrolbar.o \
-               src/motif/settings.o \
-               src/motif/slider.o \
-               src/motif/statbmp.o \
-               src/motif/statbox.o \
-               src/motif/stattext.o \
-               src/motif/textctrl.o \
-               src/motif/timer.o \
-               src/motif/toolbar.o \
-               src/motif/utils.o \
-               src/motif/window.o
-
-MSW_GENERICOBJS = \
-               src/generic/busyinfo.o \
-               src/generic/choicdgg.o \
-               src/generic/dirdlgg.o \
-               src/generic/gridg.o \
-               src/generic/laywin.o \
-               src/generic/numdlgg.o \
-               src/generic/panelg.o \
-               src/generic/progdlgg.o \
-               src/generic/prop.o \
-               src/generic/propform.o \
-               src/generic/proplist.o \
-               src/generic/sashwin.o \
-               src/generic/scrolwin.o \
-               src/generic/splitter.o \
-               src/generic/statusbr.o \
-               src/generic/tabg.o \
-               src/generic/textdlgg.o \
-               src/generic/tipdlg.o
-
-MSW_COMMONOBJS = \
-               src/common/choiccmn.o \
-               src/common/cmndata.o \
-               src/common/config.o \
-               src/common/ctrlcmn.o \
-               src/common/date.o \
-               src/common/datstrm.o \
-               src/common/db.o \
-               src/common/dbtable.o \
-               src/common/dcbase.o \
-               src/common/dlgcmn.o \
-               src/common/docmdi.o \
-               src/common/docview.o \
-               src/common/dynarray.o \
-               src/common/dynlib.o \
-               src/common/event.o \
-               src/common/extended.o \
-               src/common/ffile.o \
-               src/common/file.o \
-               src/common/fileconf.o \
-               src/common/filefn.o \
-               src/common/filesys.o \
-               src/common/framecmn.o \
-               src/common/fs_inet.o \
-               src/common/fs_zip.o \
-               src/common/ftp.o \
-               src/common/gdicmn.o \
-               src/common/hash.o \
-               src/common/helpbase.o \
-               src/common/http.o \
-               src/common/imagbmp.o \
-               src/common/image.o \
-               src/common/imaggif.o \
-               src/common/imagjpeg.o \
-               src/common/imagpng.o \
-               src/common/intl.o \
-               src/common/ipcbase.o \
-               src/common/layout.o \
-               src/common/list.o \
-               src/common/log.o \
-               src/common/memory.o \
-               src/common/mimetype.o \
-               src/common/module.o \
-               src/common/mstream.o \
-               src/common/object.o \
-               src/common/objstrm.o \
-               src/common/paper.o \
-               src/common/prntbase.o \
-               src/common/process.o \
-               src/common/protocol.o \
-               src/common/resource.o \
-               src/common/sckaddr.o \
-               src/common/sckfile.o \
-               src/common/sckipc.o \
-               src/common/sckstrm.o \
-               src/common/sizer.o \
-               src/common/socket.o \
-               src/common/strconv.o \
-               src/common/stream.o \
-               src/common/string.o \
-               src/common/tbarbase.o \
-               src/common/textcmn.o \
-               src/common/textfile.o \
-               src/common/time.o \
-               src/common/timercmn.o \
-               src/common/tokenzr.o \
-               src/common/txtstrm.o \
-               src/common/unzip.o \
-               src/common/url.o \
-               src/common/utilscmn.o \
-               src/common/valgen.o \
-               src/common/validate.o \
-               src/common/valtext.o \
-               src/common/variant.o \
-               src/common/wfstream.o \
-               src/common/wincmn.o \
-               src/common/wxchar.o \
-               src/common/wxexpr.o \
-               src/common/zipstrm.o \
-               src/common/zstream.o
-
-MSW_GUIOBJS = \
-               src/msw/accel.o \
-               src/msw/app.o \
-               src/msw/bitmap.o \
-               src/msw/bmpbuttn.o \
-               src/msw/brush.o \
-               src/msw/button.o \
-               src/msw/caret.o \
-               src/msw/checkbox.o \
-               src/msw/checklst.o \
-               src/msw/choice.o \
-               src/msw/clipbrd.o \
-               src/msw/colordlg.o \
-               src/msw/colour.o \
-               src/msw/combobox.o \
-               src/msw/control.o \
-               src/msw/curico.o \
-               src/msw/cursor.o \
-               src/msw/data.o \
-               src/msw/dc.o \
-               src/msw/dcclient.o \
-               src/msw/dcmemory.o \
-               src/msw/dcprint.o \
-               src/msw/dcscreen.o \
-               src/msw/dde.o \
-               src/msw/dialog.o \
-               src/msw/dib.o \
-               src/msw/dibutils.o \
-               src/msw/dragimag.o \
-               src/msw/filedlg.o \
-               src/msw/font.o \
-               src/msw/fontdlg.o \
-               src/msw/frame.o \
-               src/msw/gauge95.o \
-               src/msw/gdiobj.o \
-               src/msw/helpwin.o \
-               src/msw/icon.o \
-               src/msw/imaglist.o \
-               src/msw/joystick.o \
-               src/msw/listbox.o \
-               src/msw/listctrl.o \
-               src/msw/main.o \
-               src/msw/mdi.o \
-               src/msw/menu.o \
-               src/msw/menuitem.o \
-               src/msw/metafile.o \
-               src/msw/minifram.o \
-               src/msw/msgdlg.o \
-               src/msw/nativdlg.o \
-               src/msw/notebook.o \
-               src/msw/ownerdrw.o \
-               src/msw/palette.o \
-               src/msw/pen.o \
-               src/msw/penwin.o \
-               src/msw/pnghand.o \
-               src/msw/printdlg.o \
-               src/msw/printwin.o \
-               src/msw/radiobox.o \
-               src/msw/radiobut.o \
-               src/msw/regconf.o \
-               src/msw/region.o \
-               src/msw/registry.o \
-               src/msw/scrolbar.o \
-               src/msw/settings.o \
-               src/msw/slider95.o \
-               src/msw/spinbutt.o \
-               src/msw/statbmp.o \
-               src/msw/statbox.o \
-               src/msw/statbr95.o \
-               src/msw/statline.o \
-               src/msw/stattext.o \
-               src/msw/tabctrl.o \
-               src/msw/taskbar.o \
-               src/msw/tbar95.o \
-               src/msw/textctrl.o \
-               src/msw/thread.o \
-               src/msw/timer.o \
-               src/msw/tooltip.o \
-               src/msw/treectrl.o \
-               src/msw/utils.o \
-               src/msw/utilsexc.o \
-               src/msw/wave.o \
-               src/msw/window.o \
-               src/msw/xpmhand.o
-
-HTMLOBJS = \
-               src/html/htmlcell.o \
-               src/html/htmlfilter.o \
-               src/html/htmlhelp.o \
-               src/html/htmlhelp_io.o \
-               src/html/htmlparser.o \
-               src/html/htmltag.o \
-               src/html/htmlwin.o \
-               src/html/htmlwinparser.o \
-               src/html/mod_fonts.o \
-               src/html/mod_hline.o \
-               src/html/mod_image.o \
-               src/html/mod_layout.o \
-               src/html/mod_links.o \
-               src/html/mod_list.o \
-               src/html/mod_pre.o \
-               src/html/mod_tables.o \
-               src/html/search.o
-
-UNIXOBJS = \
-               src/unix/gsocket.o \
-               src/unix/threadpsx.o \
-               src/unix/utilsunx.o
-
-ZLIBOBJS    = \
-               src/zlib/adler32.o \
-               src/zlib/compress.o \
-               src/zlib/crc32.o \
-               src/zlib/gzio.o \
-               src/zlib/uncompr.o \
-               src/zlib/deflate.o \
-               src/zlib/trees.o \
-               src/zlib/zutil.o \
-               src/zlib/inflate.o \
-               src/zlib/infblock.o \
-               src/zlib/inftrees.o \
-               src/zlib/infcodes.o \
-               src/zlib/infutil.o \
-               src/zlib/inffast.o
-
-PNGOBJS     = \
-               src/png/png.o \
-               src/png/pngread.o \
-               src/png/pngrtran.o \
-               src/png/pngrutil.o \
-               src/png/pngpread.o \
-               src/png/pngtrans.o \
-               src/png/pngwrite.o \
-               src/png/pngwtran.o \
-               src/png/pngwutil.o \
-               src/png/pngerror.o \
-               src/png/pngmem.o \
-               src/png/pngwio.o \
-               src/png/pngrio.o \
-               src/png/pngget.o \
-               src/png/pngset.o
-
-
-JPEGOBJS    = \
-               src/jpeg/jcomapi.o \
-               src/jpeg/jutils.o \
-               src/jpeg/jerror.o \
-               src/jpeg/jmemmgr.o \
-               src/jpeg/jmemnobs.o \
-               src/jpeg/jcapimin.o \
-               src/jpeg/jcapistd.o \
-               src/jpeg/jctrans.o \
-               src/jpeg/jcparam.o \
-               src/jpeg/jdatadst.o \
-               src/jpeg/jcinit.o \
-               src/jpeg/jcmaster.o \
-               src/jpeg/jcmarker.o \
-               src/jpeg/jcmainct.o \
-               src/jpeg/jcprepct.o \
-               src/jpeg/jccoefct.o \
-               src/jpeg/jccolor.o \
-               src/jpeg/jcsample.o \
-               src/jpeg/jchuff.o \
-               src/jpeg/jcphuff.o \
-               src/jpeg/jcdctmgr.o \
-               src/jpeg/jfdctfst.o \
-               src/jpeg/jfdctflt.o \
-               src/jpeg/jfdctint.o \
-               src/jpeg/jdapimin.o \
-               src/jpeg/jdapistd.o \
-               src/jpeg/jdtrans.o \
-               src/jpeg/jdatasrc.o \
-               src/jpeg/jdmaster.o \
-               src/jpeg/jdinput.o \
-               src/jpeg/jdmarker.o \
-               src/jpeg/jdhuff.o \
-               src/jpeg/jdphuff.o \
-               src/jpeg/jdmainct.o \
-               src/jpeg/jdcoefct.o \
-               src/jpeg/jdpostct.o \
-               src/jpeg/jddctmgr.o \
-               src/jpeg/jidctfst.o \
-               src/jpeg/jidctflt.o \
-               src/jpeg/jidctint.o \
-               src/jpeg/jidctred.o \
-               src/jpeg/jdsample.o \
-               src/jpeg/jdcolor.o \
-               src/jpeg/jquant1.o \
-               src/jpeg/jquant2.o \
-               src/jpeg/jdmerge.o
-
-
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-         $(GENERIC_HEADERS) $(WX_HEADERS)
-
-REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \
-                ./src/generic ./src/unix ./src/motif/xmombo ./src/html \
-               ./src/zlib ./src/jpeg ./src/png
-
-all:    $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
-
-$(REQUIRED_DIRS):      $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
-       @if test ! -d ./lib; then mkdir ./lib; fi
-       @if test ! -d ./src; then mkdir ./src; fi
-       @if test ! -d ./src/common; then mkdir ./src/common; fi
-       @if test ! -d ./src/msw; then mkdir ./src/msw; fi
-       @if test ! -d ./src/gtk; then mkdir ./src/gtk; fi
-       @if test ! -d ./src/motif; then mkdir ./src/motif; fi
-       @if test ! -d ./src/motif/xmcombo; then mkdir ./src/motif/xmcombo; fi
-       @if test ! -d ./src/generic; then mkdir ./src/generic; fi
-       @if test ! -d ./src/unix; then mkdir ./src/unix; fi
-       @if test ! -d ./src/html; then mkdir ./src/html; fi
-       @if test ! -d ./src/png; then mkdir ./src/png; fi
-       @if test ! -d ./src/jpeg; then mkdir ./src/jpeg; fi
-       @if test ! -d ./src/zlib; then mkdir ./src/zlib; fi
-
-@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-       $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
-       $(RANLIB) ./lib/$@
-
-@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
-       $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
-       
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
-       @if test -e ./lib/@WX_LIBRARY_LINK1@; then rm -f ./lib/@WX_LIBRARY_LINK1@; fi
-       @if test -e ./lib/@WX_LIBRARY_LINK2@; then rm -f ./lib/@WX_LIBRARY_LINK2@; fi
-       @if test -e ./lib/@WX_LIBRARY_LINK3@; then rm -f ./lib/@WX_LIBRARY_LINK3@; fi
-       $(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@
-       
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
-       @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then rm -f $(libdir)/@WX_LIBRARY_LINK1@; fi
-       @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then rm -f $(libdir)/@WX_LIBRARY_LINK2@; fi
-       @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then rm -f $(libdir)/@WX_LIBRARY_LINK3@; fi
-       $(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@
-       
-$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
-
-parser.o:    parser.c lexer.c
-       $(CCLEX) -c $(CFLAGS) -o $@ parser.c
-
-parser.c:      $(COMMDIR)/parser.y lexer.c
+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 @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@
+
+# 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)
+REGEXOBJS = \
+               regcomp.o \
+               regexec.o \
+               regerror.o \
+               regfree.o
+
+ZLIBOBJS = \
+               adler32.o \
+               compress.o \
+               crc32.o \
+               gzio.o \
+               uncompr.o \
+               deflate.o \
+               trees.o \
+               zutil.o \
+               inflate.o \
+               infblock.o \
+               inftrees.o \
+               infcodes.o \
+               infutil.o \
+               inffast.o
+
+PNGOBJS = \
+               png.o \
+               pngread.o \
+               pngrtran.o \
+               pngrutil.o \
+               pngpread.o \
+               pngtrans.o \
+               pngwrite.o \
+               pngwtran.o \
+               pngwutil.o \
+               pngerror.o \
+               pngmem.o \
+               pngwio.o \
+               pngrio.o \
+               pngget.o \
+               pngset.o
+
+JPEGOBJS = \
+               jcomapi.o \
+               jutils.o \
+               jerror.o \
+               jmemmgr.o \
+               jmemnobs.o \
+               jcapimin.o \
+               jcapistd.o \
+               jctrans.o \
+               jcparam.o \
+               jdatadst.o \
+               jcinit.o \
+               jcmaster.o \
+               jcmarker.o \
+               jcmainct.o \
+               jcprepct.o \
+               jccoefct.o \
+               jccolor.o \
+               jcsample.o \
+               jchuff.o \
+               jcphuff.o \
+               jcdctmgr.o \
+               jfdctfst.o \
+               jfdctflt.o \
+               jfdctint.o \
+               jdapimin.o \
+               jdapistd.o \
+               jdtrans.o \
+               jdatasrc.o \
+               jdmaster.o \
+               jdinput.o \
+               jdmarker.o \
+               jdhuff.o \
+               jdphuff.o \
+               jdmainct.o \
+               jdcoefct.o \
+               jdpostct.o \
+               jddctmgr.o \
+               jidctfst.o \
+               jidctflt.o \
+               jidctint.o \
+               jidctred.o \
+               jdsample.o \
+               jdcolor.o \
+               jquant1.o \
+               jquant2.o \
+               jdmerge.o
+
+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 ##################################
+
+SONAME_FLAGS = @SONAME_FLAGS@
+SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
+
+all: @WX_ALL@
+
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+       @$(INSTALL) -d $(build_libdir)
+       @$(RM) $@
+       $(AR) $(AROPTIONS) $@ $(OBJECTS)
+       $(RANLIB) $@
+
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+       @$(INSTALL) -d $(build_libdir)
+       @$(RM) $@
+       $(AR) $(AROPTIONS) $@ glcanvas.o
+       $(RANLIB) $@
+
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+       @$(INSTALL) -d $(build_libdir)
+       $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
+
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
+       @$(INSTALL) -d $(build_libdir)
+       $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
+
+$(build_libdir)/@WX_RESOURCES_MACOSX@: $(MACRESOURCES)
+       @$(INSTALL) -d $(build_libdir)
+       $(RESCOMP) -d __UNIX__ -useDF $^ -o $@
+
+$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
+       @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
+       @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
+       cd $(build_libdir) \
+               && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+               && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
+
+$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
+       @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
+       @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
+       cd $(build_libdir) \
+               && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+               && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
+
+$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
+
+parser.o: parser.c lexer.c
+       $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c
+
+parser.c: $(COMMDIR)/parser.y lexer.c
        $(YACC) $(COMMDIR)/parser.y
        @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \
        sed -e "s/BUFSIZ/5000/g"            | \
        $(YACC) $(COMMDIR)/parser.y
        @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \
        sed -e "s/BUFSIZ/5000/g"            | \
@@ -1245,128 +354,247 @@ parser.c:      $(COMMDIR)/parser.y lexer.c
        sed -e "s/unput/PROIO_unput/g"      > parser.c
        @$(RM) y.tab.c
 
        sed -e "s/unput/PROIO_unput/g"      > parser.c
        @$(RM) y.tab.c
 
-lexer.c:       $(COMMDIR)/lexer.l
+lexer.c: $(COMMDIR)/lexer.l
        $(LEX) $(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
        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
-
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+       @$(RM) @LEX_STEM@.c
+
+@IF_GNU_MAKE@-include $(OBJECTS:.o=.d)
+
+CREATE_INSTALLED_LINKS: preinstall
+       $(RM) $(libdir)/@WX_LIBRARY_LINK1@
+       $(RM) $(libdir)/@WX_LIBRARY_LINK2@
+       cd $(libdir) \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
+
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+       $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+       $(RM) $(libdir)/@WX_LIBRARY_LINK2_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@
+
+afminstall: preinstall
+       @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+        
+m4datainstall: preinstall
+       $(INSTALL) -d $(datadir)/aclocal
+       $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
+
+# this is the real install target: copies the library, wx-config and the
+# headers to the installation directory
+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
 
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
 
-       $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
-       $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-       
-       @if test ! -d $(libdir)/wx; then mkdir $(libdir)/wx; fi
-       @if test ! -d $(libdir)/wx/include; then mkdir $(libdir)/wx/include; fi
-       @if test ! -d $(libdir)/wx/include/wx; then mkdir $(libdir)/wx/include/wx; fi
-       @if test ! -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then mkdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
-       $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       
-       @if test ! -d $(includedir)/wx; then mkdir $(includedir)/wx; fi
-       @if test ! -d $(includedir)/wx/msw; then mkdir $(includedir)/wx/msw; fi
-       @if test ! -d $(includedir)/wx/gtk; then mkdir $(includedir)/wx/gtk; fi
-       @if test ! -d $(includedir)/wx/motif; then mkdir $(includedir)/wx/motif; fi
-       @if test ! -d $(includedir)/wx/html; then mkdir $(includedir)/wx/html; fi
-       @if test ! -d $(includedir)/wx/protocol; then mkdir $(includedir)/wx/protocol; fi
-       @if test ! -d $(includedir)/wx/unix; then mkdir $(includedir)/wx/unix; fi
-       @if test ! -d $(includedir)/wx/generic; then mkdir $(includedir)/wx/generic; fi
+       @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
+       @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+
+       $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
+       cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
+       @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+       @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
+               $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
+
+       $(INSTALL) -d $(libdir)/wx
+       $(INSTALL) -d $(libdir)/wx/include
+       $(INSTALL) -d $(libdir)/wx/include/univ
+       $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
+       $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
+       $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
+                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+
+       $(INSTALL) -d $(includedir)/wx
+       @# FIXME: This will erroneously install a wx/base dir for wxBase..
+       @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
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi
+       @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
+
+       @# always install msw headers for wxBase, it's much simpler
+       @if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi
+
+       $(INSTALL) -d $(includedir)/wx/protocol
+       $(INSTALL) -d $(includedir)/wx/unix
        @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
        @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:
+
+       @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
+       @for p in $(WX_LINGUAS); do \
+         if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
+         if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
+         $(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_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@
+       @echo " "
+       @echo " Installing wxWindows Mac resource ..."
+       @echo " "
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+       $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
+
+preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
+       @echo " "
+       @echo " Installing wxWindows OpenGl add-on..."
+       @echo " "
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+       @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @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 the"
+       @echo " LD_LIBRARY_PATH (or equivalent) environment variable."
        @echo " "
        @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 " "
 
        @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..."
        @echo " "
        @echo " Removing library..."
 uninstall:
        @echo " "
        @echo " Uninstalling wxWindows..."
        @echo " "
        @echo " Removing library..."
-       @rm -f $(libdir)/@WX_TARGET_LIBRARY@
-       @rm -f $(libdir)/@WX_LIBRARY_LINK1@
-       @rm -f $(libdir)/@WX_LIBRARY_LINK2@
-       @rm -f $(libdir)/@WX_LIBRARY_LINK3@
+       @$(RM) $(libdir)/@WX_TARGET_LIBRARY@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+       @echo " Removing GL library..."
+       @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
        @echo " Removing helper files..."
        @echo " Removing helper files..."
-       @rm -f $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       @rm -f $(bindir)/wx-config
+       @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+       @$(RM) $(bindir)/wx-config
+       @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
+       @$(RM) $(datadir)/wx/afm/*
+       @$(RM) $(datadir)/wx/gs_afm/*
+# 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 \
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
-         rm -f $(includedir)/wx/$$p; \
+         $(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..."
        done
        @echo " Removing directories..."
-       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
-       @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
+       @-rmdir $(localedir)
+       @if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi
+       @if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi
        @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
        @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
-       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi
+       @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
+       @if test -d $(includedir)/wx/univ; then rmdir $(includedir)/wx/univ; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
        @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)
        mkdir _dist_dir
        mkdir $(DISTDIR)
-       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
-       cp $(WXDIR)/configure $(DISTDIR)
+       cp $(WXDIR)/wxwin.m4 $(DISTDIR)
+       cp $(WXDIR)/aclocal.m4 $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
        cp $(WXDIR)/install-sh $(DISTDIR)
        cp $(WXDIR)/mkinstalldirs $(DISTDIR)
        cp $(WXDIR)/wx-config.in $(DISTDIR)
        cp $(WXDIR)/setup.h.in $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
        cp $(WXDIR)/install-sh $(DISTDIR)
        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 $(WXDIR)/Makefile.in $(DISTDIR)
+       cp $(WXDIR)/wxBase.spec $(DISTDIR)
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       mkdir $(DISTDIR)/lib
+       cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
+       cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+       mkdir $(DISTDIR)/src
+       cp $(SRCDIR)/files.lst $(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
+       mkdir $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/README $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
+       cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
+
+# 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)/configure.in $(DISTDIR)
+       cp $(WXDIR)/configure $(DISTDIR)
+       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
-       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
+       if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
+         cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
+       cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt
        cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
        mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html
        cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
        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
        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
        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/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/png
        mkdir $(DISTDIR)/src/jpeg
-       mkdir $(DISTDIR)/src/zlib
+       mkdir $(DISTDIR)/src/tiff
+       mkdir $(DISTDIR)/src/iodbc
+       mkdir $(DISTDIR)/src/unix
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -1374,99 +602,864 @@ ALL_DIST:
        cp $(COMMDIR)/*.l $(DISTDIR)/src/common
        cp $(COMMDIR)/*.h $(DISTDIR)/src/common
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common
        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)/*.cpp $(DISTDIR)/src/generic
+       cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-       cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
        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 $(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 $(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
+       # make --disable-gui the default
+       sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
+               $(WXDIR)/configure.in > $(DISTDIR)/configure.in
+       sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \
+               $(WXDIR)/configure > $(DISTDIR)/configure
+       chmod +x $(DISTDIR)/configure
+       mkdir $(DISTDIR)/include
+       mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/protocol
+       mkdir $(DISTDIR)/include/wx/unix
+       mkdir $(DISTDIR)/include/wx/msw
+       mkdir $(DISTDIR)/src/common
+       mkdir $(DISTDIR)/src/unix
+       mkdir $(DISTDIR)/src/msw
+       cp @PORT_FILES@ $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsp $(DISTDIR)
+       cp $(WXDIR)/src/wxBase*.dsw $(DISTDIR)
+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.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/console.dsp $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
 
-GTK_DIST:
+GTK_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxGTK.spec $(DISTDIR)
        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
        cp $(WXDIR)/wxGTK.spec $(DISTDIR)
        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
+       cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/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:
-       cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
+MOTIF_DIST: ALL_GUI_DIST
+       cp $(WXDIR)/wxMotif.spec $(DISTDIR)
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
+       cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
+       cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif
        cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
        mkdir $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
        cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
        mkdir $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
-MSW_DIST:
+MACX_DIST: ALL_GUI_DIST
+       cp $(INCDIR)/*.* $(DISTDIR)/include
+       cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
+       cp $(MACDIR)/files.lst $(DISTDIR)/src/mac
+       cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
+       cp $(MACDIR)/*.c $(DISTDIR)/src/mac
+       cp $(MACDIR)/*.h $(DISTDIR)/src/mac
+       cp $(MACDIR)/*.r $(DISTDIR)/src/mac
+       mkdir $(DISTDIR)/src/mac/morefile
+       cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
+       cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
+       mkdir $(DISTDIR)/src/mac/macsock
+       cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
+
+MSW_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
+       mkdir $(DISTDIR)/include/wx/msw/ctl3d
+       mkdir $(DISTDIR)/include/wx/msw/gnuwin32
+       mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
+       mkdir $(DISTDIR)/include/wx/msw/ole
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+       cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
+       cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
+       cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
+       cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
+       cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
+
+       mkdir $(DISTDIR)/src/msw/ole
+       cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
        cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
-       mkdir $(DISTDIR)/src/msw/ole
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
-SAMPLES_DIST:
+UNIV_DIST: ALL_GUI_DIST
+       mkdir $(DISTDIR)/include/wx/univ
+       mkdir $(DISTDIR)/src/univ
+       mkdir $(DISTDIR)/src/univ/themes
+       cp $(INCDIR)/wx/univ/*.h $(DISTDIR)/include/wx/univ
+       cp $(SRCDIR)/univ/files.lst $(DISTDIR)/src/univ
+       cp $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
+       cp $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
+
+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
+
+       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
+
+       cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+
+       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
        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
        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
        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
        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
        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
        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/*.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
        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
 
 
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
-       cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
-       rm -f -r _dist_dir
+       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/erase
+       cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
+       cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
+       cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
+
+       mkdir $(DISTDIR)/samples/event
+       cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
+       cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
+       cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
+
+       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
+       cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
+       cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
+       mkdir $(DISTDIR)/samples/html/about/data
+       cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
+       cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
+       mkdir $(DISTDIR)/samples/html/help
+       cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
+       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/*.cpp $(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
+       cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
+       cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
+       cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
+       mkdir $(DISTDIR)/samples/html/widget
+       cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
+       cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
+       cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
+       mkdir $(DISTDIR)/samples/html/zip
+       cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
+       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
+       mkdir $(DISTDIR)/samples/internat/ru
+       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/ru/*.mo $(DISTDIR)/samples/internat/ru
+       cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+       cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
+       cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
+
+       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
+       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
+       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/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/*.xpm $(DISTDIR)/samples/toolbar
+       mkdir $(DISTDIR)/samples/toolbar/bitmaps
+       cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+
+       mkdir $(DISTDIR)/samples/treectrl
+       cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
+       cp $(SAMPDIR)/treectrl/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/widgets
+       mkdir $(DISTDIR)/samples/widgets/icons
+       cp $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets
+       cp $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets
+       cp $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets
+       cp $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets
+       cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons
+
+UTILS_DIST: ALL_GUI_DIST
+       mkdir $(DISTDIR)/utils
+       cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+       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
+
+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/*.inc $(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/dllwidget
+       mkdir $(DISTDIR)/wxPython/contrib/gizmos
+       mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+       mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+       mkdir $(DISTDIR)/wxPython/contrib/ogl
+       mkdir $(DISTDIR)/wxPython/contrib/stc
+       mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
+       mkdir $(DISTDIR)/wxPython/contrib/xrc
+       mkdir $(DISTDIR)/wxPython/demo
+       mkdir $(DISTDIR)/wxPython/demo/bitmaps
+       mkdir $(DISTDIR)/wxPython/demo/bmp_source
+       mkdir $(DISTDIR)/wxPython/demo/data
+       mkdir $(DISTDIR)/wxPython/demo/dllwidget
+       mkdir $(DISTDIR)/wxPython/src
+       mkdir $(DISTDIR)/wxPython/src/gtk
+       mkdir $(DISTDIR)/wxPython/wxPython
+       mkdir $(DISTDIR)/wxPython/wxPython/lib
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+
+       cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
+       cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+       -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/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
+       -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
+       -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+       -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+       -cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
+       -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+       -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
+       -cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+       -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/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+       cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+       cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+
+distclean:
+       $(RM) -r _dist_dir
+
+# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
+#     the files twice
+dist-only:
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-$(VER_SUFFIX); \
+       echo "*** Creating wxSamples archive..."; \
+       tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples-$(VER_SUFFIX) samples; \
+       mv demos wxDemos-$(VER_SUFFIX); \
+       echo "*** Creating wxDemos archive..."; \
+       tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos-$(VER_SUFFIX) demos; \
+       fi
+
+dist: @GUIDIST@
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-$(VER_SUFFIX); \
+       echo "*** Creating wxSamples archive..."; \
+       tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples-$(VER_SUFFIX) samples; \
+       mv demos wxDemos-$(VER_SUFFIX); \
+       echo "*** Creating wxDemos archive..."; \
+       tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos-$(VER_SUFFIX) demos; \
+       fi
+
+bzip-dist-only:
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-${VER_SUFFIX}; \
+       echo "*** Creating wxSamples archive..."; \
+       tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
+       mv wxSamples-${VER_SUFFIX} samples; \
+       mv demos wxDemos-${VER_SUFFIX}; \
+       echo "*** Creating wxDemos archive..."; \
+       tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
+       mv wxDemos-${VER_SUFFIX} demos; \
+       fi
+
+bzip-dist: @GUIDIST@
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(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: debian-native-dist debian-msw-dirs MSW_DIST
+       mkdir $(DISTDIR)/debian
+       -cp $(WXDIR)/debian/* $(DISTDIR)/debian
+       cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
+       cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+       cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+       rm -f $(DISTDIR)/*.spec
+
+       @# now prune away a lot of the crap included by using cp -R
+       @# in other dist targets.  Ugly and hardly portable but it
+       @# will run on any Debian box and that's enough for now.
+
+       find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+                       \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+                       -print0 | xargs -0 rm -rf
+
+       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)
+
+debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+
+debian-msw-dirs:
+       mkdir $(DISTDIR)/include/wx/msw
+       mkdir $(DISTDIR)/src/msw
+
 
 clean:
 
 clean:
-       rm -f ./src/msw/*.o
-       rm -f ./src/gtk/*.o
-       rm -f ./src/motif/*.o
-       rm -f ./src/html/*.o
-       rm -f ./src/common/*.o
-       rm -f ./src/unix/*.o
-       rm -f ./src/generic/*.o
-       rm -f ./src/png/*.o
-       rm -f ./src/jpeg/*.o
-       rm -f ./src/zlib/*.o
-       rm -f *.o
-       rm -f parser.c
-       rm -f lexer.c
-       rm -f ./lib/*
+       $(RM) *.o
+       $(RM) *.d
+       $(RM) parser.c
+       $(RM) lexer.c
+       $(RM) $(build_libdir)/lib*
+    # Don't remove this lot, configure will reuse it
+    # if it's still good
+       # $(RM) -r $(build_libdir)/wx/*
 
 cleanall: clean
 
 cleanall: clean
+
+
+RPMTOP=_dist_dir/_rpm_top
+
+rpm: bzip-dist
+       @echo "*** Building RPMs ***"
+       -mkdir $(RPMTOP)
+       -mkdir $(RPMTOP)/SOURCES
+       -mkdir $(RPMTOP)/SPECS
+       -mkdir $(RPMTOP)/BUILD
+       -mkdir $(RPMTOP)/RPMS
+       -mkdir $(RPMTOP)/SRPMS
+       cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
+       rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+       mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .
+
wxWidgets (Impactor)