]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed terminology (widget vs. binded window)
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index b5502050b0cafc523fe8911c6f274eb8ff90d4e6..3be6793df7fd711d0763b83ca5298b14d3211aac 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,5 @@
-
 #
 #
-# This file was automatically generated by tmake at 16:27, 1999/08/17
+# This file was automatically generated by tmake at 14:12, 1999/10/09
 # 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!
 
 #
@@ -24,19 +23,30 @@ include ./src/make.env
 .SUFFIXES:     .o .cpp .c .cxx
 
 .c.o :
 .SUFFIXES:     .o .cpp .c .cxx
 
 .c.o :
-       $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
+       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
 
 .cpp.o :
 
 .cpp.o :
-       $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
 
 .cxx.o :
 
 .cxx.o :
-       $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
 
 ########################### Paths #################################
 
 srcdir = @srcdir@
 
 
 ########################### Paths #################################
 
 srcdir = @srcdir@
 
-VPATH = :@top_srcdir@
+VP1 = @top_srcdir@/src/common
+VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
+VP3 = @top_srcdir@/src/motif/xmcombo
+VP4 = @top_srcdir@/src/generic
+VP5 = @top_srcdir@/src/unix
+VP6 = @top_srcdir@/src/html
+VP7 = @top_srcdir@/src/png
+VP8 = @top_srcdir@/src/jpeg
+VP9 = @top_srcdir@/src/zlib
+VP10 = @top_srcdir@/src/iodbc
+
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -104,16 +114,55 @@ MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 MSWDIR   = $(WXDIR)/src/msw
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
+UTILSDIR = $(WXDIR)/utils
+MISCDIR  = $(WXDIR)/misc
 
 DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
 
 DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
 
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
 
+BASE_HEADERS = \
+               app.h \
+               date.h \
+               debug.h \
+               defs.h \
+               dynarray.h \
+               dynlib.h \
+               event.h \
+               ffile.h \
+               file.h \
+               fileconf.h \
+               hash.h \
+               intl.h \
+               list.h \
+               log.h \
+               longlong.h \
+               mimetype.h \
+               module.h \
+               object.h \
+               process.h \
+               setup.h \
+               strconv.h \
+               stream.h \
+               string.h \
+               textfile.h \
+               thread.h \
+               time.h \
+               timer.h \
+               tokenzr.h \
+               txtstrm.h \
+               utils.h \
+               variant.h \
+               version.h \
+               wx.h \
+               wxchar.h \
+               wxprec.h
+
 WX_HEADERS = \
                accel.h \
                app.h \
 WX_HEADERS = \
                accel.h \
                app.h \
@@ -176,6 +225,7 @@ WX_HEADERS = \
                gauge.h \
                gdicmn.h \
                gdiobj.h \
                gauge.h \
                gdicmn.h \
                gdiobj.h \
+               gifdecod.h \
                grid.h \
                gsocket.h \
                hash.h \
                grid.h \
                gsocket.h \
                hash.h \
@@ -320,6 +370,7 @@ GTK_HEADERS = \
                gtk/dnd.h \
                gtk/filedlg.h \
                gtk/font.h \
                gtk/dnd.h \
                gtk/filedlg.h \
                gtk/font.h \
+               gtk/fontdlg.h \
                gtk/frame.h \
                gtk/gauge.h \
                gtk/gdiobj.h \
                gtk/frame.h \
                gtk/gauge.h \
                gtk/gdiobj.h \
@@ -511,8 +562,9 @@ GENERIC_HEADERS = \
                generic/colrdlgg.h \
                generic/dcpsg.h \
                generic/dirdlgg.h \
                generic/colrdlgg.h \
                generic/dcpsg.h \
                generic/dirdlgg.h \
+               generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/fontdlgg.h \
-               generic/gridg.h \
+               generic/grid.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
@@ -541,708 +593,1406 @@ 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/htmlcell.h \
                html/htmldefs.h \
-               html/htmlfilter.h \
-               html/htmlhelp.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/m_templ.h \
+               html/version.h \
+               html/winpars.h
 
 GTK_GENERICOBJS = \
 
 GTK_GENERICOBJS = \
-               src/generic/busyinfo.o \
-               src/generic/caret.o \
-               src/generic/choicdgg.o \
-               src/generic/colrdlgg.o \
-               src/generic/dcpsg.o \
-               src/generic/dirdlgg.o \
-               src/generic/filedlgg.o \
-               src/generic/fontdlgg.o \
-               src/generic/gridg.o \
-               src/generic/helphtml.o \
-               src/generic/helpwxht.o \
-               src/generic/imaglist.o \
-               src/generic/laywin.o \
-               src/generic/listctrl.o \
-               src/generic/msgdlgg.o \
-               src/generic/numdlgg.o \
-               src/generic/panelg.o \
-               src/generic/printps.o \
-               src/generic/prntdlgg.o \
-               src/generic/progdlgg.o \
-               src/generic/prop.o \
-               src/generic/propform.o \
-               src/generic/proplist.o \
-               src/generic/sashwin.o \
-               src/generic/scrolwin.o \
-               src/generic/splitter.o \
-               src/generic/statusbr.o \
-               src/generic/textdlgg.o \
-               src/generic/tipdlg.o \
-               src/generic/treectrl.o
+               busyinfo.o \
+               caret.o \
+               choicdgg.o \
+               colrdlgg.o \
+               dcpsg.o \
+               dirdlgg.o \
+               filedlgg.o \
+               grid.o \
+               helphtml.o \
+               helpwxht.o \
+               imaglist.o \
+               laywin.o \
+               listctrl.o \
+               logg.o \
+               msgdlgg.o \
+               numdlgg.o \
+               panelg.o \
+               printps.o \
+               prntdlgg.o \
+               progdlgg.o \
+               prop.o \
+               propform.o \
+               proplist.o \
+               sashwin.o \
+               scrolwin.o \
+               splitter.o \
+               statusbr.o \
+               textdlgg.o \
+               tipdlg.o \
+               treectrl.o \
+               wizard.o
+
+GTK_GENERICDEPS = \
+               busyinfo.d \
+               caret.d \
+               choicdgg.d \
+               colrdlgg.d \
+               dcpsg.d \
+               dirdlgg.d \
+               filedlgg.d \
+               grid.d \
+               helphtml.d \
+               helpwxht.d \
+               imaglist.d \
+               laywin.d \
+               listctrl.d \
+               logg.d \
+               msgdlgg.d \
+               numdlgg.d \
+               panelg.d \
+               printps.d \
+               prntdlgg.d \
+               progdlgg.d \
+               prop.d \
+               propform.d \
+               proplist.d \
+               sashwin.d \
+               scrolwin.d \
+               splitter.d \
+               statusbr.d \
+               textdlgg.d \
+               tipdlg.d \
+               treectrl.d \
+               wizard.d
 
 GTK_COMMONOBJS = \
                parser.o \
 
 GTK_COMMONOBJS = \
                parser.o \
-               src/common/cmndata.o \
-               src/common/config.o \
-               src/common/date.o \
-               src/common/datstrm.o \
-               src/common/db.o \
-               src/common/dbtable.o \
-               src/common/dcbase.o \
-               src/common/dlgcmn.o \
-               src/common/docmdi.o \
-               src/common/docview.o \
-               src/common/dynarray.o \
-               src/common/dynlib.o \
-               src/common/event.o \
-               src/common/extended.o \
-               src/common/ffile.o \
-               src/common/file.o \
-               src/common/fileconf.o \
-               src/common/filefn.o \
-               src/common/filesys.o \
-               src/common/framecmn.o \
-               src/common/fs_inet.o \
-               src/common/fs_zip.o \
-               src/common/ftp.o \
-               src/common/gdicmn.o \
-               src/common/hash.o \
-               src/common/helpbase.o \
-               src/common/http.o \
-               src/common/imagbmp.o \
-               src/common/image.o \
-               src/common/imaggif.o \
-               src/common/imagjpeg.o \
-               src/common/imagpng.o \
-               src/common/intl.o \
-               src/common/ipcbase.o \
-               src/common/layout.o \
-               src/common/list.o \
-               src/common/log.o \
-               src/common/memory.o \
-               src/common/mimetype.o \
-               src/common/module.o \
-               src/common/mstream.o \
-               src/common/object.o \
-               src/common/objstrm.o \
-               src/common/paper.o \
-               src/common/prntbase.o \
-               src/common/process.o \
-               src/common/protocol.o \
-               src/common/resource.o \
-               src/common/sckaddr.o \
-               src/common/sckfile.o \
-               src/common/sckipc.o \
-               src/common/sckstrm.o \
-               src/common/sizer.o \
-               src/common/socket.o \
-               src/common/strconv.o \
-               src/common/stream.o \
-               src/common/string.o \
-               src/common/tbarbase.o \
-               src/common/tbarsmpl.o \
-               src/common/textcmn.o \
-               src/common/textfile.o \
-               src/common/time.o \
-               src/common/timercmn.o \
-               src/common/tokenzr.o \
-               src/common/txtstrm.o \
-               src/common/unzip.o \
-               src/common/url.o \
-               src/common/utilscmn.o \
-               src/common/valgen.o \
-               src/common/validate.o \
-               src/common/valtext.o \
-               src/common/variant.o \
-               src/common/wfstream.o \
-               src/common/wincmn.o \
-               src/common/wxchar.o \
-               src/common/wxexpr.o \
-               src/common/zipstrm.o \
-               src/common/zstream.o
+               cmndata.o \
+               config.o \
+               date.o \
+               datstrm.o \
+               db.o \
+               dbtable.o \
+               dcbase.o \
+               dlgcmn.o \
+               docmdi.o \
+               docview.o \
+               dynarray.o \
+               dynlib.o \
+               event.o \
+               extended.o \
+               ffile.o \
+               file.o \
+               fileconf.o \
+               filefn.o \
+               filesys.o \
+               fontcmn.o \
+               framecmn.o \
+               fs_inet.o \
+               fs_zip.o \
+               ftp.o \
+               gdicmn.o \
+               gifdecod.o \
+               hash.o \
+               helpbase.o \
+               http.o \
+               imagall.o \
+               imagbmp.o \
+               image.o \
+               imaggif.o \
+               imagjpeg.o \
+               imagpcx.o \
+               imagpng.o \
+               imagpnm.o \
+               intl.o \
+               ipcbase.o \
+               layout.o \
+               list.o \
+               log.o \
+               memory.o \
+               mimetype.o \
+               module.o \
+               mstream.o \
+               object.o \
+               objstrm.o \
+               paper.o \
+               prntbase.o \
+               process.o \
+               protocol.o \
+               resource.o \
+               sckaddr.o \
+               sckfile.o \
+               sckipc.o \
+               sckstrm.o \
+               serbase.o \
+               sizer.o \
+               socket.o \
+               strconv.o \
+               stream.o \
+               string.o \
+               tbarbase.o \
+               tbarsmpl.o \
+               textcmn.o \
+               textfile.o \
+               time.o \
+               timercmn.o \
+               tokenzr.o \
+               txtstrm.o \
+               unzip.o \
+               url.o \
+               utilscmn.o \
+               valgen.o \
+               validate.o \
+               valtext.o \
+               variant.o \
+               wfstream.o \
+               wincmn.o \
+               wxchar.o \
+               wxexpr.o \
+               zipstrm.o \
+               zstream.o
+
+GTK_COMMONDEPS = \
+               parser.d \
+               cmndata.d \
+               config.d \
+               date.d \
+               datstrm.d \
+               db.d \
+               dbtable.d \
+               dcbase.d \
+               dlgcmn.d \
+               docmdi.d \
+               docview.d \
+               dynarray.d \
+               dynlib.d \
+               event.d \
+               extended.d \
+               ffile.d \
+               file.d \
+               fileconf.d \
+               filefn.d \
+               filesys.d \
+               fontcmn.d \
+               framecmn.d \
+               fs_inet.d \
+               fs_zip.d \
+               ftp.d \
+               gdicmn.d \
+               gifdecod.d \
+               hash.d \
+               helpbase.d \
+               http.d \
+               imagall.d \
+               imagbmp.d \
+               image.d \
+               imaggif.d \
+               imagjpeg.d \
+               imagpcx.d \
+               imagpng.d \
+               imagpnm.d \
+               intl.d \
+               ipcbase.d \
+               layout.d \
+               list.d \
+               log.d \
+               memory.d \
+               mimetype.d \
+               module.d \
+               mstream.d \
+               object.d \
+               objstrm.d \
+               paper.d \
+               prntbase.d \
+               process.d \
+               protocol.d \
+               resource.d \
+               sckaddr.d \
+               sckfile.d \
+               sckipc.d \
+               sckstrm.d \
+               serbase.d \
+               sizer.d \
+               socket.d \
+               strconv.d \
+               stream.d \
+               string.d \
+               tbarbase.d \
+               tbarsmpl.d \
+               textcmn.d \
+               textfile.d \
+               time.d \
+               timercmn.d \
+               tokenzr.d \
+               txtstrm.d \
+               unzip.d \
+               url.d \
+               utilscmn.d \
+               valgen.d \
+               validate.d \
+               valtext.d \
+               variant.d \
+               wfstream.d \
+               wincmn.d \
+               wxchar.d \
+               wxexpr.d \
+               zipstrm.d \
+               zstream.d
 
 GTK_GUIOBJS = \
 
 GTK_GUIOBJS = \
-               src/gtk/accel.o \
-               src/gtk/app.o \
-               src/gtk/bitmap.o \
-               src/gtk/bmpbuttn.o \
-               src/gtk/brush.o \
-               src/gtk/button.o \
-               src/gtk/checkbox.o \
-               src/gtk/checklst.o \
-               src/gtk/choice.o \
-               src/gtk/clipbrd.o \
-               src/gtk/colour.o \
-               src/gtk/combobox.o \
-               src/gtk/control.o \
-               src/gtk/cursor.o \
-               src/gtk/data.o \
-               src/gtk/dataobj.o \
-               src/gtk/dc.o \
-               src/gtk/dcclient.o \
-               src/gtk/dcmemory.o \
-               src/gtk/dcscreen.o \
-               src/gtk/dialog.o \
-               src/gtk/dnd.o \
-               src/gtk/font.o \
-               src/gtk/frame.o \
-               src/gtk/gauge.o \
-               src/gtk/gdiobj.o \
-               src/gtk/gsockgtk.o \
-               src/gtk/icon.o \
-               src/gtk/listbox.o \
-               src/gtk/main.o \
-               src/gtk/mdi.o \
-               src/gtk/menu.o \
-               src/gtk/minifram.o \
-               src/gtk/notebook.o \
-               src/gtk/palette.o \
-               src/gtk/pen.o \
-               src/gtk/radiobox.o \
-               src/gtk/radiobut.o \
-               src/gtk/region.o \
-               src/gtk/scrolbar.o \
-               src/gtk/settings.o \
-               src/gtk/slider.o \
-               src/gtk/spinbutt.o \
-               src/gtk/statbmp.o \
-               src/gtk/statbox.o \
-               src/gtk/statline.o \
-               src/gtk/stattext.o \
-               src/gtk/tbargtk.o \
-               src/gtk/textctrl.o \
-               src/gtk/timer.o \
-               src/gtk/tooltip.o \
-               src/gtk/utilsgtk.o \
-               src/gtk/utilsres.o \
-               src/gtk/wave.o \
-               src/gtk/win_gtk.o \
-               src/gtk/window.o
+               accel.o \
+               app.o \
+               bitmap.o \
+               bmpbuttn.o \
+               brush.o \
+               button.o \
+               checkbox.o \
+               checklst.o \
+               choice.o \
+               clipbrd.o \
+               colour.o \
+               combobox.o \
+               control.o \
+               cursor.o \
+               data.o \
+               dataobj.o \
+               dc.o \
+               dcclient.o \
+               dcmemory.o \
+               dcscreen.o \
+               dialog.o \
+               dnd.o \
+               font.o \
+               fontdlg.o \
+               frame.o \
+               gauge.o \
+               gdiobj.o \
+               gsockgtk.o \
+               icon.o \
+               listbox.o \
+               main.o \
+               mdi.o \
+               menu.o \
+               minifram.o \
+               notebook.o \
+               palette.o \
+               pen.o \
+               radiobox.o \
+               radiobut.o \
+               region.o \
+               scrolbar.o \
+               settings.o \
+               slider.o \
+               spinbutt.o \
+               statbmp.o \
+               statbox.o \
+               statline.o \
+               stattext.o \
+               tbargtk.o \
+               textctrl.o \
+               timer.o \
+               tooltip.o \
+               utilsgtk.o \
+               utilsres.o \
+               wave.o \
+               win_gtk.o \
+               window.o
+
+GTK_GUIDEPS = \
+               accel.d \
+               app.d \
+               bitmap.d \
+               bmpbuttn.d \
+               brush.d \
+               button.d \
+               checkbox.d \
+               checklst.d \
+               choice.d \
+               clipbrd.d \
+               colour.d \
+               combobox.d \
+               control.d \
+               cursor.d \
+               data.d \
+               dataobj.d \
+               dc.d \
+               dcclient.d \
+               dcmemory.d \
+               dcscreen.d \
+               dialog.d \
+               dnd.d \
+               font.d \
+               fontdlg.d \
+               frame.d \
+               gauge.d \
+               gdiobj.d \
+               gsockgtk.d \
+               icon.d \
+               listbox.d \
+               main.d \
+               mdi.d \
+               menu.d \
+               minifram.d \
+               notebook.d \
+               palette.d \
+               pen.d \
+               radiobox.d \
+               radiobut.d \
+               region.d \
+               scrolbar.d \
+               settings.d \
+               slider.d \
+               spinbutt.d \
+               statbmp.d \
+               statbox.d \
+               statline.d \
+               stattext.d \
+               tbargtk.d \
+               textctrl.d \
+               timer.d \
+               tooltip.d \
+               utilsgtk.d \
+               utilsres.d \
+               wave.d \
+               win_gtk.d \
+               window.d
 
 MOTIF_GENERICOBJS = \
 
 MOTIF_GENERICOBJS = \
-               src/generic/busyinfo.o \
-               src/generic/caret.o \
-               src/generic/choicdgg.o \
-               src/generic/colrdlgg.o \
-               src/generic/dcpsg.o \
-               src/generic/dirdlgg.o \
-               src/generic/filedlgg.o \
-               src/generic/fontdlgg.o \
-               src/generic/gridg.o \
-               src/generic/helphtml.o \
-               src/generic/helpwxht.o \
-               src/generic/helpxlp.o \
-               src/generic/imaglist.o \
-               src/generic/laywin.o \
-               src/generic/listctrl.o \
-               src/generic/msgdlgg.o \
-               src/generic/notebook.o \
-               src/generic/numdlgg.o \
-               src/generic/panelg.o \
-               src/generic/printps.o \
-               src/generic/prntdlgg.o \
-               src/generic/progdlgg.o \
-               src/generic/prop.o \
-               src/generic/propform.o \
-               src/generic/proplist.o \
-               src/generic/sashwin.o \
-               src/generic/scrolwin.o \
-               src/generic/splitter.o \
-               src/generic/statusbr.o \
-               src/generic/tabg.o \
-               src/generic/textdlgg.o \
-               src/generic/tipdlg.o \
-               src/generic/treectrl.o
+               busyinfo.o \
+               caret.o \
+               choicdgg.o \
+               colrdlgg.o \
+               dcpsg.o \
+               dirdlgg.o \
+               fontdlgg.o \
+               grid.o \
+               helphtml.o \
+               helpwxht.o \
+               helpxlp.o \
+               imaglist.o \
+               laywin.o \
+               listctrl.o \
+               logg.o \
+               msgdlgg.o \
+               notebook.o \
+               numdlgg.o \
+               panelg.o \
+               printps.o \
+               prntdlgg.o \
+               progdlgg.o \
+               prop.o \
+               propform.o \
+               proplist.o \
+               sashwin.o \
+               scrolwin.o \
+               splitter.o \
+               statline.o \
+               statusbr.o \
+               tabg.o \
+               textdlgg.o \
+               tipdlg.o \
+               treectrl.o \
+               wizard.o
+
+MOTIF_GENERICDEPS = \
+               busyinfo.d \
+               caret.d \
+               choicdgg.d \
+               colrdlgg.d \
+               dcpsg.d \
+               dirdlgg.d \
+               fontdlgg.d \
+               grid.d \
+               helphtml.d \
+               helpwxht.d \
+               helpxlp.d \
+               imaglist.d \
+               laywin.d \
+               listctrl.d \
+               logg.d \
+               msgdlgg.d \
+               notebook.d \
+               numdlgg.d \
+               panelg.d \
+               printps.d \
+               prntdlgg.d \
+               progdlgg.d \
+               prop.d \
+               propform.d \
+               proplist.d \
+               sashwin.d \
+               scrolwin.d \
+               splitter.d \
+               statline.d \
+               statusbr.d \
+               tabg.d \
+               textdlgg.d \
+               tipdlg.d \
+               treectrl.d \
+               wizard.d
 
 MOTIF_COMMONOBJS = \
                parser.o \
 
 MOTIF_COMMONOBJS = \
                parser.o \
-               src/common/choiccmn.o \
-               src/common/cmndata.o \
-               src/common/config.o \
-               src/common/ctrlcmn.o \
-               src/common/date.o \
-               src/common/datstrm.o \
-               src/common/db.o \
-               src/common/dbtable.o \
-               src/common/dcbase.o \
-               src/common/dlgcmn.o \
-               src/common/docmdi.o \
-               src/common/docview.o \
-               src/common/dynarray.o \
-               src/common/dynlib.o \
-               src/common/event.o \
-               src/common/extended.o \
-               src/common/ffile.o \
-               src/common/file.o \
-               src/common/fileconf.o \
-               src/common/filefn.o \
-               src/common/filesys.o \
-               src/common/framecmn.o \
-               src/common/fs_inet.o \
-               src/common/fs_zip.o \
-               src/common/ftp.o \
-               src/common/gdicmn.o \
-               src/common/hash.o \
-               src/common/helpbase.o \
-               src/common/http.o \
-               src/common/imagbmp.o \
-               src/common/image.o \
-               src/common/imaggif.o \
-               src/common/imagjpeg.o \
-               src/common/imagpng.o \
-               src/common/intl.o \
-               src/common/ipcbase.o \
-               src/common/layout.o \
-               src/common/list.o \
-               src/common/log.o \
-               src/common/memory.o \
-               src/common/mimetype.o \
-               src/common/module.o \
-               src/common/mstream.o \
-               src/common/object.o \
-               src/common/objstrm.o \
-               src/common/odbc.o \
-               src/common/paper.o \
-               src/common/prntbase.o \
-               src/common/process.o \
-               src/common/protocol.o \
-               src/common/resource.o \
-               src/common/sckaddr.o \
-               src/common/sckfile.o \
-               src/common/sckipc.o \
-               src/common/sckstrm.o \
-               src/common/sizer.o \
-               src/common/socket.o \
-               src/common/strconv.o \
-               src/common/stream.o \
-               src/common/string.o \
-               src/common/tbarbase.o \
-               src/common/tbarsmpl.o \
-               src/common/textcmn.o \
-               src/common/textfile.o \
-               src/common/time.o \
-               src/common/timercmn.o \
-               src/common/tokenzr.o \
-               src/common/txtstrm.o \
-               src/common/unzip.o \
-               src/common/url.o \
-               src/common/utilscmn.o \
-               src/common/valgen.o \
-               src/common/validate.o \
-               src/common/valtext.o \
-               src/common/variant.o \
-               src/common/wfstream.o \
-               src/common/wincmn.o \
-               src/common/wxchar.o \
-               src/common/wxexpr.o \
-               src/common/zipstrm.o \
-               src/common/zstream.o
+               choiccmn.o \
+               cmndata.o \
+               config.o \
+               ctrlcmn.o \
+               date.o \
+               datstrm.o \
+               db.o \
+               dbtable.o \
+               dcbase.o \
+               dlgcmn.o \
+               docmdi.o \
+               docview.o \
+               dynarray.o \
+               dynlib.o \
+               event.o \
+               extended.o \
+               ffile.o \
+               file.o \
+               fileconf.o \
+               filefn.o \
+               filesys.o \
+               fontcmn.o \
+               framecmn.o \
+               fs_inet.o \
+               fs_zip.o \
+               ftp.o \
+               gdicmn.o \
+               gifdecod.o \
+               hash.o \
+               helpbase.o \
+               http.o \
+               imagall.o \
+               imagbmp.o \
+               image.o \
+               imaggif.o \
+               imagjpeg.o \
+               imagpcx.o \
+               imagpng.o \
+               imagpnm.o \
+               intl.o \
+               ipcbase.o \
+               layout.o \
+               list.o \
+               log.o \
+               memory.o \
+               mimetype.o \
+               module.o \
+               mstream.o \
+               object.o \
+               objstrm.o \
+               odbc.o \
+               paper.o \
+               prntbase.o \
+               process.o \
+               protocol.o \
+               resource.o \
+               sckaddr.o \
+               sckfile.o \
+               sckipc.o \
+               sckstrm.o \
+               serbase.o \
+               sizer.o \
+               socket.o \
+               strconv.o \
+               stream.o \
+               string.o \
+               tbarbase.o \
+               tbarsmpl.o \
+               textcmn.o \
+               textfile.o \
+               time.o \
+               timercmn.o \
+               tokenzr.o \
+               txtstrm.o \
+               unzip.o \
+               url.o \
+               utilscmn.o \
+               valgen.o \
+               validate.o \
+               valtext.o \
+               variant.o \
+               wfstream.o \
+               wincmn.o \
+               wxchar.o \
+               wxexpr.o \
+               zipstrm.o \
+               zstream.o
+
+MOTIF_COMMONDEPS = \
+               parser.d \
+               choiccmn.d \
+               cmndata.d \
+               config.d \
+               ctrlcmn.d \
+               date.d \
+               datstrm.d \
+               db.d \
+               dbtable.d \
+               dcbase.d \
+               dlgcmn.d \
+               docmdi.d \
+               docview.d \
+               dynarray.d \
+               dynlib.d \
+               event.d \
+               extended.d \
+               ffile.d \
+               file.d \
+               fileconf.d \
+               filefn.d \
+               filesys.d \
+               fontcmn.d \
+               framecmn.d \
+               fs_inet.d \
+               fs_zip.d \
+               ftp.d \
+               gdicmn.d \
+               gifdecod.d \
+               hash.d \
+               helpbase.d \
+               http.d \
+               imagall.d \
+               imagbmp.d \
+               image.d \
+               imaggif.d \
+               imagjpeg.d \
+               imagpcx.d \
+               imagpng.d \
+               imagpnm.d \
+               intl.d \
+               ipcbase.d \
+               layout.d \
+               list.d \
+               log.d \
+               memory.d \
+               mimetype.d \
+               module.d \
+               mstream.d \
+               object.d \
+               objstrm.d \
+               odbc.d \
+               paper.d \
+               prntbase.d \
+               process.d \
+               protocol.d \
+               resource.d \
+               sckaddr.d \
+               sckfile.d \
+               sckipc.d \
+               sckstrm.d \
+               serbase.d \
+               sizer.d \
+               socket.d \
+               strconv.d \
+               stream.d \
+               string.d \
+               tbarbase.d \
+               tbarsmpl.d \
+               textcmn.d \
+               textfile.d \
+               time.d \
+               timercmn.d \
+               tokenzr.d \
+               txtstrm.d \
+               unzip.d \
+               url.d \
+               utilscmn.d \
+               valgen.d \
+               validate.d \
+               valtext.d \
+               variant.d \
+               wfstream.d \
+               wincmn.d \
+               wxchar.d \
+               wxexpr.d \
+               zipstrm.d \
+               zstream.d
 
 MOTIF_GUIOBJS = \
 
 MOTIF_GUIOBJS = \
-               src/motif/xmcombo/xmcombo.o \
-               src/motif/accel.o \
-               src/motif/app.o \
-               src/motif/bitmap.o \
-               src/motif/bmpbuttn.o \
-               src/motif/brush.o \
-               src/motif/button.o \
-               src/motif/checkbox.o \
-               src/motif/choice.o \
-               src/motif/clipbrd.o \
-               src/motif/colour.o \
-               src/motif/combobox.o \
-               src/motif/control.o \
-               src/motif/cursor.o \
-               src/motif/data.o \
-               src/motif/dataobj.o \
-               src/motif/dc.o \
-               src/motif/dcclient.o \
-               src/motif/dcmemory.o \
-               src/motif/dcscreen.o \
-               src/motif/dialog.o \
-               src/motif/filedlg.o \
-               src/motif/font.o \
-               src/motif/frame.o \
-               src/motif/gauge.o \
-               src/motif/gdiobj.o \
-               src/motif/gsockmot.o \
-               src/motif/icon.o \
-               src/motif/listbox.o \
-               src/motif/main.o \
-               src/motif/mdi.o \
-               src/motif/menu.o \
-               src/motif/menuitem.o \
-               src/motif/minifram.o \
-               src/motif/msgdlg.o \
-               src/motif/palette.o \
-               src/motif/pen.o \
-               src/motif/radiobox.o \
-               src/motif/radiobut.o \
-               src/motif/region.o \
-               src/motif/scrolbar.o \
-               src/motif/settings.o \
-               src/motif/slider.o \
-               src/motif/statbmp.o \
-               src/motif/statbox.o \
-               src/motif/stattext.o \
-               src/motif/textctrl.o \
-               src/motif/timer.o \
-               src/motif/toolbar.o \
-               src/motif/utils.o \
-               src/motif/window.o
+               xmcombo.o \
+               accel.o \
+               app.o \
+               bitmap.o \
+               bmpbuttn.o \
+               brush.o \
+               button.o \
+               checkbox.o \
+               checklst.o \
+               choice.o \
+               clipbrd.o \
+               colour.o \
+               combobox.o \
+               control.o \
+               cursor.o \
+               data.o \
+               dataobj.o \
+               dc.o \
+               dcclient.o \
+               dcmemory.o \
+               dcscreen.o \
+               dialog.o \
+               filedlg.o \
+               font.o \
+               fontenum.o \
+               frame.o \
+               gauge.o \
+               gdiobj.o \
+               gsockmot.o \
+               icon.o \
+               listbox.o \
+               main.o \
+               mdi.o \
+               menu.o \
+               menuitem.o \
+               minifram.o \
+               msgdlg.o \
+               palette.o \
+               pen.o \
+               radiobox.o \
+               radiobut.o \
+               region.o \
+               scrolbar.o \
+               settings.o \
+               slider.o \
+               spinbutt.o \
+               statbmp.o \
+               statbox.o \
+               stattext.o \
+               textctrl.o \
+               timer.o \
+               toolbar.o \
+               utils.o \
+               window.o
+
+MOTIF_GUIDEPS = \
+               xmcombo.d \
+               accel.d \
+               app.d \
+               bitmap.d \
+               bmpbuttn.d \
+               brush.d \
+               button.d \
+               checkbox.d \
+               checklst.d \
+               choice.d \
+               clipbrd.d \
+               colour.d \
+               combobox.d \
+               control.d \
+               cursor.d \
+               data.d \
+               dataobj.d \
+               dc.d \
+               dcclient.d \
+               dcmemory.d \
+               dcscreen.d \
+               dialog.d \
+               filedlg.d \
+               font.d \
+               fontenum.d \
+               frame.d \
+               gauge.d \
+               gdiobj.d \
+               gsockmot.d \
+               icon.d \
+               listbox.d \
+               main.d \
+               mdi.d \
+               menu.d \
+               menuitem.d \
+               minifram.d \
+               msgdlg.d \
+               palette.d \
+               pen.d \
+               radiobox.d \
+               radiobut.d \
+               region.d \
+               scrolbar.d \
+               settings.d \
+               slider.d \
+               spinbutt.d \
+               statbmp.d \
+               statbox.d \
+               stattext.d \
+               textctrl.d \
+               timer.d \
+               toolbar.d \
+               utils.d \
+               window.d
 
 MSW_GENERICOBJS = \
 
 MSW_GENERICOBJS = \
-               src/generic/busyinfo.o \
-               src/generic/choicdgg.o \
-               src/generic/dirdlgg.o \
-               src/generic/gridg.o \
-               src/generic/laywin.o \
-               src/generic/numdlgg.o \
-               src/generic/panelg.o \
-               src/generic/progdlgg.o \
-               src/generic/prop.o \
-               src/generic/propform.o \
-               src/generic/proplist.o \
-               src/generic/sashwin.o \
-               src/generic/scrolwin.o \
-               src/generic/splitter.o \
-               src/generic/statusbr.o \
-               src/generic/tabg.o \
-               src/generic/textdlgg.o \
-               src/generic/tipdlg.o
+               busyinfo.o \
+               choicdgg.o \
+               dirdlgg.o \
+               grid.o \
+               laywin.o \
+               logg.o \
+               numdlgg.o \
+               panelg.o \
+               progdlgg.o \
+               prop.o \
+               propform.o \
+               proplist.o \
+               sashwin.o \
+               scrolwin.o \
+               splitter.o \
+               statusbr.o \
+               tabg.o \
+               textdlgg.o \
+               tipdlg.o \
+               wizard.o
+
+MSW_GENERICDEPS = \
+               busyinfo.d \
+               choicdgg.d \
+               dirdlgg.d \
+               grid.d \
+               laywin.d \
+               logg.d \
+               numdlgg.d \
+               panelg.d \
+               progdlgg.d \
+               prop.d \
+               propform.d \
+               proplist.d \
+               sashwin.d \
+               scrolwin.d \
+               splitter.d \
+               statusbr.d \
+               tabg.d \
+               textdlgg.d \
+               tipdlg.d \
+               wizard.d
 
 MSW_COMMONOBJS = \
 
 MSW_COMMONOBJS = \
-               src/common/choiccmn.o \
-               src/common/cmndata.o \
-               src/common/config.o \
-               src/common/ctrlcmn.o \
-               src/common/date.o \
-               src/common/datstrm.o \
-               src/common/db.o \
-               src/common/dbtable.o \
-               src/common/dcbase.o \
-               src/common/dlgcmn.o \
-               src/common/docmdi.o \
-               src/common/docview.o \
-               src/common/dynarray.o \
-               src/common/dynlib.o \
-               src/common/event.o \
-               src/common/extended.o \
-               src/common/ffile.o \
-               src/common/file.o \
-               src/common/fileconf.o \
-               src/common/filefn.o \
-               src/common/filesys.o \
-               src/common/framecmn.o \
-               src/common/fs_inet.o \
-               src/common/fs_zip.o \
-               src/common/ftp.o \
-               src/common/gdicmn.o \
-               src/common/hash.o \
-               src/common/helpbase.o \
-               src/common/http.o \
-               src/common/imagbmp.o \
-               src/common/image.o \
-               src/common/imaggif.o \
-               src/common/imagjpeg.o \
-               src/common/imagpng.o \
-               src/common/intl.o \
-               src/common/ipcbase.o \
-               src/common/layout.o \
-               src/common/list.o \
-               src/common/log.o \
-               src/common/memory.o \
-               src/common/mimetype.o \
-               src/common/module.o \
-               src/common/mstream.o \
-               src/common/object.o \
-               src/common/objstrm.o \
-               src/common/paper.o \
-               src/common/prntbase.o \
-               src/common/process.o \
-               src/common/protocol.o \
-               src/common/resource.o \
-               src/common/sckaddr.o \
-               src/common/sckfile.o \
-               src/common/sckipc.o \
-               src/common/sckstrm.o \
-               src/common/sizer.o \
-               src/common/socket.o \
-               src/common/strconv.o \
-               src/common/stream.o \
-               src/common/string.o \
-               src/common/tbarbase.o \
-               src/common/textcmn.o \
-               src/common/textfile.o \
-               src/common/time.o \
-               src/common/timercmn.o \
-               src/common/tokenzr.o \
-               src/common/txtstrm.o \
-               src/common/unzip.o \
-               src/common/url.o \
-               src/common/utilscmn.o \
-               src/common/valgen.o \
-               src/common/validate.o \
-               src/common/valtext.o \
-               src/common/variant.o \
-               src/common/wfstream.o \
-               src/common/wincmn.o \
-               src/common/wxchar.o \
-               src/common/wxexpr.o \
-               src/common/zipstrm.o \
-               src/common/zstream.o
+               parser.o \
+               choiccmn.o \
+               cmndata.o \
+               config.o \
+               ctrlcmn.o \
+               date.o \
+               datstrm.o \
+               db.o \
+               dbtable.o \
+               dcbase.o \
+               dlgcmn.o \
+               docmdi.o \
+               docview.o \
+               dynarray.o \
+               dynlib.o \
+               event.o \
+               extended.o \
+               ffile.o \
+               file.o \
+               fileconf.o \
+               filefn.o \
+               filesys.o \
+               fontcmn.o \
+               framecmn.o \
+               fs_inet.o \
+               fs_zip.o \
+               ftp.o \
+               gdicmn.o \
+               gifdecod.o \
+               hash.o \
+               helpbase.o \
+               http.o \
+               imagall.o \
+               imagbmp.o \
+               image.o \
+               imaggif.o \
+               imagjpeg.o \
+               imagpcx.o \
+               imagpng.o \
+               imagpnm.o \
+               intl.o \
+               ipcbase.o \
+               layout.o \
+               list.o \
+               log.o \
+               memory.o \
+               mimetype.o \
+               module.o \
+               mstream.o \
+               object.o \
+               objstrm.o \
+               odbc.o \
+               paper.o \
+               prntbase.o \
+               process.o \
+               protocol.o \
+               resource.o \
+               sckaddr.o \
+               sckfile.o \
+               sckipc.o \
+               sckstrm.o \
+               serbase.o \
+               sizer.o \
+               socket.o \
+               strconv.o \
+               stream.o \
+               string.o \
+               tbarbase.o \
+               tbarsmpl.o \
+               textcmn.o \
+               textfile.o \
+               time.o \
+               timercmn.o \
+               tokenzr.o \
+               txtstrm.o \
+               unzip.o \
+               url.o \
+               utilscmn.o \
+               valgen.o \
+               validate.o \
+               valtext.o \
+               variant.o \
+               wfstream.o \
+               wincmn.o \
+               wxchar.o \
+               wxexpr.o \
+               zipstrm.o \
+               zstream.o
+
+MSW_COMMONDEPS = \
+               parser.d \
+               choiccmn.d \
+               cmndata.d \
+               config.d \
+               ctrlcmn.d \
+               date.d \
+               datstrm.d \
+               db.d \
+               dbtable.d \
+               dcbase.d \
+               dlgcmn.d \
+               docmdi.d \
+               docview.d \
+               dynarray.d \
+               dynlib.d \
+               event.d \
+               extended.d \
+               ffile.d \
+               file.d \
+               fileconf.d \
+               filefn.d \
+               filesys.d \
+               fontcmn.d \
+               framecmn.d \
+               fs_inet.d \
+               fs_zip.d \
+               ftp.d \
+               gdicmn.d \
+               gifdecod.d \
+               hash.d \
+               helpbase.d \
+               http.d \
+               imagall.d \
+               imagbmp.d \
+               image.d \
+               imaggif.d \
+               imagjpeg.d \
+               imagpcx.d \
+               imagpng.d \
+               imagpnm.d \
+               intl.d \
+               ipcbase.d \
+               layout.d \
+               list.d \
+               log.d \
+               memory.d \
+               mimetype.d \
+               module.d \
+               mstream.d \
+               object.d \
+               objstrm.d \
+               odbc.d \
+               paper.d \
+               prntbase.d \
+               process.d \
+               protocol.d \
+               resource.d \
+               sckaddr.d \
+               sckfile.d \
+               sckipc.d \
+               sckstrm.d \
+               serbase.d \
+               sizer.d \
+               socket.d \
+               strconv.d \
+               stream.d \
+               string.d \
+               tbarbase.d \
+               tbarsmpl.d \
+               textcmn.d \
+               textfile.d \
+               time.d \
+               timercmn.d \
+               tokenzr.d \
+               txtstrm.d \
+               unzip.d \
+               url.d \
+               utilscmn.d \
+               valgen.d \
+               validate.d \
+               valtext.d \
+               variant.d \
+               wfstream.d \
+               wincmn.d \
+               wxchar.d \
+               wxexpr.d \
+               zipstrm.d \
+               zstream.d
 
 MSW_GUIOBJS = \
 
 MSW_GUIOBJS = \
-               src/msw/accel.o \
-               src/msw/app.o \
-               src/msw/bitmap.o \
-               src/msw/bmpbuttn.o \
-               src/msw/brush.o \
-               src/msw/button.o \
-               src/msw/caret.o \
-               src/msw/checkbox.o \
-               src/msw/checklst.o \
-               src/msw/choice.o \
-               src/msw/clipbrd.o \
-               src/msw/colordlg.o \
-               src/msw/colour.o \
-               src/msw/combobox.o \
-               src/msw/control.o \
-               src/msw/curico.o \
-               src/msw/cursor.o \
-               src/msw/data.o \
-               src/msw/dc.o \
-               src/msw/dcclient.o \
-               src/msw/dcmemory.o \
-               src/msw/dcprint.o \
-               src/msw/dcscreen.o \
-               src/msw/dde.o \
-               src/msw/dialog.o \
-               src/msw/dib.o \
-               src/msw/dibutils.o \
-               src/msw/dragimag.o \
-               src/msw/filedlg.o \
-               src/msw/font.o \
-               src/msw/fontdlg.o \
-               src/msw/frame.o \
-               src/msw/gauge95.o \
-               src/msw/gdiobj.o \
-               src/msw/helpwin.o \
-               src/msw/icon.o \
-               src/msw/imaglist.o \
-               src/msw/joystick.o \
-               src/msw/listbox.o \
-               src/msw/listctrl.o \
-               src/msw/main.o \
-               src/msw/mdi.o \
-               src/msw/menu.o \
-               src/msw/menuitem.o \
-               src/msw/metafile.o \
-               src/msw/minifram.o \
-               src/msw/msgdlg.o \
-               src/msw/nativdlg.o \
-               src/msw/notebook.o \
-               src/msw/ownerdrw.o \
-               src/msw/palette.o \
-               src/msw/pen.o \
-               src/msw/penwin.o \
-               src/msw/pnghand.o \
-               src/msw/printdlg.o \
-               src/msw/printwin.o \
-               src/msw/radiobox.o \
-               src/msw/radiobut.o \
-               src/msw/regconf.o \
-               src/msw/region.o \
-               src/msw/registry.o \
-               src/msw/scrolbar.o \
-               src/msw/settings.o \
-               src/msw/slider95.o \
-               src/msw/spinbutt.o \
-               src/msw/statbmp.o \
-               src/msw/statbox.o \
-               src/msw/statbr95.o \
-               src/msw/statline.o \
-               src/msw/stattext.o \
-               src/msw/tabctrl.o \
-               src/msw/taskbar.o \
-               src/msw/tbar95.o \
-               src/msw/textctrl.o \
-               src/msw/thread.o \
-               src/msw/timer.o \
-               src/msw/tooltip.o \
-               src/msw/treectrl.o \
-               src/msw/utils.o \
-               src/msw/utilsexc.o \
-               src/msw/wave.o \
-               src/msw/window.o \
-               src/msw/xpmhand.o
+               accel.o \
+               app.o \
+               bitmap.o \
+               bmpbuttn.o \
+               brush.o \
+               button.o \
+               caret.o \
+               checkbox.o \
+               checklst.o \
+               choice.o \
+               clipbrd.o \
+               colordlg.o \
+               colour.o \
+               combobox.o \
+               control.o \
+               curico.o \
+               cursor.o \
+               data.o \
+               dc.o \
+               dcclient.o \
+               dcmemory.o \
+               dcprint.o \
+               dcscreen.o \
+               dde.o \
+               dialog.o \
+               dib.o \
+               dibutils.o \
+               dragimag.o \
+               filedlg.o \
+               font.o \
+               fontdlg.o \
+               frame.o \
+               gauge95.o \
+               gdiobj.o \
+               gsocket.o \
+               helpwin.o \
+               icon.o \
+               imaglist.o \
+               joystick.o \
+               listbox.o \
+               listctrl.o \
+               main.o \
+               mdi.o \
+               menu.o \
+               menuitem.o \
+               metafile.o \
+               minifram.o \
+               msgdlg.o \
+               nativdlg.o \
+               notebook.o \
+               ownerdrw.o \
+               palette.o \
+               pen.o \
+               penwin.o \
+               pnghand.o \
+               printdlg.o \
+               printwin.o \
+               radiobox.o \
+               radiobut.o \
+               regconf.o \
+               region.o \
+               registry.o \
+               scrolbar.o \
+               settings.o \
+               slider95.o \
+               spinbutt.o \
+               statbmp.o \
+               statbox.o \
+               statbr95.o \
+               statline.o \
+               stattext.o \
+               tabctrl.o \
+               taskbar.o \
+               tbar95.o \
+               textctrl.o \
+               thread.o \
+               timer.o \
+               tooltip.o \
+               treectrl.o \
+               utils.o \
+               utilsexc.o \
+               wave.o \
+               window.o \
+               xpmhand.o
+
+MSW_GUIDEPS = \
+               accel.d \
+               app.d \
+               bitmap.d \
+               bmpbuttn.d \
+               brush.d \
+               button.d \
+               caret.d \
+               checkbox.d \
+               checklst.d \
+               choice.d \
+               clipbrd.d \
+               colordlg.d \
+               colour.d \
+               combobox.d \
+               control.d \
+               curico.d \
+               cursor.d \
+               data.d \
+               dc.d \
+               dcclient.d \
+               dcmemory.d \
+               dcprint.d \
+               dcscreen.d \
+               dde.d \
+               dialog.d \
+               dib.d \
+               dibutils.d \
+               dragimag.d \
+               filedlg.d \
+               font.d \
+               fontdlg.d \
+               frame.d \
+               gauge95.d \
+               gdiobj.d \
+               gsocket.d \
+               helpwin.d \
+               icon.d \
+               imaglist.d \
+               joystick.d \
+               listbox.d \
+               listctrl.d \
+               main.d \
+               mdi.d \
+               menu.d \
+               menuitem.d \
+               metafile.d \
+               minifram.d \
+               msgdlg.d \
+               nativdlg.d \
+               notebook.d \
+               ownerdrw.d \
+               palette.d \
+               pen.d \
+               penwin.d \
+               pnghand.d \
+               printdlg.d \
+               printwin.d \
+               radiobox.d \
+               radiobut.d \
+               regconf.d \
+               region.d \
+               registry.d \
+               scrolbar.d \
+               settings.d \
+               slider95.d \
+               spinbutt.d \
+               statbmp.d \
+               statbox.d \
+               statbr95.d \
+               statline.d \
+               stattext.d \
+               tabctrl.d \
+               taskbar.d \
+               tbar95.d \
+               textctrl.d \
+               thread.d \
+               timer.d \
+               tooltip.d \
+               treectrl.d \
+               utils.d \
+               utilsexc.d \
+               wave.d \
+               window.d \
+               xpmhand.d
+
+BASE_OBJS = \
+               config.o \
+               date.o \
+               dynarray.o \
+               dynlib.o \
+               event.o \
+               extended.o \
+               ffile.o \
+               file.o \
+               fileconf.o \
+               filefn.o \
+               filesys.o \
+               hash.o \
+               init.o \
+               intl.o \
+               list.o \
+               log.o \
+               mimetype.o \
+               module.o \
+               object.o \
+               process.o \
+               strconv.o \
+               stream.o \
+               string.o \
+               textfile.o \
+               time.o \
+               timercmn.o \
+               tokenzr.o \
+               txtstrm.o \
+               utilscmn.o \
+               variant.o \
+               wxchar.o \
+               utilsunx.o
+
+BASE_DEPS = \
+               config.d \
+               date.d \
+               dynarray.d \
+               dynlib.d \
+               event.d \
+               extended.d \
+               ffile.d \
+               file.d \
+               fileconf.d \
+               filefn.d \
+               filesys.d \
+               hash.d \
+               init.d \
+               intl.d \
+               list.d \
+               log.d \
+               mimetype.d \
+               module.d \
+               object.d \
+               process.d \
+               strconv.d \
+               stream.d \
+               string.d \
+               textfile.d \
+               time.d \
+               timercmn.d \
+               tokenzr.d \
+               txtstrm.d \
+               utilscmn.d \
+               variant.d \
+               wxchar.d \
+               utilsunx.d
 
 HTMLOBJS = \
 
 HTMLOBJS = \
-               src/html/htmlcell.o \
-               src/html/htmlfilter.o \
-               src/html/htmlhelp.o \
-               src/html/htmlhelp_io.o \
-               src/html/htmlparser.o \
-               src/html/htmltag.o \
-               src/html/htmlwin.o \
-               src/html/htmlwinparser.o \
-               src/html/mod_fonts.o \
-               src/html/mod_hline.o \
-               src/html/mod_image.o \
-               src/html/mod_layout.o \
-               src/html/mod_links.o \
-               src/html/mod_list.o \
-               src/html/mod_pre.o \
-               src/html/mod_tables.o \
-               src/html/search.o
-
-UNIXOBJS = \
-               src/unix/gsocket.o \
-               src/unix/threadpsx.o \
-               src/unix/utilsunx.o
+               helpctrl.o \
+               helpdata.o \
+               helpfrm.o \
+               htmlcell.o \
+               htmlfilt.o \
+               htmlpars.o \
+               htmltag.o \
+               htmlwin.o \
+               m_fonts.o \
+               m_hline.o \
+               m_image.o \
+               m_layout.o \
+               m_links.o \
+               m_list.o \
+               m_pre.o \
+               m_tables.o \
+               search.o \
+               winpars.o
+
+HTMLDEPS = \
+               helpctrl.d \
+               helpdata.d \
+               helpfrm.d \
+               htmlcell.d \
+               htmlfilt.d \
+               htmlpars.d \
+               htmltag.d \
+               htmlwin.d \
+               m_fonts.d \
+               m_hline.d \
+               m_image.d \
+               m_layout.d \
+               m_links.d \
+               m_list.d \
+               m_pre.d \
+               m_tables.d \
+               search.d \
+               winpars.d
+
+UNIX_OBJS = \
+               dialup.o \
+               gsocket.o \
+               threadpsx.o \
+               utilsunx.o
+
+UNIX_DEPS = \
+               dialup.d \
+               gsocket.d \
+               threadpsx.d \
+               utilsunx.d
 
 ZLIBOBJS    = \
 
 ZLIBOBJS    = \
-               src/zlib/adler32.o \
-               src/zlib/compress.o \
-               src/zlib/crc32.o \
-               src/zlib/gzio.o \
-               src/zlib/uncompr.o \
-               src/zlib/deflate.o \
-               src/zlib/trees.o \
-               src/zlib/zutil.o \
-               src/zlib/inflate.o \
-               src/zlib/infblock.o \
-               src/zlib/inftrees.o \
-               src/zlib/infcodes.o \
-               src/zlib/infutil.o \
-               src/zlib/inffast.o
+               adler32.o \
+               compress.o \
+               crc32.o \
+               gzio.o \
+               uncompr.o \
+               deflate.o \
+               trees.o \
+               zutil.o \
+               inflate.o \
+               infblock.o \
+               inftrees.o \
+               infcodes.o \
+               infutil.o \
+               inffast.o
 
 PNGOBJS     = \
 
 PNGOBJS     = \
-               src/png/png.o \
-               src/png/pngread.o \
-               src/png/pngrtran.o \
-               src/png/pngrutil.o \
-               src/png/pngpread.o \
-               src/png/pngtrans.o \
-               src/png/pngwrite.o \
-               src/png/pngwtran.o \
-               src/png/pngwutil.o \
-               src/png/pngerror.o \
-               src/png/pngmem.o \
-               src/png/pngwio.o \
-               src/png/pngrio.o \
-               src/png/pngget.o \
-               src/png/pngset.o
+               png.o \
+               pngread.o \
+               pngrtran.o \
+               pngrutil.o \
+               pngpread.o \
+               pngtrans.o \
+               pngwrite.o \
+               pngwtran.o \
+               pngwutil.o \
+               pngerror.o \
+               pngmem.o \
+               pngwio.o \
+               pngrio.o \
+               pngget.o \
+               pngset.o
 
 
 JPEGOBJS    = \
 
 
 JPEGOBJS    = \
-               src/jpeg/jcomapi.o \
-               src/jpeg/jutils.o \
-               src/jpeg/jerror.o \
-               src/jpeg/jmemmgr.o \
-               src/jpeg/jmemnobs.o \
-               src/jpeg/jcapimin.o \
-               src/jpeg/jcapistd.o \
-               src/jpeg/jctrans.o \
-               src/jpeg/jcparam.o \
-               src/jpeg/jdatadst.o \
-               src/jpeg/jcinit.o \
-               src/jpeg/jcmaster.o \
-               src/jpeg/jcmarker.o \
-               src/jpeg/jcmainct.o \
-               src/jpeg/jcprepct.o \
-               src/jpeg/jccoefct.o \
-               src/jpeg/jccolor.o \
-               src/jpeg/jcsample.o \
-               src/jpeg/jchuff.o \
-               src/jpeg/jcphuff.o \
-               src/jpeg/jcdctmgr.o \
-               src/jpeg/jfdctfst.o \
-               src/jpeg/jfdctflt.o \
-               src/jpeg/jfdctint.o \
-               src/jpeg/jdapimin.o \
-               src/jpeg/jdapistd.o \
-               src/jpeg/jdtrans.o \
-               src/jpeg/jdatasrc.o \
-               src/jpeg/jdmaster.o \
-               src/jpeg/jdinput.o \
-               src/jpeg/jdmarker.o \
-               src/jpeg/jdhuff.o \
-               src/jpeg/jdphuff.o \
-               src/jpeg/jdmainct.o \
-               src/jpeg/jdcoefct.o \
-               src/jpeg/jdpostct.o \
-               src/jpeg/jddctmgr.o \
-               src/jpeg/jidctfst.o \
-               src/jpeg/jidctflt.o \
-               src/jpeg/jidctint.o \
-               src/jpeg/jidctred.o \
-               src/jpeg/jdsample.o \
-               src/jpeg/jdcolor.o \
-               src/jpeg/jquant1.o \
-               src/jpeg/jquant2.o \
-               src/jpeg/jdmerge.o
-
-
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-         $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-         $(GENERIC_HEADERS) $(WX_HEADERS)
-
-REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \
-                ./src/generic ./src/unix ./src/motif/xmombo ./src/html \
-               ./src/zlib ./src/jpeg ./src/png
-
-all:    $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
-
-$(REQUIRED_DIRS):      $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
-       @mkdir -p ./lib
-       @mkdir -p ./src
-       @mkdir -p ./src/common
-       @mkdir -p ./src/msw
-       @mkdir -p ./src/gtk
-       @mkdir -p ./src/motif
-       @mkdir -p ./src/motif/xmcombo
-       @mkdir -p ./src/generic
-       @mkdir -p ./src/unix
-       @mkdir -p ./src/html
-       @mkdir -p ./src/png
-       @mkdir -p ./src/jpeg
-       @mkdir -p ./src/zlib
+               jcomapi.o \
+               jutils.o \
+               jerror.o \
+               jmemmgr.o \
+               jmemnobs.o \
+               jcapimin.o \
+               jcapistd.o \
+               jctrans.o \
+               jcparam.o \
+               jdatadst.o \
+               jcinit.o \
+               jcmaster.o \
+               jcmarker.o \
+               jcmainct.o \
+               jcprepct.o \
+               jccoefct.o \
+               jccolor.o \
+               jcsample.o \
+               jchuff.o \
+               jcphuff.o \
+               jcdctmgr.o \
+               jfdctfst.o \
+               jfdctflt.o \
+               jfdctint.o \
+               jdapimin.o \
+               jdapistd.o \
+               jdtrans.o \
+               jdatasrc.o \
+               jdmaster.o \
+               jdinput.o \
+               jdmarker.o \
+               jdhuff.o \
+               jdphuff.o \
+               jdmainct.o \
+               jdcoefct.o \
+               jdpostct.o \
+               jddctmgr.o \
+               jidctfst.o \
+               jidctflt.o \
+               jidctint.o \
+               jidctred.o \
+               jdsample.o \
+               jdcolor.o \
+               jquant1.o \
+               jquant2.o \
+               jdmerge.o
+
+IODBCOBJS = \
+               catalog.o \
+               connect.o \
+               dlf.o \
+               dlproc.o \
+               execute.o \
+               fetch.o \
+               hdbc.o \
+               henv.o \
+               herr.o \
+               hstmt.o \
+               info.o \
+               itrace.o \
+               misc.o \
+               prepare.o \
+               result.o
+
+GUIOBJS = @GUIOBJS@
+GUIDEPS = @GUIDEPS@
+GUIHEADERS = @GUIHEADERS@
+COMMONOBJS = @COMMONOBJS@
+COMMONDEPS = @COMMONDEPS@
+GENERICOBJS = @GENERICOBJS@
+GENERICDEPS = @GENERICDEPS@
+UNIXOBJS = @UNIXOBJS@
+UNIXDEPS = @UNIXDEPS@
+
+OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
+
+DEPFILES = @ALL_DEPFILES@
+
+HEADERS = @ALL_HEADERS@
+
+all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+       @$(INSTALL) -d ./lib
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
        $(RANLIB) ./lib/$@
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
        $(RANLIB) ./lib/$@
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+       @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
        
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
-       @if test -e ./lib/@WX_LIBRARY_LINK1@; then $(RM) ./lib/@WX_LIBRARY_LINK1@; fi
-       @if test -e ./lib/@WX_LIBRARY_LINK2@; then $(RM) ./lib/@WX_LIBRARY_LINK2@; fi
-       @if test -e ./lib/@WX_LIBRARY_LINK3@; then $(RM) ./lib/@WX_LIBRARY_LINK3@; fi
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+       @$(RM) ./lib/@WX_LIBRARY_LINK1@
+       @$(RM) ./lib/@WX_LIBRARY_LINK2@
+       @$(RM) ./lib/@WX_LIBRARY_LINK3@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
        
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
        
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
-       @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then $(RM) $(libdir)/@WX_LIBRARY_LINK1@; fi
-       @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then $(RM) $(libdir)/@WX_LIBRARY_LINK2@; fi
-       @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then $(RM) $(libdir)/@WX_LIBRARY_LINK3@; fi
-       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
-       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
-       $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+       $(RM) $(libdir)/@WX_LIBRARY_LINK1@
+       $(RM) $(libdir)/@WX_LIBRARY_LINK2@
+       $(RM) $(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
 
 parser.o:    parser.c lexer.c
        
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c
-       $(CCLEX) -c $(CFLAGS) -o $@ parser.c
+       $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
 
 parser.c:      $(COMMDIR)/parser.y lexer.c
        $(YACC) $(COMMDIR)/parser.y
 
 parser.c:      $(COMMDIR)/parser.y lexer.c
        $(YACC) $(COMMDIR)/parser.y
@@ -1262,15 +2012,17 @@ lexer.c:        $(COMMDIR)/lexer.l
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 
+-include $(DEPFILES)
+
 preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
 
 preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
 
-
        $(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@
@@ -1281,6 +2033,12 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       
        $(INSTALL) -d $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
        $(INSTALL) -d $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
@@ -1306,7 +2064,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 @WX_ALL_INSTALLED@ write_message
 
 uninstall:
        @echo " "
 
 uninstall:
        @echo " "
@@ -1320,6 +2078,11 @@ uninstall:
        @echo " Removing helper files..."
        @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        @$(RM) $(bindir)/wx-config
        @echo " Removing helper files..."
        @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        @$(RM) $(bindir)/wx-config
+       @$(RM) $(datadir)/wx/afm/*
+       @$(RM) $(datadir)/wx/gs_afm/*
+       @rmdir $(datadir)/wx/gs_afm
+       @rmdir $(datadir)/wx/afm
+       @rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
@@ -1331,7 +2094,7 @@ uninstall:
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
-       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi
+       @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
@@ -1462,29 +2225,212 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
-       mkdir $(DISTDIR)/samples/checkls
+       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
        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
-
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
+       mkdir $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+       mkdir $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+       mkdir $(DISTDIR)/samples/docview
+       cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+       cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
+       cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
+       cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+       mkdir $(DISTDIR)/samples/docvwmdi
+       cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+       cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
+       cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+       mkdir $(DISTDIR)/samples/drawing
+       cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+       cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
+       cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+       mkdir $(DISTDIR)/samples/dynamic
+       cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
+       cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
+       cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+       mkdir $(DISTDIR)/samples/html
+       cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
+       mkdir $(DISTDIR)/samples/html/about
+       cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
+       cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
+       mkdir $(DISTDIR)/samples/html/about/data
+       cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
+       cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
+       mkdir $(DISTDIR)/samples/html/help
+       cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
+       cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
+       mkdir $(DISTDIR)/samples/html/help/helpfiles
+       cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+       mkdir $(DISTDIR)/samples/html/printing
+       cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
+       cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
+       cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
+       cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
+       cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
+       cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
+       mkdir $(DISTDIR)/samples/html/test
+       cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
+       cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
+       cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
+       cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
+       cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
+       cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
+       mkdir $(DISTDIR)/samples/html/virtual
+       cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
+       cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
+       cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
+       mkdir $(DISTDIR)/samples/html/widget
+       cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
+       cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
+       cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
+       mkdir $(DISTDIR)/samples/html/zip
+       cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
+       cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
+       cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
+       cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+       mkdir $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+       mkdir $(DISTDIR)/samples/layout
+       cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
+       cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
+       cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+       mkdir $(DISTDIR)/samples/listctrl
+       cp $(SAMPDIR)/listctrl/Makefile.in $(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
+       mkdir $(DISTDIR)/samples/mdi
+       cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
+       cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
+       cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
+       cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
+       mkdir $(DISTDIR)/samples/minifram
+       cp $(SAMPDIR)/minifram/Makefile.in $(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
+       mkdir $(DISTDIR)/samples/minimal
+       cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
+       cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
+       cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+       mkdir $(DISTDIR)/samples/newgrid
+       cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+       cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
+       cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
+       mkdir $(DISTDIR)/samples/notebook
+       cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
+       cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
+       cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+       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/sashtest
+       cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
+       cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
+       cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+       mkdir $(DISTDIR)/samples/scroll
+       cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+       cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+       mkdir $(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
+       cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
+       cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
+       mkdir $(DISTDIR)/samples/thread
+       cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
+       cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
+       mkdir $(DISTDIR)/samples/toolbar
+       cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
+       cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
+       cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
+       cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
+       mkdir $(DISTDIR)/samples/toolbar/bitmap
+       cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+       mkdir $(DISTDIR)/samples/treectrl
+       cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
+       cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
+       cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
+       cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+       mkdir $(DISTDIR)/samples/typetest
+       cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
+       cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
+       cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
+       cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
+       mkdir $(DISTDIR)/samples/validate
+       cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
+       cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
+       cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
+       cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
+       mkdir $(DISTDIR)/samples/wizard
+       cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
+       cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
+       cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
+       mkdir $(DISTDIR)/samples/wxpoem
+       cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem
+       cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem
+       cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem
+       cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem
+       cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem
+       mkdir $(DISTDIR)/samples/wxsocket
+       cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
+       cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket
+       cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
+
+UTILS_DIST:
+       mkdir $(DISTDIR)/utils
+       cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+       mkdir $(DISTDIR)/utils/wxMMedia2
+       cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
+       mkdir $(DISTDIR)/utils/wxMMedia2/lib
+       cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
+       cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
+       cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
+       cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
+       mkdir $(DISTDIR)/utils/wxMMedia2/sample
+       cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
+       cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+       mkdir $(DISTDIR)/utils/glcanvas
+       cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
+       cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
+       mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+       cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+       cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+       cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
+       
+MISC_DIST:
+       mkdir $(DISTDIR)/misc
+       mkdir $(DISTDIR)/misc/afm
+       cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
+       mkdir $(DISTDIR)/misc/gs_afm
+       cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
+       
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir
 
 clean:
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir
 
 clean:
-       $(RM) ./src/msw/*.o
-       $(RM) ./src/gtk/*.o
-       $(RM) ./src/motif/*.o
-       $(RM) ./src/html/*.o
-       $(RM) ./src/common/*.o
-       $(RM) ./src/unix/*.o
-       $(RM) ./src/generic/*.o
-       $(RM) ./src/png/*.o
-       $(RM) ./src/jpeg/*.o
-       $(RM) ./src/zlib/*.o
        $(RM) *.o
        $(RM) *.o
+       $(RM) *.d
        $(RM) parser.c
        $(RM) lexer.c
        $(RM) ./lib/*
        $(RM) parser.c
        $(RM) lexer.c
        $(RM) ./lib/*
wxWidgets (Impactor)