]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
Fixed problem where corner label was displayed when either row or col label size...
[wxWidgets.git] / Makefile.in
index a401b17434dbb55f140cf43cbcf5063517b5bde6..21db9f2ddb0ccba5034cac21ce6799929bc1e700 100644 (file)
@@ -1,7 +1,3 @@
-#
-# This file was automatically generated by tmake at 11:02, 1999/10/21
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
-
 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
@@ -43,10 +39,14 @@ VP5 = @top_srcdir@/src/unix
 VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
-VP9 = @top_srcdir@/src/zlib
-VP10 = @top_srcdir@/src/iodbc
+VP9 = @top_srcdir@/src/tiff
+VP10 = @top_srcdir@/src/zlib
+VP11 = @top_srcdir@/src/iodbc
 
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -79,7 +79,7 @@ INSTALL_DATA = @INSTALL_DATA@
 # my autoconf doesn't set this
 #INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # maybe do an additional chmod if needed?
-INSTALL_SCRIPT = @INSTALL@ 
+INSTALL_SCRIPT = @INSTALL@
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -95,6 +95,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -108,13 +110,16 @@ HTMLDIR  = $(WXDIR)/src/html
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
+TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+PMDIR    = $(WXDIR)/src/os2
 ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
+DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
@@ -122,1769 +127,28 @@ DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-DISTDIR = ./_dist_dir/wx$(TOOLKIT)
+WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+DISTDIR = ./_dist_dir/@DISTDIR@
 
 ############################## Files ##################################
 
-BASE_HEADERS = \
-               app.h \
-               date.h \
-               debug.h \
-               defs.h \
-               dynarray.h \
-               dynlib.h \
-               event.h \
-               ffile.h \
-               file.h \
-               fileconf.h \
-               hash.h \
-               intl.h \
-               list.h \
-               log.h \
-               longlong.h \
-               mimetype.h \
-               module.h \
-               object.h \
-               process.h \
-               setup.h \
-               strconv.h \
-               stream.h \
-               string.h \
-               textfile.h \
-               thread.h \
-               time.h \
-               timer.h \
-               tokenzr.h \
-               txtstrm.h \
-               utils.h \
-               variant.h \
-               version.h \
-               wx.h \
-               wxchar.h \
-               wxprec.h
-
-WX_HEADERS = \
-               accel.h \
-               app.h \
-               arrimpl.cpp \
-               bitmap.h \
-               bmpbuttn.h \
-               brush.h \
-               buffer.h \
-               busyinfo.h \
-               button.h \
-               caret.h \
-               checkbox.h \
-               checklst.h \
-               choicdlg.h \
-               choice.h \
-               clipbrd.h \
-               cmndata.h \
-               colordlg.h \
-               colour.h \
-               combobox.h \
-               confbase.h \
-               config.h \
-               control.h \
-               cursor.h \
-               dataobj.h \
-               date.h \
-               datstrm.h \
-               db.h \
-               dbtable.h \
-               dc.h \
-               dcclient.h \
-               dcmemory.h \
-               dcprint.h \
-               dcps.h \
-               dcscreen.h \
-               dde.h \
-               debug.h \
-               defs.h \
-               dialog.h \
-               dirdlg.h \
-               dnd.h \
-               docmdi.h \
-               docview.h \
-               dragimag.h \
-               dynarray.h \
-               dynlib.h \
-               event.h \
-               expr.h \
-               ffile.h \
-               file.h \
-               fileconf.h \
-               filedlg.h \
-               filefn.h \
-               filesys.h \
-               font.h \
-               fontdlg.h \
-               frame.h \
-               fs_inet.h \
-               fs_zip.h \
-               gauge.h \
-               gdicmn.h \
-               gdiobj.h \
-               gifdecod.h \
-               grid.h \
-               gsocket.h \
-               hash.h \
-               help.h \
-               helpbase.h \
-               helphtml.h \
-               helpwin.h \
-               helpxlp.h \
-               icon.h \
-               image.h \
-               imaglist.h \
-               intl.h \
-               ioswrap.h \
-               ipcbase.h \
-               joystick.h \
-               layout.h \
-               laywin.h \
-               list.h \
-               listbox.h \
-               listctrl.h \
-               listimpl.cpp \
-               log.h \
-               longlong.h \
-               matrix.h \
-               mdi.h \
-               memory.h \
-               menu.h \
-               menuitem.h \
-               metafile.h \
-               mimetype.h \
-               minifram.h \
-               module.h \
-               msgdlg.h \
-               mstream.h \
-               notebook.h \
-               object.h \
-               objstrm.h \
-               odbc.h \
-               ownerdrw.h \
-               palette.h \
-               panel.h \
-               paper.h \
-               pen.h \
-               pnghand.h \
-               print.h \
-               printdlg.h \
-               prntbase.h \
-               process.h \
-               progdlg.h \
-               prop.h \
-               propform.h \
-               proplist.h \
-               radiobox.h \
-               radiobut.h \
-               region.h \
-               resource.h \
-               sashwin.h \
-               sckaddr.h \
-               sckipc.h \
-               sckstrm.h \
-               scrolbar.h \
-               scrolwin.h \
-               serbase.h \
-               settings.h \
-               setup.h \
-               sizer.h \
-               slider.h \
-               socket.h \
-               spinbutt.h \
-               spinctrl.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/dataform.h \
-               gtk/dataobj.h \
-               gtk/dataobj2.h \
-               gtk/dc.h \
-               gtk/dcclient.h \
-               gtk/dcmemory.h \
-               gtk/dcscreen.h \
-               gtk/dialog.h \
-               gtk/dnd.h \
-               gtk/filedlg.h \
-               gtk/font.h \
-               gtk/fontdlg.h \
-               gtk/frame.h \
-               gtk/gauge.h \
-               gtk/gdiobj.h \
-               gtk/icon.h \
-               gtk/joystick.h \
-               gtk/listbox.h \
-               gtk/mdi.h \
-               gtk/menu.h \
-               gtk/menuitem.h \
-               gtk/minifram.h \
-               gtk/notebook.h \
-               gtk/palette.h \
-               gtk/pen.h \
-               gtk/radiobox.h \
-               gtk/radiobut.h \
-               gtk/region.h \
-               gtk/scrolbar.h \
-               gtk/settings.h \
-               gtk/slider.h \
-               gtk/spinbutt.h \
-               gtk/spinctrl.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/dataform.h \
-               motif/dataobj.h \
-               motif/dataobj2.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/filedlgg.h \
-               generic/fontdlgg.h \
-               generic/grid.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/forcelnk.h \
-               html/helpctrl.h \
-               html/helpdata.h \
-               html/helpfrm.h \
-               html/htmlcell.h \
-               html/htmldefs.h \
-               html/htmlfilt.h \
-               html/htmlpars.h \
-               html/htmltag.h \
-               html/htmlwin.h \
-               html/htmprint.h \
-               html/m_templ.h \
-               html/winpars.h
-
-GTK_GENERICOBJS = \
-               busyinfo.o \
-               caret.o \
-               choicdgg.o \
-               colrdlgg.o \
-               dcpsg.o \
-               dirdlgg.o \
-               filedlgg.o \
-               grid.o \
-               helphtml.o \
-               helpwxht.o \
-               imaglist.o \
-               laywin.o \
-               listctrl.o \
-               logg.o \
-               msgdlgg.o \
-               numdlgg.o \
-               panelg.o \
-               printps.o \
-               prntdlgg.o \
-               progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
-               sashwin.o \
-               scrolwin.o \
-               splitter.o \
-               statusbr.o \
-               textdlgg.o \
-               tipdlg.o \
-               treectrl.o \
-               wizard.o
-
-GTK_GENERICDEPS = \
-               busyinfo.d \
-               caret.d \
-               choicdgg.d \
-               colrdlgg.d \
-               dcpsg.d \
-               dirdlgg.d \
-               filedlgg.d \
-               grid.d \
-               helphtml.d \
-               helpwxht.d \
-               imaglist.d \
-               laywin.d \
-               listctrl.d \
-               logg.d \
-               msgdlgg.d \
-               numdlgg.d \
-               panelg.d \
-               printps.d \
-               prntdlgg.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splitter.d \
-               statusbr.d \
-               textdlgg.d \
-               tipdlg.d \
-               treectrl.d \
-               wizard.d
-
-GTK_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               date.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               framecmn.o \
-               fs_inet.o \
-               fs_zip.o \
-               ftp.o \
-               gdicmn.o \
-               gifdecod.o \
-               hash.o \
-               helpbase.o \
-               http.o \
-               imagall.o \
-               imagbmp.o \
-               image.o \
-               imaggif.o \
-               imagjpeg.o \
-               imagpcx.o \
-               imagpng.o \
-               imagpnm.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               list.o \
-               log.o \
-               memory.o \
-               mimetype.o \
-               module.o \
-               mstream.o \
-               object.o \
-               objstrm.o \
-               paper.o \
-               prntbase.o \
-               process.o \
-               protocol.o \
-               resource.o \
-               sckaddr.o \
-               sckfile.o \
-               sckipc.o \
-               sckstrm.o \
-               serbase.o \
-               sizer.o \
-               socket.o \
-               strconv.o \
-               stream.o \
-               string.o \
-               tbarbase.o \
-               tbarsmpl.o \
-               textcmn.o \
-               textfile.o \
-               time.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               unzip.o \
-               url.o \
-               utilscmn.o \
-               valgen.o \
-               validate.o \
-               valtext.o \
-               variant.o \
-               wfstream.o \
-               wincmn.o \
-               wxchar.o \
-               wxexpr.o \
-               zipstrm.o \
-               zstream.o
-
-GTK_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               date.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               framecmn.d \
-               fs_inet.d \
-               fs_zip.d \
-               ftp.d \
-               gdicmn.d \
-               gifdecod.d \
-               hash.d \
-               helpbase.d \
-               http.d \
-               imagall.d \
-               imagbmp.d \
-               image.d \
-               imaggif.d \
-               imagjpeg.d \
-               imagpcx.d \
-               imagpng.d \
-               imagpnm.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               list.d \
-               log.d \
-               memory.d \
-               mimetype.d \
-               module.d \
-               mstream.d \
-               object.d \
-               objstrm.d \
-               paper.d \
-               prntbase.d \
-               process.d \
-               protocol.d \
-               resource.d \
-               sckaddr.d \
-               sckfile.d \
-               sckipc.d \
-               sckstrm.d \
-               serbase.d \
-               sizer.d \
-               socket.d \
-               strconv.d \
-               stream.d \
-               string.d \
-               tbarbase.d \
-               tbarsmpl.d \
-               textcmn.d \
-               textfile.d \
-               time.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               unzip.d \
-               url.d \
-               utilscmn.d \
-               valgen.d \
-               validate.d \
-               valtext.d \
-               variant.d \
-               wfstream.d \
-               wincmn.d \
-               wxchar.d \
-               wxexpr.d \
-               zipstrm.d \
-               zstream.d
-
-GTK_GUIOBJS = \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               cursor.o \
-               data.o \
-               dataobj.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcscreen.o \
-               dialog.o \
-               dnd.o \
-               font.o \
-               fontdlg.o \
-               frame.o \
-               gauge.o \
-               gdiobj.o \
-               gsockgtk.o \
-               icon.o \
-               listbox.o \
-               main.o \
-               mdi.o \
-               menu.o \
-               minifram.o \
-               notebook.o \
-               palette.o \
-               pen.o \
-               radiobox.o \
-               radiobut.o \
-               region.o \
-               scrolbar.o \
-               settings.o \
-               slider.o \
-               spinbutt.o \
-               spinctrl.o \
-               statbmp.o \
-               statbox.o \
-               statline.o \
-               stattext.o \
-               tbargtk.o \
-               textctrl.o \
-               timer.o \
-               tooltip.o \
-               utilsgtk.o \
-               utilsres.o \
-               wave.o \
-               win_gtk.o \
-               window.o
-
-GTK_GUIDEPS = \
-               accel.d \
-               app.d \
-               bitmap.d \
-               bmpbuttn.d \
-               brush.d \
-               button.d \
-               checkbox.d \
-               checklst.d \
-               choice.d \
-               clipbrd.d \
-               colour.d \
-               combobox.d \
-               control.d \
-               cursor.d \
-               data.d \
-               dataobj.d \
-               dc.d \
-               dcclient.d \
-               dcmemory.d \
-               dcscreen.d \
-               dialog.d \
-               dnd.d \
-               font.d \
-               fontdlg.d \
-               frame.d \
-               gauge.d \
-               gdiobj.d \
-               gsockgtk.d \
-               icon.d \
-               listbox.d \
-               main.d \
-               mdi.d \
-               menu.d \
-               minifram.d \
-               notebook.d \
-               palette.d \
-               pen.d \
-               radiobox.d \
-               radiobut.d \
-               region.d \
-               scrolbar.d \
-               settings.d \
-               slider.d \
-               spinbutt.d \
-               spinctrl.d \
-               statbmp.d \
-               statbox.d \
-               statline.d \
-               stattext.d \
-               tbargtk.d \
-               textctrl.d \
-               timer.d \
-               tooltip.d \
-               utilsgtk.d \
-               utilsres.d \
-               wave.d \
-               win_gtk.d \
-               window.d
-
-MOTIF_GENERICOBJS = \
-               busyinfo.o \
-               caret.o \
-               choicdgg.o \
-               colrdlgg.o \
-               dcpsg.o \
-               dirdlgg.o \
-               fontdlgg.o \
-               grid.o \
-               helphtml.o \
-               helpwxht.o \
-               helpxlp.o \
-               imaglist.o \
-               laywin.o \
-               listctrl.o \
-               logg.o \
-               msgdlgg.o \
-               notebook.o \
-               numdlgg.o \
-               panelg.o \
-               printps.o \
-               prntdlgg.o \
-               progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
-               sashwin.o \
-               scrolwin.o \
-               splitter.o \
-               statline.o \
-               statusbr.o \
-               tabg.o \
-               textdlgg.o \
-               tipdlg.o \
-               treectrl.o \
-               wizard.o
-
-MOTIF_GENERICDEPS = \
-               busyinfo.d \
-               caret.d \
-               choicdgg.d \
-               colrdlgg.d \
-               dcpsg.d \
-               dirdlgg.d \
-               fontdlgg.d \
-               grid.d \
-               helphtml.d \
-               helpwxht.d \
-               helpxlp.d \
-               imaglist.d \
-               laywin.d \
-               listctrl.d \
-               logg.d \
-               msgdlgg.d \
-               notebook.d \
-               numdlgg.d \
-               panelg.d \
-               printps.d \
-               prntdlgg.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splitter.d \
-               statline.d \
-               statusbr.d \
-               tabg.d \
-               textdlgg.d \
-               tipdlg.d \
-               treectrl.d \
-               wizard.d
-
-MOTIF_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               date.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               framecmn.o \
-               fs_inet.o \
-               fs_zip.o \
-               ftp.o \
-               gdicmn.o \
-               gifdecod.o \
-               hash.o \
-               helpbase.o \
-               http.o \
-               imagall.o \
-               imagbmp.o \
-               image.o \
-               imaggif.o \
-               imagjpeg.o \
-               imagpcx.o \
-               imagpng.o \
-               imagpnm.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               list.o \
-               log.o \
-               memory.o \
-               mimetype.o \
-               module.o \
-               mstream.o \
-               object.o \
-               objstrm.o \
-               odbc.o \
-               paper.o \
-               prntbase.o \
-               process.o \
-               protocol.o \
-               resource.o \
-               sckaddr.o \
-               sckfile.o \
-               sckipc.o \
-               sckstrm.o \
-               serbase.o \
-               sizer.o \
-               socket.o \
-               strconv.o \
-               stream.o \
-               string.o \
-               tbarbase.o \
-               tbarsmpl.o \
-               textcmn.o \
-               textfile.o \
-               time.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               unzip.o \
-               url.o \
-               utilscmn.o \
-               valgen.o \
-               validate.o \
-               valtext.o \
-               variant.o \
-               wfstream.o \
-               wincmn.o \
-               wxchar.o \
-               wxexpr.o \
-               zipstrm.o \
-               zstream.o
-
-MOTIF_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               date.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               framecmn.d \
-               fs_inet.d \
-               fs_zip.d \
-               ftp.d \
-               gdicmn.d \
-               gifdecod.d \
-               hash.d \
-               helpbase.d \
-               http.d \
-               imagall.d \
-               imagbmp.d \
-               image.d \
-               imaggif.d \
-               imagjpeg.d \
-               imagpcx.d \
-               imagpng.d \
-               imagpnm.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               list.d \
-               log.d \
-               memory.d \
-               mimetype.d \
-               module.d \
-               mstream.d \
-               object.d \
-               objstrm.d \
-               odbc.d \
-               paper.d \
-               prntbase.d \
-               process.d \
-               protocol.d \
-               resource.d \
-               sckaddr.d \
-               sckfile.d \
-               sckipc.d \
-               sckstrm.d \
-               serbase.d \
-               sizer.d \
-               socket.d \
-               strconv.d \
-               stream.d \
-               string.d \
-               tbarbase.d \
-               tbarsmpl.d \
-               textcmn.d \
-               textfile.d \
-               time.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               unzip.d \
-               url.d \
-               utilscmn.d \
-               valgen.d \
-               validate.d \
-               valtext.d \
-               variant.d \
-               wfstream.d \
-               wincmn.d \
-               wxchar.d \
-               wxexpr.d \
-               zipstrm.d \
-               zstream.d
-
-MOTIF_GUIOBJS = \
-               xmcombo.o \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               cursor.o \
-               data.o \
-               dataobj.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcscreen.o \
-               dialog.o \
-               filedlg.o \
-               font.o \
-               fontenum.o \
-               frame.o \
-               gauge.o \
-               gdiobj.o \
-               gsockmot.o \
-               icon.o \
-               listbox.o \
-               main.o \
-               mdi.o \
-               menu.o \
-               menuitem.o \
-               minifram.o \
-               msgdlg.o \
-               palette.o \
-               pen.o \
-               radiobox.o \
-               radiobut.o \
-               region.o \
-               scrolbar.o \
-               settings.o \
-               slider.o \
-               spinbutt.o \
-               statbmp.o \
-               statbox.o \
-               stattext.o \
-               textctrl.o \
-               timer.o \
-               toolbar.o \
-               utils.o \
-               window.o
-
-MOTIF_GUIDEPS = \
-               xmcombo.d \
-               accel.d \
-               app.d \
-               bitmap.d \
-               bmpbuttn.d \
-               brush.d \
-               button.d \
-               checkbox.d \
-               checklst.d \
-               choice.d \
-               clipbrd.d \
-               colour.d \
-               combobox.d \
-               control.d \
-               cursor.d \
-               data.d \
-               dataobj.d \
-               dc.d \
-               dcclient.d \
-               dcmemory.d \
-               dcscreen.d \
-               dialog.d \
-               filedlg.d \
-               font.d \
-               fontenum.d \
-               frame.d \
-               gauge.d \
-               gdiobj.d \
-               gsockmot.d \
-               icon.d \
-               listbox.d \
-               main.d \
-               mdi.d \
-               menu.d \
-               menuitem.d \
-               minifram.d \
-               msgdlg.d \
-               palette.d \
-               pen.d \
-               radiobox.d \
-               radiobut.d \
-               region.d \
-               scrolbar.d \
-               settings.d \
-               slider.d \
-               spinbutt.d \
-               statbmp.d \
-               statbox.d \
-               stattext.d \
-               textctrl.d \
-               timer.d \
-               toolbar.d \
-               utils.d \
-               window.d
-
-MSW_GENERICOBJS = \
-               busyinfo.o \
-               choicdgg.o \
-               dirdlgg.o \
-               grid.o \
-               laywin.o \
-               logg.o \
-               numdlgg.o \
-               panelg.o \
-               progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
-               sashwin.o \
-               scrolwin.o \
-               splitter.o \
-               statusbr.o \
-               tabg.o \
-               textdlgg.o \
-               tipdlg.o \
-               wizard.o
-
-MSW_GENERICDEPS = \
-               busyinfo.d \
-               choicdgg.d \
-               dirdlgg.d \
-               grid.d \
-               laywin.d \
-               logg.d \
-               numdlgg.d \
-               panelg.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splitter.d \
-               statusbr.d \
-               tabg.d \
-               textdlgg.d \
-               tipdlg.d \
-               wizard.d
-
-MSW_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               date.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               framecmn.o \
-               fs_inet.o \
-               fs_zip.o \
-               ftp.o \
-               gdicmn.o \
-               gifdecod.o \
-               hash.o \
-               helpbase.o \
-               http.o \
-               imagall.o \
-               imagbmp.o \
-               image.o \
-               imaggif.o \
-               imagjpeg.o \
-               imagpcx.o \
-               imagpng.o \
-               imagpnm.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               list.o \
-               log.o \
-               memory.o \
-               mimetype.o \
-               module.o \
-               mstream.o \
-               object.o \
-               objstrm.o \
-               odbc.o \
-               paper.o \
-               prntbase.o \
-               process.o \
-               protocol.o \
-               resource.o \
-               sckaddr.o \
-               sckfile.o \
-               sckipc.o \
-               sckstrm.o \
-               serbase.o \
-               sizer.o \
-               socket.o \
-               strconv.o \
-               stream.o \
-               string.o \
-               tbarbase.o \
-               tbarsmpl.o \
-               textcmn.o \
-               textfile.o \
-               time.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               unzip.o \
-               url.o \
-               utilscmn.o \
-               valgen.o \
-               validate.o \
-               valtext.o \
-               variant.o \
-               wfstream.o \
-               wincmn.o \
-               wxchar.o \
-               wxexpr.o \
-               zipstrm.o \
-               zstream.o
-
-MSW_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               date.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               framecmn.d \
-               fs_inet.d \
-               fs_zip.d \
-               ftp.d \
-               gdicmn.d \
-               gifdecod.d \
-               hash.d \
-               helpbase.d \
-               http.d \
-               imagall.d \
-               imagbmp.d \
-               image.d \
-               imaggif.d \
-               imagjpeg.d \
-               imagpcx.d \
-               imagpng.d \
-               imagpnm.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               list.d \
-               log.d \
-               memory.d \
-               mimetype.d \
-               module.d \
-               mstream.d \
-               object.d \
-               objstrm.d \
-               odbc.d \
-               paper.d \
-               prntbase.d \
-               process.d \
-               protocol.d \
-               resource.d \
-               sckaddr.d \
-               sckfile.d \
-               sckipc.d \
-               sckstrm.d \
-               serbase.d \
-               sizer.d \
-               socket.d \
-               strconv.d \
-               stream.d \
-               string.d \
-               tbarbase.d \
-               tbarsmpl.d \
-               textcmn.d \
-               textfile.d \
-               time.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               unzip.d \
-               url.d \
-               utilscmn.d \
-               valgen.d \
-               validate.d \
-               valtext.d \
-               variant.d \
-               wfstream.d \
-               wincmn.d \
-               wxchar.d \
-               wxexpr.d \
-               zipstrm.d \
-               zstream.d
-
-MSW_GUIOBJS = \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               caret.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colordlg.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               curico.o \
-               cursor.o \
-               data.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcprint.o \
-               dcscreen.o \
-               dde.o \
-               dialog.o \
-               dib.o \
-               dibutils.o \
-               dragimag.o \
-               filedlg.o \
-               font.o \
-               fontdlg.o \
-               frame.o \
-               gauge95.o \
-               gdiobj.o \
-               gsocket.o \
-               helpwin.o \
-               icon.o \
-               imaglist.o \
-               joystick.o \
-               listbox.o \
-               listctrl.o \
-               main.o \
-               mdi.o \
-               menu.o \
-               menuitem.o \
-               metafile.o \
-               minifram.o \
-               msgdlg.o \
-               nativdlg.o \
-               notebook.o \
-               ownerdrw.o \
-               palette.o \
-               pen.o \
-               penwin.o \
-               pnghand.o \
-               printdlg.o \
-               printwin.o \
-               radiobox.o \
-               radiobut.o \
-               regconf.o \
-               region.o \
-               registry.o \
-               scrolbar.o \
-               settings.o \
-               slider95.o \
-               spinbutt.o \
-               spinctrl.o \
-               statbmp.o \
-               statbox.o \
-               statbr95.o \
-               statline.o \
-               stattext.o \
-               tabctrl.o \
-               taskbar.o \
-               tbar95.o \
-               textctrl.o \
-               thread.o \
-               timer.o \
-               tooltip.o \
-               treectrl.o \
-               utils.o \
-               utilsexc.o \
-               wave.o \
-               window.o \
-               xpmhand.o
-
-MSW_GUIDEPS = \
-               accel.d \
-               app.d \
-               bitmap.d \
-               bmpbuttn.d \
-               brush.d \
-               button.d \
-               caret.d \
-               checkbox.d \
-               checklst.d \
-               choice.d \
-               clipbrd.d \
-               colordlg.d \
-               colour.d \
-               combobox.d \
-               control.d \
-               curico.d \
-               cursor.d \
-               data.d \
-               dc.d \
-               dcclient.d \
-               dcmemory.d \
-               dcprint.d \
-               dcscreen.d \
-               dde.d \
-               dialog.d \
-               dib.d \
-               dibutils.d \
-               dragimag.d \
-               filedlg.d \
-               font.d \
-               fontdlg.d \
-               frame.d \
-               gauge95.d \
-               gdiobj.d \
-               gsocket.d \
-               helpwin.d \
-               icon.d \
-               imaglist.d \
-               joystick.d \
-               listbox.d \
-               listctrl.d \
-               main.d \
-               mdi.d \
-               menu.d \
-               menuitem.d \
-               metafile.d \
-               minifram.d \
-               msgdlg.d \
-               nativdlg.d \
-               notebook.d \
-               ownerdrw.d \
-               palette.d \
-               pen.d \
-               penwin.d \
-               pnghand.d \
-               printdlg.d \
-               printwin.d \
-               radiobox.d \
-               radiobut.d \
-               regconf.d \
-               region.d \
-               registry.d \
-               scrolbar.d \
-               settings.d \
-               slider95.d \
-               spinbutt.d \
-               spinctrl.d \
-               statbmp.d \
-               statbox.d \
-               statbr95.d \
-               statline.d \
-               stattext.d \
-               tabctrl.d \
-               taskbar.d \
-               tbar95.d \
-               textctrl.d \
-               thread.d \
-               timer.d \
-               tooltip.d \
-               treectrl.d \
-               utils.d \
-               utilsexc.d \
-               wave.d \
-               window.d \
-               xpmhand.d
-
-BASE_OBJS = \
-               init.o \
-               appcmn.o \
-               config.o \
-               date.o \
-               dynarray.o \
-               dynlib.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               hash.o \
-               intl.o \
-               list.o \
-               log.o \
-               mimetype.o \
-               module.o \
-               object.o \
-               process.o \
-               strconv.o \
-               stream.o \
-               string.o \
-               textfile.o \
-               time.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               utilscmn.o \
-               variant.o \
-               wxchar.o \
-               utilsunx.o
-
-BASE_DEPS = \
-               init.d \
-               appcmn.d \
-               config.d \
-               date.d \
-               dynarray.d \
-               dynlib.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               hash.d \
-               intl.d \
-               list.d \
-               log.d \
-               mimetype.d \
-               module.d \
-               object.d \
-               process.d \
-               strconv.d \
-               stream.d \
-               string.d \
-               textfile.d \
-               time.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               utilscmn.d \
-               variant.d \
-               wxchar.d \
-               utilsunx.d
-
-HTMLOBJS = \
-               helpctrl.o \
-               helpdata.o \
-               helpfrm.o \
-               htmlcell.o \
-               htmlfilt.o \
-               htmlpars.o \
-               htmltag.o \
-               htmlwin.o \
-               htmprint.o \
-               m_fonts.o \
-               m_hline.o \
-               m_image.o \
-               m_layout.o \
-               m_links.o \
-               m_list.o \
-               m_pre.o \
-               m_tables.o \
-               search.o \
-               winpars.o
-
-HTMLDEPS = \
-               helpctrl.d \
-               helpdata.d \
-               helpfrm.d \
-               htmlcell.d \
-               htmlfilt.d \
-               htmlpars.d \
-               htmltag.d \
-               htmlwin.d \
-               htmprint.d \
-               m_fonts.d \
-               m_hline.d \
-               m_image.d \
-               m_layout.d \
-               m_links.d \
-               m_list.d \
-               m_pre.d \
-               m_tables.d \
-               search.d \
-               winpars.d
-
-UNIX_OBJS = \
-               dialup.o \
-               gsocket.o \
-               threadpsx.o \
-               utilsunx.o
-
-UNIX_DEPS = \
-               dialup.d \
-               gsocket.d \
-               threadpsx.d \
-               utilsunx.d
+# this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
+# ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
+# .d and .h/.inl files for the current toolkit
+include $(top_srcdir)/@PORT_FILES@
+
+SOURCES = $(ALL_SOURCES)
+HEADERS = $(ALL_HEADERS)
+
+# for the objects and depfiles, we might be bulding only part of them
+# depending on configure arguments, so select a subset of ALL
+OBJECTS = @ALL_OBJECTS@
+DEPFILES = @ALL_DEPFILES@
 
+# the object files of sublibraries (we assume that they don't change [often],
+# so we don't generate these lists with tmake but embed them here)
 ZLIBOBJS    = \
                adler32.o \
                compress.o \
@@ -1967,7 +231,42 @@ JPEGOBJS    = \
                jquant2.o \
                jdmerge.o
 
-IODBC_OBJS = \
+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 \
@@ -1983,23 +282,10 @@ IODBC_OBJS = \
                misc.o \
                prepare.o \
                result.o
+        
+############################## Rules ##################################
 
-GUIOBJS = @GUIOBJS@
-GUIDEPS = @GUIDEPS@
-GUIHEADERS = @GUIHEADERS@
-COMMONOBJS = @COMMONOBJS@
-COMMONDEPS = @COMMONDEPS@
-GENERICOBJS = @GENERICOBJS@
-GENERICDEPS = @GENERICDEPS@
-UNIXOBJS = @UNIXOBJS@
-UNIXDEPS = @UNIXDEPS@
-IODBCOBJS = @IODBCOBJS@
-
-OBJECTS = @ALL_OBJECTS@
-
-DEPFILES = @ALL_DEPFILES@
-
-HEADERS = @ALL_HEADERS@
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
 
 all: @WX_ALL@
 
@@ -2010,7 +296,7 @@ all: @WX_ALL@
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
-       $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
+       $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
        
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
@@ -2020,7 +306,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
        
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+CREATE_INSTALLED_LINKS: preinstall
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
        $(RM) $(libdir)/@WX_LIBRARY_LINK3@
@@ -2028,7 +314,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
        
-$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
+$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
        $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -2045,15 +331,25 @@ parser.c:        $(COMMDIR)/parser.y lexer.c
 
 lexer.c:       $(COMMDIR)/lexer.l
        $(LEX) $(COMMDIR)/lexer.l
-       @sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+       @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
        sed -e "s/yy/PROIO_yy/g"            | \
        sed -e "s/input/PROIO_input/g"      | \
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
-       @$(RM) lex.yy.c
+       @$(RM) @LEX_STEM@.c
 
 -include $(DEPFILES)
 
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+afminstall: preinstall
+       $(INSTALL) -d $(datadir)
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+
+# this is the real install target: copies the library, wx-config and the
+# headers to the installation directory
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
@@ -2061,7 +357,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(prefix)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
-       $(INSTALL) -d $(datadir)
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -2070,41 +365,32 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-       $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       
-       $(INSTALL) -d $(datadir)/wx
-       $(INSTALL) -d $(datadir)/wx/afm
-       $(INSTALL) -d $(datadir)/wx/gs_afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
        $(INSTALL) -d $(includedir)/wx
-       $(INSTALL) -d $(includedir)/wx/msw
-       $(INSTALL) -d $(includedir)/wx/gtk
-       $(INSTALL) -d $(includedir)/wx/motif
-       $(INSTALL) -d $(includedir)/wx/html
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
        $(INSTALL) -d $(includedir)/wx/protocol
        $(INSTALL) -d $(includedir)/wx/unix
-       $(INSTALL) -d $(includedir)/wx/generic
        @list='$(HEADERS)'; for p in $$list; do \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
-       
-write_message:
+
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
-       @echo " if you installed a shared library."
+       @echo " if you installed a shared library and also modify"
+       @echo " LD_LIBRARY_PATH (or equivalent) environment variable."
        @echo " "
-       @echo " wxWindows comes with  no guarantees  and doesn't claim"
+       @echo " wxWindows comes with no guarantees and doesn't claim"
        @echo " to be suitable for any purpose."
        @echo " "
        @echo " Read the wxWindows Licence on licencing conditions."
        @echo " "
 
-install: preinstall @WX_ALL_INSTALLED@ write_message
-
 uninstall:
        @echo " "
        @echo " Uninstalling wxWindows..."
@@ -2140,10 +426,12 @@ uninstall:
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
-ALL_DIST:
+# this target should copy only the files common to really all ports (including
+# wxBase) to the dist dir
+ALL_DIST: distclean
        mkdir _dist_dir
        mkdir $(DISTDIR)
-       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+       cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
@@ -2155,6 +443,11 @@ ALL_DIST:
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+
+# this target is the common part of distribution script for all GUI toolkits,
+# but is not used when building wxBase distribution
+ALL_GUI_DIST: ALL_DIST
+       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
@@ -2164,9 +457,10 @@ ALL_DIST:
        mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html
-       mkdir $(DISTDIR)/include/wx/unix
        mkdir $(DISTDIR)/include/wx/protocol
-       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+       mkdir $(DISTDIR)/include/wx/unix
+       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+       cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
        cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
@@ -2179,14 +473,18 @@ ALL_DIST:
        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/tiff
        mkdir $(DISTDIR)/src/zlib
        mkdir $(DISTDIR)/src/iodbc
+       mkdir $(DISTDIR)/src/unix
+       cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
+       cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
+       cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        cp $(COMMDIR)/*.inc $(DISTDIR)/src/common
        cp $(COMMDIR)/*.l $(DISTDIR)/src/common
        cp $(COMMDIR)/*.h $(DISTDIR)/src/common
@@ -2194,8 +492,6 @@ ALL_DIST:
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-       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
@@ -2205,6 +501,9 @@ ALL_DIST:
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+       cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
+       cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+       cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
@@ -2213,7 +512,31 @@ ALL_DIST:
        cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
-GTK_DIST:
+BASE_DIST: ALL_DIST
+       mkdir $(DISTDIR)/include
+       mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/protocol
+       mkdir $(DISTDIR)/include/wx/unix
+       mkdir $(DISTDIR)/src
+       mkdir $(DISTDIR)/src/common
+       mkdir $(DISTDIR)/src/unix
+       cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
+       cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
+       cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
+       cp $(WXDIR)/wxBase.dsp $(DISTDIR)
+       cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt
+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
+       cp $(SRCDIR)/*.in $(DISTDIR)/src
+       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
+
+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
@@ -2221,7 +544,7 @@ GTK_DIST:
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
 
-MOTIF_DIST:
+MOTIF_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
@@ -2231,7 +554,7 @@ MOTIF_DIST:
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
-MSW_DIST:
+MSW_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
@@ -2244,79 +567,167 @@ MSW_DIST:
        mkdir $(DISTDIR)/src/msw/ole
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
-SAMPLES_DIST:
+DEMOS_DIST: ALL_GUI_DIST
+       mkdir $(DISTDIR)/demos
+       cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
+       cp $(DEMODIR)/configure $(DISTDIR)/samples
+       cp $(DEMODIR)/configure.in $(DISTDIR)/samples
+
+       mkdir $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
+       
+       mkdir $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
+       
+       mkdir $(DISTDIR)/demos/life
+       mkdir $(DISTDIR)/demos/life/bitmaps
+       cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
+       
+       mkdir $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
+    
+       mkdir $(DISTDIR)/demos/fractal
+       cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
+       cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
+       cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
+       
+SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
-       mkdir $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
+       cp $(SAMPDIR)/configure $(DISTDIR)/samples
+       cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
+       
        mkdir $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
+       cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
+       
+       mkdir $(DISTDIR)/samples/calendar
+       cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
+       cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+       cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
+       
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
+       cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
+       
+       mkdir $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
+       
        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
+       cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
+       
        mkdir $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
-       mkdir $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
-       cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+       
        mkdir $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
+       
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+       
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+       
        mkdir $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+       cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+       
        mkdir $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+       cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+       
        mkdir $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+       cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+       
        mkdir $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
+       cp $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
-       mkdir $(DISTDIR)/samples/forty
-       cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
-       cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
-       cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
-       cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
-       mkdir $(DISTDIR)/samples/fractal
-       cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
-       cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
+       
+       mkdir $(DISTDIR)/samples/exec
+       cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
+       cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
+       
+       mkdir $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
+       
+       mkdir $(DISTDIR)/samples/font
+       cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
+       cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
+       cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
+       
+       mkdir $(DISTDIR)/samples/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
@@ -2330,6 +741,10 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
        mkdir $(DISTDIR)/samples/html/help/helpfiles
        cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+       mkdir $(DISTDIR)/samples/html/helpview
+       cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
+       cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
+       cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
        mkdir $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
@@ -2354,14 +769,20 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
        cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
        cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+       
        mkdir $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
+    
        mkdir $(DISTDIR)/samples/internat
        mkdir $(DISTDIR)/samples/internat/de
        mkdir $(DISTDIR)/samples/internat/fr
        cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
+       cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
@@ -2370,56 +791,102 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
        cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
        cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+       
        mkdir $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
+       cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+       
        mkdir $(DISTDIR)/samples/listctrl
+       mkdir $(DISTDIR)/samples/listctrl/bitmaps
        cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
+       cp $(SAMPDIR)/listctrl/makefile.unx $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-       mkdir $(DISTDIR)/samples/listctrl/bitmaps
        cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+       
        mkdir $(DISTDIR)/samples/mdi
+       mkdir $(DISTDIR)/samples/mdi/bitmaps
        cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
+       cp $(SAMPDIR)/mdi/makefile.unx $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
-       mkdir $(DISTDIR)/samples/mdi/bitmaps
        cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
+       
+       mkdir $(DISTDIR)/samples/memcheck
+       cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck
+       cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck
+       cp $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck
+       cp $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck
+       
+       mkdir $(DISTDIR)/samples/menu
+       cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu
+       cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu
+       cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu
+       
        mkdir $(DISTDIR)/samples/minifram
+       mkdir $(DISTDIR)/samples/minifram/bitmaps
        cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
+       cp $(SAMPDIR)/minifram/makefile.unx $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-       mkdir $(DISTDIR)/samples/minifram/bitmaps
        cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+       
        mkdir $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
+       cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
-       mkdir $(DISTDIR)/samples/nettest
-       cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
-       cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+       
+       mkdir $(DISTDIR)/samples/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/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/*.cpp $(DISTDIR)/samples/richedit
@@ -2427,70 +894,93 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
+    
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+    
+       mkdir $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
+       cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
+    
        mkdir $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+    
        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+       cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+    
        mkdir $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
+       cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
+    
        mkdir $(DISTDIR)/samples/splitter
+       cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+    
+       mkdir $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/Makefile.in $(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/*.cpp $(DISTDIR)/samples/toolbar
-       cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
        mkdir $(DISTDIR)/samples/toolbar/bitmaps
        cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+    
        mkdir $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+    
        mkdir $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
+    
        mkdir $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
+    
        mkdir $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
-       mkdir $(DISTDIR)/samples/wxpoem
-       cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem
-       cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem
-       cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem
-       cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem
-       cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem
-       mkdir $(DISTDIR)/samples/wxsocket
-       cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
-       cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket
-       cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
-
-UTILS_DIST:
+    
+       mkdir $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
+
+UTILS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+       cp $(UTILSDIR)/configure $(DISTDIR)/samples
+       cp $(UTILSDIR)/configure.in $(DISTDIR)/samples
        
        mkdir $(DISTDIR)/utils/wxMMedia2
        mkdir $(DISTDIR)/utils/wxMMedia2/lib
@@ -2518,17 +1008,29 @@ UTILS_DIST:
        cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
        cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
        
-MISC_DIST:
+MISC_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/misc
        mkdir $(DISTDIR)/misc/afm
        cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
-       
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
-       cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+
+distclean:
        $(RM) -r _dist_dir
 
+dist: @GUIDIST@
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples; \
+       tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples samples; \
+       mv demos wxDemos; \
+       tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos demos; \
+       fi
+
 clean:
        $(RM) *.o
        $(RM) *.d