]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed dependency tracking if . not in PATH
authorVáclav Slavík <vslavik@fastmail.fm>
Thu, 26 Jun 2003 21:17:51 +0000 (21:17 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Thu, 26 Jun 2003 21:17:51 +0000 (21:17 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

index d31b34ae7c61e31d6402579eb758e36aa1b18d15..3189c2c528ab3abb435c552d83f33d491b3c9604 100644 (file)
@@ -102,7 +102,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__basedll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__basedll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__basedll___targetsuf2 = .0.$(SO_SUFFIX)
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p_1 = -lwxodbc
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p_2 = -lwxodbc
@@ -1316,7 +1316,6 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_GUI_1_WXUNIV_0@    src/generic/treectlg.cpp \
 @COND_USE_GUI_1_WXUNIV_0@    src/generic/wizard.cpp \
 @COND_USE_GUI_1_WXUNIV_0@    src/common/appcmn.cpp \
-@COND_USE_GUI_1_WXUNIV_0@    src/common/event.cpp \
 @COND_USE_GUI_1_WXUNIV_0@    src/common/fontmap.cpp \
 @COND_USE_GUI_1_WXUNIV_0@    src/common/accesscmn.cpp \
 @COND_USE_GUI_1_WXUNIV_0@    src/common/artprov.cpp \
@@ -1462,7 +1461,6 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_GUI_1_WXUNIV_1@    src/generic/treectlg.cpp \
 @COND_USE_GUI_1_WXUNIV_1@    src/generic/wizard.cpp \
 @COND_USE_GUI_1_WXUNIV_1@    src/common/appcmn.cpp \
-@COND_USE_GUI_1_WXUNIV_1@    src/common/event.cpp \
 @COND_USE_GUI_1_WXUNIV_1@    src/common/fontmap.cpp \
 @COND_USE_GUI_1_WXUNIV_1@    src/common/accesscmn.cpp \
 @COND_USE_GUI_1_WXUNIV_1@    src/common/artprov.cpp \
@@ -1544,14 +1542,14 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_USE_GUI_0@__CORE_SRC_OBJECTS_1 = monolib-init.o
-@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_2) $(__GUI_SRC_OBJECTS_1) monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-appcmn.o monolib-event.o monolib-fontmap.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-datacmn.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-timercmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-imagfill.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o
-@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_3) $(__UNIV_TEXTCTRL_OBJECTS_1) monolib-bmpbuttn6.o monolib-button6.o monolib-checkbox6.o monolib-checklst6.o monolib-choice6.o monolib-colschem.o monolib-combobox5.o monolib-control6.o monolib-dialog6.o monolib-framuniv.o monolib-topluniv.o monolib-gauge4.o monolib-inpcons.o monolib-inphand.o monolib-listbox6.o monolib-menu6.o monolib-notebook4.o monolib-radiobox6.o monolib-radiobut6.o monolib-renderer.o monolib-scrarrow.o monolib-scrolbar5.o monolib-scrthumb.o monolib-slider5.o monolib-spinbutt5.o monolib-statbmp6.o monolib-statbox6.o monolib-statline4.o monolib-stattext6.o monolib-statusbr1.o monolib-toolbar3.o monolib-theme.o monolib-winuniv.o monolib-caret1.o monolib-mdig.o monolib-imaglist.o monolib-colrdlgg.o monolib-listctrl.o monolib-filedlgg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-accel.o monolib-msgdlgg.o monolib-fdrepdlg.o monolib-fontdlgg.o monolib-tabg.o monolib-gtk.o monolib-win32.o monolib-metal.o monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-appcmn.o monolib-event.o monolib-fontmap.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-datacmn.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-timercmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-imagfill.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_2) $(__GUI_SRC_OBJECTS_1) monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-appcmn.o monolib-fontmap.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-datacmn.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-timercmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-imagfill.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_3) $(__UNIV_TEXTCTRL_OBJECTS_1) monolib-bmpbuttn6.o monolib-button6.o monolib-checkbox6.o monolib-checklst6.o monolib-choice6.o monolib-colschem.o monolib-combobox5.o monolib-control6.o monolib-dialog6.o monolib-framuniv.o monolib-topluniv.o monolib-gauge4.o monolib-inpcons.o monolib-inphand.o monolib-listbox6.o monolib-menu6.o monolib-notebook4.o monolib-radiobox6.o monolib-radiobut6.o monolib-renderer.o monolib-scrarrow.o monolib-scrolbar5.o monolib-scrthumb.o monolib-slider5.o monolib-spinbutt5.o monolib-statbmp6.o monolib-statbox6.o monolib-statline4.o monolib-stattext6.o monolib-statusbr1.o monolib-toolbar3.o monolib-theme.o monolib-winuniv.o monolib-caret1.o monolib-mdig.o monolib-imaglist.o monolib-colrdlgg.o monolib-listctrl.o monolib-filedlgg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-accel.o monolib-msgdlgg.o monolib-fdrepdlg.o monolib-fontdlgg.o monolib-tabg.o monolib-gtk.o monolib-win32.o monolib-metal.o monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-appcmn.o monolib-fontmap.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-datacmn.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-timercmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-imagfill.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o
 @COND_USE_GUI_0@__CORE_SRC_OBJECTS_2 = coredll-init.o
-@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(__LOWLEVEL_SRC_OBJECTS_4) $(__GUI_SRC_OBJECTS_2) coredll-selstore.o coredll-busyinfo.o coredll-calctrl.o coredll-choicdgg.o coredll-dcbuffer.o coredll-dcpsg.o coredll-dirctrlg.o coredll-grid.o coredll-gridctrl.o coredll-gridsel.o coredll-laywin.o coredll-logg.o coredll-numdlgg.o coredll-panelg.o coredll-progdlgg.o coredll-sashwin.o coredll-scrlwing.o coredll-spinctlg.o coredll-splash.o coredll-splitter.o coredll-tbarsmpl.o coredll-textdlgg.o coredll-tipdlg.o coredll-tipwin.o coredll-treectlg.o coredll-wizard.o coredll-appcmn.o coredll-event.o coredll-fontmap.o coredll-accesscmn.o coredll-artprov.o coredll-artstd.o coredll-bmpbase.o coredll-choiccmn.o coredll-clipcmn.o coredll-cmdproc.o coredll-cmndata.o coredll-containr.o coredll-cshelp.o coredll-ctrlcmn.o coredll-ctrlsub.o coredll-datacmn.o coredll-dbgrid.o coredll-dcbase.o coredll-dlgcmn.o coredll-dndcmn.o coredll-dobjcmn.o coredll-docmdi.o coredll-docview.o coredll-dpycmn.o coredll-dseldlg.o coredll-effects.o coredll-fddlgcmn.o coredll-fldlgcmn.o coredll-fontcmn.o coredll-framecmn.o coredll-timercmn.o coredll-toplvcmn.o coredll-gaugecmn.o coredll-gdicmn.o coredll-geometry.o coredll-gifdecod.o coredll-helpbase.o coredll-iconbndl.o coredll-imagall.o coredll-imagbmp.o coredll-image.o coredll-imaggif.o coredll-imagiff.o coredll-imagjpeg.o coredll-imagpcx.o coredll-imagpng.o coredll-imagpnm.o coredll-imagtiff.o coredll-imagxpm.o coredll-imagfill.o coredll-layout.o coredll-lboxcmn.o coredll-matrix.o coredll-menucmn.o coredll-nbkbase.o coredll-paper.o coredll-popupcmn.o coredll-prntbase.o coredll-quantize.o coredll-radiocmn.o coredll-rgncmn.o coredll-settcmn.o coredll-sizer.o coredll-statbar.o coredll-tbarbase.o coredll-textcmn.o coredll-treebase.o coredll-valgen.o coredll-validate.o coredll-valtext.o coredll-wincmn.o coredll-xpmdecod.o
-@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(__LOWLEVEL_SRC_OBJECTS_5) $(__UNIV_TEXTCTRL_OBJECTS_2) coredll-bmpbuttn6.o coredll-button6.o coredll-checkbox6.o coredll-checklst6.o coredll-choice6.o coredll-colschem.o coredll-combobox5.o coredll-control6.o coredll-dialog6.o coredll-framuniv.o coredll-topluniv.o coredll-gauge4.o coredll-inpcons.o coredll-inphand.o coredll-listbox6.o coredll-menu6.o coredll-notebook4.o coredll-radiobox6.o coredll-radiobut6.o coredll-renderer.o coredll-scrarrow.o coredll-scrolbar5.o coredll-scrthumb.o coredll-slider5.o coredll-spinbutt5.o coredll-statbmp6.o coredll-statbox6.o coredll-statline4.o coredll-stattext6.o coredll-statusbr1.o coredll-toolbar3.o coredll-theme.o coredll-winuniv.o coredll-caret1.o coredll-mdig.o coredll-imaglist.o coredll-colrdlgg.o coredll-listctrl.o coredll-filedlgg.o coredll-dirdlgg.o coredll-prntdlgg.o coredll-accel.o coredll-msgdlgg.o coredll-fdrepdlg.o coredll-fontdlgg.o coredll-tabg.o coredll-gtk.o coredll-win32.o coredll-metal.o coredll-selstore.o coredll-busyinfo.o coredll-calctrl.o coredll-choicdgg.o coredll-dcbuffer.o coredll-dcpsg.o coredll-dirctrlg.o coredll-grid.o coredll-gridctrl.o coredll-gridsel.o coredll-laywin.o coredll-logg.o coredll-numdlgg.o coredll-panelg.o coredll-progdlgg.o coredll-sashwin.o coredll-scrlwing.o coredll-spinctlg.o coredll-splash.o coredll-splitter.o coredll-tbarsmpl.o coredll-textdlgg.o coredll-tipdlg.o coredll-tipwin.o coredll-treectlg.o coredll-wizard.o coredll-appcmn.o coredll-event.o coredll-fontmap.o coredll-accesscmn.o coredll-artprov.o coredll-artstd.o coredll-bmpbase.o coredll-choiccmn.o coredll-clipcmn.o coredll-cmdproc.o coredll-cmndata.o coredll-containr.o coredll-cshelp.o coredll-ctrlcmn.o coredll-ctrlsub.o coredll-datacmn.o coredll-dbgrid.o coredll-dcbase.o coredll-dlgcmn.o coredll-dndcmn.o coredll-dobjcmn.o coredll-docmdi.o coredll-docview.o coredll-dpycmn.o coredll-dseldlg.o coredll-effects.o coredll-fddlgcmn.o coredll-fldlgcmn.o coredll-fontcmn.o coredll-framecmn.o coredll-timercmn.o coredll-toplvcmn.o coredll-gaugecmn.o coredll-gdicmn.o coredll-geometry.o coredll-gifdecod.o coredll-helpbase.o coredll-iconbndl.o coredll-imagall.o coredll-imagbmp.o coredll-image.o coredll-imaggif.o coredll-imagiff.o coredll-imagjpeg.o coredll-imagpcx.o coredll-imagpng.o coredll-imagpnm.o coredll-imagtiff.o coredll-imagxpm.o coredll-imagfill.o coredll-layout.o coredll-lboxcmn.o coredll-matrix.o coredll-menucmn.o coredll-nbkbase.o coredll-paper.o coredll-popupcmn.o coredll-prntbase.o coredll-quantize.o coredll-radiocmn.o coredll-rgncmn.o coredll-settcmn.o coredll-sizer.o coredll-statbar.o coredll-tbarbase.o coredll-textcmn.o coredll-treebase.o coredll-valgen.o coredll-validate.o coredll-valtext.o coredll-wincmn.o coredll-xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(__LOWLEVEL_SRC_OBJECTS_4) $(__GUI_SRC_OBJECTS_2) coredll-selstore.o coredll-busyinfo.o coredll-calctrl.o coredll-choicdgg.o coredll-dcbuffer.o coredll-dcpsg.o coredll-dirctrlg.o coredll-grid.o coredll-gridctrl.o coredll-gridsel.o coredll-laywin.o coredll-logg.o coredll-numdlgg.o coredll-panelg.o coredll-progdlgg.o coredll-sashwin.o coredll-scrlwing.o coredll-spinctlg.o coredll-splash.o coredll-splitter.o coredll-tbarsmpl.o coredll-textdlgg.o coredll-tipdlg.o coredll-tipwin.o coredll-treectlg.o coredll-wizard.o coredll-appcmn.o coredll-fontmap.o coredll-accesscmn.o coredll-artprov.o coredll-artstd.o coredll-bmpbase.o coredll-choiccmn.o coredll-clipcmn.o coredll-cmdproc.o coredll-cmndata.o coredll-containr.o coredll-cshelp.o coredll-ctrlcmn.o coredll-ctrlsub.o coredll-datacmn.o coredll-dbgrid.o coredll-dcbase.o coredll-dlgcmn.o coredll-dndcmn.o coredll-dobjcmn.o coredll-docmdi.o coredll-docview.o coredll-dpycmn.o coredll-dseldlg.o coredll-effects.o coredll-fddlgcmn.o coredll-fldlgcmn.o coredll-fontcmn.o coredll-framecmn.o coredll-timercmn.o coredll-toplvcmn.o coredll-gaugecmn.o coredll-gdicmn.o coredll-geometry.o coredll-gifdecod.o coredll-helpbase.o coredll-iconbndl.o coredll-imagall.o coredll-imagbmp.o coredll-image.o coredll-imaggif.o coredll-imagiff.o coredll-imagjpeg.o coredll-imagpcx.o coredll-imagpng.o coredll-imagpnm.o coredll-imagtiff.o coredll-imagxpm.o coredll-imagfill.o coredll-layout.o coredll-lboxcmn.o coredll-matrix.o coredll-menucmn.o coredll-nbkbase.o coredll-paper.o coredll-popupcmn.o coredll-prntbase.o coredll-quantize.o coredll-radiocmn.o coredll-rgncmn.o coredll-settcmn.o coredll-sizer.o coredll-statbar.o coredll-tbarbase.o coredll-textcmn.o coredll-treebase.o coredll-valgen.o coredll-validate.o coredll-valtext.o coredll-wincmn.o coredll-xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(__LOWLEVEL_SRC_OBJECTS_5) $(__UNIV_TEXTCTRL_OBJECTS_2) coredll-bmpbuttn6.o coredll-button6.o coredll-checkbox6.o coredll-checklst6.o coredll-choice6.o coredll-colschem.o coredll-combobox5.o coredll-control6.o coredll-dialog6.o coredll-framuniv.o coredll-topluniv.o coredll-gauge4.o coredll-inpcons.o coredll-inphand.o coredll-listbox6.o coredll-menu6.o coredll-notebook4.o coredll-radiobox6.o coredll-radiobut6.o coredll-renderer.o coredll-scrarrow.o coredll-scrolbar5.o coredll-scrthumb.o coredll-slider5.o coredll-spinbutt5.o coredll-statbmp6.o coredll-statbox6.o coredll-statline4.o coredll-stattext6.o coredll-statusbr1.o coredll-toolbar3.o coredll-theme.o coredll-winuniv.o coredll-caret1.o coredll-mdig.o coredll-imaglist.o coredll-colrdlgg.o coredll-listctrl.o coredll-filedlgg.o coredll-dirdlgg.o coredll-prntdlgg.o coredll-accel.o coredll-msgdlgg.o coredll-fdrepdlg.o coredll-fontdlgg.o coredll-tabg.o coredll-gtk.o coredll-win32.o coredll-metal.o coredll-selstore.o coredll-busyinfo.o coredll-calctrl.o coredll-choicdgg.o coredll-dcbuffer.o coredll-dcpsg.o coredll-dirctrlg.o coredll-grid.o coredll-gridctrl.o coredll-gridsel.o coredll-laywin.o coredll-logg.o coredll-numdlgg.o coredll-panelg.o coredll-progdlgg.o coredll-sashwin.o coredll-scrlwing.o coredll-spinctlg.o coredll-splash.o coredll-splitter.o coredll-tbarsmpl.o coredll-textdlgg.o coredll-tipdlg.o coredll-tipwin.o coredll-treectlg.o coredll-wizard.o coredll-appcmn.o coredll-fontmap.o coredll-accesscmn.o coredll-artprov.o coredll-artstd.o coredll-bmpbase.o coredll-choiccmn.o coredll-clipcmn.o coredll-cmdproc.o coredll-cmndata.o coredll-containr.o coredll-cshelp.o coredll-ctrlcmn.o coredll-ctrlsub.o coredll-datacmn.o coredll-dbgrid.o coredll-dcbase.o coredll-dlgcmn.o coredll-dndcmn.o coredll-dobjcmn.o coredll-docmdi.o coredll-docview.o coredll-dpycmn.o coredll-dseldlg.o coredll-effects.o coredll-fddlgcmn.o coredll-fldlgcmn.o coredll-fontcmn.o coredll-framecmn.o coredll-timercmn.o coredll-toplvcmn.o coredll-gaugecmn.o coredll-gdicmn.o coredll-geometry.o coredll-gifdecod.o coredll-helpbase.o coredll-iconbndl.o coredll-imagall.o coredll-imagbmp.o coredll-image.o coredll-imaggif.o coredll-imagiff.o coredll-imagjpeg.o coredll-imagpcx.o coredll-imagpng.o coredll-imagpnm.o coredll-imagtiff.o coredll-imagxpm.o coredll-imagfill.o coredll-layout.o coredll-lboxcmn.o coredll-matrix.o coredll-menucmn.o coredll-nbkbase.o coredll-paper.o coredll-popupcmn.o coredll-prntbase.o coredll-quantize.o coredll-radiocmn.o coredll-rgncmn.o coredll-settcmn.o coredll-sizer.o coredll-statbar.o coredll-tbarbase.o coredll-textcmn.o coredll-treebase.o coredll-valgen.o coredll-validate.o coredll-valtext.o coredll-wincmn.o coredll-xpmdecod.o
 @COND_USE_GUI_0@__CORE_SRC_OBJECTS_3 = corelib-init.o
-@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(__LOWLEVEL_SRC_OBJECTS_6) $(__GUI_SRC_OBJECTS_3) corelib-selstore.o corelib-busyinfo.o corelib-calctrl.o corelib-choicdgg.o corelib-dcbuffer.o corelib-dcpsg.o corelib-dirctrlg.o corelib-grid.o corelib-gridctrl.o corelib-gridsel.o corelib-laywin.o corelib-logg.o corelib-numdlgg.o corelib-panelg.o corelib-progdlgg.o corelib-sashwin.o corelib-scrlwing.o corelib-spinctlg.o corelib-splash.o corelib-splitter.o corelib-tbarsmpl.o corelib-textdlgg.o corelib-tipdlg.o corelib-tipwin.o corelib-treectlg.o corelib-wizard.o corelib-appcmn.o corelib-event.o corelib-fontmap.o corelib-accesscmn.o corelib-artprov.o corelib-artstd.o corelib-bmpbase.o corelib-choiccmn.o corelib-clipcmn.o corelib-cmdproc.o corelib-cmndata.o corelib-containr.o corelib-cshelp.o corelib-ctrlcmn.o corelib-ctrlsub.o corelib-datacmn.o corelib-dbgrid.o corelib-dcbase.o corelib-dlgcmn.o corelib-dndcmn.o corelib-dobjcmn.o corelib-docmdi.o corelib-docview.o corelib-dpycmn.o corelib-dseldlg.o corelib-effects.o corelib-fddlgcmn.o corelib-fldlgcmn.o corelib-fontcmn.o corelib-framecmn.o corelib-timercmn.o corelib-toplvcmn.o corelib-gaugecmn.o corelib-gdicmn.o corelib-geometry.o corelib-gifdecod.o corelib-helpbase.o corelib-iconbndl.o corelib-imagall.o corelib-imagbmp.o corelib-image.o corelib-imaggif.o corelib-imagiff.o corelib-imagjpeg.o corelib-imagpcx.o corelib-imagpng.o corelib-imagpnm.o corelib-imagtiff.o corelib-imagxpm.o corelib-imagfill.o corelib-layout.o corelib-lboxcmn.o corelib-matrix.o corelib-menucmn.o corelib-nbkbase.o corelib-paper.o corelib-popupcmn.o corelib-prntbase.o corelib-quantize.o corelib-radiocmn.o corelib-rgncmn.o corelib-settcmn.o corelib-sizer.o corelib-statbar.o corelib-tbarbase.o corelib-textcmn.o corelib-treebase.o corelib-valgen.o corelib-validate.o corelib-valtext.o corelib-wincmn.o corelib-xpmdecod.o
-@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(__LOWLEVEL_SRC_OBJECTS_7) $(__UNIV_TEXTCTRL_OBJECTS_3) corelib-bmpbuttn6.o corelib-button6.o corelib-checkbox6.o corelib-checklst6.o corelib-choice6.o corelib-colschem.o corelib-combobox5.o corelib-control6.o corelib-dialog6.o corelib-framuniv.o corelib-topluniv.o corelib-gauge4.o corelib-inpcons.o corelib-inphand.o corelib-listbox6.o corelib-menu6.o corelib-notebook4.o corelib-radiobox6.o corelib-radiobut6.o corelib-renderer.o corelib-scrarrow.o corelib-scrolbar5.o corelib-scrthumb.o corelib-slider5.o corelib-spinbutt5.o corelib-statbmp6.o corelib-statbox6.o corelib-statline4.o corelib-stattext6.o corelib-statusbr1.o corelib-toolbar3.o corelib-theme.o corelib-winuniv.o corelib-caret1.o corelib-mdig.o corelib-imaglist.o corelib-colrdlgg.o corelib-listctrl.o corelib-filedlgg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-accel.o corelib-msgdlgg.o corelib-fdrepdlg.o corelib-fontdlgg.o corelib-tabg.o corelib-gtk.o corelib-win32.o corelib-metal.o corelib-selstore.o corelib-busyinfo.o corelib-calctrl.o corelib-choicdgg.o corelib-dcbuffer.o corelib-dcpsg.o corelib-dirctrlg.o corelib-grid.o corelib-gridctrl.o corelib-gridsel.o corelib-laywin.o corelib-logg.o corelib-numdlgg.o corelib-panelg.o corelib-progdlgg.o corelib-sashwin.o corelib-scrlwing.o corelib-spinctlg.o corelib-splash.o corelib-splitter.o corelib-tbarsmpl.o corelib-textdlgg.o corelib-tipdlg.o corelib-tipwin.o corelib-treectlg.o corelib-wizard.o corelib-appcmn.o corelib-event.o corelib-fontmap.o corelib-accesscmn.o corelib-artprov.o corelib-artstd.o corelib-bmpbase.o corelib-choiccmn.o corelib-clipcmn.o corelib-cmdproc.o corelib-cmndata.o corelib-containr.o corelib-cshelp.o corelib-ctrlcmn.o corelib-ctrlsub.o corelib-datacmn.o corelib-dbgrid.o corelib-dcbase.o corelib-dlgcmn.o corelib-dndcmn.o corelib-dobjcmn.o corelib-docmdi.o corelib-docview.o corelib-dpycmn.o corelib-dseldlg.o corelib-effects.o corelib-fddlgcmn.o corelib-fldlgcmn.o corelib-fontcmn.o corelib-framecmn.o corelib-timercmn.o corelib-toplvcmn.o corelib-gaugecmn.o corelib-gdicmn.o corelib-geometry.o corelib-gifdecod.o corelib-helpbase.o corelib-iconbndl.o corelib-imagall.o corelib-imagbmp.o corelib-image.o corelib-imaggif.o corelib-imagiff.o corelib-imagjpeg.o corelib-imagpcx.o corelib-imagpng.o corelib-imagpnm.o corelib-imagtiff.o corelib-imagxpm.o corelib-imagfill.o corelib-layout.o corelib-lboxcmn.o corelib-matrix.o corelib-menucmn.o corelib-nbkbase.o corelib-paper.o corelib-popupcmn.o corelib-prntbase.o corelib-quantize.o corelib-radiocmn.o corelib-rgncmn.o corelib-settcmn.o corelib-sizer.o corelib-statbar.o corelib-tbarbase.o corelib-textcmn.o corelib-treebase.o corelib-valgen.o corelib-validate.o corelib-valtext.o corelib-wincmn.o corelib-xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(__LOWLEVEL_SRC_OBJECTS_6) $(__GUI_SRC_OBJECTS_3) corelib-selstore.o corelib-busyinfo.o corelib-calctrl.o corelib-choicdgg.o corelib-dcbuffer.o corelib-dcpsg.o corelib-dirctrlg.o corelib-grid.o corelib-gridctrl.o corelib-gridsel.o corelib-laywin.o corelib-logg.o corelib-numdlgg.o corelib-panelg.o corelib-progdlgg.o corelib-sashwin.o corelib-scrlwing.o corelib-spinctlg.o corelib-splash.o corelib-splitter.o corelib-tbarsmpl.o corelib-textdlgg.o corelib-tipdlg.o corelib-tipwin.o corelib-treectlg.o corelib-wizard.o corelib-appcmn.o corelib-fontmap.o corelib-accesscmn.o corelib-artprov.o corelib-artstd.o corelib-bmpbase.o corelib-choiccmn.o corelib-clipcmn.o corelib-cmdproc.o corelib-cmndata.o corelib-containr.o corelib-cshelp.o corelib-ctrlcmn.o corelib-ctrlsub.o corelib-datacmn.o corelib-dbgrid.o corelib-dcbase.o corelib-dlgcmn.o corelib-dndcmn.o corelib-dobjcmn.o corelib-docmdi.o corelib-docview.o corelib-dpycmn.o corelib-dseldlg.o corelib-effects.o corelib-fddlgcmn.o corelib-fldlgcmn.o corelib-fontcmn.o corelib-framecmn.o corelib-timercmn.o corelib-toplvcmn.o corelib-gaugecmn.o corelib-gdicmn.o corelib-geometry.o corelib-gifdecod.o corelib-helpbase.o corelib-iconbndl.o corelib-imagall.o corelib-imagbmp.o corelib-image.o corelib-imaggif.o corelib-imagiff.o corelib-imagjpeg.o corelib-imagpcx.o corelib-imagpng.o corelib-imagpnm.o corelib-imagtiff.o corelib-imagxpm.o corelib-imagfill.o corelib-layout.o corelib-lboxcmn.o corelib-matrix.o corelib-menucmn.o corelib-nbkbase.o corelib-paper.o corelib-popupcmn.o corelib-prntbase.o corelib-quantize.o corelib-radiocmn.o corelib-rgncmn.o corelib-settcmn.o corelib-sizer.o corelib-statbar.o corelib-tbarbase.o corelib-textcmn.o corelib-treebase.o corelib-valgen.o corelib-validate.o corelib-valtext.o corelib-wincmn.o corelib-xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(__LOWLEVEL_SRC_OBJECTS_7) $(__UNIV_TEXTCTRL_OBJECTS_3) corelib-bmpbuttn6.o corelib-button6.o corelib-checkbox6.o corelib-checklst6.o corelib-choice6.o corelib-colschem.o corelib-combobox5.o corelib-control6.o corelib-dialog6.o corelib-framuniv.o corelib-topluniv.o corelib-gauge4.o corelib-inpcons.o corelib-inphand.o corelib-listbox6.o corelib-menu6.o corelib-notebook4.o corelib-radiobox6.o corelib-radiobut6.o corelib-renderer.o corelib-scrarrow.o corelib-scrolbar5.o corelib-scrthumb.o corelib-slider5.o corelib-spinbutt5.o corelib-statbmp6.o corelib-statbox6.o corelib-statline4.o corelib-stattext6.o corelib-statusbr1.o corelib-toolbar3.o corelib-theme.o corelib-winuniv.o corelib-caret1.o corelib-mdig.o corelib-imaglist.o corelib-colrdlgg.o corelib-listctrl.o corelib-filedlgg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-accel.o corelib-msgdlgg.o corelib-fdrepdlg.o corelib-fontdlgg.o corelib-tabg.o corelib-gtk.o corelib-win32.o corelib-metal.o corelib-selstore.o corelib-busyinfo.o corelib-calctrl.o corelib-choicdgg.o corelib-dcbuffer.o corelib-dcpsg.o corelib-dirctrlg.o corelib-grid.o corelib-gridctrl.o corelib-gridsel.o corelib-laywin.o corelib-logg.o corelib-numdlgg.o corelib-panelg.o corelib-progdlgg.o corelib-sashwin.o corelib-scrlwing.o corelib-spinctlg.o corelib-splash.o corelib-splitter.o corelib-tbarsmpl.o corelib-textdlgg.o corelib-tipdlg.o corelib-tipwin.o corelib-treectlg.o corelib-wizard.o corelib-appcmn.o corelib-fontmap.o corelib-accesscmn.o corelib-artprov.o corelib-artstd.o corelib-bmpbase.o corelib-choiccmn.o corelib-clipcmn.o corelib-cmdproc.o corelib-cmndata.o corelib-containr.o corelib-cshelp.o corelib-ctrlcmn.o corelib-ctrlsub.o corelib-datacmn.o corelib-dbgrid.o corelib-dcbase.o corelib-dlgcmn.o corelib-dndcmn.o corelib-dobjcmn.o corelib-docmdi.o corelib-docview.o corelib-dpycmn.o corelib-dseldlg.o corelib-effects.o corelib-fddlgcmn.o corelib-fldlgcmn.o corelib-fontcmn.o corelib-framecmn.o corelib-timercmn.o corelib-toplvcmn.o corelib-gaugecmn.o corelib-gdicmn.o corelib-geometry.o corelib-gifdecod.o corelib-helpbase.o corelib-iconbndl.o corelib-imagall.o corelib-imagbmp.o corelib-image.o corelib-imaggif.o corelib-imagiff.o corelib-imagjpeg.o corelib-imagpcx.o corelib-imagpng.o corelib-imagpnm.o corelib-imagtiff.o corelib-imagxpm.o corelib-imagfill.o corelib-layout.o corelib-lboxcmn.o corelib-matrix.o corelib-menucmn.o corelib-nbkbase.o corelib-paper.o corelib-popupcmn.o corelib-prntbase.o corelib-quantize.o corelib-radiocmn.o corelib-rgncmn.o corelib-settcmn.o corelib-sizer.o corelib-statbar.o corelib-tbarbase.o corelib-textcmn.o corelib-treebase.o corelib-valgen.o corelib-validate.o corelib-valtext.o corelib-wincmn.o corelib-xpmdecod.o
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_DEP = $(__wxzlib___depname)
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_3 = corelib-imaglist.o corelib-colrdlgg.o corelib-listctrl.o corelib-filedlgg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-accel.o corelib-msgdlgg.o corelib-fdrepdlg.o corelib-tabg.o corelib-statusbr.o corelib-bmpbuttn.o corelib-button.o corelib-checkbox.o corelib-checklst.o corelib-choice.o corelib-combobox.o corelib-control.o corelib-dialog.o corelib-fontdlg.o corelib-frame.o corelib-gauge.o corelib-joystick2.o corelib-listbox.o corelib-mdi.o corelib-menu.o corelib-minifram2.o corelib-msgdlg.o corelib-notebook.o corelib-radiobox.o corelib-radiobut.o corelib-scrolbar.o corelib-scrolwin.o corelib-slider.o corelib-spinbutt.o corelib-spinctrl.o corelib-statbmp.o corelib-statbox.o corelib-statline.o corelib-stattext.o corelib-tbargtk.o corelib-textctrl.o corelib-tglbtn.o corelib-utilsres.o corelib-wave1.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = corelib-gsockmot.o corelib-accel1.o corelib-app4.o corelib-bmpbuttn1.o corelib-bmpmotif.o corelib-button1.o corelib-checkbox1.o corelib-checklst1.o corelib-choice1.o corelib-clipbrd4.o corelib-colour4.o corelib-combobox1.o corelib-combobox_native.o corelib-control1.o corelib-cursor4.o corelib-data4.o corelib-dataobj3.o corelib-dc4.o corelib-dcclient4.o corelib-dcmemory4.o corelib-dcscreen4.o corelib-dialog1.o corelib-evtloop4.o corelib-filedlg.o corelib-font4.o corelib-frame1.o corelib-gauge1.o corelib-gdiobj4.o corelib-glcanvas2.o corelib-icon4.o corelib-listbox1.o corelib-main2.o corelib-mdi1.o corelib-menu1.o corelib-menuitem.o corelib-minifram3.o corelib-msgdlg1.o corelib-palette3.o corelib-radiobox1.o corelib-radiobut1.o corelib-scrolbar1.o corelib-settings4.o corelib-slider1.o corelib-spinbutt1.o corelib-statbmp1.o corelib-statbox1.o corelib-stattext1.o corelib-toolbar.o corelib-textctrl1.o corelib-timer3.o corelib-toplevel4.o corelib-utils2.o corelib-window4.o corelib-fdrepdlg.o corelib-listctrl.o corelib-imaglist.o corelib-notebook1.o corelib-fontdlgg.o corelib-colrdlgg.o corelib-statline1.o corelib-tabg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-statusbr.o
@@ -1621,7 +1619,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_DEP_1 = $(__wxodbc___depname)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_LIBR = $(top_builddir)lib/libwxtiff.a
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p_2 = -lwxtiff
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_5 = coredll-fontenum.o coredll-fontutil.o coredll-utilsx11.o coredll-taskbarcmn.o coredll-taskbarx11.o coredll-printps.o coredll-dialup.o coredll-gsockgtk.o coredll-win_gtk.o coredll-app.o coredll-bitmap.o coredll-brush.o coredll-clipbrd.o coredll-colour.o coredll-cursor.o coredll-data.o coredll-dataobj.o coredll-dc.o coredll-dcclient.o coredll-dcmemory.o coredll-dcscreen.o coredll-dnd.o coredll-evtloop.o coredll-font.o coredll-toplevel.o coredll-gdiobj.o coredll-icon.o coredll-main.o coredll-pen.o coredll-popupwin.o coredll-region.o coredll-settings.o coredll-timer.o coredll-tooltip.o coredll-utilsgtk.o coredll-window.o coredll-paletteg.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = coredll-fontenum.o coredll-fontutil.o coredll-utilsx11.o coredll-taskbarcmn.o coredll-taskbarx11.o coredll-printps.o coredll-dialup.o coredll-region1.o coredll-pen1.o coredll-brush1.o coredll-bitmap1.o coredll-utilsx.o
@@ -1682,11 +1680,11 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_WXUSE_LIBPNG_BUILTIN@__wxpng___depname = $(top_builddir)lib/libwxpng.a
 @COND_USE_GUI_0@__CORE_SRC_OBJECTS = init.o
-@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o appcmn.o event.o fontmap.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o datacmn.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o timercmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o imagfill.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o
-@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS_1) $(__UNIV_TEXTCTRL_OBJECTS) monodll-bmpbuttn5.o monodll-button5.o monodll-checkbox5.o monodll-checklst5.o monodll-choice5.o colschem.o monodll-combobox4.o monodll-control5.o monodll-dialog5.o framuniv.o topluniv.o monodll-gauge3.o inpcons.o inphand.o monodll-listbox5.o monodll-menu5.o monodll-notebook3.o monodll-radiobox5.o monodll-radiobut5.o renderer.o scrarrow.o monodll-scrolbar4.o scrthumb.o monodll-slider4.o monodll-spinbutt4.o monodll-statbmp5.o monodll-statbox5.o monodll-statline3.o monodll-stattext5.o monodll-statusbr.o monodll-toolbar2.o theme.o winuniv.o monodll-caret.o mdig.o imaglist.o colrdlgg.o listctrl.o filedlgg.o dirdlgg.o prntdlgg.o accel.o msgdlgg.o fdrepdlg.o fontdlgg.o tabg.o gtk.o win32.o metal.o selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o appcmn.o event.o fontmap.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o datacmn.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o timercmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o imagfill.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o appcmn.o fontmap.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o datacmn.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o timercmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o imagfill.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o
+@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS_1) $(__UNIV_TEXTCTRL_OBJECTS) monodll-bmpbuttn5.o monodll-button5.o monodll-checkbox5.o monodll-checklst5.o monodll-choice5.o colschem.o monodll-combobox4.o monodll-control5.o monodll-dialog5.o framuniv.o topluniv.o monodll-gauge3.o inpcons.o inphand.o monodll-listbox5.o monodll-menu5.o monodll-notebook3.o monodll-radiobox5.o monodll-radiobut5.o renderer.o scrarrow.o monodll-scrolbar4.o scrthumb.o monodll-slider4.o monodll-spinbutt4.o monodll-statbmp5.o monodll-statbox5.o monodll-statline3.o monodll-stattext5.o monodll-statusbr.o monodll-toolbar2.o theme.o winuniv.o monodll-caret.o mdig.o imaglist.o colrdlgg.o listctrl.o filedlgg.o dirdlgg.o prntdlgg.o accel.o msgdlgg.o fdrepdlg.o fontdlgg.o tabg.o gtk.o win32.o metal.o selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o appcmn.o fontmap.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o datacmn.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o timercmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o imagfill.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_LIBR = $(top_builddir)lib/libwxpng.a
-@COND_USE_GUI_0@__MONOLIB_SRC_OBJECTS = init.o appbase.o clntdata.o cmdline.o config.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fs_inet.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o tokenzr.o txtstrm.o unzip.o url.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) fs_mem.o msgout.o utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS)
-@COND_USE_GUI_1@__MONOLIB_SRC_OBJECTS = appbase.o clntdata.o cmdline.o config.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fs_inet.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o tokenzr.o txtstrm.o unzip.o url.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) fs_mem.o msgout.o utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__CORE_SRC_OBJECTS) helpdata.o helpfrm.o helpctrl.o htmlcell.o htmlfilt.o htmlpars.o htmltag.o htmlwin.o winpars.o m_fonts.o m_hline.o m_image.o m_layout.o m_links.o m_list.o m_dflist.o m_pre.o m_tables.o m_style.o htmprint.o
+@COND_USE_GUI_0@__MONOLIB_SRC_OBJECTS = init.o appbase.o clntdata.o cmdline.o config.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fs_inet.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o tokenzr.o txtstrm.o unzip.o url.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) fs_mem.o msgout.o utilscmn.o event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS)
+@COND_USE_GUI_1@__MONOLIB_SRC_OBJECTS = appbase.o clntdata.o cmdline.o config.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fs_inet.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o tokenzr.o txtstrm.o unzip.o url.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) fs_mem.o msgout.o utilscmn.o event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__CORE_SRC_OBJECTS) helpdata.o helpfrm.o helpctrl.o htmlcell.o htmlfilt.o htmlpars.o htmltag.o htmlwin.o winpars.o m_fonts.o m_hline.o m_image.o m_layout.o m_links.o m_list.o m_dflist.o m_pre.o m_tables.o m_style.o htmprint.o
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_11 = -D__WXUNIVERSAL__
 @COND_TOOLKIT_X11@UNIV_TEXTCTRL = src/x11/textctrl.cpp
 @COND_TOOLKIT_MGL@UNIV_TEXTCTRL = src/univ/textctrl.cpp
@@ -1698,8 +1696,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__coredll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__coredll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__coredll___targetsuf2 = .0.$(SO_SUFFIX)
-@COND_USE_GUI_0@__MONOLIB_SRC_OBJECTS_1 = monolib-init.o monolib-appbase.o monolib-clntdata.o monolib-cmdline.o monolib-config.o monolib-datetime.o monolib-datstrm.o monolib-db.o monolib-dbtable.o monolib-dircmn.o monolib-dynarray.o monolib-dynlib.o monolib-dynload.o monolib-encconv.o monolib-extended.o monolib-ffile.o monolib-file.o monolib-fileconf.o monolib-filefn.o monolib-filename.o monolib-filesys.o monolib-fmapbase.o monolib-fs_inet.o monolib-fs_zip.o monolib-ftp.o monolib-hash.o monolib-hashmap.o monolib-http.o monolib-intl.o monolib-ipcbase.o monolib-list.o monolib-log.o monolib-longlong.o monolib-memory.o monolib-mimecmn.o monolib-module.o monolib-mstream.o monolib-object.o monolib-process.o monolib-protocol.o monolib-regex.o monolib-sckaddr.o monolib-sckfile.o monolib-sckipc.o monolib-sckstrm.o monolib-socket.o monolib-stopwatch.o monolib-strconv.o monolib-stream.o monolib-string.o monolib-sysopt.o monolib-textbuf.o monolib-textfile.o monolib-tokenzr.o monolib-txtstrm.o monolib-unzip.o monolib-url.o monolib-variant.o monolib-wfstream.o monolib-wxchar.o monolib-zipstrm.o monolib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) monolib-fs_mem.o monolib-msgout.o monolib-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2)
-@COND_USE_GUI_1@__MONOLIB_SRC_OBJECTS_1 = monolib-appbase.o monolib-clntdata.o monolib-cmdline.o monolib-config.o monolib-datetime.o monolib-datstrm.o monolib-db.o monolib-dbtable.o monolib-dircmn.o monolib-dynarray.o monolib-dynlib.o monolib-dynload.o monolib-encconv.o monolib-extended.o monolib-ffile.o monolib-file.o monolib-fileconf.o monolib-filefn.o monolib-filename.o monolib-filesys.o monolib-fmapbase.o monolib-fs_inet.o monolib-fs_zip.o monolib-ftp.o monolib-hash.o monolib-hashmap.o monolib-http.o monolib-intl.o monolib-ipcbase.o monolib-list.o monolib-log.o monolib-longlong.o monolib-memory.o monolib-mimecmn.o monolib-module.o monolib-mstream.o monolib-object.o monolib-process.o monolib-protocol.o monolib-regex.o monolib-sckaddr.o monolib-sckfile.o monolib-sckipc.o monolib-sckstrm.o monolib-socket.o monolib-stopwatch.o monolib-strconv.o monolib-stream.o monolib-string.o monolib-sysopt.o monolib-textbuf.o monolib-textfile.o monolib-tokenzr.o monolib-txtstrm.o monolib-unzip.o monolib-url.o monolib-variant.o monolib-wfstream.o monolib-wxchar.o monolib-zipstrm.o monolib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_3) monolib-fs_mem.o monolib-msgout.o monolib-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) $(__CORE_SRC_OBJECTS_1) monolib-helpdata.o monolib-helpfrm.o monolib-helpctrl.o monolib-htmlcell.o monolib-htmlfilt.o monolib-htmlpars.o monolib-htmltag.o monolib-htmlwin.o monolib-winpars.o monolib-m_fonts.o monolib-m_hline.o monolib-m_image.o monolib-m_layout.o monolib-m_links.o monolib-m_list.o monolib-m_dflist.o monolib-m_pre.o monolib-m_tables.o monolib-m_style.o monolib-htmprint.o
+@COND_USE_GUI_0@__MONOLIB_SRC_OBJECTS_1 = monolib-init.o monolib-appbase.o monolib-clntdata.o monolib-cmdline.o monolib-config.o monolib-datetime.o monolib-datstrm.o monolib-db.o monolib-dbtable.o monolib-dircmn.o monolib-dynarray.o monolib-dynlib.o monolib-dynload.o monolib-encconv.o monolib-extended.o monolib-ffile.o monolib-file.o monolib-fileconf.o monolib-filefn.o monolib-filename.o monolib-filesys.o monolib-fmapbase.o monolib-fs_inet.o monolib-fs_zip.o monolib-ftp.o monolib-hash.o monolib-hashmap.o monolib-http.o monolib-intl.o monolib-ipcbase.o monolib-list.o monolib-log.o monolib-longlong.o monolib-memory.o monolib-mimecmn.o monolib-module.o monolib-mstream.o monolib-object.o monolib-process.o monolib-protocol.o monolib-regex.o monolib-sckaddr.o monolib-sckfile.o monolib-sckipc.o monolib-sckstrm.o monolib-socket.o monolib-stopwatch.o monolib-strconv.o monolib-stream.o monolib-string.o monolib-sysopt.o monolib-textbuf.o monolib-textfile.o monolib-tokenzr.o monolib-txtstrm.o monolib-unzip.o monolib-url.o monolib-variant.o monolib-wfstream.o monolib-wxchar.o monolib-zipstrm.o monolib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) monolib-fs_mem.o monolib-msgout.o monolib-utilscmn.o monolib-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2)
+@COND_USE_GUI_1@__MONOLIB_SRC_OBJECTS_1 = monolib-appbase.o monolib-clntdata.o monolib-cmdline.o monolib-config.o monolib-datetime.o monolib-datstrm.o monolib-db.o monolib-dbtable.o monolib-dircmn.o monolib-dynarray.o monolib-dynlib.o monolib-dynload.o monolib-encconv.o monolib-extended.o monolib-ffile.o monolib-file.o monolib-fileconf.o monolib-filefn.o monolib-filename.o monolib-filesys.o monolib-fmapbase.o monolib-fs_inet.o monolib-fs_zip.o monolib-ftp.o monolib-hash.o monolib-hashmap.o monolib-http.o monolib-intl.o monolib-ipcbase.o monolib-list.o monolib-log.o monolib-longlong.o monolib-memory.o monolib-mimecmn.o monolib-module.o monolib-mstream.o monolib-object.o monolib-process.o monolib-protocol.o monolib-regex.o monolib-sckaddr.o monolib-sckfile.o monolib-sckipc.o monolib-sckstrm.o monolib-socket.o monolib-stopwatch.o monolib-strconv.o monolib-stream.o monolib-string.o monolib-sysopt.o monolib-textbuf.o monolib-textfile.o monolib-tokenzr.o monolib-txtstrm.o monolib-unzip.o monolib-url.o monolib-variant.o monolib-wfstream.o monolib-wxchar.o monolib-zipstrm.o monolib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_3) monolib-fs_mem.o monolib-msgout.o monolib-utilscmn.o monolib-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) $(__CORE_SRC_OBJECTS_1) monolib-helpdata.o monolib-helpfrm.o monolib-helpctrl.o monolib-htmlcell.o monolib-htmlfilt.o monolib-htmlpars.o monolib-htmltag.o monolib-htmlwin.o monolib-winpars.o monolib-m_fonts.o monolib-m_hline.o monolib-m_image.o monolib-m_layout.o monolib-m_links.o monolib-m_list.o monolib-m_dflist.o monolib-m_pre.o monolib-m_tables.o monolib-m_style.o monolib-htmprint.o
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_USE_SOVERLINUX_1@__coredll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf2)
 @COND_USE_SOVERSOLARIS_1@__coredll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf3)
@@ -1803,7 +1801,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_GUI_0@    src/common/zipstrm.cpp \
 @COND_USE_GUI_0@    src/common/zstream.cpp $(BASE_PLATFORM_SRC) src/common/fs_mem.cpp \
 @COND_USE_GUI_0@    src/common/msgout.cpp \
-@COND_USE_GUI_0@    src/common/utilscmn.cpp $(BASE_AND_GUI_PLATFORM_SRC)
+@COND_USE_GUI_0@    src/common/utilscmn.cpp \
+@COND_USE_GUI_0@    src/common/event.cpp $(BASE_AND_GUI_PLATFORM_SRC)
 @COND_USE_GUI_1@MONOLIB_SRC = src/common/appbase.cpp \
 @COND_USE_GUI_1@    src/common/clntdata.cpp \
 @COND_USE_GUI_1@    src/common/cmdline.cpp \
@@ -1866,7 +1865,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_GUI_1@    src/common/zipstrm.cpp \
 @COND_USE_GUI_1@    src/common/zstream.cpp $(BASE_PLATFORM_SRC) src/common/fs_mem.cpp \
 @COND_USE_GUI_1@    src/common/msgout.cpp \
-@COND_USE_GUI_1@    src/common/utilscmn.cpp $(BASE_AND_GUI_PLATFORM_SRC) $(CORE_SRC) src/html/helpdata.cpp \
+@COND_USE_GUI_1@    src/common/utilscmn.cpp \
+@COND_USE_GUI_1@    src/common/event.cpp $(BASE_AND_GUI_PLATFORM_SRC) $(CORE_SRC) src/html/helpdata.cpp \
 @COND_USE_GUI_1@    src/html/helpfrm.cpp \
 @COND_USE_GUI_1@    src/html/helpctrl.cpp \
 @COND_USE_GUI_1@    src/html/htmlcell.cpp \
@@ -3750,6 +3750,9 @@ framecmn.o: $(srcdir)/src/common/framecmn.cpp
 tipwin.o: $(srcdir)/src/generic/tipwin.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
+baselib-event.o: $(srcdir)/src/common/event.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $<
+
 monolib-dc7.o: $(srcdir)/src/os2/dc.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 $(CXXFLAGS) $<
 
@@ -4917,9 +4920,9 @@ corelib-notebook2.o: $(srcdir)/src/msw/notebook.cpp
 coredll-utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) -I$(srcdir)/include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
-$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5.a: corelib-fs_mem.o corelib-msgout.o corelib-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_7) $(__CORE_SRC_OBJECTS_3)
+$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5.a: corelib-fs_mem.o corelib-msgout.o corelib-utilscmn.o corelib-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_7) $(__CORE_SRC_OBJECTS_3)
        rm -f $@
-       $(AR) rcu $@  corelib-fs_mem.o corelib-msgout.o corelib-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_7) $(__CORE_SRC_OBJECTS_3)
+       $(AR) rcu $@  corelib-fs_mem.o corelib-msgout.o corelib-utilscmn.o corelib-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_7) $(__CORE_SRC_OBJECTS_3)
        $(RANLIB) $@
 
 corelib-scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp
@@ -4986,9 +4989,9 @@ install_corelib:
 corelib-calctrl.o: $(srcdir)/src/generic/calctrl.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_8) -I$(srcdir)/include $(CXXFLAGS) $<
 
-$(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5.a: baselib-appbase.o baselib-clntdata.o baselib-cmdline.o baselib-config.o baselib-datetime.o baselib-datstrm.o baselib-db.o baselib-dbtable.o baselib-dircmn.o baselib-dynarray.o baselib-dynlib.o baselib-dynload.o baselib-encconv.o baselib-extended.o baselib-ffile.o baselib-file.o baselib-fileconf.o baselib-filefn.o baselib-filename.o baselib-filesys.o baselib-fmapbase.o baselib-fs_inet.o baselib-fs_zip.o baselib-ftp.o baselib-hash.o baselib-hashmap.o baselib-http.o baselib-intl.o baselib-ipcbase.o baselib-list.o baselib-log.o baselib-longlong.o baselib-memory.o baselib-mimecmn.o baselib-module.o baselib-mstream.o baselib-object.o baselib-process.o baselib-protocol.o baselib-regex.o baselib-sckaddr.o baselib-sckfile.o baselib-sckipc.o baselib-sckstrm.o baselib-socket.o baselib-stopwatch.o baselib-strconv.o baselib-stream.o baselib-string.o baselib-sysopt.o baselib-textbuf.o baselib-textfile.o baselib-tokenzr.o baselib-txtstrm.o baselib-unzip.o baselib-url.o baselib-variant.o baselib-wfstream.o baselib-wxchar.o baselib-zipstrm.o baselib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_5) baselib-fs_mem.o baselib-msgout.o baselib-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5)
+$(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5.a: baselib-appbase.o baselib-clntdata.o baselib-cmdline.o baselib-config.o baselib-datetime.o baselib-datstrm.o baselib-db.o baselib-dbtable.o baselib-dircmn.o baselib-dynarray.o baselib-dynlib.o baselib-dynload.o baselib-encconv.o baselib-extended.o baselib-ffile.o baselib-file.o baselib-fileconf.o baselib-filefn.o baselib-filename.o baselib-filesys.o baselib-fmapbase.o baselib-fs_inet.o baselib-fs_zip.o baselib-ftp.o baselib-hash.o baselib-hashmap.o baselib-http.o baselib-intl.o baselib-ipcbase.o baselib-list.o baselib-log.o baselib-longlong.o baselib-memory.o baselib-mimecmn.o baselib-module.o baselib-mstream.o baselib-object.o baselib-process.o baselib-protocol.o baselib-regex.o baselib-sckaddr.o baselib-sckfile.o baselib-sckipc.o baselib-sckstrm.o baselib-socket.o baselib-stopwatch.o baselib-strconv.o baselib-stream.o baselib-string.o baselib-sysopt.o baselib-textbuf.o baselib-textfile.o baselib-tokenzr.o baselib-txtstrm.o baselib-unzip.o baselib-url.o baselib-variant.o baselib-wfstream.o baselib-wxchar.o baselib-zipstrm.o baselib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_5) baselib-fs_mem.o baselib-msgout.o baselib-utilscmn.o baselib-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5)
        rm -f $@
-       $(AR) rcu $@  baselib-appbase.o baselib-clntdata.o baselib-cmdline.o baselib-config.o baselib-datetime.o baselib-datstrm.o baselib-db.o baselib-dbtable.o baselib-dircmn.o baselib-dynarray.o baselib-dynlib.o baselib-dynload.o baselib-encconv.o baselib-extended.o baselib-ffile.o baselib-file.o baselib-fileconf.o baselib-filefn.o baselib-filename.o baselib-filesys.o baselib-fmapbase.o baselib-fs_inet.o baselib-fs_zip.o baselib-ftp.o baselib-hash.o baselib-hashmap.o baselib-http.o baselib-intl.o baselib-ipcbase.o baselib-list.o baselib-log.o baselib-longlong.o baselib-memory.o baselib-mimecmn.o baselib-module.o baselib-mstream.o baselib-object.o baselib-process.o baselib-protocol.o baselib-regex.o baselib-sckaddr.o baselib-sckfile.o baselib-sckipc.o baselib-sckstrm.o baselib-socket.o baselib-stopwatch.o baselib-strconv.o baselib-stream.o baselib-string.o baselib-sysopt.o baselib-textbuf.o baselib-textfile.o baselib-tokenzr.o baselib-txtstrm.o baselib-unzip.o baselib-url.o baselib-variant.o baselib-wfstream.o baselib-wxchar.o baselib-zipstrm.o baselib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_5) baselib-fs_mem.o baselib-msgout.o baselib-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5)
+       $(AR) rcu $@  baselib-appbase.o baselib-clntdata.o baselib-cmdline.o baselib-config.o baselib-datetime.o baselib-datstrm.o baselib-db.o baselib-dbtable.o baselib-dircmn.o baselib-dynarray.o baselib-dynlib.o baselib-dynload.o baselib-encconv.o baselib-extended.o baselib-ffile.o baselib-file.o baselib-fileconf.o baselib-filefn.o baselib-filename.o baselib-filesys.o baselib-fmapbase.o baselib-fs_inet.o baselib-fs_zip.o baselib-ftp.o baselib-hash.o baselib-hashmap.o baselib-http.o baselib-intl.o baselib-ipcbase.o baselib-list.o baselib-log.o baselib-longlong.o baselib-memory.o baselib-mimecmn.o baselib-module.o baselib-mstream.o baselib-object.o baselib-process.o baselib-protocol.o baselib-regex.o baselib-sckaddr.o baselib-sckfile.o baselib-sckipc.o baselib-sckstrm.o baselib-socket.o baselib-stopwatch.o baselib-strconv.o baselib-stream.o baselib-string.o baselib-sysopt.o baselib-textbuf.o baselib-textfile.o baselib-tokenzr.o baselib-txtstrm.o baselib-unzip.o baselib-url.o baselib-variant.o baselib-wfstream.o baselib-wxchar.o baselib-zipstrm.o baselib-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_5) baselib-fs_mem.o baselib-msgout.o baselib-utilscmn.o baselib-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5)
        $(RANLIB) $@
 
 corelib-toolbar1.o: $(srcdir)/src/mac/toolbar.cpp
@@ -6071,8 +6074,8 @@ coredll-wizard.o: $(srcdir)/src/generic/wizard.cpp
 corelib-droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_8) -I$(srcdir)/include $(CXXFLAGS) $<
 
-$(top_builddir)lib/$(DLLPREFIX)wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)-2.5$(__basedll___targetsuf3): basedll-appbase.o basedll-clntdata.o basedll-cmdline.o basedll-config.o basedll-datetime.o basedll-datstrm.o basedll-db.o basedll-dbtable.o basedll-dircmn.o basedll-dynarray.o basedll-dynlib.o basedll-dynload.o basedll-encconv.o basedll-extended.o basedll-ffile.o basedll-file.o basedll-fileconf.o basedll-filefn.o basedll-filename.o basedll-filesys.o basedll-fmapbase.o basedll-fs_inet.o basedll-fs_zip.o basedll-ftp.o basedll-hash.o basedll-hashmap.o basedll-http.o basedll-intl.o basedll-ipcbase.o basedll-list.o basedll-log.o basedll-longlong.o basedll-memory.o basedll-mimecmn.o basedll-module.o basedll-mstream.o basedll-object.o basedll-process.o basedll-protocol.o basedll-regex.o basedll-sckaddr.o basedll-sckfile.o basedll-sckipc.o basedll-sckstrm.o basedll-socket.o basedll-stopwatch.o basedll-strconv.o basedll-stream.o basedll-string.o basedll-sysopt.o basedll-textbuf.o basedll-textfile.o basedll-tokenzr.o basedll-txtstrm.o basedll-unzip.o basedll-url.o basedll-variant.o basedll-wfstream.o basedll-wxchar.o basedll-zipstrm.o basedll-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_4) basedll-fs_mem.o basedll-msgout.o basedll-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__LIB_ZLIB_DEP_1) $(__LIB_REGEX_DEP_1) $(__LIB_PNG_DEP_1) $(__LIB_JPEG_DEP_1) $(__LIB_TIFF_DEP_1)
-       $(SHARED_LD_CXX) $@  basedll-appbase.o basedll-clntdata.o basedll-cmdline.o basedll-config.o basedll-datetime.o basedll-datstrm.o basedll-db.o basedll-dbtable.o basedll-dircmn.o basedll-dynarray.o basedll-dynlib.o basedll-dynload.o basedll-encconv.o basedll-extended.o basedll-ffile.o basedll-file.o basedll-fileconf.o basedll-filefn.o basedll-filename.o basedll-filesys.o basedll-fmapbase.o basedll-fs_inet.o basedll-fs_zip.o basedll-ftp.o basedll-hash.o basedll-hashmap.o basedll-http.o basedll-intl.o basedll-ipcbase.o basedll-list.o basedll-log.o basedll-longlong.o basedll-memory.o basedll-mimecmn.o basedll-module.o basedll-mstream.o basedll-object.o basedll-process.o basedll-protocol.o basedll-regex.o basedll-sckaddr.o basedll-sckfile.o basedll-sckipc.o basedll-sckstrm.o basedll-socket.o basedll-stopwatch.o basedll-strconv.o basedll-stream.o basedll-string.o basedll-sysopt.o basedll-textbuf.o basedll-textfile.o basedll-tokenzr.o basedll-txtstrm.o basedll-unzip.o basedll-url.o basedll-variant.o basedll-wfstream.o basedll-wxchar.o basedll-zipstrm.o basedll-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_4) basedll-fs_mem.o basedll-msgout.o basedll-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4)  $(__basedll___importlib) -L$(top_builddir)lib $(__basedll___importlib) $(__basedll___macinstnamecmd) $(__basedll___soname_flags) $(__basedll___macver) $(EXTRALIBS) $(__LIB_JPEG_p_1) $(__LIB_PNG_p_1) $(__LIB_ZLIB_p_1) $(__LIB_TIFF_p_1) $(__LIB_ODBC_p_1) $(__LIB_REGEX_p_1) $(__LIB_ZLIB_LIBR_1) $(__LIB_REGEX_LIBR_1) $(__LIB_PNG_LIBR_1) $(__LIB_JPEG_LIBR_1) $(__LIB_TIFF_LIBR_1)
+$(top_builddir)lib/$(DLLPREFIX)wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)-2.5$(__basedll___targetsuf3): basedll-appbase.o basedll-clntdata.o basedll-cmdline.o basedll-config.o basedll-datetime.o basedll-datstrm.o basedll-db.o basedll-dbtable.o basedll-dircmn.o basedll-dynarray.o basedll-dynlib.o basedll-dynload.o basedll-encconv.o basedll-extended.o basedll-ffile.o basedll-file.o basedll-fileconf.o basedll-filefn.o basedll-filename.o basedll-filesys.o basedll-fmapbase.o basedll-fs_inet.o basedll-fs_zip.o basedll-ftp.o basedll-hash.o basedll-hashmap.o basedll-http.o basedll-intl.o basedll-ipcbase.o basedll-list.o basedll-log.o basedll-longlong.o basedll-memory.o basedll-mimecmn.o basedll-module.o basedll-mstream.o basedll-object.o basedll-process.o basedll-protocol.o basedll-regex.o basedll-sckaddr.o basedll-sckfile.o basedll-sckipc.o basedll-sckstrm.o basedll-socket.o basedll-stopwatch.o basedll-strconv.o basedll-stream.o basedll-string.o basedll-sysopt.o basedll-textbuf.o basedll-textfile.o basedll-tokenzr.o basedll-txtstrm.o basedll-unzip.o basedll-url.o basedll-variant.o basedll-wfstream.o basedll-wxchar.o basedll-zipstrm.o basedll-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_4) basedll-fs_mem.o basedll-msgout.o basedll-utilscmn.o basedll-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__LIB_ZLIB_DEP_1) $(__LIB_REGEX_DEP_1) $(__LIB_PNG_DEP_1) $(__LIB_JPEG_DEP_1) $(__LIB_TIFF_DEP_1)
+       $(SHARED_LD_CXX) $@  basedll-appbase.o basedll-clntdata.o basedll-cmdline.o basedll-config.o basedll-datetime.o basedll-datstrm.o basedll-db.o basedll-dbtable.o basedll-dircmn.o basedll-dynarray.o basedll-dynlib.o basedll-dynload.o basedll-encconv.o basedll-extended.o basedll-ffile.o basedll-file.o basedll-fileconf.o basedll-filefn.o basedll-filename.o basedll-filesys.o basedll-fmapbase.o basedll-fs_inet.o basedll-fs_zip.o basedll-ftp.o basedll-hash.o basedll-hashmap.o basedll-http.o basedll-intl.o basedll-ipcbase.o basedll-list.o basedll-log.o basedll-longlong.o basedll-memory.o basedll-mimecmn.o basedll-module.o basedll-mstream.o basedll-object.o basedll-process.o basedll-protocol.o basedll-regex.o basedll-sckaddr.o basedll-sckfile.o basedll-sckipc.o basedll-sckstrm.o basedll-socket.o basedll-stopwatch.o basedll-strconv.o basedll-stream.o basedll-string.o basedll-sysopt.o basedll-textbuf.o basedll-textfile.o basedll-tokenzr.o basedll-txtstrm.o basedll-unzip.o basedll-url.o basedll-variant.o basedll-wfstream.o basedll-wxchar.o basedll-zipstrm.o basedll-zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_4) basedll-fs_mem.o basedll-msgout.o basedll-utilscmn.o basedll-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4)  $(__basedll___importlib) -L$(top_builddir)lib $(__basedll___importlib) $(__basedll___macinstnamecmd) $(__basedll___soname_flags) $(__basedll___macver) $(EXTRALIBS) $(__LIB_JPEG_p_1) $(__LIB_PNG_p_1) $(__LIB_ZLIB_p_1) $(__LIB_TIFF_p_1) $(__LIB_ODBC_p_1) $(__LIB_REGEX_p_1) $(__LIB_ZLIB_LIBR_1) $(__LIB_REGEX_LIBR_1) $(__LIB_PNG_LIBR_1) $(__LIB_JPEG_LIBR_1) $(__LIB_TIFF_LIBR_1)
        $(__basedll___so_symlinks_cmd)
 
 monolib-dcmemory2.o: $(srcdir)/src/x11/dcmemory.cpp
@@ -7021,6 +7024,9 @@ corelib-icon6.o: $(srcdir)/src/cocoa/icon.cpp
 monodll-scrolbar2.o: $(srcdir)/src/mac/scrolbar.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
+basedll-event.o: $(srcdir)/src/common/event.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_3) -I$(srcdir)/include -DWXMAKINGDLL -D__WXBASE__ -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG) $<
+
 coredll-checkbox4.o: $(srcdir)/src/cocoa/checkbox.mm
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) -I$(srcdir)/include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
@@ -7787,28 +7793,23 @@ monolib-artstd.o: $(srcdir)/src/common/artstd.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 $(CXXFLAGS) $<
 
 clean: 
-       rm -rf ./.deps
-       rm -f -f ./*.o
+       rm -f ./*.o ./.deps/*
        rm -f $(top_builddir)lib/libwxregex.a
        rm -f $(top_builddir)lib/libwxzlib.a
        rm -f $(top_builddir)lib/libwxpng.a
        rm -f $(top_builddir)lib/libwxjpeg.a
        rm -f $(top_builddir)lib/libwxtiff.a
        rm -f $(top_builddir)lib/libwxodbc.a
-       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3)
-       rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.a
-       rm -f $(top_builddir)lib/$(DLLPREFIX)wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)-2.5$(__basedll___targetsuf3)
-       rm -f $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/$(DLLPREFIX)wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)-2.5$(__basedll___targetsuf3) $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base$(WXCOMPILER)-2.5$(__basedll___targetsuf2)
        rm -f $(top_builddir)lib/libwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5.a
-       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf3)
-       rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5.a
-       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)-2.5$(__htmldll___targetsuf3)
-       rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)-2.5$(__htmldll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)-2.5$(__htmldll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5.a
        rm -f lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.rsrc lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
@@ -8102,8 +8103,8 @@ corelib-wincmn.o: $(srcdir)/src/common/wincmn.cpp
 coredll-statbmp5.o: $(srcdir)/src/os2/statbmp.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) -I$(srcdir)/include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
-coredll-dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp
-       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) -I$(srcdir)/include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+monolib-evtloop1.o: $(srcdir)/src/msw/evtloop.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 $(CXXFLAGS) $<
 
 colordlg.o: $(srcdir)/src/msw/colordlg.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
@@ -9073,8 +9074,8 @@ corelib-dialup1.o: $(srcdir)/src/msw/dialup.cpp
 monolib-effects.o: $(srcdir)/src/common/effects.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 $(CXXFLAGS) $<
 
-$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf3): coredll-fs_mem.o coredll-msgout.o coredll-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_6) $(__CORE_SRC_OBJECTS_2) $(__LIB_ODBC_DEP_1)
-       $(SHARED_LD_CXX) $@  coredll-fs_mem.o coredll-msgout.o coredll-utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_6) $(__CORE_SRC_OBJECTS_2)  $(__coredll___importlib) -L$(top_builddir)lib $(__coredll___importlib) $(__coredll___macinstnamecmd) $(__coredll___soname_flags) $(__coredll___macver) $(EXTRALIBS) $(__LIB_JPEG_p_2) $(__LIB_PNG_p_2) $(__LIB_ZLIB_p_2) $(__LIB_TIFF_p_2) $(__LIB_ODBC_p_2) $(__LIB_REGEX_p_2) $(__WXLIB_BASE_p) $(__LIB_ODBC_LIBR_1)
+$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)-2.5$(__coredll___targetsuf3): coredll-fs_mem.o coredll-msgout.o coredll-utilscmn.o coredll-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_6) $(__CORE_SRC_OBJECTS_2) $(__LIB_ODBC_DEP_1)
+       $(SHARED_LD_CXX) $@  coredll-fs_mem.o coredll-msgout.o coredll-utilscmn.o coredll-event.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_6) $(__CORE_SRC_OBJECTS_2)  $(__coredll___importlib) -L$(top_builddir)lib $(__coredll___importlib) $(__coredll___macinstnamecmd) $(__coredll___soname_flags) $(__coredll___macver) $(EXTRALIBS) $(__LIB_JPEG_p_2) $(__LIB_PNG_p_2) $(__LIB_ZLIB_p_2) $(__LIB_TIFF_p_2) $(__LIB_ODBC_p_2) $(__LIB_REGEX_p_2) $(__WXLIB_BASE_p) $(__LIB_ODBC_LIBR_1)
        $(__coredll___so_symlinks_cmd)
 
 coredll-fontdlg2.o: $(srcdir)/src/mac/fontdlg.cpp
@@ -9216,8 +9217,8 @@ monolib-icon2.o: $(srcdir)/src/x11/icon.cpp
 coredll-icon6.o: $(srcdir)/src/cocoa/icon.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) -I$(srcdir)/include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
-monolib-evtloop1.o: $(srcdir)/src/msw/evtloop.cpp
-       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 $(CXXFLAGS) $<
+coredll-dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) -I$(srcdir)/include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
 
 monolib-evtloop3.o: $(srcdir)/src/mgl/evtloop.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/include -D__WXBASE__ -DwxUSE_BASE=1 $(CXXFLAGS) $<