don't force wxUSE_EXTENDED_RTTI to eb 1 for Borland compiler (why?)

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6c6f017a14da65a56627727255dfedd840a95a7c..3778f0ceb6b89cf2683ef23567cec25d3926dc00 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,6 +58,7 @@ EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@

+EXTRALIBS_GNOMEPRINT = @EXTRALIBS_GNOMEPRINT@

 HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
 HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###


@@ -162,6 +163,7 @@ WXTIFF_OBJECTS =  \
        wxtiff_tif_aux.o \
        wxtiff_tif_close.o \
        wxtiff_tif_codec.o \
        wxtiff_tif_aux.o \
        wxtiff_tif_close.o \
        wxtiff_tif_codec.o \

+       wxtiff_tif_color.o \

        wxtiff_tif_compress.o \
        wxtiff_tif_dir.o \
        wxtiff_tif_dirinfo.o \
        wxtiff_tif_compress.o \
        wxtiff_tif_dir.o \
        wxtiff_tif_dirinfo.o \


@@ -218,6 +220,7 @@ ALL_BASE_HEADERS =  \
        wx/afterstd.h \
        wx/app.h \
        wx/apptrait.h \
        wx/afterstd.h \
        wx/app.h \
        wx/apptrait.h \

+       wx/archive.h \

        wx/arrimpl.cpp \
        wx/arrstr.h \
        wx/beforestd.h \
        wx/arrimpl.cpp \
        wx/arrstr.h \
        wx/beforestd.h \


@@ -340,6 +343,7 @@ ALL_HEADERS =  \
        $(ALL_GUI_HEADERS)
 ALL_BASE_SOURCES =  \
        src/common/appbase.cpp \
        $(ALL_GUI_HEADERS)
 ALL_BASE_SOURCES =  \
        src/common/appbase.cpp \

+       src/common/archive.cpp \

        src/common/clntdata.cpp \
        src/common/cmdline.cpp \
        src/common/config.cpp \
        src/common/clntdata.cpp \
        src/common/cmdline.cpp \
        src/common/config.cpp \


@@ -385,7 +389,6 @@ ALL_BASE_SOURCES =  \
        src/common/textfile.cpp \
        src/common/tokenzr.cpp \
        src/common/txtstrm.cpp \
        src/common/textfile.cpp \
        src/common/tokenzr.cpp \
        src/common/txtstrm.cpp \

-       src/common/unzip.c \

        src/common/uri.cpp \
        src/common/variant.cpp \
        src/common/wfstream.cpp \
        src/common/uri.cpp \
        src/common/variant.cpp \
        src/common/wfstream.cpp \


@@ -408,20 +411,22 @@ ALL_BASE_SOURCES =  \
        src/msw/regconf.cpp \
        src/msw/registry.cpp \
        src/msw/snglinst.cpp \
        src/msw/regconf.cpp \
        src/msw/registry.cpp \
        src/msw/snglinst.cpp \

+       src/msw/stdpaths.cpp \

        src/msw/thread.cpp \
        src/msw/utils.cpp \
        src/msw/utilsexc.cpp \
        $(BASE_WINCE_SRC) \
        src/mac/carbon/dirmac.cpp \
        src/mac/carbon/mimetmac.cpp \
        src/msw/thread.cpp \
        src/msw/utils.cpp \
        src/msw/utilsexc.cpp \
        $(BASE_WINCE_SRC) \
        src/mac/carbon/dirmac.cpp \
        src/mac/carbon/mimetmac.cpp \

-       src/unix/baseunix.cpp \

        src/mac/carbon/utilsexc.cpp \
        src/mac/carbon/thread.cpp \
        src/mac/carbon/macnotfy.cpp \
        src/mac/carbon/morefilex/MoreFilesX.c \
        src/mac/corefoundation/cfstring.cpp \
        src/mac/carbon/utilsexc.cpp \
        src/mac/carbon/thread.cpp \
        src/mac/carbon/macnotfy.cpp \
        src/mac/carbon/morefilex/MoreFilesX.c \
        src/mac/corefoundation/cfstring.cpp \

+       src/mac/corefoundation/stdpaths_cf.cpp \

        src/os2/dir.cpp \
        src/os2/mimetype.cpp \
        src/os2/dir.cpp \
        src/os2/mimetype.cpp \

+       src/os2/stdpaths.cpp \

        src/os2/thread.cpp \
        src/os2/utils.cpp \
        src/os2/utilsexc.cpp \
        src/os2/thread.cpp \
        src/os2/utils.cpp \
        src/os2/utilsexc.cpp \


@@ -463,6 +468,7 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        monodll_appbase.o \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        monodll_appbase.o \

+       monodll_archive.o \

        monodll_clntdata.o \
        monodll_cmdline.o \
        monodll_config.o \
        monodll_clntdata.o \
        monodll_cmdline.o \
        monodll_config.o \


@@ -508,7 +514,6 @@ MONODLL_OBJECTS =  \
        monodll_textfile.o \
        monodll_tokenzr.o \
        monodll_txtstrm.o \
        monodll_textfile.o \
        monodll_tokenzr.o \
        monodll_txtstrm.o \

-       monodll_unzip.o \

        monodll_uri.o \
        monodll_variant.o \
        monodll_wfstream.o \
        monodll_uri.o \
        monodll_variant.o \
        monodll_wfstream.o \


@@ -550,6 +555,7 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        monolib_appbase.o \
        -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        monolib_appbase.o \

+       monolib_archive.o \

        monolib_clntdata.o \
        monolib_cmdline.o \
        monolib_config.o \
        monolib_clntdata.o \
        monolib_cmdline.o \
        monolib_config.o \


@@ -595,7 +601,6 @@ MONOLIB_OBJECTS =  \
        monolib_textfile.o \
        monolib_tokenzr.o \
        monolib_txtstrm.o \
        monolib_textfile.o \
        monolib_tokenzr.o \
        monolib_txtstrm.o \

-       monolib_unzip.o \

        monolib_uri.o \
        monolib_variant.o \
        monolib_wfstream.o \
        monolib_uri.o \
        monolib_variant.o \
        monolib_wfstream.o \


@@ -638,6 +643,7 @@ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        basedll_appbase.o \
        $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        basedll_appbase.o \

+       basedll_archive.o \

        basedll_clntdata.o \
        basedll_cmdline.o \
        basedll_config.o \
        basedll_clntdata.o \
        basedll_cmdline.o \
        basedll_config.o \


@@ -683,7 +689,6 @@ BASEDLL_OBJECTS =  \
        basedll_textfile.o \
        basedll_tokenzr.o \
        basedll_txtstrm.o \
        basedll_textfile.o \
        basedll_tokenzr.o \
        basedll_txtstrm.o \

-       basedll_unzip.o \

        basedll_uri.o \
        basedll_variant.o \
        basedll_wfstream.o \
        basedll_uri.o \
        basedll_variant.o \
        basedll_wfstream.o \


@@ -710,6 +715,7 @@ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
        -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \
        -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \

+       baselib_archive.o \

        baselib_clntdata.o \
        baselib_cmdline.o \
        baselib_config.o \
        baselib_clntdata.o \
        baselib_cmdline.o \
        baselib_config.o \


@@ -755,7 +761,6 @@ BASELIB_OBJECTS =  \
        baselib_textfile.o \
        baselib_tokenzr.o \
        baselib_txtstrm.o \
        baselib_textfile.o \
        baselib_tokenzr.o \
        baselib_txtstrm.o \

-       baselib_unzip.o \

        baselib_uri.o \
        baselib_variant.o \
        baselib_wfstream.o \
        baselib_uri.o \
        baselib_variant.o \
        baselib_wfstream.o \


@@ -883,6 +888,22 @@ ADVLIB_OBJECTS =  \
        $(__ADVANCED_PLATFORM_SRC_OBJECTS_3) \
        $(__PLUGIN_ADV_SRC_OBJECTS_3)
 ADVLIB_ODEP =  $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)
        $(__ADVANCED_PLATFORM_SRC_OBJECTS_3) \
        $(__PLUGIN_ADV_SRC_OBJECTS_3)
 ADVLIB_ODEP =  $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)

+MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+MEDIADLL_OBJECTS =  \
+       mediadll_mediactrlcmn.o \
+       $(__MEDIA_PLATFORM_SRC_OBJECTS_2)
+MEDIADLL_ODEP =  $(___pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
+MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CPPFLAGS) $(CXXFLAGS)
+MEDIALIB_OBJECTS =  \
+       medialib_mediactrlcmn.o \
+       $(__MEDIA_PLATFORM_SRC_OBJECTS_3)
+MEDIALIB_ODEP =  $(___pch_wxprec_medialib_wx_wxprec_h_gch___depname)

 ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
 ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \


@@ -1100,7 +1121,8 @@ LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_
 @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = \
+@COND_USE_PLUGINS_0@   $(EXTRALIBS_SDL) $(EXTRALIBS_GNOMEPRINT)

 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -1145,6 +1167,7 @@ COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname = \
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        = install_wxtiff
 @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        = install_wxtiff
 @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o

+@COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o

 @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
 @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o


@@ -1211,9 +1234,13 @@ COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR =  \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)
        wx/unix/pipe.h \
        wx/unix/stdpaths.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)

-@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = \
-@COND_TOOLKIT_MAC@     include/wx/mac/corefoundation/cfstring.h
+COND_TOOLKIT_MAC_BASE_PLATFORM_HDR =  \
+       wx/mac/corefoundation/cfstring.h \
+       wx/mac/corefoundation/stdpaths.h \
+       wx/unix/stdpaths.h
+@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = $(COND_TOOLKIT_MAC_BASE_PLATFORM_HDR)

 @COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h

+@COND_PLATFORM_MACOS_1@NET_PLATFORM_HDR = wx/mac/carbon/gsockmac.h

 @COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = \
 @COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = \


@@ -1407,8 +1434,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
        wx/generic/paletteg.h \
        wx/generic/region.h \
        wx/generic/statusbr.h \
        wx/generic/paletteg.h \
        wx/generic/region.h \
        wx/generic/statusbr.h \

-       wx/generic/tabg.h \
-       include/wx/mac/corefoundation/cfstring.h
+       wx/generic/tabg.h

 @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/generic/colrdlgg.h \
 @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/generic/colrdlgg.h \


@@ -2031,7 +2057,7 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
        wx/msw/wince/textctrlce.h \
        wx/msw/wince/resources.h
 @COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)
        wx/msw/wince/textctrlce.h \
        wx/msw/wince/resources.h
 @COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)

-@COND_TOOLKIT_COCOA@ADVANCED_PLATFORM_HDR = include/wx/cocoa/taskbar.h
+@COND_TOOLKIT_COCOA@ADVANCED_PLATFORM_HDR = wx/cocoa/taskbar.h

 @COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_GTK@     wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
 COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
 @COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_GTK@     wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
 COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \


@@ -2051,6 +2077,14 @@ COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
 @COND_TOOLKIT_WINCE@   wx/msw/sound.h wx/msw/taskbar.h
 @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_X11@     wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
 @COND_TOOLKIT_WINCE@   wx/msw/sound.h wx/msw/taskbar.h
 @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_X11@     wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h

+@COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_MAC@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR =  
+@COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = 

 @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR)
 COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
        wx/generic/accel.h \
 @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR)
 COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
        wx/generic/accel.h \


@@ -2293,6 +2327,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/wave.h \
        wx/wizard.h \
        $(ADVANCED_PLATFORM_HDR) \
        wx/wave.h \
        wx/wizard.h \
        $(ADVANCED_PLATFORM_HDR) \

+       wx/mediactrl.h \
+       $(MEDIA_PLATFORM_HDR) \

        wx/html/forcelnk.h \
        wx/html/helpctrl.h \
        wx/html/helpdata.h \
        wx/html/forcelnk.h \
        wx/html/helpctrl.h \
        wx/html/helpdata.h \


@@ -2395,9 +2431,29 @@ COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd = rm -f \
 @COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)
 @COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)

+COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS =  \
+       monodll_dirmac.o \
+       monodll_mimetmac.o \
+       monodll_utilsexc.o \
+       monodll_thread.o \
+       monodll_macnotfy.o \
+       monodll_MoreFilesX.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o \
+       monodll_DirectoryCopy.o \
+       monodll_FSpCompat.o \
+       monodll_FileCopy.o \
+       monodll_FullPath.o \
+       monodll_IterateDirectory.o \
+       monodll_MoreDesktopMgr.o \
+       monodll_MoreFiles.o \
+       monodll_MoreFilesExtras.o \
+       monodll_Search.o
+@COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS)

 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_dir.o \
        monodll_mimetype.o \
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_dir.o \
        monodll_mimetype.o \

+       monodll_stdpaths.o \

        monodll_thread.o \
        monodll_utils.o \
        monodll_utilsexc.o
        monodll_thread.o \
        monodll_utils.o \
        monodll_utilsexc.o


@@ -2419,6 +2475,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_regconf.o \
        monodll_registry.o \
        monodll_snglinst.o \
        monodll_regconf.o \
        monodll_registry.o \
        monodll_snglinst.o \

+       monodll_stdpaths.o \

        monodll_thread.o \
        monodll_utils.o \
        monodll_utilsexc.o \
        monodll_thread.o \
        monodll_utils.o \
        monodll_utilsexc.o \


@@ -2431,7 +2488,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \

-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o

 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \


@@ -2439,7 +2498,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \

-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o

 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \


@@ -2447,17 +2508,21 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \

-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o

 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_dirmac.o \
        monodll_mimetmac.o \
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
 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 \
        monodll_utilsexc.o \
        monodll_thread.o \
        monodll_macnotfy.o \
        monodll_MoreFilesX.o \

-       monodll_cfstring.o
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o \
+       monodll_baseunix.o \
+       monodll_stdpaths.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \


@@ -2465,7 +2530,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \

-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o

 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \


@@ -2473,7 +2540,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \

-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o

 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = monodll_utilsunx.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = monodll_utilsunx.o


@@ -2484,6 +2553,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = \
 @COND_TOOLKIT_MAC@     monodll_utils.o monodll_uma.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = \
 @COND_TOOLKIT_MAC@     monodll_utils.o monodll_uma.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o

+@COND_PLATFORM_MACOS_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o

 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \
 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \


@@ -2503,6 +2573,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        monodll_tipdlg.o \
        monodll_wizard.o \
        $(__ADVANCED_PLATFORM_SRC_OBJECTS) \
        monodll_tipdlg.o \
        monodll_wizard.o \
        $(__ADVANCED_PLATFORM_SRC_OBJECTS) \

+       monodll_mediactrlcmn.o \
+       $(__MEDIA_PLATFORM_SRC_OBJECTS) \

        $(__HTML_SRC_PLATFORM_OBJECTS) \
        monodll_helpctrl.o \
        monodll_helpdata.o \
        $(__HTML_SRC_PLATFORM_OBJECTS) \
        monodll_helpctrl.o \
        monodll_helpdata.o \


@@ -2669,7 +2741,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \

-       $(__LOWLEVEL_SRC_OBJECTS) \
+       $(__LOWLEVEL_SRC_OBJECTS_1) \

        monodll_accel.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \
        monodll_accel.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \


@@ -2816,6 +2888,227 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_vlbox.o \
        monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
        monodll_vlbox.o \
        monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)

+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_paletteg.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dnd.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockgtk.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgtk.o \
+       monodll_win_gtk.o \
+       monodll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dirmgl.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiobj.o \
+       monodll_icon.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o \
+       monodll_helpchm.o \
+       monodll_helpwin.o \
+       monodll_automtn.o \
+       monodll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockx11.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_nanox.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_reparent.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_utilsx.o \
+       monodll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)

 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_NSBox.o \
        monodll_NSButton.o \
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_NSBox.o \
        monodll_NSButton.o \


@@ -2903,9 +3196,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_regiong.o \
        monodll_statusbr.o \
        monodll_tabg.o \
        monodll_regiong.o \
        monodll_statusbr.o \
        monodll_tabg.o \

-       monodll_timer.o \
-       monodll_gsockosx.o \
-       monodll_cfstring.o
+       monodll_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_accel.o \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_accel.o \


@@ -2930,6 +3221,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_combobox.o \
        monodll_control.o \
        monodll_dialog.o \
        monodll_combobox.o \
        monodll_control.o \
        monodll_dialog.o \

+       monodll_filedlg.o \

        monodll_fontdlg.o \
        monodll_frame.o \
        monodll_gauge.o \
        monodll_fontdlg.o \
        monodll_frame.o \
        monodll_gauge.o \


@@ -2990,7 +3282,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_frame.o \
        monodll_gauge.o \
        monodll_gdiobj.o \
        monodll_frame.o \
        monodll_gauge.o \
        monodll_gdiobj.o \

-       monodll_gsockosx.o \

        monodll_hid.o \
        monodll_icon.o \
        monodll_listbox.o \
        monodll_hid.o \
        monodll_icon.o \
        monodll_listbox.o \


@@ -3036,8 +3327,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_prntdlgg.o \
        monodll_statusbr.o \
        monodll_tabg.o \
        monodll_prntdlgg.o \
        monodll_statusbr.o \
        monodll_tabg.o \

-       monodll_snglinst.o \
-       monodll_webkit.o
+       $(__MAC_OSX_SRC_OBJECTS)

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_accel.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_accel.o \


@@ -3296,17 +3586,244 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
        monodll_tbarwce.o \
        monodll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
        monodll_tbarwce.o \
        monodll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)

-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_COCOA@   monodll_taskbar.o monodll_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
-       monodll_taskbarx11.o \
-       monodll_taskbar.o \
-       monodll_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS =  \
+       monodll_snglinst.o \
+       monodll_webkit.o \
+       monodll_fontdlgosx.o \
+       monodll_colordlgosx.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_paletteg.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dnd.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockgtk.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgtk.o \
+       monodll_win_gtk.o \
+       monodll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_1)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dirmgl.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiobj.o \
+       monodll_icon.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o \
+       monodll_helpchm.o \
+       monodll_helpwin.o \
+       monodll_automtn.o \
+       monodll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_1 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockx11.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_nanox.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_reparent.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_utilsx.o \
+       monodll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@   monodll_taskbar.o monodll_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
+       monodll_joystick.o \
+       monodll_sound.o \
+       monodll_taskbarx11.o \
+       monodll_taskbar.o \
+       monodll_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \

        monodll_taskbarcmn.o \
        monodll_drawer.o \
        monodll_joystick.o \
        monodll_taskbarcmn.o \
        monodll_drawer.o \
        monodll_joystick.o \


@@ -3332,11 +3849,19 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
        monodll_sound.o \
        monodll_taskbarx11.o
 @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
        monodll_sound.o \
        monodll_taskbarx11.o
 @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)

+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = 
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS =  
+@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = 
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o 
+@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = 
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = 

 @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
 @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
 @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \

-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monodll_sound_sdl.o
+@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monodll_sound_sdl.o monodll_gprint.o

 COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
 COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)


@@ -3346,9 +3871,29 @@ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
 @COND_GCC_PCH_1@       = .pch/wxprec_monolib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_1)
 @COND_GCC_PCH_1@       = .pch/wxprec_monolib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_1)

+COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_dirmac.o \
+       monolib_mimetmac.o \
+       monolib_utilsexc.o \
+       monolib_thread.o \
+       monolib_macnotfy.o \
+       monolib_MoreFilesX.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o \
+       monolib_DirectoryCopy.o \
+       monolib_FSpCompat.o \
+       monolib_FileCopy.o \
+       monolib_FullPath.o \
+       monolib_IterateDirectory.o \
+       monolib_MoreDesktopMgr.o \
+       monolib_MoreFiles.o \
+       monolib_MoreFilesExtras.o \
+       monolib_Search.o
+@COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_1)

 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_dir.o \
        monolib_mimetype.o \
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_dir.o \
        monolib_mimetype.o \

+       monolib_stdpaths.o \

        monolib_thread.o \
        monolib_utils.o \
        monolib_utilsexc.o
        monolib_thread.o \
        monolib_utils.o \
        monolib_utilsexc.o


@@ -3370,6 +3915,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_regconf.o \
        monolib_registry.o \
        monolib_snglinst.o \
        monolib_regconf.o \
        monolib_registry.o \
        monolib_snglinst.o \

+       monolib_stdpaths.o \

        monolib_thread.o \
        monolib_utils.o \
        monolib_utilsexc.o \
        monolib_thread.o \
        monolib_utils.o \
        monolib_utilsexc.o \


@@ -3382,7 +3928,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \

-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o

 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \


@@ -3390,7 +3938,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \

-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o

 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \


@@ -3398,17 +3948,21 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \

-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.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 =  \
        monolib_dirmac.o \
        monolib_mimetmac.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 =  \
        monolib_dirmac.o \
        monolib_mimetmac.o \

-       monolib_baseunix.o \

        monolib_utilsexc.o \
        monolib_thread.o \
        monolib_macnotfy.o \
        monolib_MoreFilesX.o \
        monolib_utilsexc.o \
        monolib_thread.o \
        monolib_macnotfy.o \
        monolib_MoreFilesX.o \

-       monolib_cfstring.o
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o \
+       monolib_baseunix.o \
+       monolib_stdpaths.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \


@@ -3416,7 +3970,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \

-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o

 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \


@@ -3424,7 +3980,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \

-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o

 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = monolib_utilsunx.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = monolib_utilsunx.o


@@ -3435,6 +3993,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_MAC@     monolib_utils.o monolib_uma.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_MAC@     monolib_utils.o monolib_uma.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o

+@COND_PLATFORM_MACOS_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o

 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \


@@ -3454,6 +4013,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_tipdlg.o \
        monolib_wizard.o \
        $(__ADVANCED_PLATFORM_SRC_OBJECTS_1) \
        monolib_tipdlg.o \
        monolib_wizard.o \
        $(__ADVANCED_PLATFORM_SRC_OBJECTS_1) \

+       monolib_mediactrlcmn.o \
+       $(__MEDIA_PLATFORM_SRC_OBJECTS_1) \

        $(__HTML_SRC_PLATFORM_OBJECTS_1) \
        monolib_helpctrl.o \
        monolib_helpdata.o \
        $(__HTML_SRC_PLATFORM_OBJECTS_1) \
        monolib_helpctrl.o \
        monolib_helpdata.o \


@@ -3520,7 +4081,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_xmlrsall.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_xmlrsall.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \

-       $(__LOWLEVEL_SRC_OBJECTS_0) \
+       $(__LOWLEVEL_SRC_OBJECTS_2) \

        $(__GUI_SRC_OBJECTS_1) \
        monolib_accesscmn.o \
        monolib_appcmn.o \
        $(__GUI_SRC_OBJECTS_1) \
        monolib_accesscmn.o \
        monolib_appcmn.o \


@@ -3620,7 +4181,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \

-       $(__LOWLEVEL_SRC_OBJECTS_0) \
+       $(__LOWLEVEL_SRC_OBJECTS_3) \

        monolib_accel.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \
        monolib_accel.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \


@@ -3767,26 +4328,248 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_vlbox.o \
        monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
        monolib_vlbox.o \
        monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)

-COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
-       monolib_NSBox.o \
-       monolib_NSButton.o \
-       monolib_NSControl.o \
-       monolib_NSMenu.o \
-       monolib_NSPanel.o \
-       monolib_NSScroller.o \
-       monolib_NSTabView.o \
-       monolib_NSTableView.o \
-       monolib_NSTextField.o \
-       monolib_NSView.o \
-       monolib_NSWindow.o \
-       monolib_ObjcRef.o \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_paletteg.o \

        monolib_app.o \
        monolib_bitmap.o \
        monolib_app.o \
        monolib_bitmap.o \

-       monolib_bmpbuttn.o \

        monolib_brush.o \
        monolib_brush.o \

-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_checklst.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dnd.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockgtk.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgtk.o \
+       monolib_win_gtk.o \
+       monolib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_2)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dirmgl.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiobj.o \
+       monolib_icon.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o \
+       monolib_helpchm.o \
+       monolib_helpwin.o \
+       monolib_automtn.o \
+       monolib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_2 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockx11.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_nanox.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_reparent.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_utilsx.o \
+       monolib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
+       monolib_NSBox.o \
+       monolib_NSButton.o \
+       monolib_NSControl.o \
+       monolib_NSMenu.o \
+       monolib_NSPanel.o \
+       monolib_NSScroller.o \
+       monolib_NSTabView.o \
+       monolib_NSTableView.o \
+       monolib_NSTextField.o \
+       monolib_NSView.o \
+       monolib_NSWindow.o \
+       monolib_ObjcRef.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_bmpbuttn.o \
+       monolib_brush.o \
+       monolib_button.o \
+       monolib_checkbox.o \
+       monolib_checklst.o \

        monolib_choice.o \
        monolib_clipbrd.o \
        monolib_colordlg.o \
        monolib_choice.o \
        monolib_clipbrd.o \
        monolib_colordlg.o \


@@ -3854,9 +4637,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_regiong.o \
        monolib_statusbr.o \
        monolib_tabg.o \
        monolib_regiong.o \
        monolib_statusbr.o \
        monolib_tabg.o \

-       monolib_timer.o \
-       monolib_gsockosx.o \
-       monolib_cfstring.o
+       monolib_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \


@@ -3881,6 +4662,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_combobox.o \
        monolib_control.o \
        monolib_dialog.o \
        monolib_combobox.o \
        monolib_control.o \
        monolib_dialog.o \

+       monolib_filedlg.o \

        monolib_fontdlg.o \
        monolib_frame.o \
        monolib_gauge.o \
        monolib_fontdlg.o \
        monolib_frame.o \
        monolib_gauge.o \


@@ -3941,7 +4723,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_frame.o \
        monolib_gauge.o \
        monolib_gdiobj.o \
        monolib_frame.o \
        monolib_gauge.o \
        monolib_gdiobj.o \

-       monolib_gsockosx.o \

        monolib_hid.o \
        monolib_icon.o \
        monolib_listbox.o \
        monolib_hid.o \
        monolib_icon.o \
        monolib_listbox.o \


@@ -3987,8 +4768,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_prntdlgg.o \
        monolib_statusbr.o \
        monolib_tabg.o \
        monolib_prntdlgg.o \
        monolib_statusbr.o \
        monolib_tabg.o \

-       monolib_snglinst.o \
-       monolib_webkit.o
+       $(__MAC_OSX_SRC_OBJECTS_1)

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \


@@ -4247,47 +5027,283 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
        monolib_tbarwce.o \
        monolib_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
        monolib_tbarwce.o \
        monolib_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)

-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_COCOA@   monolib_taskbar.o monolib_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbarx11.o \
-       monolib_taskbar.o \
-       monolib_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_drawer.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbarx11.o
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_MSW@     monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o \
-@COND_TOOLKIT_MSW@     monolib_joystick.o
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_PM@      monolib_joystick.o monolib_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_WINCE@   monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o
-COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbarx11.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
-@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1 =  \
+       monolib_snglinst.o \
+       monolib_webkit.o \
+       monolib_fontdlgosx.o \
+       monolib_colordlgosx.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_paletteg.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dnd.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockgtk.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgtk.o \
+       monolib_win_gtk.o \
+       monolib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_3)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dirmgl.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiobj.o \
+       monolib_icon.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o \
+       monolib_helpchm.o \
+       monolib_helpwin.o \
+       monolib_automtn.o \
+       monolib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_3 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockx11.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_nanox.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_reparent.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_utilsx.o \
+       monolib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@   monolib_taskbar.o monolib_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbarx11.o \
+       monolib_taskbar.o \
+       monolib_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_drawer.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbarx11.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MSW@     monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o \
+@COND_TOOLKIT_MSW@     monolib_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_PM@      monolib_joystick.o monolib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_WINCE@   monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 =  
+@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o 
+@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o

 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \

-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monolib_sound_sdl.o
+@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monolib_sound_sdl.o monolib_gprint.o

 COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
 COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)


@@ -4332,9 +5348,29 @@ COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd = rm -f \
 @COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)
 @COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)

+COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
+       basedll_dirmac.o \
+       basedll_mimetmac.o \
+       basedll_utilsexc.o \
+       basedll_thread.o \
+       basedll_macnotfy.o \
+       basedll_MoreFilesX.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o \
+       basedll_DirectoryCopy.o \
+       basedll_FSpCompat.o \
+       basedll_FileCopy.o \
+       basedll_FullPath.o \
+       basedll_IterateDirectory.o \
+       basedll_MoreDesktopMgr.o \
+       basedll_MoreFiles.o \
+       basedll_MoreFilesExtras.o \
+       basedll_Search.o
+@COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_2)

 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_dir.o \
        basedll_mimetype.o \
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_dir.o \
        basedll_mimetype.o \

+       basedll_stdpaths.o \

        basedll_thread.o \
        basedll_utils.o \
        basedll_utilsexc.o
        basedll_thread.o \
        basedll_utils.o \
        basedll_utilsexc.o


@@ -4356,6 +5392,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_regconf.o \
        basedll_registry.o \
        basedll_snglinst.o \
        basedll_regconf.o \
        basedll_registry.o \
        basedll_snglinst.o \

+       basedll_stdpaths.o \

        basedll_thread.o \
        basedll_utils.o \
        basedll_utilsexc.o \
        basedll_thread.o \
        basedll_utils.o \
        basedll_utilsexc.o \


@@ -4368,7 +5405,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \

-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o

 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \


@@ -4376,7 +5415,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \

-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o

 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \


@@ -4384,17 +5425,21 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \

-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.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 =  \
        basedll_dirmac.o \
        basedll_mimetmac.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 =  \
        basedll_dirmac.o \
        basedll_mimetmac.o \

-       basedll_baseunix.o \

        basedll_utilsexc.o \
        basedll_thread.o \
        basedll_macnotfy.o \
        basedll_MoreFilesX.o \
        basedll_utilsexc.o \
        basedll_thread.o \
        basedll_macnotfy.o \
        basedll_MoreFilesX.o \

-       basedll_cfstring.o
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o \
+       basedll_baseunix.o \
+       basedll_stdpaths.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \


@@ -4402,7 +5447,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \

-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o

 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \


@@ -4410,7 +5457,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \

-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o

 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = basedll_utilsunx.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = basedll_utilsunx.o


@@ -4429,9 +5478,29 @@ COND_MONOLITHIC_0_SHARED_0___baselib___depname = \
 @COND_GCC_PCH_1@       = .pch/wxprec_baselib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_3)
 @COND_GCC_PCH_1@       = .pch/wxprec_baselib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_3)

+COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
+       baselib_dirmac.o \
+       baselib_mimetmac.o \
+       baselib_utilsexc.o \
+       baselib_thread.o \
+       baselib_macnotfy.o \
+       baselib_MoreFilesX.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o \
+       baselib_DirectoryCopy.o \
+       baselib_FSpCompat.o \
+       baselib_FileCopy.o \
+       baselib_FullPath.o \
+       baselib_IterateDirectory.o \
+       baselib_MoreDesktopMgr.o \
+       baselib_MoreFiles.o \
+       baselib_MoreFilesExtras.o \
+       baselib_Search.o
+@COND_PLATFORM_MACOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS_3)

 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_dir.o \
        baselib_mimetype.o \
 COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_dir.o \
        baselib_mimetype.o \

+       baselib_stdpaths.o \

        baselib_thread.o \
        baselib_utils.o \
        baselib_utilsexc.o
        baselib_thread.o \
        baselib_utils.o \
        baselib_utilsexc.o


@@ -4453,6 +5522,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_regconf.o \
        baselib_registry.o \
        baselib_snglinst.o \
        baselib_regconf.o \
        baselib_registry.o \
        baselib_snglinst.o \

+       baselib_stdpaths.o \

        baselib_thread.o \
        baselib_utils.o \
        baselib_utilsexc.o \
        baselib_thread.o \
        baselib_utils.o \
        baselib_utilsexc.o \


@@ -4465,7 +5535,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \

-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o

 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \


@@ -4473,7 +5545,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \

-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o

 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \


@@ -4481,17 +5555,21 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \

-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.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 =  \
        baselib_dirmac.o \
        baselib_mimetmac.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 =  \
        baselib_dirmac.o \
        baselib_mimetmac.o \

-       baselib_baseunix.o \

        baselib_utilsexc.o \
        baselib_thread.o \
        baselib_macnotfy.o \
        baselib_MoreFilesX.o \
        baselib_utilsexc.o \
        baselib_thread.o \
        baselib_macnotfy.o \
        baselib_MoreFilesX.o \

-       baselib_cfstring.o
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o \
+       baselib_baseunix.o \
+       baselib_stdpaths.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \


@@ -4499,7 +5577,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \

-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o

 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \


@@ -4507,7 +5587,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \

-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o

 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = baselib_utilsunx.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = baselib_utilsunx.o


@@ -4560,6 +5642,7 @@ COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd = rm -f \
        $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
        $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o

+@COND_PLATFORM_MACOS_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o

 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \


@@ -4574,6 +5657,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
 @COND_GCC_PCH_1@___pch_wxprec_netlib_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_netlib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_GCC_PCH_1@___pch_wxprec_netlib_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_netlib/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o

+@COND_PLATFORM_MACOS_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o

 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \


@@ -4632,7 +5716,7 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \
 @COND_TOOLKIT_MAC@     coredll_utils.o coredll_uma.o
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \
 @COND_TOOLKIT_MAC@     coredll_utils.o coredll_uma.o
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \

-       $(__LOWLEVEL_SRC_OBJECTS_8) \
+       $(__LOWLEVEL_SRC_OBJECTS_4) \

        $(__GUI_SRC_OBJECTS_2) \
        coredll_accesscmn.o \
        coredll_appcmn.o \
        $(__GUI_SRC_OBJECTS_2) \
        coredll_accesscmn.o \
        coredll_appcmn.o \


@@ -4732,7 +5816,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \

-       $(__LOWLEVEL_SRC_OBJECTS_8) \
+       $(__LOWLEVEL_SRC_OBJECTS_5) \

        coredll_accel.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \
        coredll_accel.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \


@@ -4879,6 +5963,228 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_vlbox.o \
        coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
        coredll_vlbox.o \
        coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)

+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
+@COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_paletteg.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dnd.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockgtk.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgtk.o \
+       coredll_win_gtk.o \
+       coredll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_4)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_4 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dirmgl.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiobj.o \
+       coredll_icon.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o \
+       coredll_helpchm.o \
+       coredll_helpwin.o \
+       coredll_automtn.o \
+       coredll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_4 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockx11.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_nanox.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_reparent.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_utilsx.o \
+       coredll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4)

 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_NSBox.o \
        coredll_NSButton.o \
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_NSBox.o \
        coredll_NSButton.o \


@@ -4966,9 +6272,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_regiong.o \
        coredll_statusbr.o \
        coredll_tabg.o \
        coredll_regiong.o \
        coredll_statusbr.o \
        coredll_tabg.o \

-       coredll_timer.o \
-       coredll_gsockosx.o \
-       coredll_cfstring.o
+       coredll_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \


@@ -4993,6 +6297,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_combobox.o \
        coredll_control.o \
        coredll_dialog.o \
        coredll_combobox.o \
        coredll_control.o \
        coredll_dialog.o \

+       coredll_filedlg.o \

        coredll_fontdlg.o \
        coredll_frame.o \
        coredll_gauge.o \
        coredll_fontdlg.o \
        coredll_frame.o \
        coredll_gauge.o \


@@ -5053,7 +6358,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_frame.o \
        coredll_gauge.o \
        coredll_gdiobj.o \
        coredll_frame.o \
        coredll_gauge.o \
        coredll_gdiobj.o \

-       coredll_gsockosx.o \

        coredll_hid.o \
        coredll_icon.o \
        coredll_listbox.o \
        coredll_hid.o \
        coredll_icon.o \
        coredll_listbox.o \


@@ -5099,8 +6403,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_prntdlgg.o \
        coredll_statusbr.o \
        coredll_tabg.o \
        coredll_prntdlgg.o \
        coredll_statusbr.o \
        coredll_tabg.o \

-       coredll_snglinst.o \
-       coredll_webkit.o
+       $(__MAC_OSX_SRC_OBJECTS_2)

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \


@@ -5359,37 +6662,265 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
        coredll_tbarwce.o \
        coredll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
        coredll_tbarwce.o \
        coredll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)

-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
-@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
-@COND_GCC_PCH_1@___pch_wxprec_corelib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_corelib/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_MACOSX_1@       = corelib_utilsunx.o
-@COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@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_5 = \
-@COND_TOOLKIT_MAC@     corelib_utils.o corelib_uma.o
-COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_9) \
-       $(__GUI_SRC_OBJECTS_3) \
-       corelib_accesscmn.o \
-       corelib_appcmn.o \
-       corelib_artprov.o \
-       corelib_artstd.o \
-       corelib_bmpbase.o \
-       corelib_bookctrl.o \
-       corelib_choiccmn.o \
-       corelib_clipcmn.o \
-       corelib_cmdproc.o \
-       corelib_cmndata.o \
-       corelib_containr.o \
-       corelib_cshelp.o \
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2 =  \
+       coredll_snglinst.o \
+       coredll_webkit.o \
+       coredll_fontdlgosx.o \
+       coredll_colordlgosx.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
+@COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_paletteg.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dnd.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockgtk.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgtk.o \
+       coredll_win_gtk.o \
+       coredll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_5)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_5 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dirmgl.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiobj.o \
+       coredll_icon.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o \
+       coredll_helpchm.o \
+       coredll_helpwin.o \
+       coredll_automtn.o \
+       coredll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_5 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockx11.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_nanox.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_reparent.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_utilsx.o \
+       coredll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5)
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
+@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
+@COND_GCC_PCH_1@___pch_wxprec_corelib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
+@COND_PLATFORM_MACOSX_1@       = corelib_utilsunx.o
+@COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
+@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_5 = \
+@COND_TOOLKIT_MAC@     corelib_utils.o corelib_uma.o
+COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
+       $(__LOWLEVEL_SRC_OBJECTS_6) \
+       $(__GUI_SRC_OBJECTS_3) \
+       corelib_accesscmn.o \
+       corelib_appcmn.o \
+       corelib_artprov.o \
+       corelib_artstd.o \
+       corelib_bmpbase.o \
+       corelib_bookctrl.o \
+       corelib_choiccmn.o \
+       corelib_clipcmn.o \
+       corelib_cmdproc.o \
+       corelib_cmndata.o \
+       corelib_containr.o \
+       corelib_cshelp.o \

        corelib_ctrlcmn.o \
        corelib_ctrlsub.o \
        corelib_datacmn.o \
        corelib_ctrlcmn.o \
        corelib_ctrlsub.o \
        corelib_datacmn.o \


@@ -5476,7 +7007,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \

-       $(__LOWLEVEL_SRC_OBJECTS_9) \
+       $(__LOWLEVEL_SRC_OBJECTS_7) \

        corelib_accel.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \
        corelib_accel.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \


@@ -5623,19 +7154,241 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_vlbox.o \
        corelib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
        corelib_vlbox.o \
        corelib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)

-COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
-       corelib_NSBox.o \
-       corelib_NSButton.o \
-       corelib_NSControl.o \
-       corelib_NSMenu.o \
-       corelib_NSPanel.o \
-       corelib_NSScroller.o \
-       corelib_NSTabView.o \
-       corelib_NSTableView.o \
-       corelib_NSTextField.o \
-       corelib_NSView.o \
-       corelib_NSWindow.o \
-       corelib_ObjcRef.o \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
+@COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_paletteg.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dataobj.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_dnd.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_gdiobj.o \
+       corelib_gsockgtk.o \
+       corelib_icon.o \
+       corelib_main.o \
+       corelib_minifram.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgtk.o \
+       corelib_win_gtk.o \
+       corelib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_6)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_6 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_timer.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_dirmgl.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiobj.o \
+       corelib_icon.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_region.o \
+       corelib_settings.o \
+       corelib_toplevel.o \
+       corelib_utils.o \
+       corelib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_pen.o \
+       corelib_region.o \
+       corelib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_caret.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcprint.o \
+       corelib_dcscreen.o \
+       corelib_dialup.o \
+       corelib_dib.o \
+       corelib_display.o \
+       corelib_enhmeta.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiimage.o \
+       corelib_gdiobj.o \
+       corelib_gsockmsw.o \
+       corelib_icon.o \
+       corelib_minifram.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_printdlg.o \
+       corelib_printwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgui.o \
+       corelib_uxtheme.o \
+       corelib_window.o \
+       corelib_helpchm.o \
+       corelib_helpwin.o \
+       corelib_automtn.o \
+       corelib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_6 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_caret.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcprint.o \
+       corelib_dcscreen.o \
+       corelib_dialup.o \
+       corelib_dib.o \
+       corelib_display.o \
+       corelib_enhmeta.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiimage.o \
+       corelib_gdiobj.o \
+       corelib_gsockmsw.o \
+       corelib_icon.o \
+       corelib_minifram.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_printdlg.o \
+       corelib_printwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgui.o \
+       corelib_uxtheme.o \
+       corelib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_timer.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dataobj.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_gdiobj.o \
+       corelib_gsockx11.o \
+       corelib_icon.o \
+       corelib_main.o \
+       corelib_minifram.o \
+       corelib_nanox.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_region.o \
+       corelib_reparent.o \
+       corelib_settings.o \
+       corelib_toplevel.o \
+       corelib_utils.o \
+       corelib_utilsx.o \
+       corelib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
+       corelib_NSBox.o \
+       corelib_NSButton.o \
+       corelib_NSControl.o \
+       corelib_NSMenu.o \
+       corelib_NSPanel.o \
+       corelib_NSScroller.o \
+       corelib_NSTabView.o \
+       corelib_NSTableView.o \
+       corelib_NSTextField.o \
+       corelib_NSView.o \
+       corelib_NSWindow.o \
+       corelib_ObjcRef.o \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_bmpbuttn.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_bmpbuttn.o \


@@ -5710,9 +7463,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_regiong.o \
        corelib_statusbr.o \
        corelib_tabg.o \
        corelib_regiong.o \
        corelib_statusbr.o \
        corelib_tabg.o \

-       corelib_timer.o \
-       corelib_gsockosx.o \
-       corelib_cfstring.o
+       corelib_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \


@@ -5737,6 +7488,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_combobox.o \
        corelib_control.o \
        corelib_dialog.o \
        corelib_combobox.o \
        corelib_control.o \
        corelib_dialog.o \

+       corelib_filedlg.o \

        corelib_fontdlg.o \
        corelib_frame.o \
        corelib_gauge.o \
        corelib_fontdlg.o \
        corelib_frame.o \
        corelib_gauge.o \


@@ -5797,7 +7549,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_frame.o \
        corelib_gauge.o \
        corelib_gdiobj.o \
        corelib_frame.o \
        corelib_gauge.o \
        corelib_gdiobj.o \

-       corelib_gsockosx.o \

        corelib_hid.o \
        corelib_icon.o \
        corelib_listbox.o \
        corelib_hid.o \
        corelib_icon.o \
        corelib_listbox.o \


@@ -5843,8 +7594,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_prntdlgg.o \
        corelib_statusbr.o \
        corelib_tabg.o \
        corelib_prntdlgg.o \
        corelib_statusbr.o \
        corelib_tabg.o \

-       corelib_snglinst.o \
-       corelib_webkit.o
+       $(__MAC_OSX_SRC_OBJECTS_3)

 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \


@@ -6066,1176 +7816,52 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
        corelib_iniconf.o \
        corelib_listbox.o \
        corelib_listctrl.o \
        corelib_iniconf.o \
        corelib_listbox.o \
        corelib_listctrl.o \

-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_metafile.o \
-       corelib_msgdlg.o \
-       corelib_nativdlg.o \
-       corelib_notebook.o \
-       corelib_access.o \
-       corelib_ownerdrw.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_slider95.o \
-       corelib_spinbutt.o \
-       corelib_spinctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_statbr95.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_tabctrl.o \
-       corelib_tbar95.o \
-       corelib_textctrl.o \
-       corelib_tglbtn.o \
-       corelib_treectrl.o \
-       corelib_dirdlgg.o \
-       corelib_fdrepdlg.o \
-       corelib_fontdlgg.o \
-       corelib_choicece.o \
-       corelib_crt.o \
-       corelib_filedlgwce.o \
-       corelib_filefnwce.o \
-       corelib_helpwce.o \
-       corelib_menuce.o \
-       corelib_tbarwce.o \
-       corelib_textctrlce.o
-@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
-COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___advdll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__advdll___importlib = $(COND_PLATFORM_OS2_1___advdll___importlib)
-COND_PLATFORM_WIN32_1___advdll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib)
-@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
-@COND_GCC_PCH_1@___pch_wxprec_advdll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_advdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___advdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags)
-COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_COCOA@   advdll_taskbar.o advdll_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
-       advdll_taskbarcmn.o \
-       advdll_joystick.o \
-       advdll_sound.o \
-       advdll_taskbarx11.o \
-       advdll_taskbar.o \
-       advdll_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
-       advdll_taskbarcmn.o \
-       advdll_drawer.o \
-       advdll_joystick.o \
-       advdll_sound.o \
-       advdll_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_2)
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_MOTIF@   advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_MOTIF@   advdll_taskbarx11.o
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_MSW@     advdll_taskbarcmn.o advdll_sound.o advdll_taskbar.o \
-@COND_TOOLKIT_MSW@     advdll_joystick.o
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_PM@      advdll_joystick.o advdll_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_WINCE@   advdll_taskbarcmn.o advdll_sound.o advdll_taskbar.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_X11@     advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_X11@     advdll_taskbarx11.o
-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advdll_sound_sdl.o
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_advlib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
-@COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
-@COND_GCC_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_advlib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_COCOA@   advlib_taskbar.o advlib_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
-       advlib_taskbarcmn.o \
-       advlib_joystick.o \
-       advlib_sound.o \
-       advlib_taskbarx11.o \
-       advlib_taskbar.o \
-       advlib_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
-       advlib_taskbarcmn.o \
-       advlib_drawer.o \
-       advlib_joystick.o \
-       advlib_sound.o \
-       advlib_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3)
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_MOTIF@   advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_MOTIF@   advlib_taskbarx11.o
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_MSW@     advlib_taskbarcmn.o advlib_sound.o advlib_taskbar.o \
-@COND_TOOLKIT_MSW@     advlib_joystick.o
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_PM@      advlib_joystick.o advlib_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_WINCE@   advlib_taskbarcmn.o advlib_sound.o advlib_taskbar.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_X11@     advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_X11@     advlib_taskbarx11.o
-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
-@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = install_odbcdll
-COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___odbcdll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__odbcdll___importlib = $(COND_PLATFORM_OS2_1___odbcdll___importlib)
-COND_PLATFORM_WIN32_1___odbcdll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__odbcdll___importlib = $(COND_PLATFORM_WIN32_1___odbcdll___importlib)
-@COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll
-@COND_GCC_PCH_1@___pch_wxprec_odbcdll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_odbcdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__odbcdll___soname_flags = $(COND_USE_SOVERLINUX_1___odbcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd)
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__install_odbclib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = install_odbclib
-@COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib
-@COND_GCC_PCH_1@___pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_odbclib/wx/wxprec.h.gch
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = install_dbgriddll
-COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd)
-COND_PLATFORM_OS2_1___dbgriddll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__dbgriddll___importlib = $(COND_PLATFORM_OS2_1___dbgriddll___importlib)
-COND_PLATFORM_WIN32_1___dbgriddll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__dbgriddll___importlib = $(COND_PLATFORM_WIN32_1___dbgriddll___importlib)
-@COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll
-@COND_GCC_PCH_1@___pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_dbgriddll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__dbgriddll___soname_flags = $(COND_USE_SOVERLINUX_1___dbgriddll___soname_flags)
-COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__dbgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags)
-COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd)
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = install_dbgridlib
-@COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib
-@COND_GCC_PCH_1@___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
-COND_MONOLITHIC_0_SHARED_1_USE_HTML_1___htmldll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1___htmldll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@__install_htmldll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        = install_htmldll
-COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___htmldll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__htmldll___importlib = $(COND_PLATFORM_OS2_1___htmldll___importlib)
-COND_PLATFORM_WIN32_1___htmldll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__htmldll___importlib = $(COND_PLATFORM_WIN32_1___htmldll___importlib)
-@COND_GCC_PCH_1@__htmldll_PCH_INC = -I.pch/wxprec_htmldll
-@COND_GCC_PCH_1@___pch_wxprec_htmldll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_htmldll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___htmldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__htmldll___soname_flags = $(COND_USE_SOVERLINUX_1___htmldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__htmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___htmldll___soname_flags)
-COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd)
-@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
-@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
-@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o
-COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@__install_htmllib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        = install_htmllib
-@COND_GCC_PCH_1@__htmllib_PCH_INC = -I.pch/wxprec_htmllib
-@COND_GCC_PCH_1@___pch_wxprec_htmllib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_htmllib/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
-@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
-@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
-COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
-@COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
-COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___xmldll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__xmldll___importlib = $(COND_PLATFORM_OS2_1___xmldll___importlib)
-COND_PLATFORM_WIN32_1___xmldll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__xmldll___importlib = $(COND_PLATFORM_WIN32_1___xmldll___importlib)
-@COND_GCC_PCH_1@__xmldll_PCH_INC = -I.pch/wxprec_xmldll
-@COND_GCC_PCH_1@___pch_wxprec_xmldll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_xmldll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___xmldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__xmldll___soname_flags = $(COND_USE_SOVERLINUX_1___xmldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___xmldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xmldll___soname_flags)
-COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd)
-COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname)
-@COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
-@COND_GCC_PCH_1@__xmllib_PCH_INC = -I.pch/wxprec_xmllib
-@COND_GCC_PCH_1@___pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_xmllib/wx/wxprec.h.gch
-COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
-COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___xrcdll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__xrcdll___importlib = $(COND_PLATFORM_OS2_1___xrcdll___importlib)
-COND_PLATFORM_WIN32_1___xrcdll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib)
-@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll
-@COND_GCC_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_xrcdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
-COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__xrclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__install_xrclib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
-@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
-@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_xrclib/wx/wxprec.h.gch
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
-COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___gldll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__gldll___importlib = $(COND_PLATFORM_OS2_1___gldll___importlib)
-COND_PLATFORM_WIN32_1___gldll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__gldll___importlib = $(COND_PLATFORM_WIN32_1___gldll___importlib)
-@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
-@COND_GCC_PCH_1@___pch_wxprec_gldll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_gldll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___gldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
-COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
-@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
-@COND_GCC_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_gllib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
-       $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
-@COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
-@COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
-@COND_USE_XRC_1@__wxrc___depname = wxrc
-@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
-@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
-@COND_USE_GUI_1@__install_afm___depname = install-afm
-@COND_USE_GUI_1@__install_gsafm___depname = install-gsafm
-@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
-@COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
-@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
-@COND_SHARED_0@____SHARED = 
-@COND_SHARED_1@____SHARED = $(PIC_FLAG)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
-       monodll_displayx11.o \
-       monodll_paletteg.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dnd.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_gdiobj.o \
-       monodll_gsockgtk.o \
-       monodll_icon.o \
-       monodll_main.o \
-       monodll_minifram.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_timer.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgtk.o \
-       monodll_win_gtk.o \
-       monodll_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dirmgl.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiobj.o \
-       monodll_icon.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
-       monodll_displayx11.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_caret.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcprint.o \
-       monodll_dcscreen.o \
-       monodll_dialup.o \
-       monodll_dib.o \
-       monodll_display.o \
-       monodll_enhmeta.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
-       monodll_gsockmsw.o \
-       monodll_icon.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
-       monodll_dropsrc.o \
-       monodll_droptgt.o \
-       monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
-       monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_stdpaths.o \
-       monodll_timer.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
-       monodll_uxtheme.o \
-       monodll_window.o \
-       monodll_helpchm.o \
-       monodll_helpwin.o \
-       monodll_automtn.o \
-       monodll_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_caret.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcprint.o \
-       monodll_dcscreen.o \
-       monodll_dialup.o \
-       monodll_dib.o \
-       monodll_display.o \
-       monodll_enhmeta.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
-       monodll_gsockmsw.o \
-       monodll_icon.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
-       monodll_dropsrc.o \
-       monodll_droptgt.o \
-       monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
-       monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_stdpaths.o \
-       monodll_timer.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
-       monodll_uxtheme.o \
-       monodll_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
-       monodll_displayx11.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_gdiobj.o \
-       monodll_gsockx11.o \
-       monodll_icon.o \
-       monodll_main.o \
-       monodll_minifram.o \
-       monodll_nanox.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_region.o \
-       monodll_reparent.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_utilsx.o \
-       monodll_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
-       monolib_displayx11.o \
-       monolib_paletteg.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dnd.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_gdiobj.o \
-       monolib_gsockgtk.o \
-       monolib_icon.o \
-       monolib_main.o \
-       monolib_minifram.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_timer.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgtk.o \
-       monolib_win_gtk.o \
-       monolib_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dirmgl.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiobj.o \
-       monolib_icon.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
-       monolib_displayx11.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_caret.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcprint.o \
-       monolib_dcscreen.o \
-       monolib_dialup.o \
-       monolib_dib.o \
-       monolib_display.o \
-       monolib_enhmeta.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
-       monolib_gsockmsw.o \
-       monolib_icon.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
-       monolib_dropsrc.o \
-       monolib_droptgt.o \
-       monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
-       monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_stdpaths.o \
-       monolib_timer.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
-       monolib_uxtheme.o \
-       monolib_window.o \
-       monolib_helpchm.o \
-       monolib_helpwin.o \
-       monolib_automtn.o \
-       monolib_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_caret.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcprint.o \
-       monolib_dcscreen.o \
-       monolib_dialup.o \
-       monolib_dib.o \
-       monolib_display.o \
-       monolib_enhmeta.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
-       monolib_gsockmsw.o \
-       monolib_icon.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
-       monolib_dropsrc.o \
-       monolib_droptgt.o \
-       monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
-       monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_stdpaths.o \
-       monolib_timer.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
-       monolib_uxtheme.o \
-       monolib_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
-       monolib_displayx11.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_gdiobj.o \
-       monolib_gsockx11.o \
-       monolib_icon.o \
-       monolib_main.o \
-       monolib_minifram.o \
-       monolib_nanox.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_region.o \
-       monolib_reparent.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_utilsx.o \
-       monolib_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
-       coredll_displayx11.o \
-       coredll_paletteg.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dnd.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_gdiobj.o \
-       coredll_gsockgtk.o \
-       coredll_icon.o \
-       coredll_main.o \
-       coredll_minifram.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_timer.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgtk.o \
-       coredll_win_gtk.o \
-       coredll_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dirmgl.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiobj.o \
-       coredll_icon.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
-       coredll_displayx11.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_caret.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcprint.o \
-       coredll_dcscreen.o \
-       coredll_dialup.o \
-       coredll_dib.o \
-       coredll_display.o \
-       coredll_enhmeta.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
-       coredll_gsockmsw.o \
-       coredll_icon.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
-       coredll_dropsrc.o \
-       coredll_droptgt.o \
-       coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
-       coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_stdpaths.o \
-       coredll_timer.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
-       coredll_uxtheme.o \
-       coredll_window.o \
-       coredll_helpchm.o \
-       coredll_helpwin.o \
-       coredll_automtn.o \
-       coredll_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_caret.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcprint.o \
-       coredll_dcscreen.o \
-       coredll_dialup.o \
-       coredll_dib.o \
-       coredll_display.o \
-       coredll_enhmeta.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
-       coredll_gsockmsw.o \
-       coredll_icon.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
-       coredll_dropsrc.o \
-       coredll_droptgt.o \
-       coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
-       coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_stdpaths.o \
-       coredll_timer.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
-       coredll_uxtheme.o \
-       coredll_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
-       coredll_displayx11.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_gdiobj.o \
-       coredll_gsockx11.o \
-       coredll_icon.o \
-       coredll_main.o \
-       coredll_minifram.o \
-       coredll_nanox.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_region.o \
-       coredll_reparent.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_utilsx.o \
-       coredll_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
+       corelib_mdi.o \
+       corelib_menu.o \
+       corelib_menuitem.o \
+       corelib_metafile.o \
+       corelib_msgdlg.o \
+       corelib_nativdlg.o \
+       corelib_notebook.o \
+       corelib_access.o \
+       corelib_ownerdrw.o \
+       corelib_radiobox.o \
+       corelib_radiobut.o \
+       corelib_scrolbar.o \
+       corelib_slider95.o \
+       corelib_spinbutt.o \
+       corelib_spinctrl.o \
+       corelib_statbmp.o \
+       corelib_statbox.o \
+       corelib_statbr95.o \
+       corelib_statline.o \
+       corelib_stattext.o \
+       corelib_tabctrl.o \
+       corelib_tbar95.o \
+       corelib_textctrl.o \
+       corelib_tglbtn.o \
+       corelib_treectrl.o \
+       corelib_dirdlgg.o \
+       corelib_fdrepdlg.o \
+       corelib_fontdlgg.o \
+       corelib_choicece.o \
+       corelib_crt.o \
+       corelib_filedlgwce.o \
+       corelib_filefnwce.o \
+       corelib_helpwce.o \
+       corelib_menuce.o \
+       corelib_tbarwce.o \
+       corelib_textctrlce.o
+@COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3 =  \
+       corelib_snglinst.o \
+       corelib_webkit.o \
+       corelib_fontdlgosx.o \
+       corelib_colordlgosx.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
+@COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_7 =  \

        corelib_caret.o \
        corelib_dialup.o \
        corelib_fontenum.o \
        corelib_caret.o \
        corelib_dialup.o \
        corelib_fontenum.o \


@@ -7274,9 +7900,10 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_utilsgtk.o \
        corelib_win_gtk.o \
        corelib_window.o
        corelib_utilsgtk.o \
        corelib_win_gtk.o \
        corelib_window.o

-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_7)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_7 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \

        corelib_caret.o \
        corelib_timer.o \
        corelib_app.o \
        corelib_caret.o \
        corelib_timer.o \
        corelib_app.o \


@@ -7304,8 +7931,8 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_toplevel.o \
        corelib_utils.o \
        corelib_window.o
        corelib_toplevel.o \
        corelib_utils.o \
        corelib_window.o

-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 =  \

        corelib_caret.o \
        corelib_dialup.o \
        corelib_fontenum.o \
        corelib_caret.o \
        corelib_dialup.o \
        corelib_fontenum.o \


@@ -7317,8 +7944,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_pen.o \
        corelib_region.o \
        corelib_utilsx.o
        corelib_pen.o \
        corelib_region.o \
        corelib_utilsx.o

-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \


@@ -7357,7 +7984,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_region.o \
        corelib_renderer.o \
        corelib_settings.o \
        corelib_region.o \
        corelib_renderer.o \
        corelib_settings.o \

-       corelib_stdpaths.o \

        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \


@@ -7368,9 +7994,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_helpwin.o \
        corelib_automtn.o \
        corelib_uuid.o
        corelib_helpwin.o \
        corelib_automtn.o \
        corelib_uuid.o

-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9 =  \
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_7 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 =  \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \


@@ -7409,15 +8035,14 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_region.o \
        corelib_renderer.o \
        corelib_settings.o \
        corelib_region.o \
        corelib_renderer.o \
        corelib_settings.o \

-       corelib_stdpaths.o \

        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_utilsgui.o \
        corelib_uxtheme.o \
        corelib_window.o
        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_utilsgui.o \
        corelib_uxtheme.o \
        corelib_window.o

-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \

        corelib_caret.o \
        corelib_dialup.o \
        corelib_fontenum.o \
        corelib_caret.o \
        corelib_dialup.o \
        corelib_fontenum.o \


@@ -7455,7 +8080,545 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_utils.o \
        corelib_utilsx.o \
        corelib_window.o
        corelib_utils.o \
        corelib_utilsx.o \
        corelib_window.o

-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9)
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
+COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd)
+COND_PLATFORM_OS2_1___advdll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__advdll___importlib = $(COND_PLATFORM_OS2_1___advdll___importlib)
+COND_PLATFORM_WIN32_1___advdll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib)
+@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
+@COND_GCC_PCH_1@___pch_wxprec_advdll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_advdll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___advdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags)
+COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_COCOA@   advdll_taskbar.o advdll_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
+       advdll_taskbarcmn.o \
+       advdll_joystick.o \
+       advdll_sound.o \
+       advdll_taskbarx11.o \
+       advdll_taskbar.o \
+       advdll_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_2)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_2 =  \
+       advdll_taskbarcmn.o \
+       advdll_drawer.o \
+       advdll_joystick.o \
+       advdll_sound.o \
+       advdll_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_2)
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MOTIF@   advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
+@COND_TOOLKIT_MOTIF@   advdll_taskbarx11.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MSW@     advdll_taskbarcmn.o advdll_sound.o advdll_taskbar.o \
+@COND_TOOLKIT_MSW@     advdll_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_PM@      advdll_joystick.o advdll_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_WINCE@   advdll_taskbarcmn.o advdll_sound.o advdll_taskbar.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_X11@     advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
+@COND_TOOLKIT_X11@     advdll_taskbarx11.o
+@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
+@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advdll_sound_sdl.o advdll_gprint.o
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_advlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
+@COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
+@COND_GCC_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_advlib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_COCOA@   advlib_taskbar.o advlib_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
+       advlib_taskbarcmn.o \
+       advlib_joystick.o \
+       advlib_sound.o \
+       advlib_taskbarx11.o \
+       advlib_taskbar.o \
+       advlib_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_3)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
+       advlib_taskbarcmn.o \
+       advlib_drawer.o \
+       advlib_joystick.o \
+       advlib_sound.o \
+       advlib_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3)
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MOTIF@   advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
+@COND_TOOLKIT_MOTIF@   advlib_taskbarx11.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MSW@     advlib_taskbarcmn.o advlib_sound.o advlib_taskbar.o \
+@COND_TOOLKIT_MSW@     advlib_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_PM@      advlib_joystick.o advlib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_WINCE@   advlib_taskbarcmn.o advlib_sound.o advlib_taskbar.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_X11@     advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
+@COND_TOOLKIT_X11@     advlib_taskbarx11.o
+@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
+@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o advlib_gprint.o
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___mediadll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_mediadll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_mediadll
+COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__mediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd)
+COND_PLATFORM_OS2_1___mediadll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__mediadll___importlib = $(COND_PLATFORM_OS2_1___mediadll___importlib)
+COND_PLATFORM_WIN32_1___mediadll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__mediadll___importlib = $(COND_PLATFORM_WIN32_1___mediadll___importlib)
+@COND_GCC_PCH_1@__mediadll_PCH_INC = -I.pch/wxprec_mediadll
+@COND_GCC_PCH_1@___pch_wxprec_mediadll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_mediadll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___mediadll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__mediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mediadll___soname_flags)
+COND_USE_SOVERSOLARIS_1___mediadll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__mediadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___mediadll___soname_flags)
+COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__mediadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__mediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_inst_cmd)
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 =  
+@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o 
+@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___medialib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___medialib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_medialib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_medialib
+@COND_GCC_PCH_1@__medialib_PCH_INC = -I.pch/wxprec_medialib
+@COND_GCC_PCH_1@___pch_wxprec_medialib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_medialib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 =  
+@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o 
+@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
+COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = install_odbcdll
+COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd)
+COND_PLATFORM_OS2_1___odbcdll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__odbcdll___importlib = $(COND_PLATFORM_OS2_1___odbcdll___importlib)
+COND_PLATFORM_WIN32_1___odbcdll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__odbcdll___importlib = $(COND_PLATFORM_WIN32_1___odbcdll___importlib)
+@COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll
+@COND_GCC_PCH_1@___pch_wxprec_odbcdll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_odbcdll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__odbcdll___soname_flags = $(COND_USE_SOVERLINUX_1___odbcdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags)
+COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd)
+COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__install_odbclib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = install_odbclib
+@COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib
+@COND_GCC_PCH_1@___pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_odbclib/wx/wxprec.h.gch
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = install_dbgriddll
+COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd)
+COND_PLATFORM_OS2_1___dbgriddll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__dbgriddll___importlib = $(COND_PLATFORM_OS2_1___dbgriddll___importlib)
+COND_PLATFORM_WIN32_1___dbgriddll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__dbgriddll___importlib = $(COND_PLATFORM_WIN32_1___dbgriddll___importlib)
+@COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll
+@COND_GCC_PCH_1@___pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_dbgriddll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__dbgriddll___soname_flags = $(COND_USE_SOVERLINUX_1___dbgriddll___soname_flags)
+COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__dbgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags)
+COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd)
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = install_dbgridlib
+@COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib
+@COND_GCC_PCH_1@___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      = install_htmldll
+COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd)
+COND_PLATFORM_OS2_1___htmldll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__htmldll___importlib = $(COND_PLATFORM_OS2_1___htmldll___importlib)
+COND_PLATFORM_WIN32_1___htmldll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__htmldll___importlib = $(COND_PLATFORM_WIN32_1___htmldll___importlib)
+@COND_GCC_PCH_1@__htmldll_PCH_INC = -I.pch/wxprec_htmldll
+@COND_GCC_PCH_1@___pch_wxprec_htmldll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_htmldll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___htmldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__htmldll___soname_flags = $(COND_USE_SOVERLINUX_1___htmldll___soname_flags)
+COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__htmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___htmldll___soname_flags)
+COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd)
+@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
+@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
+@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__install_htmllib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = install_htmllib
+@COND_GCC_PCH_1@__htmllib_PCH_INC = -I.pch/wxprec_htmllib
+@COND_GCC_PCH_1@___pch_wxprec_htmllib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_htmllib/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
+@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
+@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
+COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
+@COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
+COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd)
+COND_PLATFORM_OS2_1___xmldll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__xmldll___importlib = $(COND_PLATFORM_OS2_1___xmldll___importlib)
+COND_PLATFORM_WIN32_1___xmldll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__xmldll___importlib = $(COND_PLATFORM_WIN32_1___xmldll___importlib)
+@COND_GCC_PCH_1@__xmldll_PCH_INC = -I.pch/wxprec_xmldll
+@COND_GCC_PCH_1@___pch_wxprec_xmldll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xmldll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___xmldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__xmldll___soname_flags = $(COND_USE_SOVERLINUX_1___xmldll___soname_flags)
+COND_USE_SOVERSOLARIS_1___xmldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xmldll___soname_flags)
+COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd)
+COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname)
+@COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
+@COND_GCC_PCH_1@__xmllib_PCH_INC = -I.pch/wxprec_xmllib
+@COND_GCC_PCH_1@___pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xmllib/wx/wxprec.h.gch
+COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
+COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd)
+COND_PLATFORM_OS2_1___xrcdll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__xrcdll___importlib = $(COND_PLATFORM_OS2_1___xrcdll___importlib)
+COND_PLATFORM_WIN32_1___xrcdll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib)
+@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll
+@COND_GCC_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xrcdll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags)
+COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
+COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__xrclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__install_xrclib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
+@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
+@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xrclib/wx/wxprec.h.gch
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
+COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd)
+COND_PLATFORM_OS2_1___gldll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__gldll___importlib = $(COND_PLATFORM_OS2_1___gldll___importlib)
+COND_PLATFORM_WIN32_1___gldll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__gldll___importlib = $(COND_PLATFORM_WIN32_1___gldll___importlib)
+@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
+@COND_GCC_PCH_1@___pch_wxprec_gldll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_gldll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___gldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
+COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
+COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
+COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
+@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
+@COND_GCC_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
+       $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+@COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
+@COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
+@COND_USE_XRC_1@__wxrc___depname = wxrc
+@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
+@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
+@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
+@COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
+@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
+@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
+@COND_SHARED_0@____SHARED = 
+@COND_SHARED_1@____SHARED = $(PIC_FLAG)
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \
+@COND_PLATFORM_MACOSX_1@       = monodll_gsockosx.o monodll_utilsexc_cf.o
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \
+@COND_PLATFORM_MACOSX_1@       = monolib_gsockosx.o monolib_utilsexc_cf.o
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \
+@COND_PLATFORM_MACOSX_1@       = coredll_gsockosx.o coredll_utilsexc_cf.o
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \
+@COND_PLATFORM_MACOSX_1@       = corelib_gsockosx.o corelib_utilsexc_cf.o

 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)


@@ -7496,9 +8659,9 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)
+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__macos_res___depname) $(__cocoa_res___depname)

 
 

-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_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
+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_mediadll___depname) $(__install_medialib___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_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)

        $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
        $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx


@@ -7534,6 +8697,7 @@ install-strip: install
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)

+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)

        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)


@@ -7572,6 +8736,10 @@ clean: $(__clean_wxrc___depname)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)

+       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)

        rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)


@@ -7797,6 +8965,32 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
 

+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_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) $@ $(MEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___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_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__mediadll___so_symlinks_cmd)
+
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_mediadll: 
+@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)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
+
+@COND_GCC_PCH_1@.pch/wxprec_mediadll/wx/wxprec.h.gch: 
+@COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MEDIALIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(MEDIALIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
+
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_medialib: 
+@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)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+
+@COND_GCC_PCH_1@.pch/wxprec_medialib/wx/wxprec.h.gch: 
+@COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
+

 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(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_FOR_BASE) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_ODBC)
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(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_FOR_BASE) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_ODBC)
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        


@@ -7849,28 +9043,28 @@ distclean: clean
 @COND_GCC_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
 

-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(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_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_HTML)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(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_GUI_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_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_HTML)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(__htmldll___so_symlinks_cmd)

 
 

-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@install_htmldll: 
-@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)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_1_USE_GUI_1_USE_HTML_1@install_htmldll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))

 
 @COND_GCC_PCH_1@.pch/wxprec_htmldll/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
 
 
 @COND_GCC_PCH_1@.pch/wxprec_htmldll/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
 

-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(HTMLLIB_OBJECTS)
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        rm -f $@
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(AR) rcu $@ $(HTMLLIB_OBJECTS)
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(RANLIB) $@
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(HTMLLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      rm -f $@
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(AR) rcu $@ $(HTMLLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(RANLIB) $@

 
 

-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@install_htmllib: 
-@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)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@install_htmllib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)

 
 @COND_GCC_PCH_1@.pch/wxprec_htmllib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_htmllib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)


@@ -7972,14 +9166,6 @@ samples:
 @COND_USE_XRC_1@install-wxrc: 
 @COND_USE_XRC_1@       (test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
 
 @COND_USE_XRC_1@install-wxrc: 
 @COND_USE_XRC_1@       (test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
 

-@COND_USE_GUI_1@install-afm: 
-@COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/afm
-@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(DESTDIR)$(datadir)/wx/afm)
-
-@COND_USE_GUI_1@install-gsafm: 
-@COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/gs_afm
-@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/gs_afm)
-

 install-wxconfig: 
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 install-wxconfig: 
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config


@@ -8252,6 +9438,9 @@ wxjpeg_jdmerge.o: $(srcdir)/src/jpeg/jdmerge.c
 wxtiff_tif_win32.o: $(srcdir)/src/tiff/tif_win32.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 
 wxtiff_tif_win32.o: $(srcdir)/src/tiff/tif_win32.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 

+wxtiff_tif_apple.o: $(srcdir)/src/tiff/tif_apple.c
+       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
+

 wxtiff_tif_aux.o: $(srcdir)/src/tiff/tif_aux.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 
 wxtiff_tif_aux.o: $(srcdir)/src/tiff/tif_aux.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 


@@ -8261,6 +9450,9 @@ wxtiff_tif_close.o: $(srcdir)/src/tiff/tif_close.c
 wxtiff_tif_codec.o: $(srcdir)/src/tiff/tif_codec.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 
 wxtiff_tif_codec.o: $(srcdir)/src/tiff/tif_codec.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 

+wxtiff_tif_color.o: $(srcdir)/src/tiff/tif_color.c
+       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
+

 wxtiff_tif_compress.o: $(srcdir)/src/tiff/tif_compress.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 
 wxtiff_tif_compress.o: $(srcdir)/src/tiff/tif_compress.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 


@@ -8414,6 +9606,9 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
 monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -8549,9 +9744,6 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP)
 monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-monodll_unzip.o: $(srcdir)/src/common/unzip.c $(MONODLL_ODEP)
-       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
-

 monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -8594,16 +9786,31 @@ monodll_registry.o: $(srcdir)/src/msw/registry.cpp $(MONODLL_ODEP)
 monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-monodll_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_DirectoryCopy.o: $(srcdir)/src/mac/carbon/morefile/DirectoryCopy.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

 
 

-monodll_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_FSpCompat.o: $(srcdir)/src/mac/carbon/morefile/FSpCompat.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

 
 

-monodll_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_FileCopy.o: $(srcdir)/src/mac/carbon/morefile/FileCopy.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_FullPath.o: $(srcdir)/src/mac/carbon/morefile/FullPath.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_IterateDirectory.o: $(srcdir)/src/mac/carbon/morefile/IterateDirectory.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_MoreDesktopMgr.o: $(srcdir)/src/mac/carbon/morefile/MoreDesktopMgr.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<

 
 

-monodll_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(MONODLL_ODEP)
+monodll_MoreFiles.o: $(srcdir)/src/mac/carbon/morefile/MoreFiles.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+monodll_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(MONODLL_ODEP)

        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP)
        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP)


@@ -8735,6 +9942,12 @@ monodll_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(MONODLL_ODEP)
 monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+monodll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+monodll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -8858,6 +10071,9 @@ monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
 monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 

+monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9059,6 +10275,9 @@ monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
 monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9146,8 +10365,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@monodll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monodll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -9155,6 +10374,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9170,11 +10392,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monodll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -9200,6 +10422,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@monodll_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9230,17 +10455,80 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@monodll_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@monodll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@monodll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monodll_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monodll_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monodll_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monodll_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+

 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<


@@ -9278,6 +10566,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@monodll_gsocket.o: $(srcdir)/src/mac/carbon/gsocket.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -9956,7 +11247,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONODLL_ODEP)

 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)


@@ -10208,6 +11499,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -10652,6 +11955,27 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@monodll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1_WXUNIV_1@monodll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -11069,24 +12393,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -11222,12 +12528,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -11615,6 +12915,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -11624,6 +12933,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -11759,9 +13071,6 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
 monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-monolib_unzip.o: $(srcdir)/src/common/unzip.c $(MONOLIB_ODEP)
-       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
-

 monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -11804,16 +13113,31 @@ monolib_registry.o: $(srcdir)/src/msw/registry.cpp $(MONOLIB_ODEP)
 monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-monolib_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_DirectoryCopy.o: $(srcdir)/src/mac/carbon/morefile/DirectoryCopy.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

 
 

-monolib_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_FSpCompat.o: $(srcdir)/src/mac/carbon/morefile/FSpCompat.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

 
 

-monolib_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_FileCopy.o: $(srcdir)/src/mac/carbon/morefile/FileCopy.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_FullPath.o: $(srcdir)/src/mac/carbon/morefile/FullPath.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_IterateDirectory.o: $(srcdir)/src/mac/carbon/morefile/IterateDirectory.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_MoreDesktopMgr.o: $(srcdir)/src/mac/carbon/morefile/MoreDesktopMgr.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_MoreFiles.o: $(srcdir)/src/mac/carbon/morefile/MoreFiles.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+monolib_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $(MONOLIB_ODEP)
+       $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<

 
 

-monolib_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(MONOLIB_ODEP)
+monolib_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(MONOLIB_ODEP)

        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP)
        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP)


@@ -11945,6 +13269,12 @@ monolib_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(MONOLIB_ODEP)
 monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+monolib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+monolib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12068,6 +13398,9 @@ monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
 monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 

+monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12269,6 +13602,9 @@ monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONOLIB_ODEP)
 monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12356,8 +13692,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_PLATFORM_WIN32_1@monolib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monolib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -12365,6 +13701,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12380,11 +13719,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_WIN32_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 

-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_OS2_1@monolib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -12410,6 +13749,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@monolib_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -12440,17 +13782,80 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@monolib_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@monolib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@monolib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monolib_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monolib_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monolib_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monolib_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+

 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

 
 @COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<


@@ -12488,6 +13893,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@monolib_gsocket.o: $(srcdir)/src/mac/carbon/gsocket.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -13166,7 +14574,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONOLIB_ODEP)

 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)


@@ -13418,6 +14826,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -13862,6 +15282,27 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@monolib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1_WXUNIV_1@monolib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -14279,24 +15720,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -14432,12 +15855,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -14825,6 +16242,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -14834,6 +16260,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -14969,9 +16398,6 @@ basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
 basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-basedll_unzip.o: $(srcdir)/src/common/unzip.c $(BASEDLL_ODEP)
-       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
-

 basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -15014,20 +16440,32 @@ basedll_registry.o: $(srcdir)/src/msw/registry.cpp $(BASEDLL_ODEP)
 basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

-basedll_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+basedll_DirectoryCopy.o: $(srcdir)/src/mac/carbon/morefile/DirectoryCopy.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<

 
 

-basedll_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+basedll_FSpCompat.o: $(srcdir)/src/mac/carbon/morefile/FSpCompat.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<

 
 

-basedll_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+basedll_FileCopy.o: $(srcdir)/src/mac/carbon/morefile/FileCopy.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<

 
 

-basedll_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(BASEDLL_ODEP)
+basedll_FullPath.o: $(srcdir)/src/mac/carbon/morefile/FullPath.c $(BASEDLL_ODEP)

        $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 
        $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 

-basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+basedll_IterateDirectory.o: $(srcdir)/src/mac/carbon/morefile/IterateDirectory.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
+basedll_MoreDesktopMgr.o: $(srcdir)/src/mac/carbon/morefile/MoreDesktopMgr.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
+basedll_MoreFiles.o: $(srcdir)/src/mac/carbon/morefile/MoreFiles.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
+basedll_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
+basedll_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(BASEDLL_ODEP)
+       $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<

 
 basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_event.o: $(srcdir)/src/common/event.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<


@@ -15146,6 +16584,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -15161,6 +16602,12 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_WIN32_1@basedll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_OS2_1@basedll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -15185,6 +16632,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@basedll_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -15203,9 +16653,78 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@basedll_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@basedll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@basedll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@basedll_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@basedll_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@basedll_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@basedll_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 


@@ -15215,6 +16734,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -15350,9 +16872,6 @@ baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP)
 baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-baselib_unzip.o: $(srcdir)/src/common/unzip.c $(BASELIB_ODEP)
-       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
-

 baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -15395,20 +16914,32 @@ baselib_registry.o: $(srcdir)/src/msw/registry.cpp $(BASELIB_ODEP)
 baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

-baselib_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+baselib_DirectoryCopy.o: $(srcdir)/src/mac/carbon/morefile/DirectoryCopy.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<

 
 

-baselib_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+baselib_FSpCompat.o: $(srcdir)/src/mac/carbon/morefile/FSpCompat.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<

 
 

-baselib_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+baselib_FileCopy.o: $(srcdir)/src/mac/carbon/morefile/FileCopy.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<

 
 

-baselib_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(BASELIB_ODEP)
+baselib_FullPath.o: $(srcdir)/src/mac/carbon/morefile/FullPath.c $(BASELIB_ODEP)

        $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 
        $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 

-baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+baselib_IterateDirectory.o: $(srcdir)/src/mac/carbon/morefile/IterateDirectory.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
+baselib_MoreDesktopMgr.o: $(srcdir)/src/mac/carbon/morefile/MoreDesktopMgr.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
+baselib_MoreFiles.o: $(srcdir)/src/mac/carbon/morefile/MoreFiles.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
+baselib_MoreFilesExtras.o: $(srcdir)/src/mac/carbon/morefile/MoreFilesExtras.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
+baselib_Search.o: $(srcdir)/src/mac/carbon/morefile/Search.c $(BASELIB_ODEP)
+       $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<

 
 baselib_event.o: $(srcdir)/src/common/event.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_event.o: $(srcdir)/src/common/event.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<


@@ -15527,6 +17058,9 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -15542,6 +17076,12 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_PLATFORM_WIN32_1@baselib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_OS2_1@baselib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -15566,6 +17106,9 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@baselib_thread.o: $(srcdir)/src/mac/carbon/thread.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -15584,9 +17127,78 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@baselib_utilsexc.o: $(srcdir)/src/mac/carbon/utilsexc.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 @COND_PLATFORM_OS2_1@baselib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_OS2_1@baselib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@baselib_dirmac.o: $(srcdir)/src/mac/carbon/dirmac.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@baselib_mimetmac.o: $(srcdir)/src/mac/carbon/mimetmac.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@baselib_macnotfy.o: $(srcdir)/src/mac/carbon/macnotfy.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@baselib_MoreFilesX.o: $(srcdir)/src/mac/carbon/morefilex/MoreFilesX.c $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOS_1@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+

 @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 


@@ -15641,6 +17253,9 @@ netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP)
 @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@netdll_gsocket.o: $(srcdir)/src/mac/carbon/gsocket.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $<
+

 netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
 
 netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
 


@@ -15689,6 +17304,9 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
 @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP)
 @COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOS_1@netlib_gsocket.o: $(srcdir)/src/mac/carbon/gsocket.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $<
+

 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -15785,6 +17403,12 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP)
 coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

+coredll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+coredll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+

 coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -15839,9 +17463,6 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP)
 coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-coredll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -16604,7 +18225,7 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.mm $(COREDLL_ODEP)

 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)


@@ -16826,12 +18447,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -16862,6 +18477,18 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -17306,6 +18933,27 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@coredll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1_WXUNIV_1@coredll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -17723,24 +19371,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -17876,12 +19506,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(COREDLL_ODEP)
-@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 $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_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 $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -18272,6 +19896,12 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP)
 corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

+corelib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+corelib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+

 corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -18326,9 +19956,6 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP)
 corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-corelib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -19091,7 +20718,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.mm $(CORELIB_ODEP)

 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)


@@ -19313,12 +20940,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -19349,6 +20970,18 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -19793,6 +21426,27 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@corelib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1_WXUNIV_1@corelib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -20210,24 +21864,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/mac/carbon/tglbtn.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/mac/carbon/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -20363,12 +21999,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(CORELIB_ODEP)
-@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 $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_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 $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -20702,6 +22332,9 @@ advdll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
 advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
 advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 

+advdll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 


@@ -20825,6 +22458,9 @@ advlib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
 advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
 advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 

+advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 


@@ -20909,6 +22545,30 @@ advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 

+mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
+       $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW@mediadll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE@mediadll_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC@mediadll_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $<
+
+medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
+       $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW@medialib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_WINCE@medialib_mediactrl.o: $(srcdir)/src/msw/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC@medialib_mediactrl.o: $(srcdir)/src/mac/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $<
+

 odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP)
        $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $<
 
 odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP)
        $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $<
 


@@ -21598,6 +23258,12 @@ GTK_DIST: ALL_GUI_DIST
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk

+
+       mkdir $(DISTDIR)/include/wx/gtk/gnome
+       mkdir $(DISTDIR)/src/gtk/gnome
+       cp $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome
+       cp $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome
+

        mkdir $(DISTDIR)/contrib
        cp -R $(WXDIR)/contrib $(DISTDIR)
 
        mkdir $(DISTDIR)/contrib
        cp -R $(WXDIR)/contrib $(DISTDIR)
 


@@ -21695,6 +23361,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/msw/wince
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
        mkdir $(DISTDIR)/include/wx/msw/wince
        cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw

+       cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw

        cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
        cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
        cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
        cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
        cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
        cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl


@@ -22211,6 +23878,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash
        cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash
        cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash
        cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash
        cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash
        cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash

+       cp $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash

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


@@ -22335,11 +24003,6 @@ UTILS_DIST: ALL_GUI_DIST
        cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
 
 MISC_DIST: ALL_GUI_DIST
        cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
 
 MISC_DIST: ALL_GUI_DIST

-       mkdir $(DISTDIR)/misc
-       mkdir $(DISTDIR)/misc/afm
-       cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
-       mkdir $(DISTDIR)/misc/gs_afm
-       cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm

 
 INTL_DIST:
        mkdir $(DISTDIR)/locale
 
 INTL_DIST:
        mkdir $(DISTDIR)/locale


@@ -22517,4 +24180,4 @@ rpm: bzip-dist
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

-.PHONY: all install uninstall clean distclean install_wxregex install_wxzlib install_wxpng install_wxjpeg install_wxtiff install_wxodbc install_wxexpat install_monodll install_monolib install_basedll install_baselib install_netdll install_netlib install_coredll install_corelib install_advdll install_advlib install_odbcdll install_odbclib install_dbgriddll install_dbgridlib install_htmldll install_htmllib install_xmldll install_xmllib install_xrcdll install_xrclib install_gldll install_gllib install_sound_sdl samples
+.PHONY: all install uninstall clean distclean install_wxregex install_wxzlib install_wxpng install_wxjpeg install_wxtiff install_wxodbc install_wxexpat install_monodll install_monolib install_basedll install_baselib install_netdll install_netlib install_coredll install_corelib install_advdll install_advlib install_mediadll install_medialib install_odbcdll install_odbclib install_dbgriddll install_dbgridlib install_htmldll install_htmllib install_xmldll install_xmllib install_xrcdll install_xrclib install_gldll install_gllib install_sound_sdl samples