reverted the delete/Destroy() change in DestroyChildren()

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1322112c93c5080a4e33cbc70647c1775ec91398..eb87c0f49553f419c9a69b1ef72379621e60091f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,7 @@ CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 DEREZ = @DEREZ@
+DESTDIR = @DESTDIR@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
@@ -197,6 +198,7 @@ ALL_BASE_HEADERS =  \
        wx/url.h \
        $(NET_PLATFORM_HDR) \
        wx/xml/xml.h \
+       wx/xtixml.h \
        wx/db.h \
        wx/dbkeyg.h \
        wx/dbtable.h
@@ -273,12 +275,17 @@ ALL_BASE_SOURCES =  \
        src/mac/mimetmac.cpp \
        src/unix/baseunix.cpp \
        src/mac/utilsexc.cpp \
+       src/mac/thread.cpp \
+       src/mac/macnotfy.cpp \
+       src/mac/morefilex/MoreFilesX.c \
        src/unix/baseunix.cpp \
        src/unix/dir.cpp \
        src/unix/mimetype.cpp \
        src/unix/snglinst.cpp \
        src/unix/threadpsx.cpp \
        src/os2/dir.cpp \
+       src/os2/mimetype.cpp \
+       src/os2/thread.cpp \
        src/os2/utils.cpp \
        src/os2/utilsexc.cpp \
        src/common/event.cpp \
@@ -287,6 +294,7 @@ ALL_BASE_SOURCES =  \
        src/common/utilscmn.cpp \
        src/unix/utilsunx.cpp \
        src/mac/utils.cpp \
+       src/mac/uma.cpp \
        src/unix/utilsunx.cpp \
        src/msw/main.cpp \
        src/msw/mslu.cpp \
@@ -305,6 +313,7 @@ ALL_BASE_SOURCES =  \
        src/msw/gsocket.c \
        src/mac/gsocket.c \
        src/xml/xml.cpp \
+       src/common/xtixml.cpp \
        src/common/db.cpp \
        src/common/dbtable.cpp
 ALL_HEADERS =  \
@@ -647,7 +656,8 @@ MONODLL_OBJECTS =  \
        monodll_url.o \
        $(__NET_PLATFORM_SRC_OBJECTS) \
        $(__MONOLIB_GUI_SRC_OBJECTS) \
-       monodll_xml.o
+       monodll_xml.o \
+       monodll_xtixml.o
 MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
@@ -728,7 +738,8 @@ MONOLIB_OBJECTS =  \
        monolib_url.o \
        $(__NET_PLATFORM_SRC_OBJECTS_1) \
        $(__MONOLIB_GUI_SRC_OBJECTS_1) \
-       monolib_xml.o
+       monolib_xml.o \
+       monolib_xtixml.o
 NETDLL_CFLAGS = $(__netdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
@@ -786,12 +797,12 @@ ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
 ODBCLIB_OBJECTS =  \
        odbclib_db.o \
        odbclib_dbtable.o
-WXEXPAT_CFLAGS = $(CPPFLAGS)   -I./src/expat $(CFLAGS)
+WXEXPAT_CFLAGS = $(CPPFLAGS)    -I./src/expat $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        wxexpat_xmlparse.o \
        wxexpat_xmlrole.o \
        wxexpat_xmltok.o
-WXJPEG_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
+WXJPEG_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
 WXJPEG_OBJECTS =  \
        wxjpeg_jcomapi.o \
        wxjpeg_jutils.o \
@@ -839,7 +850,7 @@ WXJPEG_OBJECTS =  \
        wxjpeg_jquant1.o \
        wxjpeg_jquant2.o \
        wxjpeg_jdmerge.o
-WXODBC_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
+WXODBC_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
 WXODBC_OBJECTS =  \
        wxodbc_catalog.o \
        wxodbc_connect.o \
@@ -856,7 +867,7 @@ WXODBC_OBJECTS =  \
        wxodbc_misc.o \
        wxodbc_prepare.o \
        wxodbc_result.o
-WXPNG_CFLAGS = $(CPPFLAGS)   $(__INC_ZLIB_p) $(CFLAGS)
+WXPNG_CFLAGS = $(CPPFLAGS)    $(__INC_ZLIB_p) $(CFLAGS)
 WXPNG_OBJECTS =  \
        wxpng_png.o \
        wxpng_pngerror.o \
@@ -875,13 +886,13 @@ WXPNG_OBJECTS =  \
        wxpng_pngwrite.o \
        wxpng_pngwtran.o \
        wxpng_pngwutil.o
-WXREGEX_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
+WXREGEX_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
 WXREGEX_OBJECTS =  \
        wxregex_regcomp.o \
        wxregex_regexec.o \
        wxregex_regerror.o \
        wxregex_regfree.o
-WXTIFF_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
+WXTIFF_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(__TIFF_PLATFORM_SRC_OBJECTS) \
        wxtiff_tif_aux.o \
@@ -916,7 +927,7 @@ WXTIFF_OBJECTS =  \
        wxtiff_tif_warning.o \
        wxtiff_tif_write.o \
        wxtiff_tif_zip.o
-WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
+WXZLIB_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
 WXZLIB_OBJECTS =  \
        wxzlib_adler32.o \
        wxzlib_compress.o \
@@ -932,20 +943,22 @@ WXZLIB_OBJECTS =  \
        wxzlib_infcodes.o \
        wxzlib_infutil.o \
        wxzlib_inffast.o
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
        -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG)
 XMLDLL_OBJECTS =  \
-       xmldll_xml.o
+       xmldll_xml.o \
+       xmldll_xtixml.o
 XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS)
 XMLLIB_OBJECTS =  \
-       xmllib_xml.o
+       xmllib_xml.o \
+       xmllib_xtixml.o
 
 ### Conditionally set variables: ###
 
@@ -1282,6 +1295,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
        wx/cocoa/gdiobj.h \
        wx/cocoa/icon.h \
        wx/cocoa/listbox.h \
+       wx/cocoa/mbarman.h \
        wx/cocoa/menu.h \
        wx/cocoa/menuitem.h \
        wx/cocoa/pen.h \
@@ -1513,7 +1527,6 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
        wx/motif/radiobut.h \
        wx/motif/region.h \
        wx/motif/scrolbar.h \
-       wx/motif/settings.h \
        wx/motif/slider.h \
        wx/motif/spinbutt.h \
        wx/motif/statbmp.h \
@@ -1659,6 +1672,11 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR)
 COND_TOOLKIT_PM_GUI_HDR =  \
        wx/generic/caret.h \
+       wx/generic/colrdlgg.h \
+       wx/generic/dirdlgg.h \
+       wx/generic/fdrepdlg.h \
+       wx/generic/mdig.h \
+       wx/generic/statusbr.h \
        wx/os2/accel.h \
        wx/os2/app.h \
        wx/os2/bitmap.h \
@@ -1694,6 +1712,7 @@ COND_TOOLKIT_PM_GUI_HDR =  \
        wx/os2/icon.h \
        wx/os2/iniconf.h \
        wx/os2/listbox.h \
+       wx/os2/listctrl.h \
        wx/os2/menu.h \
        wx/os2/menuitem.h \
        wx/os2/metafile.h \
@@ -1725,6 +1744,7 @@ COND_TOOLKIT_PM_GUI_HDR =  \
        wx/os2/toolbar.h \
        wx/os2/tooltip.h \
        wx/os2/toplevel.h \
+       wx/msw/treectrl.h \
        wx/os2/window.h
 @COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR)
 @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
@@ -1760,8 +1780,15 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
        wx/mgl/toplevel.h \
        wx/mgl/window.h
 @COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR)
-@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = wx/generic/caret.h \
-@COND_TOOLKIT_MOTIF@   wx/unix/fontutil.h wx/unix/utilsx11.h
+COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
+       wx/generic/caret.h \
+       wx/unix/fontutil.h \
+       wx/unix/utilsx11.h \
+       wx/x11/bitmap.h \
+       wx/x11/brush.h \
+       wx/x11/pen.h \
+       wx/x11/region.h
+@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = 
 @COND_TOOLKIT_PM@LOWLEVEL_HDR = 
 COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
@@ -1818,9 +1845,9 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)250
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)251
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 @COND_UNICODE_1@WXUNICODEFLAG = u
@@ -1943,12 +1970,18 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_PLATFORM_UNIX_1@ = corelib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
 @COND_PLATFORM_WIN32_1@        = corelib_main.o corelib_mslu.o corelib_volume.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = monodll_utils.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = monolib_utils.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = basedll_utils.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = baselib_utils.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = coredll_utils.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = corelib_utils.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = \
+@COND_TOOLKIT_MAC@     monodll_utils.o monodll_uma.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MAC@     monolib_utils.o monolib_uma.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MAC@     basedll_utils.o basedll_uma.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MAC@     baselib_utils.o baselib_uma.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \
+@COND_TOOLKIT_MAC@     coredll_utils.o coredll_uma.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = \
+@COND_TOOLKIT_MAC@     corelib_utils.o corelib_uma.o
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
        monodll_dir.o \
@@ -1963,9 +1996,15 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_snglinst.o \
        monodll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = \
-@COND_TOOLKIT_MAC@     monodll_dirmac.o monodll_mimetmac.o monodll_baseunix.o \
-@COND_TOOLKIT_MAC@     monodll_utilsexc.o
+COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
+       monodll_dirmac.o \
+       monodll_mimetmac.o \
+       monodll_baseunix.o \
+       monodll_utilsexc.o \
+       monodll_thread.o \
+       monodll_macnotfy.o \
+       monodll_MoreFilesX.o
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
        monolib_dir.o \
@@ -1980,9 +2019,15 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_snglinst.o \
        monolib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_MAC@     monolib_dirmac.o monolib_mimetmac.o monolib_baseunix.o \
-@COND_TOOLKIT_MAC@     monolib_utilsexc.o
+COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
+       monolib_dirmac.o \
+       monolib_mimetmac.o \
+       monolib_baseunix.o \
+       monolib_utilsexc.o \
+       monolib_thread.o \
+       monolib_macnotfy.o \
+       monolib_MoreFilesX.o
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
        basedll_dir.o \
@@ -1997,9 +2042,15 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_snglinst.o \
        basedll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_MAC@     basedll_dirmac.o basedll_mimetmac.o basedll_baseunix.o \
-@COND_TOOLKIT_MAC@     basedll_utilsexc.o
+COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
+       basedll_dirmac.o \
+       basedll_mimetmac.o \
+       basedll_baseunix.o \
+       basedll_utilsexc.o \
+       basedll_thread.o \
+       basedll_macnotfy.o \
+       basedll_MoreFilesX.o
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
        baselib_dir.o \
@@ -2014,13 +2065,24 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_snglinst.o \
        baselib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_MAC@     baselib_dirmac.o baselib_mimetmac.o baselib_baseunix.o \
-@COND_TOOLKIT_MAC@     baselib_utilsexc.o
+COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
+       baselib_dirmac.o \
+       baselib_mimetmac.o \
+       baselib_baseunix.o \
+       baselib_utilsexc.o \
+       baselib_thread.o \
+       baselib_macnotfy.o \
+       baselib_MoreFilesX.o
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)
-@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = \
-@COND_PLATFORM_OS2_1@  monodll_dir.o monodll_utils.o monodll_utilsexc.o
+COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS =  \
+       monodll_dir.o \
+       monodll_mimetype.o \
+       monodll_thread.o \
+       monodll_utils.o \
+       monodll_utilsexc.o
+@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS)
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_baseunix.o \
        monodll_dir.o \
@@ -2043,8 +2105,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_1)
-@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = \
-@COND_PLATFORM_OS2_1@  monolib_dir.o monolib_utils.o monolib_utilsexc.o
+COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_dir.o \
+       monolib_mimetype.o \
+       monolib_thread.o \
+       monolib_utils.o \
+       monolib_utilsexc.o
+@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1)
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
        monolib_dir.o \
@@ -2067,8 +2134,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)
-@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = \
-@COND_PLATFORM_OS2_1@  basedll_dir.o basedll_utils.o basedll_utilsexc.o
+COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
+       basedll_dir.o \
+       basedll_mimetype.o \
+       basedll_thread.o \
+       basedll_utils.o \
+       basedll_utilsexc.o
+@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2)
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
        basedll_dir.o \
@@ -2091,8 +2163,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_3)
-@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = \
-@COND_PLATFORM_OS2_1@  baselib_dir.o baselib_utils.o baselib_utilsexc.o
+COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
+       baselib_dir.o \
+       baselib_mimetype.o \
+       baselib_thread.o \
+       baselib_utils.o \
+       baselib_utilsexc.o
+@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3)
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
        baselib_dir.o \
@@ -3120,6 +3197,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_icon.o \
        monodll_listbox.o \
        monodll_main.o \
+       monodll_mbarman.o \
        monodll_menu.o \
        monodll_menuitem.o \
        monodll_pen.o \
@@ -3237,13 +3315,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_gdiobj.o \
        monodll_icon.o \
        monodll_listbox.o \
-       monodll_macnotfy.o \
        monodll_mdi.o \
        monodll_menu.o \
        monodll_menuitem.o \
        monodll_metafile.o \
        monodll_minifram.o \
-       monodll_MoreFilesX.o \
        monodll_msgdlg.o \
        monodll_notebmac.o \
        monodll_palette.o \
@@ -3266,12 +3342,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_stattext.o \
        monodll_tabctrl.o \
        monodll_textctrl.o \
-       monodll_thread.o \
        monodll_timer.o \
        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
-       monodll_uma.o \
        monodll_window.o \
        monodll_caret.o \
        monodll_fdrepdlg.o \
@@ -3336,6 +3410,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_toplevel.o \
        monodll_utils.o \
        monodll_window.o \
+       monodll_xmcombo.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \
        monodll_fdrepdlg.o \
@@ -3398,6 +3473,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_caret.o \
+       monodll_colrdlgg.o \
+       monodll_dirdlgg.o \
+       monodll_fdrepdlg.o \
+       monodll_imaglist.o \
+       monodll_mdig.o \
+       monodll_msgdlgg.o \
+       monodll_prntdlgg.o \
+       monodll_statusbr.o \
        monodll_accel.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -3435,11 +3518,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_icon.o \
        monodll_iniconf.o \
        monodll_listbox.o \
+       monodll_listctrl.o \
        monodll_main.o \
        monodll_menu.o \
        monodll_menuitem.o \
        monodll_metafile.o \
-       monodll_mimetype.o \
        monodll_msgdlg.o \
        monodll_nativdlg.o \
        monodll_notebook.o \
@@ -3461,11 +3544,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_stattext.o \
        monodll_tabctrl.o \
        monodll_textctrl.o \
-       monodll_thread.o \
        monodll_timer.o \
        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
+       monodll_treectrl.o \
        monodll_utilsgui.o \
        monodll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
@@ -3508,6 +3591,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_icon.o \
        monolib_listbox.o \
        monolib_main.o \
+       monolib_mbarman.o \
        monolib_menu.o \
        monolib_menuitem.o \
        monolib_pen.o \
@@ -3625,13 +3709,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_gdiobj.o \
        monolib_icon.o \
        monolib_listbox.o \
-       monolib_macnotfy.o \
        monolib_mdi.o \
        monolib_menu.o \
        monolib_menuitem.o \
        monolib_metafile.o \
        monolib_minifram.o \
-       monolib_MoreFilesX.o \
        monolib_msgdlg.o \
        monolib_notebmac.o \
        monolib_palette.o \
@@ -3654,12 +3736,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_stattext.o \
        monolib_tabctrl.o \
        monolib_textctrl.o \
-       monolib_thread.o \
        monolib_timer.o \
        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
-       monolib_uma.o \
        monolib_window.o \
        monolib_caret.o \
        monolib_fdrepdlg.o \
@@ -3724,6 +3804,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_toplevel.o \
        monolib_utils.o \
        monolib_window.o \
+       monolib_xmcombo.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \
        monolib_fdrepdlg.o \
@@ -3786,6 +3867,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_caret.o \
+       monolib_colrdlgg.o \
+       monolib_dirdlgg.o \
+       monolib_fdrepdlg.o \
+       monolib_imaglist.o \
+       monolib_mdig.o \
+       monolib_msgdlgg.o \
+       monolib_prntdlgg.o \
+       monolib_statusbr.o \
        monolib_accel.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -3823,11 +3912,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_icon.o \
        monolib_iniconf.o \
        monolib_listbox.o \
+       monolib_listctrl.o \
        monolib_main.o \
        monolib_menu.o \
        monolib_menuitem.o \
        monolib_metafile.o \
-       monolib_mimetype.o \
        monolib_msgdlg.o \
        monolib_nativdlg.o \
        monolib_notebook.o \
@@ -3849,11 +3938,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_stattext.o \
        monolib_tabctrl.o \
        monolib_textctrl.o \
-       monolib_thread.o \
        monolib_timer.o \
        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
+       monolib_treectrl.o \
        monolib_utilsgui.o \
        monolib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
@@ -3896,6 +3985,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_icon.o \
        coredll_listbox.o \
        coredll_main.o \
+       coredll_mbarman.o \
        coredll_menu.o \
        coredll_menuitem.o \
        coredll_pen.o \
@@ -4013,13 +4103,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_gdiobj.o \
        coredll_icon.o \
        coredll_listbox.o \
-       coredll_macnotfy.o \
        coredll_mdi.o \
        coredll_menu.o \
        coredll_menuitem.o \
        coredll_metafile.o \
        coredll_minifram.o \
-       coredll_MoreFilesX.o \
        coredll_msgdlg.o \
        coredll_notebmac.o \
        coredll_palette.o \
@@ -4042,12 +4130,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_stattext.o \
        coredll_tabctrl.o \
        coredll_textctrl.o \
-       coredll_thread.o \
        coredll_timer.o \
        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
-       coredll_uma.o \
        coredll_window.o \
        coredll_caret.o \
        coredll_fdrepdlg.o \
@@ -4112,6 +4198,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_toplevel.o \
        coredll_utils.o \
        coredll_window.o \
+       coredll_xmcombo.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \
        coredll_fdrepdlg.o \
@@ -4174,6 +4261,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_caret.o \
+       coredll_colrdlgg.o \
+       coredll_dirdlgg.o \
+       coredll_fdrepdlg.o \
+       coredll_imaglist.o \
+       coredll_mdig.o \
+       coredll_msgdlgg.o \
+       coredll_prntdlgg.o \
+       coredll_statusbr.o \
        coredll_accel.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -4211,11 +4306,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_icon.o \
        coredll_iniconf.o \
        coredll_listbox.o \
+       coredll_listctrl.o \
        coredll_main.o \
        coredll_menu.o \
        coredll_menuitem.o \
        coredll_metafile.o \
-       coredll_mimetype.o \
        coredll_msgdlg.o \
        coredll_nativdlg.o \
        coredll_notebook.o \
@@ -4237,11 +4332,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_stattext.o \
        coredll_tabctrl.o \
        coredll_textctrl.o \
-       coredll_thread.o \
        coredll_timer.o \
        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
+       coredll_treectrl.o \
        coredll_utilsgui.o \
        coredll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
@@ -4284,6 +4379,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_icon.o \
        corelib_listbox.o \
        corelib_main.o \
+       corelib_mbarman.o \
        corelib_menu.o \
        corelib_menuitem.o \
        corelib_pen.o \
@@ -4401,13 +4497,11 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_gdiobj.o \
        corelib_icon.o \
        corelib_listbox.o \
-       corelib_macnotfy.o \
        corelib_mdi.o \
        corelib_menu.o \
        corelib_menuitem.o \
        corelib_metafile.o \
        corelib_minifram.o \
-       corelib_MoreFilesX.o \
        corelib_msgdlg.o \
        corelib_notebmac.o \
        corelib_palette.o \
@@ -4430,12 +4524,10 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_stattext.o \
        corelib_tabctrl.o \
        corelib_textctrl.o \
-       corelib_thread.o \
        corelib_timer.o \
        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
-       corelib_uma.o \
        corelib_window.o \
        corelib_caret.o \
        corelib_fdrepdlg.o \
@@ -4500,6 +4592,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_toplevel.o \
        corelib_utils.o \
        corelib_window.o \
+       corelib_xmcombo.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \
        corelib_fdrepdlg.o \
@@ -4562,6 +4655,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_caret.o \
+       corelib_colrdlgg.o \
+       corelib_dirdlgg.o \
+       corelib_fdrepdlg.o \
+       corelib_imaglist.o \
+       corelib_mdig.o \
+       corelib_msgdlgg.o \
+       corelib_prntdlgg.o \
+       corelib_statusbr.o \
        corelib_accel.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -4599,11 +4700,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_icon.o \
        corelib_iniconf.o \
        corelib_listbox.o \
+       corelib_listctrl.o \
        corelib_main.o \
        corelib_menu.o \
        corelib_menuitem.o \
        corelib_metafile.o \
-       corelib_mimetype.o \
        corelib_msgdlg.o \
        corelib_nativdlg.o \
        corelib_notebook.o \
@@ -4625,11 +4726,11 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_stattext.o \
        corelib_tabctrl.o \
        corelib_textctrl.o \
-       corelib_thread.o \
        corelib_timer.o \
        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
+       corelib_treectrl.o \
        corelib_utilsgui.o \
        corelib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
@@ -5565,7 +5666,7 @@ COND_USE_SOVERSOLARIS_1___basedll___soname_flags = \
 COND_MONOLITHIC_0_SHARED_0___baselib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname)
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
+@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r
 @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
 @COND_GCC_PCH_1@__coredll_PCH_DEP = .pch/wxprec_coredll/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__coredll_PCH_INC = -I.pch/wxprec_coredll
@@ -5783,7 +5884,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \
 @COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     = install_wxzlib
 @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
 @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
-@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
+@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r
 @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
 @COND_GCC_PCH_1@__monodll_PCH_DEP = .pch/wxprec_monodll/wx/wxprec.h.gch
 @COND_GCC_PCH_1@__monodll_PCH_INC = -I.pch/wxprec_monodll
@@ -5973,13 +6074,13 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
 @COND_PLATFORM_MACOSX_1@dll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version $(WX_VERSION) \
 @COND_PLATFORM_MACOSX_1@       -current_version $(WX_VERSION)
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 
 ### Targets: ###
@@ -6048,6 +6149,7 @@ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpe
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__advdll_PCH_DEP)  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
 
 advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp
@@ -6243,8 +6345,12 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp
 
 @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__basedll_PCH_DEP)  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
 @COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
 
+basedll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -6374,6 +6480,9 @@ basedll_log.o: $(srcdir)/src/common/log.cpp
 basedll_longlong.o: $(srcdir)/src/common/longlong.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+basedll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_main.o: $(srcdir)/src/msw/main.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -6398,6 +6507,9 @@ basedll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+@COND_PLATFORM_OS2_1@basedll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_module.o: $(srcdir)/src/common/module.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -6458,8 +6570,14 @@ basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp
 basedll_textfile.o: $(srcdir)/src/common/textfile.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
-basedll_thread.o: $(srcdir)/src/msw/thread.cpp
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@basedll_thread.o: $(srcdir)/src/msw/thread.cpp
+@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_thread.o: $(srcdir)/src/mac/thread.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
@@ -6476,6 +6594,9 @@ basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp
 basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+basedll_uma.o: $(srcdir)/src/mac/uma.cpp
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_unzip.o: $(srcdir)/src/common/unzip.c
        $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 
@@ -6535,6 +6656,9 @@ basedll_zstream.o: $(srcdir)/src/common/zstream.cpp
 @COND_MONOLITHIC_0_SHARED_0@   $(AR) rcu $@ $(BASELIB_OBJECTS)
 @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
 
+baselib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -6664,6 +6788,9 @@ baselib_log.o: $(srcdir)/src/common/log.cpp
 baselib_longlong.o: $(srcdir)/src/common/longlong.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+baselib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_main.o: $(srcdir)/src/msw/main.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -6688,6 +6815,9 @@ baselib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+@COND_PLATFORM_OS2_1@baselib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_module.o: $(srcdir)/src/common/module.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -6748,8 +6878,14 @@ baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp
 baselib_textfile.o: $(srcdir)/src/common/textfile.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
-baselib_thread.o: $(srcdir)/src/msw/thread.cpp
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@baselib_thread.o: $(srcdir)/src/msw/thread.cpp
+@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_thread.o: $(srcdir)/src/mac/thread.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
@@ -6766,6 +6902,9 @@ baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp
 baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+baselib_uma.o: $(srcdir)/src/mac/uma.cpp
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_unzip.o: $(srcdir)/src/common/unzip.c
        $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 
@@ -6871,24 +7010,22 @@ clean:
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
        (cd samples && $(MAKE) clean)
-       rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
-       rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
+       rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
+       rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
 
-@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
-@COND_TOOLKIT_COCOA@   $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
-@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
+@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r: 
+@COND_TOOLKIT_COCOA@   $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc
+@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r
 
 @COND_TOOLKIT_COCOA@cocoa-res-install: $(__macos_res___depname)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__coredll_PCH_DEP)  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
 
-coredll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
-       $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
-
 coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7249,6 +7386,9 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7552,6 +7692,9 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7645,6 +7788,9 @@ coredll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7954,6 +8100,9 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8017,6 +8166,9 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8038,9 +8190,6 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/os2/main.cpp
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8062,6 +8211,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/mac/mdi.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8077,6 +8229,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8131,9 +8286,6 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8170,6 +8322,9 @@ coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8323,6 +8478,9 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8656,6 +8814,9 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8725,12 +8886,6 @@ coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp
 coredll_theme.o: $(srcdir)/src/univ/theme.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/os2/thread.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/mac/thread.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8821,8 +8976,11 @@ coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_uma.o: $(srcdir)/src/mac/uma.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -8941,6 +9099,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp
 coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c
+       $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
+
 @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8949,9 +9110,6 @@ coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(CORELIB_OBJECTS)
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
 
-corelib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
-       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
-
 corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -9312,6 +9470,9 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -9615,6 +9776,9 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -9708,6 +9872,9 @@ corelib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10017,6 +10184,9 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10080,6 +10250,9 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10101,9 +10274,6 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_USE_GUI_1@corelib_logg.o: $(srcdir)/src/generic/logg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/os2/main.cpp
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10125,6 +10295,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_USE_GUI_1@corelib_matrix.o: $(srcdir)/src/common/matrix.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/mac/mdi.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10140,6 +10313,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10194,9 +10370,6 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10233,6 +10406,9 @@ corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10386,6 +10562,9 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10719,6 +10898,9 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10788,12 +10970,6 @@ corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp
 corelib_theme.o: $(srcdir)/src/univ/theme.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/os2/thread.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/mac/thread.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_timer.o: $(srcdir)/src/msw/timer.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10884,8 +11060,11 @@ corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_uma.o: $(srcdir)/src/mac/uma.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -11004,11 +11183,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp
 corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c
+       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
+
 @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__dbgriddll_PCH_DEP)  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(__dbgriddll___so_symlinks_cmd)
 
 dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp
@@ -11025,8 +11208,9 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP)  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP)  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
@@ -11072,6 +11256,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__htmldll_PCH_DEP)  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
 
 htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp
@@ -11212,16 +11397,16 @@ htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp
        $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
 
 install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-       $(INSTALL_DIR) $(datadir)/aclocal
-       (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(datadir)/aclocal)
-       $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
-       (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
-       $(INSTALL_DIR) $(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+       (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
+       (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        for f in $(ALL_HEADERS); do \
-       if test ! -d $(includedir)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
        fi; \
-       $(INSTALL_DATA) $(srcdir)/include//$$f $(includedir)/$$f; \
+       $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \
        done
        @echo " "
        @echo " ------------------------------------------------------"
@@ -11240,178 +11425,179 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
        @echo " "
 
 @COND_USE_GUI_1@install-afm: 
-@COND_USE_GUI_1@       $(INSTALL_DIR) $(datadir)/wx/2.5/afm
-@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(datadir)/wx/2.5/afm)
+@COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/2.5/afm
+@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(DESTDIR)$(datadir)/wx/2.5/afm)
 
 @COND_USE_GUI_1@install-gsafm: 
-@COND_USE_GUI_1@       $(INSTALL_DIR) $(datadir)/wx/2.5/gs_afm
-@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(datadir)/wx/2.5/gs_afm)
+@COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/2.5/gs_afm
+@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/2.5/gs_afm)
 
 install-strip: install
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 
 install-wxconfig: 
-       $(INSTALL_DIR) $(bindir)
-       $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(bindir)
-       (cd $(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+       (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__advdll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_basedll: 
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__basedll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0@install_baselib: 
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__coredll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_dbgriddll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: 
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(libdir) ; $(__gldll___so_symlinks_inst_cmd))
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd))
 
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: 
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@install_htmldll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        (cd $(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@install_htmllib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_1_SHARED_1@install_monodll: 
-@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_1_SHARED_1@   (cd $(libdir) ; $(__monodll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_1_SHARED_0@install_monolib: 
-@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_netdll: 
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__netdll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0@install_netlib: 
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@install_odbcdll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@install_odbclib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@install_wxexpat: 
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: 
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_REGEX_BUILTIN@install_wxregex: 
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_ZLIB_BUILTIN@install_wxzlib: 
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_xmldll: 
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0@install_xmllib: 
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 locale_install: 
-       $(INSTALL_DIR) $(datadir)/locale
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
        for l in $(LOCALE_LINGUAS) ; do \
-       $(INSTALL_DIR) $(datadir)/locale/$$l ; \
-       $(INSTALL_DIR) $(datadir)/locale/$$l/LC_MESSAGES ; \
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
        if test -f $(srcdir)/locale/$$l.mo ; then \
-       $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
+       $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
        fi ; \
        done
 
-@COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
-@COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
-@COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
+@COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).1.r: 
+@COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc
+@COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r
 
 @COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname)
-@COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
-@COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
+@COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir)
+@COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir)
 
 @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__monodll_PCH_DEP)  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
 @COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_ODBC)
+@COND_MONOLITHIC_1_SHARED_1@   
 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
 monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
@@ -11804,6 +11990,9 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12152,6 +12341,9 @@ monodll_dircmn.o: $(srcdir)/src/common/dircmn.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12263,6 +12455,9 @@ monodll_extended.o: $(srcdir)/src/common/extended.c
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12674,6 +12869,9 @@ monodll_http.o: $(srcdir)/src/common/http.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12770,6 +12968,9 @@ monodll_list.o: $(srcdir)/src/common/list.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12851,6 +13052,9 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/mac/mdi.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12866,6 +13070,9 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12941,8 +13148,8 @@ monodll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -12983,6 +13190,9 @@ monodll_module.o: $(srcdir)/src/common/module.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13142,6 +13352,9 @@ monodll_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13523,6 +13736,9 @@ monodll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13640,11 +13856,11 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp
 @COND_PLATFORM_WIN32_1@monodll_thread.o: $(srcdir)/src/msw/thread.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_thread.o: $(srcdir)/src/os2/thread.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_thread.o: $(srcdir)/src/mac/thread.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_thread.o: $(srcdir)/src/mac/thread.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -13751,8 +13967,11 @@ monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -13928,6 +14147,9 @@ monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp
 monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
 monodll_xml.o: $(srcdir)/src/xml/xml.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13940,6 +14162,9 @@ monodll_xti.o: $(srcdir)/src/common/xti.cpp
 monodll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -14341,6 +14566,9 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14689,6 +14917,9 @@ monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14800,6 +15031,9 @@ monolib_extended.o: $(srcdir)/src/common/extended.c
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15211,6 +15445,9 @@ monolib_http.o: $(srcdir)/src/common/http.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15307,6 +15544,9 @@ monolib_list.o: $(srcdir)/src/common/list.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15388,6 +15628,9 @@ monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/mac/mdi.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15403,6 +15646,9 @@ monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15478,8 +15724,8 @@ monolib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -15520,6 +15766,9 @@ monolib_module.o: $(srcdir)/src/common/module.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15679,6 +15928,9 @@ monolib_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16060,6 +16312,9 @@ monolib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16177,11 +16432,11 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp
 @COND_PLATFORM_WIN32_1@monolib_thread.o: $(srcdir)/src/msw/thread.cpp
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_thread.o: $(srcdir)/src/os2/thread.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_thread.o: $(srcdir)/src/mac/thread.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_thread.o: $(srcdir)/src/mac/thread.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -16288,8 +16543,11 @@ monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -16465,6 +16723,9 @@ monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp
 monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
 monolib_xml.o: $(srcdir)/src/xml/xml.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16477,6 +16738,9 @@ monolib_xti.o: $(srcdir)/src/common/xti.cpp
 monolib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16485,6 +16749,7 @@ monolib_zstream.o: $(srcdir)/src/common/zstream.cpp
 
 @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__netdll_PCH_DEP)  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
 
 netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp
@@ -16590,6 +16855,7 @@ netlib_url.o: $(srcdir)/src/common/url.cpp
 
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__odbcdll_PCH_DEP)  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(__odbcdll___so_symlinks_cmd)
 
 odbcdll_db.o: $(srcdir)/src/common/db.cpp
@@ -17053,11 +17319,15 @@ wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
 
 @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__xmldll_PCH_DEP)  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
 
 xmldll_xml.o: $(srcdir)/src/xml/xml.cpp
        $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $<
 
+xmldll_xtixml.o: $(srcdir)/src/common/xtixml.cpp
+       $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $<
+
 @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(__xmllib_PCH_DEP)  $(XMLLIB_OBJECTS)
 @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
 @COND_MONOLITHIC_0_SHARED_0@   $(AR) rcu $@ $(XMLLIB_OBJECTS)
@@ -17066,10 +17336,12 @@ xmldll_xml.o: $(srcdir)/src/xml/xml.cpp
 xmllib_xml.o: $(srcdir)/src/xml/xml.cpp
        $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $<
 
+xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp
+       $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $<
+
 
 #
 # "make dist" target implementation:
-# $Id$
 #
 
 
@@ -17089,6 +17361,7 @@ JPEGDIR  = $(WXDIR)/src/jpeg
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
+EXPATDIR = $(WXDIR)/src/expat
 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
@@ -17179,6 +17452,8 @@ ALL_DIST: distrib_clean
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
        cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
        cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
+       cp -Rf $(EXPATDIR) $(DISTDIR)/src
+       (cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
        mkdir $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
@@ -17324,6 +17599,8 @@ MOTIF_DIST: ALL_GUI_DIST
        cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
                $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
+       mkdir $(DISTDIR)/contrib
+       cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MACX_DIST: ALL_GUI_DIST
        cp $(INCDIR)/*.* $(DISTDIR)/include
@@ -17337,6 +17614,8 @@ MACX_DIST: ALL_GUI_DIST
        cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
        mkdir $(DISTDIR)/src/mac/macsock
        cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
+       mkdir $(DISTDIR)/contrib
+       cp -R $(WXDIR)/contrib $(DISTDIR)
 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST
@@ -17529,6 +17808,11 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
 
+       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/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
@@ -17606,6 +17890,12 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
        cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
 
+       mkdir $(DISTDIR)/samples/htlbox
+       cp $(SAMPDIR)/htlbox/Makefile.in $(DISTDIR)/samples/htlbox
+       cp $(SAMPDIR)/htlbox/makefile.unx $(DISTDIR)/samples/htlbox
+       cp $(SAMPDIR)/htlbox/*.cpp $(DISTDIR)/samples/htlbox
+       cp $(SAMPDIR)/htlbox/*.xpm $(DISTDIR)/samples/htlbox
+
        mkdir $(DISTDIR)/samples/html
        cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
        mkdir $(DISTDIR)/samples/html/about
@@ -17759,10 +18049,10 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
        cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
     
-       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/multimon
+       cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon
+       cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon
+       cp $(SAMPDIR)/multimon/*.cpp $(DISTDIR)/samples/multimon
 
        mkdir $(DISTDIR)/samples/notebook
        cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
@@ -17813,6 +18103,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 #      cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
 #      cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
 
+       mkdir $(DISTDIR)/samples/render
+       cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render
+       cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render
+       cp $(SAMPDIR)/render/*.cpp $(DISTDIR)/samples/render
+
        mkdir $(DISTDIR)/samples/rotate
        cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
        cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
@@ -17963,12 +18258,6 @@ UTILS_DIST: ALL_GUI_DIST
        cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
        cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
 
-       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