removed wxBusyCursorSuspender use

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a5008654dbd0141317b7e9b377946219ff68af9b..d900a7c5af944a7383b4bac25a484e000e2f305a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,3 @@
-#
-# This file was automatically generated by tmake at 14:41, 2000/01/22
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
-

 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 #
 # File:     makefile.unx
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin


@@ -23,36 +19,39 @@ include ./src/make.env
 .SUFFIXES:     .o .cpp .c .cxx
 
 .c.o :
 .SUFFIXES:     .o .cpp .c .cxx
 
 .c.o :

-       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<

 
 .cpp.o :
 
 .cpp.o :

-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<

 
 .cxx.o :
 
 .cxx.o :

-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<

 
 ########################### Paths #################################
 
 srcdir = @srcdir@
 
 ########################### Paths #################################
 
 srcdir = @srcdir@

+top_srcdir = @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/tiff
-VP10 = @top_srcdir@/src/zlib
-VP11 = @top_srcdir@/src/iodbc
+VP1 = @TOOLKIT_VPATH@
+VP2 = @top_srcdir@/src/common
+VP3 = @top_srcdir@/src/generic
+VP4 = @top_srcdir@/src/unix
+VP5 = @top_srcdir@/src/html
+VP6 = @top_srcdir@/src/png
+VP7 = @top_srcdir@/src/jpeg
+VP8 = @top_srcdir@/src/tiff
+VP9 = @top_srcdir@/src/zlib
+VPA = @top_srcdir@/src/regex
+VP10 = @top_srcdir@/src/iodbc
+VP11 = @top_srcdir@/src/msw/ole
+VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
+VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@

 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'

-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf

 
 

-top_srcdir = @top_srcdir@

 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 


@@ -71,6 +70,8 @@ oldincludedir = /usr/include
 
 DESTDIR =
 
 
 DESTDIR =
 

+localedir = $(datadir)/locale
+

 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@


@@ -83,7 +84,7 @@ INSTALL_DATA = @INSTALL_DATA@
 # my autoconf doesn't set this
 #INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # maybe do an additional chmod if needed?
 # my autoconf doesn't set this
 #INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # maybe do an additional chmod if needed?

-INSTALL_SCRIPT = @INSTALL@ 
+INSTALL_SCRIPT = @INSTALL@

 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :


@@ -120,2385 +121,62 @@ GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2

+MACDIR   = $(WXDIR)/src/mac

 ODBCDIR  = $(WXDIR)/src/iodbc
 ODBCDIR  = $(WXDIR)/src/iodbc

+FTDIR    = $(WXDIR)/src/freetype

 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 

-DOCDIR = $(WXDIR)/docs
+DOCDIR   = $(WXDIR)/docs
+INTLDIR  = $(WXDIR)/locale

 
 ########################## Archive name ###############################
 
 
 ########################## Archive name ###############################
 

-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
-DISTDIR = ./_dist_dir/wx$(TOOLKIT)
+# append a version suffix x.y.z to all file names
+VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
+WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
+WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
+WXSAMPLES=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
+WXDEMOS=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
+
+WXARCHIVE_BZIP=@DISTDIR@-$(VER_SUFFIX).tar.bz2
+WXGLARCHIVE_BZIP=@DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
+WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
+WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
+
+DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
+DISTDIR=./_dist_dir/$(DISTDIRNAME)
+

 
 ############################## Files ##################################
 
 
 ############################## Files ##################################
 

-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 \
-               arrimpl.cpp \
-               bitmap.h \
-               bmpbuttn.h \
-               brush.h \
-               buffer.h \
-               busyinfo.h \
-               button.h \
-               calctrl.h \
-               caret.h \
-               checkbox.h \
-               checklst.h \
-               choicdlg.h \
-               choice.h \
-               clipbrd.h \
-               cmdline.h \
-               cmndata.h \
-               colordlg.h \
-               colour.h \
-               combobox.h \
-               confbase.h \
-               config.h \
-               control.h \
-               ctrlsub.h \
-               cursor.h \
-               dataobj.h \
-               date.h \
-               datetime.h \
-               datstrm.h \
-               db.h \
-               dbtable.h \
-               dc.h \
-               dcclient.h \
-               dcmemory.h \
-               dcprint.h \
-               dcps.h \
-               dcscreen.h \
-               dde.h \
-               debug.h \
-               defs.h \
-               dialog.h \
-               dialup.h \
-               dir.h \
-               dirdlg.h \
-               dnd.h \
-               docmdi.h \
-               docview.h \
-               dragimag.h \
-               dynarray.h \
-               dynlib.h \
-               encconv.h \
-               event.h \
-               expr.h \
-               ffile.h \
-               file.h \
-               fileconf.h \
-               filedlg.h \
-               filefn.h \
-               filesys.h \
-               font.h \
-               fontdlg.h \
-               fontenum.h \
-               fontmap.h \
-               fontutil.h \
-               frame.h \
-               fs_inet.h \
-               fs_zip.h \
-               gauge.h \
-               gdicmn.h \
-               gdiobj.h \
-               gifdecod.h \
-               grid.h \
-               gsocket.h \
-               hash.h \
-               help.h \
-               helpbase.h \
-               helphtml.h \
-               helpwin.h \
-               helpxlp.h \
-               icon.h \
-               imagbmp.h \
-               image.h \
-               imaggif.h \
-               imagjpeg.h \
-               imaglist.h \
-               imagpcx.h \
-               imagpng.h \
-               imagpnm.h \
-               imagtiff.h \
-               intl.h \
-               ioswrap.h \
-               ipcbase.h \
-               joystick.h \
-               layout.h \
-               laywin.h \
-               list.h \
-               listbox.h \
-               listctrl.h \
-               listimpl.cpp \
-               log.h \
-               longlong.h \
-               matrix.h \
-               mdi.h \
-               memory.h \
-               menu.h \
-               menuitem.h \
-               metafile.h \
-               mimetype.h \
-               minifram.h \
-               module.h \
-               msgdlg.h \
-               mstream.h \
-               notebook.h \
-               object.h \
-               objstrm.h \
-               odbc.h \
-               ownerdrw.h \
-               palette.h \
-               panel.h \
-               paper.h \
-               pen.h \
-               plot.h \
-               print.h \
-               printdlg.h \
-               prntbase.h \
-               process.h \
-               progdlg.h \
-               prop.h \
-               propform.h \
-               proplist.h \
-               radiobox.h \
-               radiobut.h \
-               region.h \
-               resource.h \
-               sashwin.h \
-               sckaddr.h \
-               sckipc.h \
-               sckstrm.h \
-               scrolbar.h \
-               scrolwin.h \
-               serbase.h \
-               settings.h \
-               setup.h \
-               sizer.h \
-               slider.h \
-               socket.h \
-               spinbutt.h \
-               spinctrl.h \
-               splitter.h \
-               statbmp.h \
-               statbox.h \
-               statline.h \
-               stattext.h \
-               statusbr.h \
-               strconv.h \
-               stream.h \
-               string.h \
-               tab.h \
-               tabctrl.h \
-               taskbar.h \
-               tbarbase.h \
-               tbarsmpl.h \
-               textctrl.h \
-               textdlg.h \
-               textfile.h \
-               thread.h \
-               time.h \
-               timer.h \
-               tipdlg.h \
-               tokenzr.h \
-               toolbar.h \
-               tooltip.h \
-               treectrl.h \
-               txtstrm.h \
-               types.h \
-               url.h \
-               utils.h \
-               valgen.h \
-               validate.h \
-               valtext.h \
-               variant.h \
-               version.h \
-               wave.h \
-               wfstream.h \
-               window.h \
-               wizard.h \
-               wx.h \
-               wx_cw.h \
-               wx_cw_cm.h \
-               wx_cw_d.h \
-               wxchar.h \
-               wxexpr.h \
-               wxhtml.h \
-               wxprec.h \
-               xpmhand.h \
-               zipstrm.h \
-               zstream.h
-
-GTK_HEADERS = \
-               gtk/accel.h \
-               gtk/app.h \
-               gtk/bitmap.h \
-               gtk/bmpbuttn.h \
-               gtk/brush.h \
-               gtk/button.h \
-               gtk/checkbox.h \
-               gtk/checklst.h \
-               gtk/choice.h \
-               gtk/clipbrd.h \
-               gtk/colour.h \
-               gtk/combobox.h \
-               gtk/control.h \
-               gtk/cursor.h \
-               gtk/dataform.h \
-               gtk/dataobj.h \
-               gtk/dataobj2.h \
-               gtk/dc.h \
-               gtk/dcclient.h \
-               gtk/dcmemory.h \
-               gtk/dcscreen.h \
-               gtk/dialog.h \
-               gtk/dnd.h \
-               gtk/filedlg.h \
-               gtk/font.h \
-               gtk/fontdlg.h \
-               gtk/frame.h \
-               gtk/gauge.h \
-               gtk/gdiobj.h \
-               gtk/icon.h \
-               gtk/joystick.h \
-               gtk/listbox.h \
-               gtk/mdi.h \
-               gtk/menu.h \
-               gtk/menuitem.h \
-               gtk/minifram.h \
-               gtk/notebook.h \
-               gtk/palette.h \
-               gtk/pen.h \
-               gtk/radiobox.h \
-               gtk/radiobut.h \
-               gtk/region.h \
-               gtk/scrolbar.h \
-               gtk/settings.h \
-               gtk/slider.h \
-               gtk/spinbutt.h \
-               gtk/spinctrl.h \
-               gtk/statbmp.h \
-               gtk/statbox.h \
-               gtk/statline.h \
-               gtk/stattext.h \
-               gtk/tbargtk.h \
-               gtk/textctrl.h \
-               gtk/timer.h \
-               gtk/tooltip.h \
-               gtk/treectrl.h \
-               gtk/wave.h \
-               gtk/win_gtk.h \
-               gtk/window.h
-
-MOTIF_HEADERS = \
-               motif/accel.h \
-               motif/app.h \
-               motif/bitmap.h \
-               motif/bmpbuttn.h \
-               motif/brush.h \
-               motif/button.h \
-               motif/checkbox.h \
-               motif/checklst.h \
-               motif/choice.h \
-               motif/clipbrd.h \
-               motif/colordlg.h \
-               motif/colour.h \
-               motif/combobox.h \
-               motif/control.h \
-               motif/cursor.h \
-               motif/dataform.h \
-               motif/dataobj.h \
-               motif/dataobj2.h \
-               motif/dc.h \
-               motif/dcclient.h \
-               motif/dcmemory.h \
-               motif/dcprint.h \
-               motif/dcscreen.h \
-               motif/dialog.h \
-               motif/dnd.h \
-               motif/filedlg.h \
-               motif/font.h \
-               motif/fontdlg.h \
-               motif/frame.h \
-               motif/gauge.h \
-               motif/gdiobj.h \
-               motif/icon.h \
-               motif/joystick.h \
-               motif/listbox.h \
-               motif/mdi.h \
-               motif/menu.h \
-               motif/menuitem.h \
-               motif/metafile.h \
-               motif/minifram.h \
-               motif/msgdlg.h \
-               motif/palette.h \
-               motif/pen.h \
-               motif/print.h \
-               motif/printdlg.h \
-               motif/private.h \
-               motif/radiobox.h \
-               motif/radiobut.h \
-               motif/region.h \
-               motif/scrolbar.h \
-               motif/settings.h \
-               motif/slider.h \
-               motif/spinbutt.h \
-               motif/statbmp.h \
-               motif/statbox.h \
-               motif/stattext.h \
-               motif/textctrl.h \
-               motif/timer.h \
-               motif/toolbar.h \
-               motif/window.h
-
-MSW_HEADERS = \
-               msw/accel.h \
-               msw/app.h \
-               msw/bitmap.h \
-               msw/bmpbuttn.h \
-               msw/brush.h \
-               msw/button.h \
-               msw/caret.h \
-               msw/checkbox.h \
-               msw/checklst.h \
-               msw/choice.h \
-               msw/clipbrd.h \
-               msw/colordlg.h \
-               msw/colour.h \
-               msw/combobox.h \
-               msw/control.h \
-               msw/curico.h \
-               msw/curicop.h \
-               msw/cursor.h \
-               msw/dc.h \
-               msw/dcclient.h \
-               msw/dcmemory.h \
-               msw/dcprint.h \
-               msw/dcscreen.h \
-               msw/dde.h \
-               msw/dialog.h \
-               msw/dib.h \
-               msw/dibutils.h \
-               msw/dirdlg.h \
-               msw/dragimag.h \
-               msw/enhmeta.h \
-               msw/filedlg.h \
-               msw/font.h \
-               msw/fontdlg.h \
-               msw/frame.h \
-               msw/gauge.h \
-               msw/gauge95.h \
-               msw/gaugemsw.h \
-               msw/gdiimage.h \
-               msw/gdiobj.h \
-               msw/helpwin.h \
-               msw/icon.h \
-               msw/imaglist.h \
-               msw/iniconf.h \
-               msw/joystick.h \
-               msw/listbox.h \
-               msw/listctrl.h \
-               msw/mdi.h \
-               msw/menu.h \
-               msw/menuitem.h \
-               msw/metafile.h \
-               msw/minifram.h \
-               msw/msgdlg.h \
-               msw/msvcrt.h \
-               msw/notebook.h \
-               msw/palette.h \
-               msw/pen.h \
-               msw/printdlg.h \
-               msw/printwin.h \
-               msw/private.h \
-               msw/radiobox.h \
-               msw/radiobut.h \
-               msw/regconf.h \
-               msw/region.h \
-               msw/registry.h \
-               msw/scrolbar.h \
-               msw/settings.h \
-               msw/setup0.h \
-               msw/slider.h \
-               msw/slider95.h \
-               msw/slidrmsw.h \
-               msw/spinbutt.h \
-               msw/statbmp.h \
-               msw/statbox.h \
-               msw/statbr95.h \
-               msw/statline.h \
-               msw/stattext.h \
-               msw/tabctrl.h \
-               msw/taskbar.h \
-               msw/tbar95.h \
-               msw/tbarmsw.h \
-               msw/textctrl.h \
-               msw/timer.h \
-               msw/tooltip.h \
-               msw/treectrl.h \
-               msw/wave.h \
-               msw/window.h \
-               msw/winundef.h \
-               msw/xpmhand.h
-
-PM_HEADERS = \
-               os2/accel.h \
-               os2/app.h \
-               os2/bitmap.h \
-               os2/bmpbuttn.h \
-               os2/brush.h \
-               os2/button.h \
-               os2/checkbox.h \
-               os2/checklst.h \
-               os2/choice.h \
-               os2/clipbrd.h \
-               os2/colour.h \
-               os2/combobox.h \
-               os2/control.h \
-               os2/cursor.h \
-               os2/dataform.h \
-               os2/dataobj.h \
-               os2/dataobj2.h \
-               os2/dc.h \
-               os2/dcclient.h \
-               os2/dcmemory.h \
-               os2/dcprint.h \
-               os2/dcscreen.h \
-               os2/dialog.h \
-               os2/dirdlg.h \
-               os2/dnd.h \
-               os2/filedlg.h \
-               os2/font.h \
-               os2/fontdlg.h \
-               os2/frame.h \
-               os2/gauge.h \
-               os2/gdiimage.h \
-               os2/gdiobj.h \
-               os2/gsockos2.h \
-               os2/helpwin.h \
-               os2/icon.h \
-               os2/iniconf.h \
-               os2/joystick.h \
-               os2/listbox.h \
-               os2/mdi.h \
-               os2/menu.h \
-               os2/menuitem.h \
-               os2/metafile.h \
-               os2/minifram.h \
-               os2/msgdlg.h \
-               os2/notebook.h \
-               os2/palette.h \
-               os2/pen.h \
-               os2/pnghand.h \
-               os2/pngread.h \
-               os2/print.h \
-               os2/private.h \
-               os2/radiobox.h \
-               os2/radiobut.h \
-               os2/region.h \
-               os2/scrolbar.h \
-               os2/settings.h \
-               os2/setup0.h \
-               os2/slider.h \
-               os2/spinbutt.h \
-               os2/spinctrl.h \
-               os2/statbmp.h \
-               os2/statbox.h \
-               os2/statline.h \
-               os2/stattext.h \
-               os2/tabctrl.h \
-               os2/taskbar.h \
-               os2/textctrl.h \
-               os2/timer.h \
-               os2/toolbar.h \
-               os2/tooltip.h \
-               os2/wave.h \
-               os2/window.h
-
-UNIX_HEADERS = \
-               unix/execute.h \
-               unix/fontutil.h
-
-GENERIC_HEADERS = \
-               generic/calctrl.h \
-               generic/caret.h \
-               generic/choicdgg.h \
-               generic/colrdlgg.h \
-               generic/dcpsg.h \
-               generic/dirdlgg.h \
-               generic/filedlgg.h \
-               generic/fontdlgg.h \
-               generic/grid.h \
-               generic/gridg.h \
-               generic/helpext.h \
-               generic/helphtml.h \
-               generic/helpwxht.h \
-               generic/helpxlp.h \
-               generic/imaglist.h \
-               generic/laywin.h \
-               generic/listctrl.h \
-               generic/msgdlgg.h \
-               generic/notebook.h \
-               generic/panelg.h \
-               generic/plot.h \
-               generic/printps.h \
-               generic/prntdlgg.h \
-               generic/progdlgg.h \
-               generic/sashwin.h \
-               generic/scrolwin.h \
-               generic/splitter.h \
-               generic/statusbr.h \
-               generic/tabg.h \
-               generic/textdlgg.h \
-               generic/treectrl.h \
-               generic/wizard.h
-
-PROTOCOL_HEADERS = \
-               protocol/file.h \
-               protocol/ftp.h \
-               protocol/http.h \
-               protocol/protocol.h
-
-HTML_HEADERS = \
-               html/forcelnk.h \
-               html/helpctrl.h \
-               html/helpdata.h \
-               html/helpfrm.h \
-               html/htmlcell.h \
-               html/htmldefs.h \
-               html/htmlfilt.h \
-               html/htmlpars.h \
-               html/htmltag.h \
-               html/htmlwin.h \
-               html/htmprint.h \
-               html/m_templ.h \
-               html/winpars.h
-
-GTK_GENERICOBJS = \
-               busyinfo.o \
-               calctrl.o \
-               caret.o \
-               choicdgg.o \
-               colrdlgg.o \
-               dcpsg.o \
-               dirdlgg.o \
-               filedlgg.o \
-               grid.o \
-               helpext.o \
-               helphtml.o \
-               helpwxht.o \
-               imaglist.o \
-               laywin.o \
-               listctrl.o \
-               logg.o \
-               msgdlgg.o \
-               numdlgg.o \
-               panelg.o \
-               plot.o \
-               printps.o \
-               prntdlgg.o \
-               progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
-               sashwin.o \
-               scrolwin.o \
-               splitter.o \
-               statusbr.o \
-               tabg.o \
-               tbarsmpl.o \
-               textdlgg.o \
-               tipdlg.o \
-               treectrl.o \
-               wizard.o
-
-GTK_GENERICDEPS = \
-               busyinfo.d \
-               calctrl.d \
-               caret.d \
-               choicdgg.d \
-               colrdlgg.d \
-               dcpsg.d \
-               dirdlgg.d \
-               filedlgg.d \
-               grid.d \
-               helpext.d \
-               helphtml.d \
-               helpwxht.d \
-               imaglist.d \
-               laywin.d \
-               listctrl.d \
-               logg.d \
-               msgdlgg.d \
-               numdlgg.d \
-               panelg.d \
-               plot.d \
-               printps.d \
-               prntdlgg.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splitter.d \
-               statusbr.d \
-               tabg.d \
-               tbarsmpl.d \
-               textdlgg.d \
-               tipdlg.d \
-               treectrl.d \
-               wizard.d
-
-GTK_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmdline.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               ctrlsub.o \
-               datetime.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               encconv.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               fontmap.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 \
-               imagtiff.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               lboxcmn.o \
-               list.o \
-               log.o \
-               longlong.o \
-               memory.o \
-               menucmn.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 \
-               textcmn.o \
-               textfile.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               unzip.o \
-               url.o \
-               utilscmn.o \
-               valgen.o \
-               validate.o \
-               valtext.o \
-               variant.o \
-               wfstream.o \
-               wincmn.o \
-               wxchar.o \
-               wxexpr.o \
-               zipstrm.o \
-               zstream.o
-
-GTK_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmdline.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               ctrlsub.d \
-               datetime.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               encconv.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               fontmap.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 \
-               imagtiff.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               lboxcmn.d \
-               list.d \
-               log.d \
-               longlong.d \
-               memory.d \
-               menucmn.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 \
-               textcmn.d \
-               textfile.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               unzip.d \
-               url.d \
-               utilscmn.d \
-               valgen.d \
-               validate.d \
-               valtext.d \
-               variant.d \
-               wfstream.d \
-               wincmn.d \
-               wxchar.d \
-               wxexpr.d \
-               zipstrm.d \
-               zstream.d
-
-GTK_GUIOBJS = \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               cursor.o \
-               data.o \
-               dataobj.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcscreen.o \
-               dialog.o \
-               dnd.o \
-               font.o \
-               fontdlg.o \
-               frame.o \
-               gauge.o \
-               gdiobj.o \
-               gsockgtk.o \
-               icon.o \
-               listbox.o \
-               main.o \
-               mdi.o \
-               menu.o \
-               minifram.o \
-               notebook.o \
-               palette.o \
-               pen.o \
-               radiobox.o \
-               radiobut.o \
-               region.o \
-               scrolbar.o \
-               settings.o \
-               slider.o \
-               spinbutt.o \
-               spinctrl.o \
-               statbmp.o \
-               statbox.o \
-               statline.o \
-               stattext.o \
-               tbargtk.o \
-               textctrl.o \
-               timer.o \
-               tooltip.o \
-               utilsgtk.o \
-               utilsres.o \
-               wave.o \
-               win_gtk.o \
-               window.o
-
-GTK_GUIDEPS = \
-               accel.d \
-               app.d \
-               bitmap.d \
-               bmpbuttn.d \
-               brush.d \
-               button.d \
-               checkbox.d \
-               checklst.d \
-               choice.d \
-               clipbrd.d \
-               colour.d \
-               combobox.d \
-               control.d \
-               cursor.d \
-               data.d \
-               dataobj.d \
-               dc.d \
-               dcclient.d \
-               dcmemory.d \
-               dcscreen.d \
-               dialog.d \
-               dnd.d \
-               font.d \
-               fontdlg.d \
-               frame.d \
-               gauge.d \
-               gdiobj.d \
-               gsockgtk.d \
-               icon.d \
-               listbox.d \
-               main.d \
-               mdi.d \
-               menu.d \
-               minifram.d \
-               notebook.d \
-               palette.d \
-               pen.d \
-               radiobox.d \
-               radiobut.d \
-               region.d \
-               scrolbar.d \
-               settings.d \
-               slider.d \
-               spinbutt.d \
-               spinctrl.d \
-               statbmp.d \
-               statbox.d \
-               statline.d \
-               stattext.d \
-               tbargtk.d \
-               textctrl.d \
-               timer.d \
-               tooltip.d \
-               utilsgtk.d \
-               utilsres.d \
-               wave.d \
-               win_gtk.d \
-               window.d
-
-MOTIF_GENERICOBJS = \
-               busyinfo.o \
-               calctrl.o \
-               caret.o \
-               choicdgg.o \
-               colrdlgg.o \
-               dcpsg.o \
-               dirdlgg.o \
-               fontdlgg.o \
-               grid.o \
-               helpext.o \
-               helphtml.o \
-               helpwxht.o \
-               helpxlp.o \
-               imaglist.o \
-               laywin.o \
-               listctrl.o \
-               logg.o \
-               msgdlgg.o \
-               notebook.o \
-               numdlgg.o \
-               panelg.o \
-               plot.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 \
-               tbarsmpl.o \
-               textdlgg.o \
-               tipdlg.o \
-               treectrl.o \
-               wizard.o
-
-MOTIF_GENERICDEPS = \
-               busyinfo.d \
-               calctrl.d \
-               caret.d \
-               choicdgg.d \
-               colrdlgg.d \
-               dcpsg.d \
-               dirdlgg.d \
-               fontdlgg.d \
-               grid.d \
-               helpext.d \
-               helphtml.d \
-               helpwxht.d \
-               helpxlp.d \
-               imaglist.d \
-               laywin.d \
-               listctrl.d \
-               logg.d \
-               msgdlgg.d \
-               notebook.d \
-               numdlgg.d \
-               panelg.d \
-               plot.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 \
-               tbarsmpl.d \
-               textdlgg.d \
-               tipdlg.d \
-               treectrl.d \
-               wizard.d
-
-MOTIF_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmdline.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               ctrlsub.o \
-               datetime.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               encconv.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               fontmap.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 \
-               imagtiff.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               lboxcmn.o \
-               list.o \
-               log.o \
-               longlong.o \
-               memory.o \
-               menucmn.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 \
-               textcmn.o \
-               textfile.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               unzip.o \
-               url.o \
-               utilscmn.o \
-               valgen.o \
-               validate.o \
-               valtext.o \
-               variant.o \
-               wfstream.o \
-               wincmn.o \
-               wxchar.o \
-               wxexpr.o \
-               zipstrm.o \
-               zstream.o
-
-MOTIF_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmdline.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               ctrlsub.d \
-               datetime.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               encconv.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               fontmap.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 \
-               imagtiff.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               lboxcmn.d \
-               list.d \
-               log.d \
-               longlong.d \
-               memory.d \
-               menucmn.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 \
-               textcmn.d \
-               textfile.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               unzip.d \
-               url.d \
-               utilscmn.d \
-               valgen.d \
-               validate.d \
-               valtext.d \
-               variant.d \
-               wfstream.d \
-               wincmn.d \
-               wxchar.d \
-               wxexpr.d \
-               zipstrm.d \
-               zstream.d
-
-MOTIF_GUIOBJS = \
-               xmcombo.o \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               cursor.o \
-               data.o \
-               dataobj.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcscreen.o \
-               dialog.o \
-               filedlg.o \
-               font.o \
-               frame.o \
-               gauge.o \
-               gdiobj.o \
-               gsockmot.o \
-               icon.o \
-               listbox.o \
-               main.o \
-               mdi.o \
-               menu.o \
-               menuitem.o \
-               minifram.o \
-               msgdlg.o \
-               palette.o \
-               pen.o \
-               radiobox.o \
-               radiobut.o \
-               region.o \
-               scrolbar.o \
-               settings.o \
-               slider.o \
-               spinbutt.o \
-               statbmp.o \
-               statbox.o \
-               stattext.o \
-               textctrl.o \
-               timer.o \
-               toolbar.o \
-               utils.o \
-               window.o
-
-MOTIF_GUIDEPS = \
-               xmcombo.d \
-               accel.d \
-               app.d \
-               bitmap.d \
-               bmpbuttn.d \
-               brush.d \
-               button.d \
-               checkbox.d \
-               checklst.d \
-               choice.d \
-               clipbrd.d \
-               colour.d \
-               combobox.d \
-               control.d \
-               cursor.d \
-               data.d \
-               dataobj.d \
-               dc.d \
-               dcclient.d \
-               dcmemory.d \
-               dcscreen.d \
-               dialog.d \
-               filedlg.d \
-               font.d \
-               frame.d \
-               gauge.d \
-               gdiobj.d \
-               gsockmot.d \
-               icon.d \
-               listbox.d \
-               main.d \
-               mdi.d \
-               menu.d \
-               menuitem.d \
-               minifram.d \
-               msgdlg.d \
-               palette.d \
-               pen.d \
-               radiobox.d \
-               radiobut.d \
-               region.d \
-               scrolbar.d \
-               settings.d \
-               slider.d \
-               spinbutt.d \
-               statbmp.d \
-               statbox.d \
-               stattext.d \
-               textctrl.d \
-               timer.d \
-               toolbar.d \
-               utils.d \
-               window.d
-
-MSW_GENERICOBJS = \
-               busyinfo.o \
-               calctrl.o \
-               choicdgg.o \
-               dirdlgg.o \
-               grid.o \
-               laywin.o \
-               logg.o \
-               numdlgg.o \
-               panelg.o \
-               plot.o \
-               progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
-               sashwin.o \
-               scrolwin.o \
-               splitter.o \
-               statusbr.o \
-               tbarsmpl.o \
-               textdlgg.o \
-               tipdlg.o \
-               wizard.o
-
-MSW_GENERICDEPS = \
-               busyinfo.d \
-               calctrl.d \
-               choicdgg.d \
-               dirdlgg.d \
-               grid.d \
-               laywin.d \
-               logg.d \
-               numdlgg.d \
-               panelg.d \
-               plot.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splitter.d \
-               statusbr.d \
-               tbarsmpl.d \
-               textdlgg.d \
-               tipdlg.d \
-               wizard.d
-
-MSW_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmdline.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               ctrlsub.o \
-               datetime.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               encconv.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               fontmap.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 \
-               imagtiff.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               lboxcmn.o \
-               list.o \
-               log.o \
-               longlong.o \
-               memory.o \
-               menucmn.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 \
-               textcmn.o \
-               textfile.o \
-               timercmn.o \
-               tokenzr.o \
-               txtstrm.o \
-               unzip.o \
-               url.o \
-               utilscmn.o \
-               valgen.o \
-               validate.o \
-               valtext.o \
-               variant.o \
-               wfstream.o \
-               wincmn.o \
-               wxchar.o \
-               wxexpr.o \
-               zipstrm.o \
-               zstream.o
-
-MSW_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmdline.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               ctrlsub.d \
-               datetime.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               encconv.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               fontmap.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 \
-               imagtiff.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               lboxcmn.d \
-               list.d \
-               log.d \
-               longlong.d \
-               memory.d \
-               menucmn.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 \
-               textcmn.d \
-               textfile.d \
-               timercmn.d \
-               tokenzr.d \
-               txtstrm.d \
-               unzip.d \
-               url.d \
-               utilscmn.d \
-               valgen.d \
-               validate.d \
-               valtext.d \
-               variant.d \
-               wfstream.d \
-               wincmn.d \
-               wxchar.d \
-               wxexpr.d \
-               zipstrm.d \
-               zstream.d
-
-MSW_GUIOBJS = \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               caret.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colordlg.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               curico.o \
-               cursor.o \
-               data.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcprint.o \
-               dcscreen.o \
-               dde.o \
-               dialog.o \
-               dialup.o \
-               dib.o \
-               dibutils.o \
-               dir.o \
-               dragimag.o \
-               enhmeta.o \
-               filedlg.o \
-               font.o \
-               fontdlg.o \
-               fontenum.o \
-               fontutil.o \
-               frame.o \
-               gauge95.o \
-               gdiimage.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 \
-               printdlg.o \
-               printwin.o \
-               radiobox.o \
-               radiobut.o \
-               regconf.o \
-               region.o \
-               registry.o \
-               scrolbar.o \
-               settings.o \
-               slider95.o \
-               spinbutt.o \
-               spinctrl.o \
-               statbmp.o \
-               statbox.o \
-               statbr95.o \
-               statline.o \
-               stattext.o \
-               tabctrl.o \
-               taskbar.o \
-               tbar95.o \
-               textctrl.o \
-               thread.o \
-               timer.o \
-               tooltip.o \
-               treectrl.o \
-               utils.o \
-               utilsexc.o \
-               wave.o \
-               window.o \
-               xpmhand.o
-
-MSW_GUIDEPS = \
-               accel.d \
-               app.d \
-               bitmap.d \
-               bmpbuttn.d \
-               brush.d \
-               button.d \
-               caret.d \
-               checkbox.d \
-               checklst.d \
-               choice.d \
-               clipbrd.d \
-               colordlg.d \
-               colour.d \
-               combobox.d \
-               control.d \
-               curico.d \
-               cursor.d \
-               data.d \
-               dc.d \
-               dcclient.d \
-               dcmemory.d \
-               dcprint.d \
-               dcscreen.d \
-               dde.d \
-               dialog.d \
-               dialup.d \
-               dib.d \
-               dibutils.d \
-               dir.d \
-               dragimag.d \
-               enhmeta.d \
-               filedlg.d \
-               font.d \
-               fontdlg.d \
-               fontenum.d \
-               fontutil.d \
-               frame.d \
-               gauge95.d \
-               gdiimage.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 \
-               printdlg.d \
-               printwin.d \
-               radiobox.d \
-               radiobut.d \
-               regconf.d \
-               region.d \
-               registry.d \
-               scrolbar.d \
-               settings.d \
-               slider95.d \
-               spinbutt.d \
-               spinctrl.d \
-               statbmp.d \
-               statbox.d \
-               statbr95.d \
-               statline.d \
-               stattext.d \
-               tabctrl.d \
-               taskbar.d \
-               tbar95.d \
-               textctrl.d \
-               thread.d \
-               timer.d \
-               tooltip.d \
-               treectrl.d \
-               utils.d \
-               utilsexc.d \
-               wave.d \
-               window.d \
-               xpmhand.d
-
-PM_GENERICOBJS = \
-               busyinfo.o \
-               calctrl.o \
-               caret.o \
-               choicdgg.o \
-               colrdlgg.o \
-               dcpsg.o \
-               grid.o \
-               helpext.o \
-               helphtml.o \
-               helpwxht.o \
-               helpxlp.o \
-               imaglist.o \
-               laywin.o \
-               listctrl.o \
-               logg.o \
-               msgdlgg.o \
-               numdlgg.o \
-               panelg.o \
-               plot.o \
-               printps.o \
-               prntdlgg.o \
-               progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
-               sashwin.o \
-               scrolwin.o \
-               splitter.o \
-               statusbr.o \
-               tbarsmpl.o \
-               textdlgg.o \
-               tipdlg.o \
-               treectrl.o \
-               wizard.o
-
-PM_GENERICDEPS = \
-               busyinfo.d \
-               calctrl.d \
-               caret.d \
-               choicdgg.d \
-               colrdlgg.d \
-               dcpsg.d \
-               grid.d \
-               helpext.d \
-               helphtml.d \
-               helpwxht.d \
-               helpxlp.d \
-               imaglist.d \
-               laywin.d \
-               listctrl.d \
-               logg.d \
-               msgdlgg.d \
-               numdlgg.d \
-               panelg.d \
-               plot.d \
-               printps.d \
-               prntdlgg.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splitter.d \
-               statusbr.d \
-               tbarsmpl.d \
-               textdlgg.d \
-               tipdlg.d \
-               treectrl.d \
-               wizard.d
-
-PM_COMMONOBJS = \
-               parser.o \
-               appcmn.o \
-               choiccmn.o \
-               clipcmn.o \
-               cmdline.o \
-               cmndata.o \
-               config.o \
-               ctrlcmn.o \
-               ctrlsub.o \
-               datetime.o \
-               datstrm.o \
-               db.o \
-               dbtable.o \
-               dcbase.o \
-               dlgcmn.o \
-               dobjcmn.o \
-               docmdi.o \
-               docview.o \
-               dynarray.o \
-               dynlib.o \
-               encconv.o \
-               event.o \
-               extended.o \
-               ffile.o \
-               file.o \
-               fileconf.o \
-               filefn.o \
-               filesys.o \
-               fontcmn.o \
-               fontmap.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 \
-               imagtiff.o \
-               intl.o \
-               ipcbase.o \
-               layout.o \
-               lboxcmn.o \
-               list.o \
-               log.o \
-               longlong.o \
-               memory.o \
-               menucmn.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 \
-               textcmn.o \
-               textfile.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
-
-PM_COMMONDEPS = \
-               parser.d \
-               appcmn.d \
-               choiccmn.d \
-               clipcmn.d \
-               cmdline.d \
-               cmndata.d \
-               config.d \
-               ctrlcmn.d \
-               ctrlsub.d \
-               datetime.d \
-               datstrm.d \
-               db.d \
-               dbtable.d \
-               dcbase.d \
-               dlgcmn.d \
-               dobjcmn.d \
-               docmdi.d \
-               docview.d \
-               dynarray.d \
-               dynlib.d \
-               encconv.d \
-               event.d \
-               extended.d \
-               ffile.d \
-               file.d \
-               fileconf.d \
-               filefn.d \
-               filesys.d \
-               fontcmn.d \
-               fontmap.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 \
-               imagtiff.d \
-               intl.d \
-               ipcbase.d \
-               layout.d \
-               lboxcmn.d \
-               list.d \
-               log.d \
-               longlong.d \
-               memory.d \
-               menucmn.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 \
-               textcmn.d \
-               textfile.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
-
-PM_GUIOBJS = \
-               accel.o \
-               app.o \
-               bitmap.o \
-               bmpbuttn.o \
-               brush.o \
-               button.o \
-               checkbox.o \
-               checklst.o \
-               choice.o \
-               clipbrd.o \
-               colour.o \
-               combobox.o \
-               control.o \
-               cursor.o \
-               data.o \
-               dataobj.o \
-               dc.o \
-               dcclient.o \
-               dcmemory.o \
-               dcprint.o \
-               dcscreen.o \
-               dialog.o \
-               dir.o \
-               dirdlg.o \
-               dnd.o \
-               filedlg.o \
-               font.o \
-               fontdlg.o \
-               frame.o \
-               gauge.o \
-               gdiimage.o \
-               gdiobj.o \
-               gsocket.o \
-               helpwin.o \
-               icon.o \
-               iniconf.o \
-               joystick.o \
-               listbox.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 \
-               print.o \
-               radiobox.o \
-               radiobut.o \
-               region.o \
-               scrolbar.o \
-               settings.o \
-               slider.o \
-               spinbutt.o \
-               spinctrl.o \
-               statbmp.o \
-               statbox.o \
-               statline.o \
-               stattext.o \
-               tabctrl.o \
-               taskbar.o \
-               textctrl.o \
-               thread.o \
-               timer.o \
-               toolbar.o \
-               tooltip.o \
-               utils.o \
-               utilsexc.o \
-               wave.o \
-               window.o
-
-PM_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 \
-               dcprint.d \
-               dcscreen.d \
-               dialog.d \
-               dir.d \
-               dirdlg.d \
-               dnd.d \
-               filedlg.d \
-               font.d \
-               fontdlg.d \
-               frame.d \
-               gauge.d \
-               gdiimage.d \
-               gdiobj.d \
-               gsocket.d \
-               helpwin.d \
-               icon.d \
-               iniconf.d \
-               joystick.d \
-               listbox.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 \
-               print.d \
-               radiobox.d \
-               radiobut.d \
-               region.d \
-               scrolbar.d \
-               settings.d \
-               slider.d \
-               spinbutt.d \
-               spinctrl.d \
-               statbmp.d \
-               statbox.d \
-               statline.d \
-               stattext.d \
-               tabctrl.d \
-               taskbar.d \
-               textctrl.d \
-               thread.d \
-               timer.d \
-               toolbar.d \
-               tooltip.d \
-               utils.d \
-               utilsexc.d \
-               wave.d \
-               window.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 \
-               htmlfilt.o \
-               htmlpars.o \
-               htmltag.o \
-               htmlwin.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_meta.o \
-               m_pre.o \
-               m_tables.o \
-               winpars.o
-
-HTMLDEPS = \
-               helpctrl.d \
-               helpdata.d \
-               helpfrm.d \
-               htmlcell.d \
-               htmlfilt.d \
-               htmlpars.d \
-               htmltag.d \
-               htmlwin.d \
-               htmprint.d \
-               m_dflist.d \
-               m_fonts.d \
-               m_hline.d \
-               m_image.d \
-               m_layout.d \
-               m_links.d \
-               m_list.d \
-               m_meta.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
-
-UNIX_DEPS = \
-               dialup.d \
-               dir.d \
-               fontenum.d \
-               fontutil.d \
-               gsocket.d \
-               threadpsx.d \
-               utilsunx.d
-
-ZLIBOBJS    = \
+WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//p'`
+
+# this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
+# ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
+# .d and .h/.inl files for the current toolkit
+include @PORT_FILES@
+
+SOURCES = $(ALL_SOURCES)
+HEADERS = $(ALL_HEADERS)
+
+# for the objects and depfiles, we might be bulding only part of them
+# depending on configure arguments, so select a subset of ALL
+OBJECTS = @ALL_OBJECTS@
+DEPFILES = @ALL_DEPFILES@
+
+# the object files of sublibraries (we assume that they don't change [often],
+# so we don't generate these lists with tmake but embed them here)
+REGEXOBJS = \
+               regcomp.o \
+               regexec.o \
+               regerror.o \
+               regfree.o
+
+ZLIBOBJS = \

                adler32.o \
                compress.o \
                crc32.o \
                adler32.o \
                compress.o \
                crc32.o \


@@ -2514,7 +192,7 @@ ZLIBOBJS    = \
                infutil.o \
                inffast.o
 
                infutil.o \
                inffast.o
 

-PNGOBJS     = \
+PNGOBJS = \

                png.o \
                pngread.o \
                pngrtran.o \
                png.o \
                pngread.o \
                pngrtran.o \


@@ -2531,8 +209,26 @@ PNGOBJS     = \
                pngget.o \
                pngset.o
 
                pngget.o \
                pngset.o
 

-
-JPEGOBJS    = \
+FREETYPEOBJS = \
+               ftsystem.o \
+               autohint.o \
+               ftbase.o \
+               ftdebug.o \
+               ftglyph.o \
+               ftinit.o \
+               ftmm.o \
+               cff.o \
+               type1cid.o \
+               psnames.o \
+               psmodule.o \
+               raster1.o \
+               sfnt.o \
+               smooth.o \
+               truetype.o \
+               type1z.o \
+               winfnt.o
+
+JPEGOBJS = \

                jcomapi.o \
                jutils.o \
                jerror.o \
                jcomapi.o \
                jutils.o \
                jerror.o \


@@ -2580,7 +276,7 @@ JPEGOBJS    = \
                jquant2.o \
                jdmerge.o
 
                jquant2.o \
                jdmerge.o
 

-TIFFOBJS       = \
+TIFFOBJS = \

                tif_aux.o \
                tif_close.o \
                tif_codec.o \
                tif_aux.o \
                tif_close.o \
                tif_codec.o \


@@ -2615,7 +311,7 @@ TIFFOBJS   = \
                tif_write.o \
                tif_zip.o
 
                tif_write.o \
                tif_zip.o
 

-IODBC_OBJS = \
+IODBCOBJS = \

                catalog.o \
                connect.o \
                dlf.o \
                catalog.o \
                connect.o \
                dlf.o \


@@ -2632,24 +328,18 @@ IODBC_OBJS = \
                prepare.o \
                result.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@
+OLEOBJS = \
+               automtn.o \
+               dataobj.o \
+               dropsrc.o \
+               droptgt.o \
+               oleutils.o \
+               uuid.o

 
 

-HEADERS = @ALL_HEADERS@
+############################## Rules ##################################

 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@

+BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@

 
 all: @WX_ALL@
 
 
 all: @WX_ALL@
 


@@ -2658,26 +348,61 @@ all: @WX_ALL@
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
        $(RANLIB) ./lib/$@
 
        $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
        $(RANLIB) ./lib/$@
 

+@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+       @$(INSTALL) -d ./lib
+       $(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
+       $(RANLIB) ./lib/$@
+

 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)

-       
+
+@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o @WX_LIBRARY_NAME_SHARED@
+       @$(INSTALL) -d ./lib
+       $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS)
+
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
+       $(DEREZ) $^ $(DEREZFLAGS) > $@
+
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
+       $(REZ) $(REZFLAGS) $^ -o $@
+

 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
        @$(RM) ./lib/@WX_LIBRARY_LINK3@
 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@
-       
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+       cd lib \
+               && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+               && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+               && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+
+CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+       @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+       @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+       @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+       cd lib \
+               && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+               && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+               && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
+
+CREATE_INSTALLED_LINKS: preinstall

        $(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_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@
-       
+       cd $(libdir) \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
+
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+       $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+       $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+       $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+       cd $(libdir) \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+               && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
+

 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c


@@ -2703,57 +428,74 @@ lexer.c: $(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
 
 -include $(DEPFILES)
 

-afminstall:
-       $(INSTALL) -d $(datadir)
+afminstall: preinstall
+       @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi

        $(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 $(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
+
+# this is the real install target: copies the library, wx-config and the
+# headers to the installation directory
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config

        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
 
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
 

-       $(INSTALL) -d $(prefix)
-       $(INSTALL) -d $(bindir)
-       $(INSTALL) -d $(libdir)
+       @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
+       @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi

 
 

-       $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
+       $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+       cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config

        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
        $(INSTALL) -d $(libdir)/wx
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx

-       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
-       
+       $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+

        $(INSTALL) -d $(includedir)/wx
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
        $(INSTALL) -d $(includedir)/wx
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi

-       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/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
        @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi

+       $(INSTALL) -d $(includedir)/wx/protocol
+       $(INSTALL) -d $(includedir)/wx/unix

        @list='$(HEADERS)'; for p in $$list; do \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
 
        @list='$(HEADERS)'; for p in $$list; do \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
 

-write_message:
+       @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
+       @for p in $(WX_LINGUAS); do \
+         if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
+         if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
+         $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+         echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
+       done
+
+preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
+       @echo " "
+       @echo " Installing wxWindows OpenGl add-on..."
+       @echo " "
+       @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
+       $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+
+install: @AFMINSTALL@ @WX_ALL_INSTALLED@

        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux) you'll now have to run ldconfig"

-       @echo " if you installed a shared library."
+       @echo " if you installed a shared library and also modify"
+       @echo " LD_LIBRARY_PATH (or equivalent) environment variable."

        @echo " "
        @echo " "

-       @echo " wxWindows comes with  no guarantees  and doesn't claim"
+       @echo " wxWindows comes with no guarantees and doesn't claim"

        @echo " to be suitable for any purpose."
        @echo " "
        @echo " Read the wxWindows Licence on licencing conditions."
        @echo " "
 
        @echo " to be suitable for any purpose."
        @echo " "
        @echo " Read the wxWindows Licence on licencing conditions."
        @echo " "
 

-install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
-

 uninstall:
        @echo " "
        @echo " Uninstalling wxWindows..."
 uninstall:
        @echo " "
        @echo " Uninstalling wxWindows..."


@@ -2763,20 +505,34 @@ uninstall:
        @$(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@

+       @echo " Removing GL library..."
+       @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+       @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@

        @echo " Removing helper files..."
        @echo " Removing helper files..."

-       @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+       @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h

        @$(RM) $(bindir)/wx-config
        @$(RM) $(bindir)/wx-config

+       @$(RM) $(bindir)/wx@TOOLKIT_NAME@-config

        @$(RM) $(datadir)/wx/afm/*
        @$(RM) $(datadir)/wx/gs_afm/*
        @$(RM) $(datadir)/wx/afm/*
        @$(RM) $(datadir)/wx/gs_afm/*

-       @rmdir $(datadir)/wx/gs_afm
-       @rmdir $(datadir)/wx/afm
-       @rmdir $(datadir)/wx
+# FIXME: wxBase doesnt install these next 3 dirs.
+       @-rmdir $(datadir)/wx/gs_afm
+       @-rmdir $(datadir)/wx/afm
+       @-rmdir $(datadir)/wx

        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
        done
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
        done

+       @echo " Removing i18n files..."
+       @-for p in $(WX_LINGUAS); do \
+         $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+         rmdir $(localedir)/$$p/LC_MESSAGES; \
+         rmdir $(localedir)/$$p; \
+       done

        @echo " Removing directories..."
        @echo " Removing directories..."

-       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_DIR@; fi
+       @-rmdir $(localedir)
+       @if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi

        @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
        @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
        @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi


@@ -2789,10 +545,11 @@ uninstall:
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 
        @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
        @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi
 

-ALL_DIST:
+# this target should copy only the files common to really all ports (including
+# wxBase) to the dist dir
+ALL_DIST: distclean

        mkdir _dist_dir
        mkdir $(DISTDIR)
        mkdir _dist_dir
        mkdir $(DISTDIR)

-       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)

        cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)


@@ -2801,10 +558,27 @@ ALL_DIST:
        cp $(WXDIR)/mkinstalldirs $(DISTDIR)
        cp $(WXDIR)/wx-config.in $(DISTDIR)
        cp $(WXDIR)/setup.h.in $(DISTDIR)
        cp $(WXDIR)/mkinstalldirs $(DISTDIR)
        cp $(WXDIR)/wx-config.in $(DISTDIR)
        cp $(WXDIR)/setup.h.in $(DISTDIR)

+       cp $(WXDIR)/setup.h_vms $(DISTDIR)
+       cp $(WXDIR)/descrip.mms $(DISTDIR)

        cp $(WXDIR)/Makefile.in $(DISTDIR)
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
        cp $(WXDIR)/Makefile.in $(DISTDIR)
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt

+       mkdir $(DISTDIR)/lib
+       cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
+       cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+       mkdir $(DISTDIR)/src
+       mkdir $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
+
+# this target is the common part of distribution script for all GUI toolkits,
+# but is not used when building wxBase distribution
+ALL_GUI_DIST: ALL_DIST
+       cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+       cp $(WXDIR)/wxBase.spec $(DISTDIR)

        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
        cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt


@@ -2814,28 +588,27 @@ ALL_DIST:
        mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html

-       mkdir $(DISTDIR)/include/wx/unix

        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/protocol

-       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
-       cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx 
+       mkdir $(DISTDIR)/include/wx/unix
+       cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
+       cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx

        cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
        cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
        cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
        cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
        cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
        cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
        cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
        cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol

-       mkdir $(DISTDIR)/src

        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html
        mkdir $(DISTDIR)/src/html/bitmaps
        mkdir $(DISTDIR)/src/$(TOOLKITDIR)
        mkdir $(DISTDIR)/src/common
        mkdir $(DISTDIR)/src/generic
        mkdir $(DISTDIR)/src/html
        mkdir $(DISTDIR)/src/html/bitmaps
        mkdir $(DISTDIR)/src/$(TOOLKITDIR)

-       mkdir $(DISTDIR)/src/unix

        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg
        mkdir $(DISTDIR)/src/tiff
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg
        mkdir $(DISTDIR)/src/tiff

-       mkdir $(DISTDIR)/src/zlib

        mkdir $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/iodbc

+       mkdir $(DISTDIR)/src/unix
+       cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)

        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


@@ -2843,17 +616,17 @@ ALL_DIST:
        cp $(COMMDIR)/*.l $(DISTDIR)/src/common
        cp $(COMMDIR)/*.h $(DISTDIR)/src/common
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common
        cp $(COMMDIR)/*.l $(DISTDIR)/src/common
        cp $(COMMDIR)/*.h $(DISTDIR)/src/common
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common

+       cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
+       cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
+       cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
+       cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix

        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic

+       cp $(GENDIR)/*.mms $(DISTDIR)/src/generic

        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps

-       cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
-       cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix

        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png
        cp $(PNGDIR)/README $(DISTDIR)/src/png
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
        cp $(PNGDIR)/*.c $(DISTDIR)/src/png
        cp $(PNGDIR)/README $(DISTDIR)/src/png

-       cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
-       cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib

        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg


@@ -2868,15 +641,52 @@ ALL_DIST:
        cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
        cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 

-GTK_DIST:
-       cp $(WXDIR)/wxGTK.spec $(DISTDIR)
+BASE_DIST: ALL_DIST
+       mkdir $(DISTDIR)/include
+       mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/protocol
+       mkdir $(DISTDIR)/include/wx/unix
+       mkdir $(DISTDIR)/src/common
+       mkdir $(DISTDIR)/src/unix
+       cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
+       cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
+       cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
+       cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
+       cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
+       cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+       cp $(SRCDIR)/*.in $(DISTDIR)/src
+       cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
+       cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
+       cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
+       list='$(HEADERS)'; for p in $$list; do \
+         cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
+       done
+       list='$(SOURCES)'; for p in $$list; do \
+         cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \
+       done
+
+       mkdir $(DISTDIR)/samples
+       cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+       cp $(SAMPDIR)/configure $(DISTDIR)/samples
+       cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
+
+       mkdir $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
+       cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
+
+GTK_DIST: ALL_GUI_DIST

        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
        cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk

+       cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
+       mkdir $(DISTDIR)/contrib
+       cp -R $(WXDIR)/contrib $(DISTDIR)

 
 

-MOTIF_DIST:
+MOTIF_DIST: ALL_GUI_DIST

        cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
        cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
        cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
        cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif


@@ -2886,7 +696,10 @@ MOTIF_DIST:
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 
        cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
        cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
 

-MSW_DIST:
+MACX_DIST: ALL_GUI_DIST
+       echo "Apple Mac OS X specific distribution not complete"
+
+MSW_DIST: ALL_GUI_DIST

        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
        cp $(WXDIR)/wxWINE.spec $(DISTDIR)
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw


@@ -2899,9 +712,13 @@ MSW_DIST:
        mkdir $(DISTDIR)/src/msw/ole
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
        mkdir $(DISTDIR)/src/msw/ole
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 

-DEMOS_DIST:
+DEMOS_DIST: ALL_GUI_DIST

        mkdir $(DISTDIR)/demos
        cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
        mkdir $(DISTDIR)/demos
        cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos

+       cp $(DEMODIR)/configure $(DISTDIR)/demos
+       cp $(DEMODIR)/configure.in $(DISTDIR)/demos
+
+       cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse

 
        mkdir $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 
        mkdir $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs


@@ -2910,7 +727,7 @@ DEMOS_DIST:
        cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs

-       
+

        mkdir $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
        mkdir $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty


@@ -2918,7 +735,7 @@ DEMOS_DIST:
        cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
        cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty

-       
+

        mkdir $(DISTDIR)/demos/life
        mkdir $(DISTDIR)/demos/life/bitmaps
        cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
        mkdir $(DISTDIR)/demos/life
        mkdir $(DISTDIR)/demos/life/bitmaps
        cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life


@@ -2926,74 +743,82 @@ DEMOS_DIST:
        cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
        cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life

+       cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life

        cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
        cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps

-       
+

        mkdir $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
        mkdir $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem

+       cp $(DEMODIR)/poem/*.h $(DISTDIR)/demos/poem

        cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
        cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem

-    
+

        mkdir $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
        mkdir $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
        cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal

-       
-SAMPLES_DIST:
+
+SAMPLES_DIST: ALL_GUI_DIST

        mkdir $(DISTDIR)/samples
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
        mkdir $(DISTDIR)/samples
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples

-       
+       cp $(SAMPDIR)/configure $(DISTDIR)/samples
+       cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
+
+       mkdir $(DISTDIR)/samples/calendar
+       cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
+       cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+       cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
+

        mkdir $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
        mkdir $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret

-       
-       mkdir $(DISTDIR)/samples/calendar
-       cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
-       cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
-       cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
-       
+
+       mkdir $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
+

        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config

-       
+

        mkdir $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
        mkdir $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
        cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console

-       
+

        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls

+       cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls

        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons

-       
-       mkdir $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
-       cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
-       
+

        mkdir $(DISTDIR)/samples/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/db
        cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db

-       
+

        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs

-       
+       cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
+

        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd


@@ -3002,52 +827,66 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd

-       
+

        mkdir $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
        mkdir $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
        cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview

-       
+

        mkdir $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
        mkdir $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
        cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi

-       
+
+       mkdir $(DISTDIR)/samples/dragimag
+       cp $(SAMPDIR)/dragimag/Makefile.in $(DISTDIR)/samples/dragimag
+       cp $(SAMPDIR)/dragimag/makefile.unx $(DISTDIR)/samples/dragimag
+       cp $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag
+       cp $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag
+       cp $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag
+       cp $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag
+

        mkdir $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
        mkdir $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
        cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing

-       
+       cp $(SAMPDIR)/drawing/*.bmp $(DISTDIR)/samples/drawing
+

        mkdir $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
        mkdir $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/makefile.unx $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
        cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic

-       
+
+       mkdir $(DISTDIR)/samples/erase
+       cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
+       cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
+       cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
+
+       mkdir $(DISTDIR)/samples/event
+       cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
+       cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
+       cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
+

        mkdir $(DISTDIR)/samples/exec
        cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
        mkdir $(DISTDIR)/samples/exec
        cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec

+       cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec

        cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
        cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec

-       
-       mkdir $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
-       cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
-       
+

        mkdir $(DISTDIR)/samples/font
        cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
        cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
        cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
        mkdir $(DISTDIR)/samples/font
        cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
        cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
        cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font

-       
+

        mkdir $(DISTDIR)/samples/grid
        cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
        cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
        cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
        mkdir $(DISTDIR)/samples/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
        mkdir $(DISTDIR)/samples/help
        mkdir $(DISTDIR)/samples/help/doc
        cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help


@@ -3055,7 +894,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help
        cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
        cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
        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


@@ -3082,6 +921,7 @@ SAMPLES_DIST:
        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/*.cpp $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test

+       cp $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test

        cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
        mkdir $(DISTDIR)/samples/html/virtual
        cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
        mkdir $(DISTDIR)/samples/html/virtual


@@ -3097,34 +937,53 @@ 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
        cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/*.cpp $(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/*.mms $(DISTDIR)/samples/image

        cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image

-    
+       cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
+

        mkdir $(DISTDIR)/samples/internat
        mkdir $(DISTDIR)/samples/internat/de
        mkdir $(DISTDIR)/samples/internat/fr
        mkdir $(DISTDIR)/samples/internat
        mkdir $(DISTDIR)/samples/internat/de
        mkdir $(DISTDIR)/samples/internat/fr

+       mkdir $(DISTDIR)/samples/internat/ru

        cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
        cp $(SAMPDIR)/internat/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/fr/*.mo $(DISTDIR)/samples/internat/fr

        cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
        cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de

+       cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru

        cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
        cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr

-       cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
-       
+       cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
+       cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
+
+       mkdir $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/makefile.unx $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
+       cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
+
+       mkdir $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
+       cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
+

        mkdir $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
        mkdir $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
        cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout

-       
+

        mkdir $(DISTDIR)/samples/listctrl
        mkdir $(DISTDIR)/samples/listctrl/bitmaps
        cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
        mkdir $(DISTDIR)/samples/listctrl
        mkdir $(DISTDIR)/samples/listctrl/bitmaps
        cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl


@@ -3133,7 +992,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
        cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps

-       
+

        mkdir $(DISTDIR)/samples/mdi
        mkdir $(DISTDIR)/samples/mdi/bitmaps
        cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
        mkdir $(DISTDIR)/samples/mdi
        mkdir $(DISTDIR)/samples/mdi/bitmaps
        cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi


@@ -3142,18 +1001,18 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
        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/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/menu
        cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu
        cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu
        cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu

-       
+

        mkdir $(DISTDIR)/samples/minifram
        mkdir $(DISTDIR)/samples/minifram/bitmaps
        cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
        mkdir $(DISTDIR)/samples/minifram
        mkdir $(DISTDIR)/samples/minifram/bitmaps
        cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram


@@ -3162,37 +1021,59 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
        cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps

-       
+

        mkdir $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
        mkdir $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal

-       
+       cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
+

        mkdir $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
        mkdir $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup

-       
+

        mkdir $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/makefile.unx $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
        mkdir $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/makefile.unx $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid

-       
+

        mkdir $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/makefile.unx $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
        mkdir $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/makefile.unx $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook

-       
+
+       mkdir $(DISTDIR)/samples/opengl
+       cp $(SAMPDIR)/opengl/Makefile.in $(DISTDIR)/samples/opengl
+       mkdir $(DISTDIR)/samples/opengl/penguin
+       cp $(SAMPDIR)/opengl/penguin/Makefile.in $(DISTDIR)/samples/opengl/penguin
+       cp $(SAMPDIR)/opengl/penguin/makefile.unx $(DISTDIR)/samples/opengl/penguin
+       cp $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin
+       cp $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin
+       cp $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin
+       cp $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin
+       mkdir $(DISTDIR)/samples/opengl/cube
+       cp $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube
+       cp $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube
+       cp $(SAMPDIR)/opengl/cube/*.cpp $(DISTDIR)/samples/opengl/cube
+       cp $(SAMPDIR)/opengl/cube/*.h $(DISTDIR)/samples/opengl/cube
+       mkdir $(DISTDIR)/samples/opengl/isosurf
+       cp $(SAMPDIR)/opengl/isosurf/Makefile.in $(DISTDIR)/samples/opengl/isosurf
+       cp $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf
+       cp $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf
+       cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
+       cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
+

        mkdir $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
        mkdir $(DISTDIR)/samples/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
        mkdir $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing


@@ -3200,148 +1081,315 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(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/resource
        cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
        cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
        cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
        cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
        cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource

-       
+
+       mkdir $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+

        mkdir $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
        mkdir $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit

+       cp $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit

        cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
        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
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist

+       cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist

        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
        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
        mkdir $(DISTDIR)/samples/propsize
        cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize

+       cp $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize

        cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
        cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
        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
        mkdir $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest

+       cp $(SAMPDIR)/sashtest/makefile.unx $(DISTDIR)/samples/sashtest

        cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
        cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest

-    
+

        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll

-    
+

        mkdir $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
        mkdir $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
        cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub

-    
+
+       mkdir $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+       cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
+

        mkdir $(DISTDIR)/samples/splitter
        mkdir $(DISTDIR)/samples/splitter

-       cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter

        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter

+       cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter

        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter

-    
+
+       mkdir $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar
+       cp $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar
+

        mkdir $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
        mkdir $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
        cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text

-    
+

        mkdir $(DISTDIR)/samples/thread
        cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
        cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
        cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
        mkdir $(DISTDIR)/samples/thread
        cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
        cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
        cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread

-    
+

        mkdir $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
        mkdir $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar

+       cp $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar

        cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
        mkdir $(DISTDIR)/samples/toolbar/bitmaps
        cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
        cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
        mkdir $(DISTDIR)/samples/toolbar/bitmaps
        cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps

-    
+

        mkdir $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
        mkdir $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl

+       cp $(SAMPDIR)/treectrl/makefile.unx $(DISTDIR)/samples/treectrl

        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl

-    
+       mkdir $(DISTDIR)/samples/treectrl/bitmaps
+       cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
+
+       mkdir $(DISTDIR)/samples/treelay
+       cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
+       cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
+       cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
+       cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
+

        mkdir $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
        mkdir $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest

+       cp $(SAMPDIR)/typetest/makefile.unx $(DISTDIR)/samples/typetest

        cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
        cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
        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
        mkdir $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate

+       cp $(SAMPDIR)/validate/makefile.unx $(DISTDIR)/samples/validate

        cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
        cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
        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
        mkdir $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard

+       cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard

        cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
        cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard

-    
-       mkdir $(DISTDIR)/samples/sockets
-       cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
-       cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
-       cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets

 
 

-UTILS_DIST:
+UTILS_DIST: ALL_GUI_DIST

        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils

-       
-       mkdir $(DISTDIR)/utils/wxMMedia2
-       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/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
-       cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
-       
-       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/$(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:
+       cp $(UTILSDIR)/configure $(DISTDIR)/utils
+       cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
+
+       mkdir $(DISTDIR)/utils/tex2rtf
+       mkdir $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
+       cp $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
+
+       mkdir $(DISTDIR)/utils/makegen
+       mkdir $(DISTDIR)/utils/makegen/templates
+       cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
+       cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen
+       cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates
+
+       mkdir $(DISTDIR)/utils/hhp2cached
+       cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
+
+       mkdir $(DISTDIR)/utils/HelpGen
+       mkdir $(DISTDIR)/utils/HelpGen/src
+       cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
+       cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
+
+       cp -R $(UTILSDIR)/dialoged $(DISTDIR)/utils/dialoged
+
+MISC_DIST: ALL_GUI_DIST

        mkdir $(DISTDIR)/misc
        mkdir $(DISTDIR)/misc/afm
        cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
        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 DEMOS_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) ../..
-       mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos
-       cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../..
+
+INTL_DIST:
+       mkdir $(DISTDIR)/locale
+       cp $(INTLDIR)/Makefile $(DISTDIR)/locale
+       cp $(INTLDIR)/*.po $(DISTDIR)/locale
+       -cp $(INTLDIR)/*.mo $(DISTDIR)/locale
+
+MANUAL_DIST:
+       mkdir $(DISTDIR)/docs
+       mkdir $(DISTDIR)/docs/latex
+       mkdir $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
+       cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
+
+# this target does not generate a complete wxPython dist, it only includes
+# those files needed for the Debian source package.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
+PYTHON_DIST:
+       mkdir $(DISTDIR)/wxPython
+       mkdir $(DISTDIR)/wxPython/contrib
+       mkdir $(DISTDIR)/wxPython/contrib/glcanvas
+       mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+       mkdir $(DISTDIR)/wxPython/contrib/ogl
+       mkdir $(DISTDIR)/wxPython/contrib/stc
+       mkdir $(DISTDIR)/wxPython/demo
+       mkdir $(DISTDIR)/wxPython/demo/bitmaps
+       mkdir $(DISTDIR)/wxPython/demo/data
+       mkdir $(DISTDIR)/wxPython/src
+       mkdir $(DISTDIR)/wxPython/src/gtk
+       mkdir $(DISTDIR)/wxPython/wxPython
+       mkdir $(DISTDIR)/wxPython/wxPython/lib
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
+       mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers
+
+       cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
+       cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+       -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
+       cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
+       -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+       -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
+       -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
+       -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
+       -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+       -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
+       cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
+       cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
+       cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
+       cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+
+distclean:

        $(RM) -r _dist_dir
 
        $(RM) -r _dist_dir
 

+# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
+#     the files twice
+dist-only:
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-$(VER_SUFFIX); \
+       echo "*** Creating wxSamples archive..."; \
+       tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples-$(VER_SUFFIX) samples; \
+       mv demos wxDemos-$(VER_SUFFIX); \
+       echo "*** Creating wxDemos archive..."; \
+       tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos-$(VER_SUFFIX) demos; \
+       fi
+
+dist: @GUIDIST@
+       cp $(WXDIR)/src/files.lst $(DISTDIR)/src
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-$(VER_SUFFIX); \
+       echo "*** Creating wxSamples archive..."; \
+       tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+       mv wxSamples-$(VER_SUFFIX) samples; \
+       mv demos wxDemos-$(VER_SUFFIX); \
+       echo "*** Creating wxDemos archive..."; \
+       tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+       mv wxDemos-$(VER_SUFFIX) demos; \
+       fi
+
+bzip-dist-only:
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples-${VER_SUFFIX}; \
+       echo "*** Creating wxSamples archive..."; \
+       tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
+       mv wxSamples-${VER_SUFFIX} samples; \
+       mv demos wxDemos-${VER_SUFFIX}; \
+       echo "*** Creating wxDemos archive..."; \
+       tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
+       mv wxDemos-${VER_SUFFIX} demos; \
+       fi
+
+bzip-dist: @GUIDIST@
+       cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+       @echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+       @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
+       @if test "$(USE_GUI)" = 1; then \
+       cd $(DISTDIR); \
+       mv samples wxSamples; \
+       tar ch wxSamples | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
+       mv wxSamples samples; \
+       mv demos wxDemos; \
+       tar ch wxDemos | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
+       mv wxDemos demos; \
+       fi
+
+debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+       mkdir $(DISTDIR)/debian
+       -cp $(WXDIR)/debian/* $(DISTDIR)/debian
+       cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+       cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
+       cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+       cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+       rm -f $(DISTDIR)/*.spec
+       rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+       mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+

 clean:
        $(RM) *.o
        $(RM) *.d
        $(RM) parser.c
        $(RM) lexer.c
 clean:
        $(RM) *.o
        $(RM) *.d
        $(RM) parser.c
        $(RM) lexer.c

-       $(RM) ./lib/*
+       # $(RM) -r ./lib/wx/*
+       $(RM) ./lib/lib*

 
 cleanall: clean
 
 cleanall: clean

+
+
+RPMTOP=_dist_dir/_rpm_top
+
+rpm: dist
+       @echo "*** Building RPMs ***"
+       -mkdir $(RPMTOP)
+       -mkdir $(RPMTOP)/SOURCES
+       -mkdir $(RPMTOP)/SPECS
+       -mkdir $(RPMTOP)/BUILD
+       -mkdir $(RPMTOP)/RPMS
+       -mkdir $(RPMTOP)/SRPMS
+       cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
+       rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+       mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .