added wxUSE_NOTEBOOK to include/wx/msw/setup0.h, removed wxUSE_RADIOBUTTON (we

[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 495881099f29ca7cc2bdcc0d993b249a99fb47ca..c5796a704f4061a1427e8d5425c2f965783bf4f7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
  #
  #
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 18:11, 2000/01/10
  # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
  
  #
  # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
  
  #
@@ -43,9 +43,11 @@ VP5 = @top_srcdir@/src/unix
  VP6 = @top_srcdir@/src/html
  VP7 = @top_srcdir@/src/png
  VP8 = @top_srcdir@/src/jpeg
  VP6 = @top_srcdir@/src/html
  VP7 = @top_srcdir@/src/png
  VP8 = @top_srcdir@/src/jpeg
-VP9 = @top_srcdir@/src/zlib
+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)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11)
  
  top_srcdir = @top_srcdir@
  prefix = @prefix@
  
  top_srcdir = @top_srcdir@
  prefix = @prefix@
@@ -94,6 +96,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)
@@ -107,10 +111,12 @@ 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
  GTKDIR   = $(WXDIR)/src/gtk
  MOTIFDIR = $(WXDIR)/src/motif
  MSWDIR   = $(WXDIR)/src/msw
  ZLIBDIR  = $(WXDIR)/src/zlib
  GTKDIR   = $(WXDIR)/src/gtk
  MOTIFDIR = $(WXDIR)/src/motif
  MSWDIR   = $(WXDIR)/src/msw
+ODBCDIR  = $(WXDIR)/src/iodbc
  INCDIR   = $(WXDIR)/include
  SAMPDIR  = $(WXDIR)/samples
  UTILSDIR = $(WXDIR)/utils
  INCDIR   = $(WXDIR)/include
  SAMPDIR  = $(WXDIR)/samples
  UTILSDIR = $(WXDIR)/utils
@@ -120,11 +126,55 @@ DOCDIR = $(WXDIR)/docs
  
  ########################## Archive name ###############################
  
  
  ########################## Archive name ###############################
  
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
  DISTDIR = ./_dist_dir/wx$(TOOLKIT)
  
  ############################## Files ##################################
  
  DISTDIR = ./_dist_dir/wx$(TOOLKIT)
  
  ############################## Files ##################################
  
+BASE_HEADERS = \
+               app.h \
+               buffer.h \
+               cmdline.h \
+               date.h \
+               datetime.h \
+               debug.h \
+               defs.h \
+               dir.h \
+               dynarray.h \
+               dynlib.h \
+               event.h \
+               ffile.h \
+               file.h \
+               fileconf.h \
+               hash.h \
+               intl.h \
+               ioswrap.h \
+               list.h \
+               log.h \
+               longlong.h \
+               memory.h \
+               mimetype.h \
+               module.h \
+               object.h \
+               process.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 \
+               wfstream.h \
+               wx.h \
+               wxchar.h \
+               wxprec.h
+
  WX_HEADERS = \
                 accel.h \
                 app.h \
  WX_HEADERS = \
                 accel.h \
                 app.h \
@@ -135,12 +185,14 @@ WX_HEADERS = \
                 buffer.h \
                 busyinfo.h \
                 button.h \
                 buffer.h \
                 busyinfo.h \
                 button.h \
+               calctrl.h \
                 caret.h \
                 checkbox.h \
                 checklst.h \
                 choicdlg.h \
                 choice.h \
                 clipbrd.h \
                 caret.h \
                 checkbox.h \
                 checklst.h \
                 choicdlg.h \
                 choice.h \
                 clipbrd.h \
+               cmdline.h \
                 cmndata.h \
                 colordlg.h \
                 colour.h \
                 cmndata.h \
                 colordlg.h \
                 colour.h \
@@ -148,9 +200,11 @@ WX_HEADERS = \
                 confbase.h \
                 config.h \
                 control.h \
                 confbase.h \
                 config.h \
                 control.h \
+               ctrlsub.h \
                 cursor.h \
                 dataobj.h \
                 date.h \
                 cursor.h \
                 dataobj.h \
                 date.h \
+               datetime.h \
                 datstrm.h \
                 db.h \
                 dbtable.h \
                 datstrm.h \
                 db.h \
                 dbtable.h \
@@ -164,6 +218,8 @@ WX_HEADERS = \
                 debug.h \
                 defs.h \
                 dialog.h \
                 debug.h \
                 defs.h \
                 dialog.h \
+               dialup.h \
+               dir.h \
                 dirdlg.h \
                 dnd.h \
                 docmdi.h \
                 dirdlg.h \
                 dnd.h \
                 docmdi.h \
@@ -171,6 +227,7 @@ WX_HEADERS = \
                 dragimag.h \
                 dynarray.h \
                 dynlib.h \
                 dragimag.h \
                 dynarray.h \
                 dynlib.h \
+               encconv.h \
                 event.h \
                 expr.h \
                 ffile.h \
                 event.h \
                 expr.h \
                 ffile.h \
@@ -181,6 +238,9 @@ WX_HEADERS = \
                 filesys.h \
                 font.h \
                 fontdlg.h \
                 filesys.h \
                 font.h \
                 fontdlg.h \
+               fontenum.h \
+               fontmap.h \
+               fontutil.h \
                 frame.h \
                 fs_inet.h \
                 fs_zip.h \
                 frame.h \
                 fs_inet.h \
                 fs_zip.h \
@@ -197,8 +257,15 @@ WX_HEADERS = \
                 helpwin.h \
                 helpxlp.h \
                 icon.h \
                 helpwin.h \
                 helpxlp.h \
                 icon.h \
+               imagbmp.h \
                 image.h \
                 image.h \
+               imaggif.h \
+               imagjpeg.h \
                 imaglist.h \
                 imaglist.h \
+               imagpcx.h \
+               imagpng.h \
+               imagpnm.h \
+               imagtiff.h \
                 intl.h \
                 ioswrap.h \
                 ipcbase.h \
                 intl.h \
                 ioswrap.h \
                 ipcbase.h \
@@ -231,7 +298,6 @@ WX_HEADERS = \
                 panel.h \
                 paper.h \
                 pen.h \
                 panel.h \
                 paper.h \
                 pen.h \
-               pnghand.h \
                 print.h \
                 printdlg.h \
                 prntbase.h \
                 print.h \
                 printdlg.h \
                 prntbase.h \
@@ -257,6 +323,7 @@ WX_HEADERS = \
                 slider.h \
                 socket.h \
                 spinbutt.h \
                 slider.h \
                 socket.h \
                 spinbutt.h \
+               spinctrl.h \
                 splitter.h \
                 statbmp.h \
                 statbox.h \
                 splitter.h \
                 statbmp.h \
                 statbox.h \
@@ -269,9 +336,7 @@ WX_HEADERS = \
                 tab.h \
                 tabctrl.h \
                 taskbar.h \
                 tab.h \
                 tabctrl.h \
                 taskbar.h \
-               tbar95.h \
                 tbarbase.h \
                 tbarbase.h \
-               tbarmsw.h \
                 tbarsmpl.h \
                 textctrl.h \
                 textdlg.h \
                 tbarsmpl.h \
                 textctrl.h \
                 textdlg.h \
@@ -296,6 +361,7 @@ WX_HEADERS = \
                 wave.h \
                 wfstream.h \
                 window.h \
                 wave.h \
                 wfstream.h \
                 window.h \
+               wizard.h \
                 wx.h \
                 wx_cw.h \
                 wx_cw_cm.h \
                 wx.h \
                 wx_cw.h \
                 wx_cw_cm.h \
@@ -323,7 +389,9 @@ GTK_HEADERS = \
                 gtk/combobox.h \
                 gtk/control.h \
                 gtk/cursor.h \
                 gtk/combobox.h \
                 gtk/control.h \
                 gtk/cursor.h \
+               gtk/dataform.h \
                 gtk/dataobj.h \
                 gtk/dataobj.h \
+               gtk/dataobj2.h \
                 gtk/dc.h \
                 gtk/dcclient.h \
                 gtk/dcmemory.h \
                 gtk/dc.h \
                 gtk/dcclient.h \
                 gtk/dcmemory.h \
@@ -353,6 +421,7 @@ GTK_HEADERS = \
                 gtk/settings.h \
                 gtk/slider.h \
                 gtk/spinbutt.h \
                 gtk/settings.h \
                 gtk/slider.h \
                 gtk/spinbutt.h \
+               gtk/spinctrl.h \
                 gtk/statbmp.h \
                 gtk/statbox.h \
                 gtk/statline.h \
                 gtk/statbmp.h \
                 gtk/statbox.h \
                 gtk/statline.h \
@@ -382,7 +451,9 @@ MOTIF_HEADERS = \
                 motif/combobox.h \
                 motif/control.h \
                 motif/cursor.h \
                 motif/combobox.h \
                 motif/control.h \
                 motif/cursor.h \
+               motif/dataform.h \
                 motif/dataobj.h \
                 motif/dataobj.h \
+               motif/dataobj2.h \
                 motif/dc.h \
                 motif/dcclient.h \
                 motif/dcmemory.h \
                 motif/dc.h \
                 motif/dcclient.h \
                 motif/dcmemory.h \
@@ -462,6 +533,7 @@ MSW_HEADERS = \
                 msw/gauge.h \
                 msw/gauge95.h \
                 msw/gaugemsw.h \
                 msw/gauge.h \
                 msw/gauge95.h \
                 msw/gaugemsw.h \
+               msw/gdiimage.h \
                 msw/gdiobj.h \
                 msw/helpwin.h \
                 msw/icon.h \
                 msw/gdiobj.h \
                 msw/helpwin.h \
                 msw/icon.h \
@@ -480,8 +552,6 @@ MSW_HEADERS = \
                 msw/notebook.h \
                 msw/palette.h \
                 msw/pen.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/printdlg.h \
                 msw/printwin.h \
                 msw/private.h \
@@ -516,9 +586,11 @@ MSW_HEADERS = \
                 msw/xpmhand.h
  
  UNIX_HEADERS = \
                 msw/xpmhand.h
  
  UNIX_HEADERS = \
-               unix/execute.h
+               unix/execute.h \
+               unix/fontutil.h
  
  GENERIC_HEADERS = \
  
  GENERIC_HEADERS = \
+               generic/calctrl.h \
                 generic/caret.h \
                 generic/choicdgg.h \
                 generic/colrdlgg.h \
                 generic/caret.h \
                 generic/choicdgg.h \
                 generic/colrdlgg.h \
@@ -526,6 +598,7 @@ GENERIC_HEADERS = \
                 generic/dirdlgg.h \
                 generic/filedlgg.h \
                 generic/fontdlgg.h \
                 generic/dirdlgg.h \
                 generic/filedlgg.h \
                 generic/fontdlgg.h \
+               generic/grid.h \
                 generic/gridg.h \
                 generic/helpext.h \
                 generic/helphtml.h \
                 generic/gridg.h \
                 generic/helpext.h \
                 generic/helphtml.h \
@@ -546,7 +619,8 @@ GENERIC_HEADERS = \
                 generic/statusbr.h \
                 generic/tabg.h \
                 generic/textdlgg.h \
                 generic/statusbr.h \
                 generic/tabg.h \
                 generic/textdlgg.h \
-               generic/treectrl.h
+               generic/treectrl.h \
+               generic/wizard.h
  
  PROTOCOL_HEADERS = \
                 protocol/file.h \
  
  PROTOCOL_HEADERS = \
                 protocol/file.h \
@@ -555,34 +629,37 @@ PROTOCOL_HEADERS = \
                 protocol/protocol.h
  
  HTML_HEADERS = \
                 protocol/protocol.h
  
  HTML_HEADERS = \
-               html/forcelink.h \
+               html/forcelnk.h \
                 html/helpctrl.h \
                 html/helpdata.h \
                 html/helpfrm.h \
                 html/htmlcell.h \
                 html/htmldefs.h \
                 html/helpctrl.h \
                 html/helpdata.h \
                 html/helpfrm.h \
                 html/htmlcell.h \
                 html/htmldefs.h \
-               html/htmlfilter.h \
-               html/htmlparser.h \
+               html/htmlfilt.h \
+               html/htmlpars.h \
                 html/htmltag.h \
                 html/htmlwin.h \
                 html/htmltag.h \
                 html/htmlwin.h \
-               html/htmlwinparser.h \
-               html/mod_templ.h \
-               html/version.h
+               html/htmprint.h \
+               html/m_templ.h \
+               html/winpars.h
  
  GTK_GENERICOBJS = \
                 busyinfo.o \
  
  GTK_GENERICOBJS = \
                 busyinfo.o \
+               calctrl.o \
                 caret.o \
                 choicdgg.o \
                 colrdlgg.o \
                 dcpsg.o \
                 dirdlgg.o \
                 filedlgg.o \
                 caret.o \
                 choicdgg.o \
                 colrdlgg.o \
                 dcpsg.o \
                 dirdlgg.o \
                 filedlgg.o \
-               gridg.o \
+               grid.o \
+               helpext.o \
                 helphtml.o \
                 helpwxht.o \
                 imaglist.o \
                 laywin.o \
                 listctrl.o \
                 helphtml.o \
                 helpwxht.o \
                 imaglist.o \
                 laywin.o \
                 listctrl.o \
+               logg.o \
                 msgdlgg.o \
                 numdlgg.o \
                 panelg.o \
                 msgdlgg.o \
                 numdlgg.o \
                 panelg.o \
@@ -596,6 +673,8 @@ GTK_GENERICOBJS = \
                 scrolwin.o \
                 splitter.o \
                 statusbr.o \
                 scrolwin.o \
                 splitter.o \
                 statusbr.o \
+               tabg.o \
+               tbarsmpl.o \
                 textdlgg.o \
                 tipdlg.o \
                 treectrl.o \
                 textdlgg.o \
                 tipdlg.o \
                 treectrl.o \
@@ -603,18 +682,21 @@ GTK_GENERICOBJS = \
  
  GTK_GENERICDEPS = \
                 busyinfo.d \
  
  GTK_GENERICDEPS = \
                 busyinfo.d \
+               calctrl.d \
                 caret.d \
                 choicdgg.d \
                 colrdlgg.d \
                 dcpsg.d \
                 dirdlgg.d \
                 filedlgg.d \
                 caret.d \
                 choicdgg.d \
                 colrdlgg.d \
                 dcpsg.d \
                 dirdlgg.d \
                 filedlgg.d \
-               gridg.d \
+               grid.d \
+               helpext.d \
                 helphtml.d \
                 helpwxht.d \
                 imaglist.d \
                 laywin.d \
                 listctrl.d \
                 helphtml.d \
                 helpwxht.d \
                 imaglist.d \
                 laywin.d \
                 listctrl.d \
+               logg.d \
                 msgdlgg.d \
                 numdlgg.d \
                 panelg.d \
                 msgdlgg.d \
                 numdlgg.d \
                 panelg.d \
@@ -628,6 +710,8 @@ GTK_GENERICDEPS = \
                 scrolwin.d \
                 splitter.d \
                 statusbr.d \
                 scrolwin.d \
                 splitter.d \
                 statusbr.d \
+               tabg.d \
+               tbarsmpl.d \
                 textdlgg.d \
                 tipdlg.d \
                 treectrl.d \
                 textdlgg.d \
                 tipdlg.d \
                 treectrl.d \
@@ -635,18 +719,26 @@ GTK_GENERICDEPS = \
  
  GTK_COMMONOBJS = \
                 parser.o \
  
  GTK_COMMONOBJS = \
                 parser.o \
+               appcmn.o \
+               choiccmn.o \
+               clipcmn.o \
+               cmdline.o \
                 cmndata.o \
                 config.o \
                 cmndata.o \
                 config.o \
-               date.o \
+               ctrlcmn.o \
+               ctrlsub.o \
+               datetime.o \
                 datstrm.o \
                 db.o \
                 dbtable.o \
                 dcbase.o \
                 dlgcmn.o \
                 datstrm.o \
                 db.o \
                 dbtable.o \
                 dcbase.o \
                 dlgcmn.o \
+               dobjcmn.o \
                 docmdi.o \
                 docview.o \
                 dynarray.o \
                 dynlib.o \
                 docmdi.o \
                 docview.o \
                 dynarray.o \
                 dynlib.o \
+               encconv.o \
                 event.o \
                 extended.o \
                 ffile.o \
                 event.o \
                 extended.o \
                 ffile.o \
@@ -654,6 +746,8 @@ GTK_COMMONOBJS = \
                 fileconf.o \
                 filefn.o \
                 filesys.o \
                 fileconf.o \
                 filefn.o \
                 filesys.o \
+               fontcmn.o \
+               fontmap.o \
                 framecmn.o \
                 fs_inet.o \
                 fs_zip.o \
                 framecmn.o \
                 fs_inet.o \
                 fs_zip.o \
@@ -663,6 +757,7 @@ GTK_COMMONOBJS = \
                 hash.o \
                 helpbase.o \
                 http.o \
                 hash.o \
                 helpbase.o \
                 http.o \
+               imagall.o \
                 imagbmp.o \
                 image.o \
                 imaggif.o \
                 imagbmp.o \
                 image.o \
                 imaggif.o \
@@ -670,12 +765,16 @@ GTK_COMMONOBJS = \
                 imagpcx.o \
                 imagpng.o \
                 imagpnm.o \
                 imagpcx.o \
                 imagpng.o \
                 imagpnm.o \
+               imagtiff.o \
                 intl.o \
                 ipcbase.o \
                 layout.o \
                 intl.o \
                 ipcbase.o \
                 layout.o \
+               lboxcmn.o \
                 list.o \
                 log.o \
                 list.o \
                 log.o \
+               longlong.o \
                 memory.o \
                 memory.o \
+               menucmn.o \
                 mimetype.o \
                 module.o \
                 mstream.o \
                 mimetype.o \
                 module.o \
                 mstream.o \
@@ -690,16 +789,15 @@ GTK_COMMONOBJS = \
                 sckfile.o \
                 sckipc.o \
                 sckstrm.o \
                 sckfile.o \
                 sckipc.o \
                 sckstrm.o \
+               serbase.o \
                 sizer.o \
                 socket.o \
                 strconv.o \
                 stream.o \
                 string.o \
                 tbarbase.o \
                 sizer.o \
                 socket.o \
                 strconv.o \
                 stream.o \
                 string.o \
                 tbarbase.o \
-               tbarsmpl.o \
                 textcmn.o \
                 textfile.o \
                 textcmn.o \
                 textfile.o \
-               time.o \
                 timercmn.o \
                 tokenzr.o \
                 txtstrm.o \
                 timercmn.o \
                 tokenzr.o \
                 txtstrm.o \
@@ -719,18 +817,26 @@ GTK_COMMONOBJS = \
  
  GTK_COMMONDEPS = \
                 parser.d \
  
  GTK_COMMONDEPS = \
                 parser.d \
+               appcmn.d \
+               choiccmn.d \
+               clipcmn.d \
+               cmdline.d \
                 cmndata.d \
                 config.d \
                 cmndata.d \
                 config.d \
-               date.d \
+               ctrlcmn.d \
+               ctrlsub.d \
+               datetime.d \
                 datstrm.d \
                 db.d \
                 dbtable.d \
                 dcbase.d \
                 dlgcmn.d \
                 datstrm.d \
                 db.d \
                 dbtable.d \
                 dcbase.d \
                 dlgcmn.d \
+               dobjcmn.d \
                 docmdi.d \
                 docview.d \
                 dynarray.d \
                 dynlib.d \
                 docmdi.d \
                 docview.d \
                 dynarray.d \
                 dynlib.d \
+               encconv.d \
                 event.d \
                 extended.d \
                 ffile.d \
                 event.d \
                 extended.d \
                 ffile.d \
@@ -738,6 +844,8 @@ GTK_COMMONDEPS = \
                 fileconf.d \
                 filefn.d \
                 filesys.d \
                 fileconf.d \
                 filefn.d \
                 filesys.d \
+               fontcmn.d \
+               fontmap.d \
                 framecmn.d \
                 fs_inet.d \
                 fs_zip.d \
                 framecmn.d \
                 fs_inet.d \
                 fs_zip.d \
@@ -747,6 +855,7 @@ GTK_COMMONDEPS = \
                 hash.d \
                 helpbase.d \
                 http.d \
                 hash.d \
                 helpbase.d \
                 http.d \
+               imagall.d \
                 imagbmp.d \
                 image.d \
                 imaggif.d \
                 imagbmp.d \
                 image.d \
                 imaggif.d \
@@ -754,12 +863,16 @@ GTK_COMMONDEPS = \
                 imagpcx.d \
                 imagpng.d \
                 imagpnm.d \
                 imagpcx.d \
                 imagpng.d \
                 imagpnm.d \
+               imagtiff.d \
                 intl.d \
                 ipcbase.d \
                 layout.d \
                 intl.d \
                 ipcbase.d \
                 layout.d \
+               lboxcmn.d \
                 list.d \
                 log.d \
                 list.d \
                 log.d \
+               longlong.d \
                 memory.d \
                 memory.d \
+               menucmn.d \
                 mimetype.d \
                 module.d \
                 mstream.d \
                 mimetype.d \
                 module.d \
                 mstream.d \
@@ -774,16 +887,15 @@ GTK_COMMONDEPS = \
                 sckfile.d \
                 sckipc.d \
                 sckstrm.d \
                 sckfile.d \
                 sckipc.d \
                 sckstrm.d \
+               serbase.d \
                 sizer.d \
                 socket.d \
                 strconv.d \
                 stream.d \
                 string.d \
                 tbarbase.d \
                 sizer.d \
                 socket.d \
                 strconv.d \
                 stream.d \
                 string.d \
                 tbarbase.d \
-               tbarsmpl.d \
                 textcmn.d \
                 textfile.d \
                 textcmn.d \
                 textfile.d \
-               time.d \
                 timercmn.d \
                 tokenzr.d \
                 txtstrm.d \
                 timercmn.d \
                 tokenzr.d \
                 txtstrm.d \
@@ -846,6 +958,7 @@ GTK_GUIOBJS = \
                 settings.o \
                 slider.o \
                 spinbutt.o \
                 settings.o \
                 slider.o \
                 spinbutt.o \
+               spinctrl.o \
                 statbmp.o \
                 statbox.o \
                 statline.o \
                 statbmp.o \
                 statbox.o \
                 statline.o \
@@ -905,6 +1018,7 @@ GTK_GUIDEPS = \
                 settings.d \
                 slider.d \
                 spinbutt.d \
                 settings.d \
                 slider.d \
                 spinbutt.d \
+               spinctrl.d \
                 statbmp.d \
                 statbox.d \
                 statline.d \
                 statbmp.d \
                 statbox.d \
                 statline.d \
@@ -921,19 +1035,22 @@ GTK_GUIDEPS = \
  
  MOTIF_GENERICOBJS = \
                 busyinfo.o \
  
  MOTIF_GENERICOBJS = \
                 busyinfo.o \
+               calctrl.o \
                 caret.o \
                 choicdgg.o \
                 colrdlgg.o \
                 dcpsg.o \
                 dirdlgg.o \
                 fontdlgg.o \
                 caret.o \
                 choicdgg.o \
                 colrdlgg.o \
                 dcpsg.o \
                 dirdlgg.o \
                 fontdlgg.o \
-               gridg.o \
+               grid.o \
+               helpext.o \
                 helphtml.o \
                 helpwxht.o \
                 helpxlp.o \
                 imaglist.o \
                 laywin.o \
                 listctrl.o \
                 helphtml.o \
                 helpwxht.o \
                 helpxlp.o \
                 imaglist.o \
                 laywin.o \
                 listctrl.o \
+               logg.o \
                 msgdlgg.o \
                 notebook.o \
                 numdlgg.o \
                 msgdlgg.o \
                 notebook.o \
                 numdlgg.o \
@@ -950,6 +1067,7 @@ MOTIF_GENERICOBJS = \
                 statline.o \
                 statusbr.o \
                 tabg.o \
                 statline.o \
                 statusbr.o \
                 tabg.o \
+               tbarsmpl.o \
                 textdlgg.o \
                 tipdlg.o \
                 treectrl.o \
                 textdlgg.o \
                 tipdlg.o \
                 treectrl.o \
@@ -957,19 +1075,22 @@ MOTIF_GENERICOBJS = \
  
  MOTIF_GENERICDEPS = \
                 busyinfo.d \
  
  MOTIF_GENERICDEPS = \
                 busyinfo.d \
+               calctrl.d \
                 caret.d \
                 choicdgg.d \
                 colrdlgg.d \
                 dcpsg.d \
                 dirdlgg.d \
                 fontdlgg.d \
                 caret.d \
                 choicdgg.d \
                 colrdlgg.d \
                 dcpsg.d \
                 dirdlgg.d \
                 fontdlgg.d \
-               gridg.d \
+               grid.d \
+               helpext.d \
                 helphtml.d \
                 helpwxht.d \
                 helpxlp.d \
                 imaglist.d \
                 laywin.d \
                 listctrl.d \
                 helphtml.d \
                 helpwxht.d \
                 helpxlp.d \
                 imaglist.d \
                 laywin.d \
                 listctrl.d \
+               logg.d \
                 msgdlgg.d \
                 notebook.d \
                 numdlgg.d \
                 msgdlgg.d \
                 notebook.d \
                 numdlgg.d \
@@ -986,6 +1107,7 @@ MOTIF_GENERICDEPS = \
                 statline.d \
                 statusbr.d \
                 tabg.d \
                 statline.d \
                 statusbr.d \
                 tabg.d \
+               tbarsmpl.d \
                 textdlgg.d \
                 tipdlg.d \
                 treectrl.d \
                 textdlgg.d \
                 tipdlg.d \
                 treectrl.d \
@@ -993,20 +1115,26 @@ MOTIF_GENERICDEPS = \
  
  MOTIF_COMMONOBJS = \
                 parser.o \
  
  MOTIF_COMMONOBJS = \
                 parser.o \
+               appcmn.o \
                 choiccmn.o \
                 choiccmn.o \
+               clipcmn.o \
+               cmdline.o \
                 cmndata.o \
                 config.o \
                 ctrlcmn.o \
                 cmndata.o \
                 config.o \
                 ctrlcmn.o \
-               date.o \
+               ctrlsub.o \
+               datetime.o \
                 datstrm.o \
                 db.o \
                 dbtable.o \
                 dcbase.o \
                 dlgcmn.o \
                 datstrm.o \
                 db.o \
                 dbtable.o \
                 dcbase.o \
                 dlgcmn.o \
+               dobjcmn.o \
                 docmdi.o \
                 docview.o \
                 dynarray.o \
                 dynlib.o \
                 docmdi.o \
                 docview.o \
                 dynarray.o \
                 dynlib.o \
+               encconv.o \
                 event.o \
                 extended.o \
                 ffile.o \
                 event.o \
                 extended.o \
                 ffile.o \
@@ -1014,6 +1142,8 @@ MOTIF_COMMONOBJS = \
                 fileconf.o \
                 filefn.o \
                 filesys.o \
                 fileconf.o \
                 filefn.o \
                 filesys.o \
+               fontcmn.o \
+               fontmap.o \
                 framecmn.o \
                 fs_inet.o \
                 fs_zip.o \
                 framecmn.o \
                 fs_inet.o \
                 fs_zip.o \
@@ -1023,6 +1153,7 @@ MOTIF_COMMONOBJS = \
                 hash.o \
                 helpbase.o \
                 http.o \
                 hash.o \
                 helpbase.o \
                 http.o \
+               imagall.o \
                 imagbmp.o \
                 image.o \
                 imaggif.o \
                 imagbmp.o \
                 image.o \
                 imaggif.o \
@@ -1030,18 +1161,21 @@ MOTIF_COMMONOBJS = \
                 imagpcx.o \
                 imagpng.o \
                 imagpnm.o \
                 imagpcx.o \
                 imagpng.o \
                 imagpnm.o \
+               imagtiff.o \
                 intl.o \
                 ipcbase.o \
                 layout.o \
                 intl.o \
                 ipcbase.o \
                 layout.o \
+               lboxcmn.o \
                 list.o \
                 log.o \
                 list.o \
                 log.o \
+               longlong.o \
                 memory.o \
                 memory.o \
+               menucmn.o \
                 mimetype.o \
                 module.o \
                 mstream.o \
                 object.o \
                 objstrm.o \
                 mimetype.o \
                 module.o \
                 mstream.o \
                 object.o \
                 objstrm.o \
-               odbc.o \
                 paper.o \
                 prntbase.o \
                 process.o \
                 paper.o \
                 prntbase.o \
                 process.o \
@@ -1051,16 +1185,15 @@ MOTIF_COMMONOBJS = \
                 sckfile.o \
                 sckipc.o \
                 sckstrm.o \
                 sckfile.o \
                 sckipc.o \
                 sckstrm.o \
+               serbase.o \
                 sizer.o \
                 socket.o \
                 strconv.o \
                 stream.o \
                 string.o \
                 tbarbase.o \
                 sizer.o \
                 socket.o \
                 strconv.o \
                 stream.o \
                 string.o \
                 tbarbase.o \
-               tbarsmpl.o \
                 textcmn.o \
                 textfile.o \
                 textcmn.o \
                 textfile.o \
-               time.o \
                 timercmn.o \
                 tokenzr.o \
                 txtstrm.o \
                 timercmn.o \
                 tokenzr.o \
                 txtstrm.o \
@@ -1080,20 +1213,26 @@ MOTIF_COMMONOBJS = \
  
  MOTIF_COMMONDEPS = \
                 parser.d \
  
  MOTIF_COMMONDEPS = \
                 parser.d \
+               appcmn.d \
                 choiccmn.d \
                 choiccmn.d \
+               clipcmn.d \
+               cmdline.d \
                 cmndata.d \
                 config.d \
                 ctrlcmn.d \
                 cmndata.d \
                 config.d \
                 ctrlcmn.d \
-               date.d \
+               ctrlsub.d \
+               datetime.d \
                 datstrm.d \
                 db.d \
                 dbtable.d \
                 dcbase.d \
                 dlgcmn.d \
                 datstrm.d \
                 db.d \
                 dbtable.d \
                 dcbase.d \
                 dlgcmn.d \
+               dobjcmn.d \
                 docmdi.d \
                 docview.d \
                 dynarray.d \
                 dynlib.d \
                 docmdi.d \
                 docview.d \
                 dynarray.d \
                 dynlib.d \
+               encconv.d \
                 event.d \
                 extended.d \
                 ffile.d \
                 event.d \
                 extended.d \
                 ffile.d \
@@ -1101,6 +1240,8 @@ MOTIF_COMMONDEPS = \
                 fileconf.d \
                 filefn.d \
                 filesys.d \
                 fileconf.d \
                 filefn.d \
                 filesys.d \
+               fontcmn.d \
+               fontmap.d \
                 framecmn.d \
                 fs_inet.d \
                 fs_zip.d \
                 framecmn.d \
                 fs_inet.d \
                 fs_zip.d \
@@ -1110,6 +1251,7 @@ MOTIF_COMMONDEPS = \
                 hash.d \
                 helpbase.d \
                 http.d \
                 hash.d \
                 helpbase.d \
                 http.d \
+               imagall.d \
                 imagbmp.d \
                 image.d \
                 imaggif.d \
                 imagbmp.d \
                 image.d \
                 imaggif.d \
@@ -1117,18 +1259,21 @@ MOTIF_COMMONDEPS = \
                 imagpcx.d \
                 imagpng.d \
                 imagpnm.d \
                 imagpcx.d \
                 imagpng.d \
                 imagpnm.d \
+               imagtiff.d \
                 intl.d \
                 ipcbase.d \
                 layout.d \
                 intl.d \
                 ipcbase.d \
                 layout.d \
+               lboxcmn.d \
                 list.d \
                 log.d \
                 list.d \
                 log.d \
+               longlong.d \
                 memory.d \
                 memory.d \
+               menucmn.d \
                 mimetype.d \
                 module.d \
                 mstream.d \
                 object.d \
                 objstrm.d \
                 mimetype.d \
                 module.d \
                 mstream.d \
                 object.d \
                 objstrm.d \
-               odbc.d \
                 paper.d \
                 prntbase.d \
                 process.d \
                 paper.d \
                 prntbase.d \
                 process.d \
@@ -1138,16 +1283,15 @@ MOTIF_COMMONDEPS = \
                 sckfile.d \
                 sckipc.d \
                 sckstrm.d \
                 sckfile.d \
                 sckipc.d \
                 sckstrm.d \
+               serbase.d \
                 sizer.d \
                 socket.d \
                 strconv.d \
                 stream.d \
                 string.d \
                 tbarbase.d \
                 sizer.d \
                 socket.d \
                 strconv.d \
                 stream.d \
                 string.d \
                 tbarbase.d \
-               tbarsmpl.d \
                 textcmn.d \
                 textfile.d \
                 textcmn.d \
                 textfile.d \
-               time.d \
                 timercmn.d \
                 tokenzr.d \
                 txtstrm.d \
                 timercmn.d \
                 tokenzr.d \
                 txtstrm.d \
@@ -1277,10 +1421,12 @@ MOTIF_GUIDEPS = \
  
  MSW_GENERICOBJS = \
                 busyinfo.o \
  
  MSW_GENERICOBJS = \
                 busyinfo.o \
+               calctrl.o \
                 choicdgg.o \
                 dirdlgg.o \
                 choicdgg.o \
                 dirdlgg.o \
-               gridg.o \
+               grid.o \
                 laywin.o \
                 laywin.o \
+               logg.o \
                 numdlgg.o \
                 panelg.o \
                 progdlgg.o \
                 numdlgg.o \
                 panelg.o \
                 progdlgg.o \
@@ -1291,17 +1437,19 @@ MSW_GENERICOBJS = \
                 scrolwin.o \
                 splitter.o \
                 statusbr.o \
                 scrolwin.o \
                 splitter.o \
                 statusbr.o \
-               tabg.o \
+               tbarsmpl.o \
                 textdlgg.o \
                 tipdlg.o \
                 wizard.o
  
  MSW_GENERICDEPS = \
                 busyinfo.d \
                 textdlgg.o \
                 tipdlg.o \
                 wizard.o
  
  MSW_GENERICDEPS = \
                 busyinfo.d \
+               calctrl.d \
                 choicdgg.d \
                 dirdlgg.d \
                 choicdgg.d \
                 dirdlgg.d \
-               gridg.d \
+               grid.d \
                 laywin.d \
                 laywin.d \
+               logg.d \
                 numdlgg.d \
                 panelg.d \
                 progdlgg.d \
                 numdlgg.d \
                 panelg.d \
                 progdlgg.d \
@@ -1312,27 +1460,33 @@ MSW_GENERICDEPS = \
                 scrolwin.d \
                 splitter.d \
                 statusbr.d \
                 scrolwin.d \
                 splitter.d \
                 statusbr.d \
-               tabg.d \
+               tbarsmpl.d \
                 textdlgg.d \
                 tipdlg.d \
                 wizard.d
  
  MSW_COMMONOBJS = \
                 parser.o \
                 textdlgg.d \
                 tipdlg.d \
                 wizard.d
  
  MSW_COMMONOBJS = \
                 parser.o \
+               appcmn.o \
                 choiccmn.o \
                 choiccmn.o \
+               clipcmn.o \
+               cmdline.o \
                 cmndata.o \
                 config.o \
                 ctrlcmn.o \
                 cmndata.o \
                 config.o \
                 ctrlcmn.o \
-               date.o \
+               ctrlsub.o \
+               datetime.o \
                 datstrm.o \
                 db.o \
                 dbtable.o \
                 dcbase.o \
                 dlgcmn.o \
                 datstrm.o \
                 db.o \
                 dbtable.o \
                 dcbase.o \
                 dlgcmn.o \
+               dobjcmn.o \
                 docmdi.o \
                 docview.o \
                 dynarray.o \
                 dynlib.o \
                 docmdi.o \
                 docview.o \
                 dynarray.o \
                 dynlib.o \
+               encconv.o \
                 event.o \
                 extended.o \
                 ffile.o \
                 event.o \
                 extended.o \
                 ffile.o \
@@ -1340,6 +1494,8 @@ MSW_COMMONOBJS = \
                 fileconf.o \
                 filefn.o \
                 filesys.o \
                 fileconf.o \
                 filefn.o \
                 filesys.o \
+               fontcmn.o \
+               fontmap.o \
                 framecmn.o \
                 fs_inet.o \
                 fs_zip.o \
                 framecmn.o \
                 fs_inet.o \
                 fs_zip.o \
@@ -1349,6 +1505,7 @@ MSW_COMMONOBJS = \
                 hash.o \
                 helpbase.o \
                 http.o \
                 hash.o \
                 helpbase.o \
                 http.o \
+               imagall.o \
                 imagbmp.o \
                 image.o \
                 imaggif.o \
                 imagbmp.o \
                 image.o \
                 imaggif.o \
@@ -1356,17 +1513,22 @@ MSW_COMMONOBJS = \
                 imagpcx.o \
                 imagpng.o \
                 imagpnm.o \
                 imagpcx.o \
                 imagpng.o \
                 imagpnm.o \
+               imagtiff.o \
                 intl.o \
                 ipcbase.o \
                 layout.o \
                 intl.o \
                 ipcbase.o \
                 layout.o \
+               lboxcmn.o \
                 list.o \
                 log.o \
                 list.o \
                 log.o \
+               longlong.o \
                 memory.o \
                 memory.o \
+               menucmn.o \
                 mimetype.o \
                 module.o \
                 mstream.o \
                 object.o \
                 objstrm.o \
                 mimetype.o \
                 module.o \
                 mstream.o \
                 object.o \
                 objstrm.o \
+               odbc.o \
                 paper.o \
                 prntbase.o \
                 process.o \
                 paper.o \
                 prntbase.o \
                 process.o \
@@ -1376,6 +1538,7 @@ MSW_COMMONOBJS = \
                 sckfile.o \
                 sckipc.o \
                 sckstrm.o \
                 sckfile.o \
                 sckipc.o \
                 sckstrm.o \
+               serbase.o \
                 sizer.o \
                 socket.o \
                 strconv.o \
                 sizer.o \
                 socket.o \
                 strconv.o \
@@ -1384,7 +1547,6 @@ MSW_COMMONOBJS = \
                 tbarbase.o \
                 textcmn.o \
                 textfile.o \
                 tbarbase.o \
                 textcmn.o \
                 textfile.o \
-               time.o \
                 timercmn.o \
                 tokenzr.o \
                 txtstrm.o \
                 timercmn.o \
                 tokenzr.o \
                 txtstrm.o \
@@ -1404,20 +1566,26 @@ MSW_COMMONOBJS = \
  
  MSW_COMMONDEPS = \
                 parser.d \
  
  MSW_COMMONDEPS = \
                 parser.d \
+               appcmn.d \
                 choiccmn.d \
                 choiccmn.d \
+               clipcmn.d \
+               cmdline.d \
                 cmndata.d \
                 config.d \
                 ctrlcmn.d \
                 cmndata.d \
                 config.d \
                 ctrlcmn.d \
-               date.d \
+               ctrlsub.d \
+               datetime.d \
                 datstrm.d \
                 db.d \
                 dbtable.d \
                 dcbase.d \
                 dlgcmn.d \
                 datstrm.d \
                 db.d \
                 dbtable.d \
                 dcbase.d \
                 dlgcmn.d \
+               dobjcmn.d \
                 docmdi.d \
                 docview.d \
                 dynarray.d \
                 dynlib.d \
                 docmdi.d \
                 docview.d \
                 dynarray.d \
                 dynlib.d \
+               encconv.d \
                 event.d \
                 extended.d \
                 ffile.d \
                 event.d \
                 extended.d \
                 ffile.d \
@@ -1425,6 +1593,8 @@ MSW_COMMONDEPS = \
                 fileconf.d \
                 filefn.d \
                 filesys.d \
                 fileconf.d \
                 filefn.d \
                 filesys.d \
+               fontcmn.d \
+               fontmap.d \
                 framecmn.d \
                 fs_inet.d \
                 fs_zip.d \
                 framecmn.d \
                 fs_inet.d \
                 fs_zip.d \
@@ -1434,6 +1604,7 @@ MSW_COMMONDEPS = \
                 hash.d \
                 helpbase.d \
                 http.d \
                 hash.d \
                 helpbase.d \
                 http.d \
+               imagall.d \
                 imagbmp.d \
                 image.d \
                 imaggif.d \
                 imagbmp.d \
                 image.d \
                 imaggif.d \
@@ -1441,17 +1612,22 @@ MSW_COMMONDEPS = \
                 imagpcx.d \
                 imagpng.d \
                 imagpnm.d \
                 imagpcx.d \
                 imagpng.d \
                 imagpnm.d \
+               imagtiff.d \
                 intl.d \
                 ipcbase.d \
                 layout.d \
                 intl.d \
                 ipcbase.d \
                 layout.d \
+               lboxcmn.d \
                 list.d \
                 log.d \
                 list.d \
                 log.d \
+               longlong.d \
                 memory.d \
                 memory.d \
+               menucmn.d \
                 mimetype.d \
                 module.d \
                 mstream.d \
                 object.d \
                 objstrm.d \
                 mimetype.d \
                 module.d \
                 mstream.d \
                 object.d \
                 objstrm.d \
+               odbc.d \
                 paper.d \
                 prntbase.d \
                 process.d \
                 paper.d \
                 prntbase.d \
                 process.d \
@@ -1461,6 +1637,7 @@ MSW_COMMONDEPS = \
                 sckfile.d \
                 sckipc.d \
                 sckstrm.d \
                 sckfile.d \
                 sckipc.d \
                 sckstrm.d \
+               serbase.d \
                 sizer.d \
                 socket.d \
                 strconv.d \
                 sizer.d \
                 socket.d \
                 strconv.d \
@@ -1469,7 +1646,6 @@ MSW_COMMONDEPS = \
                 tbarbase.d \
                 textcmn.d \
                 textfile.d \
                 tbarbase.d \
                 textcmn.d \
                 textfile.d \
-               time.d \
                 timercmn.d \
                 tokenzr.d \
                 txtstrm.d \
                 timercmn.d \
                 tokenzr.d \
                 txtstrm.d \
@@ -1513,14 +1689,19 @@ MSW_GUIOBJS = \
                 dcscreen.o \
                 dde.o \
                 dialog.o \
                 dcscreen.o \
                 dde.o \
                 dialog.o \
+               dialup.o \
                 dib.o \
                 dibutils.o \
                 dib.o \
                 dibutils.o \
+               dir.o \
                 dragimag.o \
                 filedlg.o \
                 font.o \
                 fontdlg.o \
                 dragimag.o \
                 filedlg.o \
                 font.o \
                 fontdlg.o \
+               fontenum.o \
+               fontutil.o \
                 frame.o \
                 gauge95.o \
                 frame.o \
                 gauge95.o \
+               gdiimage.o \
                 gdiobj.o \
                 gsocket.o \
                 helpwin.o \
                 gdiobj.o \
                 gsocket.o \
                 helpwin.o \
@@ -1542,7 +1723,6 @@ MSW_GUIOBJS = \
                 palette.o \
                 pen.o \
                 penwin.o \
                 palette.o \
                 pen.o \
                 penwin.o \
-               pnghand.o \
                 printdlg.o \
                 printwin.o \
                 radiobox.o \
                 printdlg.o \
                 printwin.o \
                 radiobox.o \
@@ -1554,6 +1734,7 @@ MSW_GUIOBJS = \
                 settings.o \
                 slider95.o \
                 spinbutt.o \
                 settings.o \
                 slider95.o \
                 spinbutt.o \
+               spinctrl.o \
                 statbmp.o \
                 statbox.o \
                 statbr95.o \
                 statbmp.o \
                 statbox.o \
                 statbr95.o \
@@ -1599,14 +1780,19 @@ MSW_GUIDEPS = \
                 dcscreen.d \
                 dde.d \
                 dialog.d \
                 dcscreen.d \
                 dde.d \
                 dialog.d \
+               dialup.d \
                 dib.d \
                 dibutils.d \
                 dib.d \
                 dibutils.d \
+               dir.d \
                 dragimag.d \
                 filedlg.d \
                 font.d \
                 fontdlg.d \
                 dragimag.d \
                 filedlg.d \
                 font.d \
                 fontdlg.d \
+               fontenum.d \
+               fontutil.d \
                 frame.d \
                 gauge95.d \
                 frame.d \
                 gauge95.d \
+               gdiimage.d \
                 gdiobj.d \
                 gsocket.d \
                 helpwin.d \
                 gdiobj.d \
                 gsocket.d \
                 helpwin.d \
@@ -1628,7 +1814,6 @@ MSW_GUIDEPS = \
                 palette.d \
                 pen.d \
                 penwin.d \
                 palette.d \
                 pen.d \
                 penwin.d \
-               pnghand.d \
                 printdlg.d \
                 printwin.d \
                 radiobox.d \
                 printdlg.d \
                 printwin.d \
                 radiobox.d \
@@ -1640,6 +1825,7 @@ MSW_GUIDEPS = \
                 settings.d \
                 slider95.d \
                 spinbutt.d \
                 settings.d \
                 slider95.d \
                 spinbutt.d \
+               spinctrl.d \
                 statbmp.d \
                 statbox.d \
                 statbr95.d \
                 statbmp.d \
                 statbox.d \
                 statbr95.d \
@@ -1659,52 +1845,140 @@ MSW_GUIDEPS = \
                 window.d \
                 xpmhand.d
  
                 window.d \
                 xpmhand.d
  
+BASE_OBJS = \
+               init.o \
+               appcmn.o \
+               cmdline.o \
+               config.o \
+               datetime.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 \
+               longlong.o \
+               mimetype.o \
+               module.o \
+               object.o \
+               process.o \
+               strconv.o \
+               stream.o \
+               string.o \
+               textfile.o \
+               timercmn.o \
+               tokenzr.o \
+               txtstrm.o \
+               utilscmn.o \
+               variant.o \
+               wfstream.o \
+               wxchar.o \
+               dir.o \
+               threadpsx.o \
+               utilsunx.o
+
+BASE_DEPS = \
+               init.d \
+               appcmn.d \
+               cmdline.d \
+               config.d \
+               datetime.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 \
+               longlong.d \
+               mimetype.d \
+               module.d \
+               object.d \
+               process.d \
+               strconv.d \
+               stream.d \
+               string.d \
+               textfile.d \
+               timercmn.d \
+               tokenzr.d \
+               txtstrm.d \
+               utilscmn.d \
+               variant.d \
+               wfstream.d \
+               wxchar.d \
+               dir.d \
+               threadpsx.d \
+               utilsunx.d
+
  HTMLOBJS = \
                 helpctrl.o \
                 helpdata.o \
                 helpfrm.o \
                 htmlcell.o \
  HTMLOBJS = \
                 helpctrl.o \
                 helpdata.o \
                 helpfrm.o \
                 htmlcell.o \
-               htmlfilter.o \
-               htmlparser.o \
+               htmlfilt.o \
+               htmlpars.o \
                 htmltag.o \
                 htmlwin.o \
                 htmltag.o \
                 htmlwin.o \
-               htmlwinparser.o \
-               mod_fonts.o \
-               mod_hline.o \
-               mod_image.o \
-               mod_layout.o \
-               mod_links.o \
-               mod_list.o \
-               mod_pre.o \
-               mod_tables.o \
-               search.o
+               htmprint.o \
+               m_dflist.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 \
+               winpars.o
  
  HTMLDEPS = \
                 helpctrl.d \
                 helpdata.d \
                 helpfrm.d \
                 htmlcell.d \
  
  HTMLDEPS = \
                 helpctrl.d \
                 helpdata.d \
                 helpfrm.d \
                 htmlcell.d \
-               htmlfilter.d \
-               htmlparser.d \
+               htmlfilt.d \
+               htmlpars.d \
                 htmltag.d \
                 htmlwin.d \
                 htmltag.d \
                 htmlwin.d \
-               htmlwinparser.d \
-               mod_fonts.d \
-               mod_hline.d \
-               mod_image.d \
-               mod_layout.d \
-               mod_links.d \
-               mod_list.d \
-               mod_pre.d \
-               mod_tables.d \
-               search.d
-
-UNIXOBJS = \
+               htmprint.d \
+               m_dflist.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 \
+               winpars.d
+
+UNIX_OBJS = \
+               dialup.o \
+               dir.o \
+               fontenum.o \
+               fontutil.o \
                 gsocket.o \
                 threadpsx.o \
                 utilsunx.o
  
                 gsocket.o \
                 threadpsx.o \
                 utilsunx.o
  
-UNIXDEPS = \
+UNIX_DEPS = \
+               dialup.d \
+               dir.d \
+               fontenum.d \
+               fontutil.d \
                 gsocket.d \
                 threadpsx.d \
                 utilsunx.d
                 gsocket.d \
                 threadpsx.d \
                 utilsunx.d
@@ -1791,16 +2065,78 @@ JPEGOBJS    = \
                 jquant2.o \
                 jdmerge.o
  
                 jquant2.o \
                 jdmerge.o
  
-
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
-
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-         $(GENERIC_HEADERS) $(WX_HEADERS)
-
-all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+TIFFOBJS       = \
+               tif_aux.o \
+               tif_close.o \
+               tif_codec.o \
+               tif_compress.o \
+               tif_dir.o \
+               tif_dirinfo.o \
+               tif_dirread.o \
+               tif_dirwrite.o \
+               tif_dumpmode.o \
+               tif_error.o \
+               tif_fax3.o \
+               tif_fax3sm.o \
+               tif_getimage.o \
+               tif_jpeg.o \
+               tif_flush.o \
+               tif_lzw.o \
+               tif_luv.o \
+               tif_next.o \
+               tif_open.o \
+               tif_packbits.o \
+               tif_pixarlog.o \
+               tif_predict.o \
+               tif_print.o \
+               tif_read.o \
+               tif_swab.o \
+               tif_strip.o \
+               tif_thunder.o \
+               tif_tile.o \
+               tif_unix.o \
+               tif_version.o \
+               tif_warning.o \
+               tif_write.o \
+               tif_zip.o
+
+IODBC_OBJS = \
+               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
+
+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@
  
  @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
         @$(INSTALL) -d ./lib
  
  @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
         @$(INSTALL) -d ./lib
@@ -1809,9 +2145,9 @@ all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
  
  @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
         @$(INSTALL) -d ./lib
  
  @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
         @$(INSTALL) -d ./lib
-       $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
+       $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
         
         
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
         @$(RM) ./lib/@WX_LIBRARY_LINK1@
         @$(RM) ./lib/@WX_LIBRARY_LINK2@
         @$(RM) ./lib/@WX_LIBRARY_LINK3@
         @$(RM) ./lib/@WX_LIBRARY_LINK1@
         @$(RM) ./lib/@WX_LIBRARY_LINK2@
         @$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1819,15 +2155,15 @@ CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
         $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
         $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
         
         $(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@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
         $(RM) $(libdir)/@WX_LIBRARY_LINK1@
         $(RM) $(libdir)/@WX_LIBRARY_LINK2@
         $(RM) $(libdir)/@WX_LIBRARY_LINK3@
         $(RM) $(libdir)/@WX_LIBRARY_LINK1@
         $(RM) $(libdir)/@WX_LIBRARY_LINK2@
         $(RM) $(libdir)/@WX_LIBRARY_LINK3@
-       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
-       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
-       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
+       $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
+       $(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
  
  parser.o:    parser.c lexer.c
         $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -1852,7 +2188,15 @@ lexer.c: $(COMMDIR)/lexer.l
  
  -include $(DEPFILES)
  
  
  -include $(DEPFILES)
  
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+afminstall:
+       $(INSTALL) -d $(datadir)
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
         @echo " "
         @echo " Installing wxWindows..."
         @echo " "
         @echo " "
         @echo " Installing wxWindows..."
         @echo " "
@@ -1860,7 +2204,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
         $(INSTALL) -d $(prefix)
         $(INSTALL) -d $(bindir)
         $(INSTALL) -d $(libdir)
         $(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@
  
         $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
         $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -1869,22 +2212,13 @@ 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) -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
-       $(INSTALL) -d $(includedir)/wx/msw
-       $(INSTALL) -d $(includedir)/wx/gtk
-       $(INSTALL) -d $(includedir)/wx/motif
-       $(INSTALL) -d $(includedir)/wx/html
-       $(INSTALL) -d $(includedir)/wx/protocol
-       $(INSTALL) -d $(includedir)/wx/unix
-       $(INSTALL) -d $(includedir)/wx/generic
+    @if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+       @if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
+       @if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
+       @if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
         @list='$(HEADERS)'; for p in $$list; do \
           $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
           echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
         @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"; \
@@ -1893,8 +2227,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
  write_message:
         @echo " "
         @echo " The installation of wxWindows is finished.  On certain"
  write_message:
         @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."
         @echo " "
         @echo " wxWindows comes with  no guarantees  and doesn't claim"
         @echo " to be suitable for any purpose."
         @echo " "
         @echo " wxWindows comes with  no guarantees  and doesn't claim"
         @echo " to be suitable for any purpose."
@@ -1902,7 +2236,7 @@ write_message:
         @echo " Read the wxWindows Licence on licencing conditions."
         @echo " "
  
         @echo " Read the wxWindows Licence on licencing conditions."
         @echo " "
  
-install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message
+install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
  
  uninstall:
         @echo " "
  
  uninstall:
         @echo " "
@@ -1943,6 +2277,7 @@ ALL_DIST:
         mkdir _dist_dir
         mkdir $(DISTDIR)
         cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
         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)
         cp $(WXDIR)/configure $(DISTDIR)
         cp $(WXDIR)/config.sub $(DISTDIR)
         cp $(WXDIR)/config.guess $(DISTDIR)
@@ -1966,6 +2301,7 @@ ALL_DIST:
         mkdir $(DISTDIR)/include/wx/unix
         mkdir $(DISTDIR)/include/wx/protocol
         cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
         mkdir $(DISTDIR)/include/wx/unix
         mkdir $(DISTDIR)/include/wx/protocol
         cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+       cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx 
         cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
         cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
         cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
         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
@@ -1981,7 +2317,9 @@ ALL_DIST:
         mkdir $(DISTDIR)/src/unix
         mkdir $(DISTDIR)/src/png
         mkdir $(DISTDIR)/src/jpeg
         mkdir $(DISTDIR)/src/unix
         mkdir $(DISTDIR)/src/png
         mkdir $(DISTDIR)/src/jpeg
+       mkdir $(DISTDIR)/src/tiff
         mkdir $(DISTDIR)/src/zlib
         mkdir $(DISTDIR)/src/zlib
+       mkdir $(DISTDIR)/src/iodbc
         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
@@ -1991,9 +2329,7 @@ ALL_DIST:
         cp $(COMMDIR)/*.y $(DISTDIR)/src/common
         cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
         cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
         cp $(COMMDIR)/*.y $(DISTDIR)/src/common
         cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
         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 $(UNIXDIR)/*.c $(DISTDIR)/src/unix
         cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
         cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -2005,6 +2341,16 @@ ALL_DIST:
         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
  
  GTK_DIST:
         cp $(WXDIR)/wxGTK.spec $(DISTDIR)
  
  GTK_DIST:
         cp $(WXDIR)/wxGTK.spec $(DISTDIR)
@@ -2040,63 +2386,129 @@ MSW_DIST:
  SAMPLES_DIST:
         mkdir $(DISTDIR)/samples
         cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
  SAMPLES_DIST:
         mkdir $(DISTDIR)/samples
         cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+       
         mkdir $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
         mkdir $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
+       cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
         cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
+       
         mkdir $(DISTDIR)/samples/caret
         cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
         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/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
         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/icons/*.??? $(DISTDIR)/samples/controls/icons
         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
         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/*.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
         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/*.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
         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
         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
         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
         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
         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
         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
         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/*.cpp $(DISTDIR)/samples/drawing
         cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+       
         mkdir $(DISTDIR)/samples/dynamic
         cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
         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
         cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
         cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+       
+       mkdir $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/makefile.unx $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.h $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+       
+       mkdir $(DISTDIR)/samples/font
+       cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
+       cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
+       cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
+       
+       mkdir $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
+       
+       mkdir $(DISTDIR)/samples/grid
+       cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
+       cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
+       cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
+       
+       mkdir $(DISTDIR)/samples/help
+       mkdir $(DISTDIR)/samples/help/doc
+       cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
+       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
         mkdir $(DISTDIR)/samples/html
         cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
         mkdir $(DISTDIR)/samples/html/about
@@ -2110,12 +2522,13 @@ 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
         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
         mkdir $(DISTDIR)/samples/html/printing
         cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
         cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
         cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
         cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
         mkdir $(DISTDIR)/samples/html/test
         cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
         cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
         mkdir $(DISTDIR)/samples/html/test
         cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
@@ -2137,94 +2550,211 @@ 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
         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
         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/*.cpp $(DISTDIR)/samples/image
         cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
+    
+       mkdir $(DISTDIR)/samples/internat
+       mkdir $(DISTDIR)/samples/internat/de
+       mkdir $(DISTDIR)/samples/internat/fr
+       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/*.po $(DISTDIR)/samples/internat/fr
+       cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+       cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+       cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+       
         mkdir $(DISTDIR)/samples/layout
         cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
         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
         cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
         cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+       
+       mkdir $(DISTDIR)/samples/life
+       mkdir $(DISTDIR)/samples/life/bitmaps
+       cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life
+       cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life
+       cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life
+       cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life
+       cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps
+       
         mkdir $(DISTDIR)/samples/listctrl
         mkdir $(DISTDIR)/samples/listctrl
+       mkdir $(DISTDIR)/samples/listctrl/bitmaps
         cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
         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/*.cpp $(DISTDIR)/samples/listctrl
         cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
         cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-       mkdir $(DISTDIR)/samples/listctrl/bitmap
-       cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+       cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+       
         mkdir $(DISTDIR)/samples/mdi
         mkdir $(DISTDIR)/samples/mdi
+       mkdir $(DISTDIR)/samples/mdi/bitmaps
         cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
         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/*.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
+       mkdir $(DISTDIR)/samples/minifram/bitmaps
         cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
         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/*.cpp $(DISTDIR)/samples/minifram
         cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
         cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-       mkdir $(DISTDIR)/samples/minifram/bitmap
-       cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+       cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+       
         mkdir $(DISTDIR)/samples/minimal
         cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
         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/*.cpp $(DISTDIR)/samples/minimal
         cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+       
+       mkdir $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/makefile.unx $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+       
+       mkdir $(DISTDIR)/samples/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
         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
         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/richedit
+       cp $(SAMPDIR)/richedit/Makefile.in $(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/*.cpp $(DISTDIR)/samples/proplist
         cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
         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/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
         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
         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
         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
         cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
         cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+    
         mkdir $(DISTDIR)/samples/text
         cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
         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
         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
         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
         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
         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
         cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
-       mkdir $(DISTDIR)/samples/toolbar/bitmap
-       cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+       mkdir $(DISTDIR)/samples/toolbar/bitmaps
+       cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+    
         mkdir $(DISTDIR)/samples/treectrl
         cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
         cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
         cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
         cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
         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/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/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/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/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
         mkdir $(DISTDIR)/samples/wxsocket
         cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
         cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket
@@ -2233,24 +2763,33 @@ SAMPLES_DIST:
  UTILS_DIST:
         mkdir $(DISTDIR)/utils
         cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
  UTILS_DIST:
         mkdir $(DISTDIR)/utils
         cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+       
         mkdir $(DISTDIR)/utils/wxMMedia2
         mkdir $(DISTDIR)/utils/wxMMedia2
-       cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
         mkdir $(DISTDIR)/utils/wxMMedia2/lib
         mkdir $(DISTDIR)/utils/wxMMedia2/lib
+       mkdir $(DISTDIR)/utils/wxMMedia2/sample
+       cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
         cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
         cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
-       mkdir $(DISTDIR)/utils/wxMMedia2/sample
         cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
         cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
         cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
         cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+       
         mkdir $(DISTDIR)/utils/glcanvas
         mkdir $(DISTDIR)/utils/glcanvas
+       mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
         cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
         cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
         cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
-       mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         
         cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
         
+       mkdir $(DISTDIR)/utils/ogl
+       mkdir $(DISTDIR)/utils/ogl/src
+       cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
+       cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
+       cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
+       cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
+       
  MISC_DIST:
         mkdir $(DISTDIR)/misc
         mkdir $(DISTDIR)/misc/afm
  MISC_DIST:
         mkdir $(DISTDIR)/misc
         mkdir $(DISTDIR)/misc/afm
@@ -2260,6 +2799,8 @@ MISC_DIST:
         
  dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
         cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
         
  dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
         cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+       mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples
+       cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../..
         $(RM) -r _dist_dir
  
  clean:
         $(RM) -r _dist_dir
  
  clean: