X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54e83ca581eef6ba5b83935e4f25fb73f85cedfe..0334f97f9c0857d4eb57dcda1c4205780a427677:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 13de7117f9..0122ff3c4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -386,7 +386,7 @@ ALL_BASE_SOURCES =  \
 	src/common/textfile.cpp \
 	src/common/tokenzr.cpp \
 	src/common/txtstrm.cpp \
-	src/common/unzip.c \
+	src/common/archive.cpp \
 	src/common/uri.cpp \
 	src/common/variant.cpp \
 	src/common/wfstream.cpp \
@@ -409,6 +409,7 @@ ALL_BASE_SOURCES =  \
 	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 \
@@ -510,7 +511,7 @@ MONODLL_OBJECTS =  \
 	monodll_textfile.o \
 	monodll_tokenzr.o \
 	monodll_txtstrm.o \
-	monodll_unzip.o \
+	monodll_archive.o \
 	monodll_uri.o \
 	monodll_variant.o \
 	monodll_wfstream.o \
@@ -597,7 +598,7 @@ MONOLIB_OBJECTS =  \
 	monolib_textfile.o \
 	monolib_tokenzr.o \
 	monolib_txtstrm.o \
-	monolib_unzip.o \
+	monolib_archive.o \
 	monolib_uri.o \
 	monolib_variant.o \
 	monolib_wfstream.o \
@@ -685,7 +686,7 @@ BASEDLL_OBJECTS =  \
 	basedll_textfile.o \
 	basedll_tokenzr.o \
 	basedll_txtstrm.o \
-	basedll_unzip.o \
+	basedll_archive.o \
 	basedll_uri.o \
 	basedll_variant.o \
 	basedll_wfstream.o \
@@ -757,7 +758,7 @@ BASELIB_OBJECTS =  \
 	baselib_textfile.o \
 	baselib_tokenzr.o \
 	baselib_txtstrm.o \
-	baselib_unzip.o \
+	baselib_archive.o \
 	baselib_uri.o \
 	baselib_variant.o \
 	baselib_wfstream.o \
@@ -885,6 +886,22 @@ ADVLIB_OBJECTS =  \
 	$(__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_emptydmy.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_emptydmy.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) \
@@ -1216,11 +1233,12 @@ COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR =  \
 	wx/unix/stdpaths.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)
 COND_TOOLKIT_MAC_BASE_PLATFORM_HDR =  \
-	include/wx/mac/corefoundation/cfstring.h \
-	include/wx/mac/corefoundation/stdpaths.h
+	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_MACOS_1@NET_PLATFORM_HDR = include/wx/mac/carbon/gsockmac.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 = \
@@ -1414,9 +1432,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/generic/paletteg.h \
 	wx/generic/region.h \
 	wx/generic/statusbr.h \
-	wx/generic/tabg.h \
-	include/wx/mac/corefoundation/cfstring.h \
-	include/wx/mac/corefoundation/stdpaths.h
+	wx/generic/tabg.h
 @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \
 	wx/generic/colrdlgg.h \
@@ -2039,7 +2055,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)
-@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 =  \
@@ -2059,6 +2075,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_COCOA@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_MAC@MEDIA_PLATFORM_HDR = wx/mac/carbon/mediactrl.h
+@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR = wx/msw/mediactrl.h 
+@COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = wx/msw/mediactrl.h
+@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 \
@@ -2301,6 +2325,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	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 \
@@ -2447,6 +2473,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
 	monodll_regconf.o \
 	monodll_registry.o \
 	monodll_snglinst.o \
+	monodll_stdpaths.o \
 	monodll_thread.o \
 	monodll_utils.o \
 	monodll_utilsexc.o \
@@ -2459,7 +2486,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS =  \
 	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 \
@@ -2467,7 +2496,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
 	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 \
@@ -2475,7 +2506,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
 	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 \
@@ -2486,7 +2519,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
 	monodll_MoreFilesX.o \
 	monodll_cfstring.o \
 	monodll_stdpaths_cf.o \
-	monodll_baseunix.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 \
@@ -2494,7 +2528,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
 	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 \
@@ -2502,7 +2538,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
 	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
@@ -2533,6 +2571,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_tipdlg.o \
 	monodll_wizard.o \
 	$(__ADVANCED_PLATFORM_SRC_OBJECTS) \
+	monodll_emptydmy.o \
+	$(__MEDIA_PLATFORM_SRC_OBJECTS) \
 	$(__HTML_SRC_PLATFORM_OBJECTS) \
 	monodll_helpctrl.o \
 	monodll_helpdata.o \
@@ -2699,7 +2739,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 =  \
-	$(__LOWLEVEL_SRC_OBJECTS) \
+	$(__LOWLEVEL_SRC_OBJECTS_1) \
 	monodll_accel.o \
 	monodll_colrdlgg.o \
 	monodll_dirdlgg.o \
@@ -2846,6 +2886,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)
+@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 \
@@ -2933,11 +3194,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
 	monodll_regiong.o \
 	monodll_statusbr.o \
 	monodll_tabg.o \
-	monodll_timer.o \
-	monodll_cfstring.o \
-	monodll_gsockosx.o \
-	monodll_stdpaths_cf.o \
-	monodll_utilsexc_cf.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 \
@@ -3068,9 +3325,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
 	monodll_statusbr.o \
 	monodll_tabg.o \
 	monodll_snglinst.o \
-	monodll_webkit.o \
-	monodll_gsockosx.o \
-	monodll_utilsexc_cf.o
+	monodll_webkit.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
 	monodll_accel.o \
@@ -3329,21 +3584,242 @@ 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 =  \
-	monodll_taskbarcmn.o \
-	monodll_drawer.o \
-	monodll_joystick.o \
-	monodll_sound.o \
+@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_sound.o \
 	monodll_taskbar.o
 @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
@@ -3365,6 +3841,14 @@ 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
@@ -3423,6 +3907,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 	monolib_regconf.o \
 	monolib_registry.o \
 	monolib_snglinst.o \
+	monolib_stdpaths.o \
 	monolib_thread.o \
 	monolib_utils.o \
 	monolib_utilsexc.o \
@@ -3435,7 +3920,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1 =  \
 	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 \
@@ -3443,7 +3930,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	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 \
@@ -3451,7 +3940,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	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 \
@@ -3462,7 +3953,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	monolib_MoreFilesX.o \
 	monolib_cfstring.o \
 	monolib_stdpaths_cf.o \
-	monolib_baseunix.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 \
@@ -3470,7 +3962,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	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 \
@@ -3478,7 +3972,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	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
@@ -3509,6 +4005,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_tipdlg.o \
 	monolib_wizard.o \
 	$(__ADVANCED_PLATFORM_SRC_OBJECTS_1) \
+	monolib_emptydmy.o \
+	$(__MEDIA_PLATFORM_SRC_OBJECTS_1) \
 	$(__HTML_SRC_PLATFORM_OBJECTS_1) \
 	monolib_helpctrl.o \
 	monolib_helpdata.o \
@@ -3575,7 +4073,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 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_0) \
+	$(__LOWLEVEL_SRC_OBJECTS_2) \
 	$(__GUI_SRC_OBJECTS_1) \
 	monolib_accesscmn.o \
 	monolib_appcmn.o \
@@ -3675,7 +4173,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 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_0) \
+	$(__LOWLEVEL_SRC_OBJECTS_3) \
 	monolib_accel.o \
 	monolib_colrdlgg.o \
 	monolib_dirdlgg.o \
@@ -3822,26 +4320,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)
-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_bmpbuttn.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 \
@@ -3909,11 +4629,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
 	monolib_regiong.o \
 	monolib_statusbr.o \
 	monolib_tabg.o \
-	monolib_timer.o \
-	monolib_cfstring.o \
-	monolib_gsockosx.o \
-	monolib_stdpaths_cf.o \
-	monolib_utilsexc_cf.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 \
@@ -4044,9 +4760,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
 	monolib_statusbr.o \
 	monolib_tabg.o \
 	monolib_snglinst.o \
-	monolib_webkit.o \
-	monolib_gsockosx.o \
-	monolib_utilsexc_cf.o
+	monolib_webkit.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 \
@@ -4305,44 +5019,274 @@ 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_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_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monolib_sound_sdl.o monolib_gprint.o
@@ -4434,6 +5378,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 	basedll_regconf.o \
 	basedll_registry.o \
 	basedll_snglinst.o \
+	basedll_stdpaths.o \
 	basedll_thread.o \
 	basedll_utils.o \
 	basedll_utilsexc.o \
@@ -4446,7 +5391,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2 =  \
 	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 \
@@ -4454,7 +5401,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	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 \
@@ -4462,7 +5411,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	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 \
@@ -4473,7 +5424,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	basedll_MoreFilesX.o \
 	basedll_cfstring.o \
 	basedll_stdpaths_cf.o \
-	basedll_baseunix.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 \
@@ -4481,7 +5433,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	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 \
@@ -4489,7 +5443,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	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
@@ -4552,6 +5508,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 	baselib_regconf.o \
 	baselib_registry.o \
 	baselib_snglinst.o \
+	baselib_stdpaths.o \
 	baselib_thread.o \
 	baselib_utils.o \
 	baselib_utilsexc.o \
@@ -4564,7 +5521,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3 =  \
 	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 \
@@ -4572,7 +5531,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	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 \
@@ -4580,7 +5541,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	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 \
@@ -4591,7 +5554,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	baselib_MoreFilesX.o \
 	baselib_cfstring.o \
 	baselib_stdpaths_cf.o \
-	baselib_baseunix.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 \
@@ -4599,7 +5563,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	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 \
@@ -4607,7 +5573,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	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
@@ -4734,7 +5702,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 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_8) \
+	$(__LOWLEVEL_SRC_OBJECTS_4) \
 	$(__GUI_SRC_OBJECTS_2) \
 	coredll_accesscmn.o \
 	coredll_appcmn.o \
@@ -4834,7 +5802,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 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_8) \
+	$(__LOWLEVEL_SRC_OBJECTS_5) \
 	coredll_accel.o \
 	coredll_colrdlgg.o \
 	coredll_dirdlgg.o \
@@ -4981,6 +5949,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)
+@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 \
@@ -5068,11 +6258,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
 	coredll_regiong.o \
 	coredll_statusbr.o \
 	coredll_tabg.o \
-	coredll_timer.o \
-	coredll_cfstring.o \
-	coredll_gsockosx.o \
-	coredll_stdpaths_cf.o \
-	coredll_utilsexc_cf.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 \
@@ -5203,9 +6389,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
 	coredll_statusbr.o \
 	coredll_tabg.o \
 	coredll_snglinst.o \
-	coredll_webkit.o \
-	coredll_gsockosx.o \
-	coredll_utilsexc_cf.o
+	coredll_webkit.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 \
@@ -5464,46 +6648,268 @@ 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 \
-	corelib_ctrlcmn.o \
-	corelib_ctrlsub.o \
-	corelib_datacmn.o \
-	corelib_dcbase.o \
-	corelib_dlgcmn.o \
-	corelib_dndcmn.o \
-	corelib_dobjcmn.o \
-	corelib_docmdi.o \
-	corelib_docview.o \
+@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_dcbase.o \
+	corelib_dlgcmn.o \
+	corelib_dndcmn.o \
+	corelib_dobjcmn.o \
+	corelib_docmdi.o \
+	corelib_docview.o \
 	corelib_dpycmn.o \
 	corelib_dseldlg.o \
 	corelib_effects.o \
@@ -5581,7 +6987,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 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_9) \
+	$(__LOWLEVEL_SRC_OBJECTS_7) \
 	corelib_accel.o \
 	corelib_colrdlgg.o \
 	corelib_dirdlgg.o \
@@ -5728,18 +7134,240 @@ 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 \
+@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 \
@@ -5815,11 +7443,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
 	corelib_regiong.o \
 	corelib_statusbr.o \
 	corelib_tabg.o \
-	corelib_timer.o \
-	corelib_cfstring.o \
-	corelib_gsockosx.o \
-	corelib_stdpaths_cf.o \
-	corelib_utilsexc_cf.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 \
@@ -5950,9 +7574,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
 	corelib_statusbr.o \
 	corelib_tabg.o \
 	corelib_snglinst.o \
-	corelib_webkit.o \
-	corelib_gsockosx.o \
-	corelib_utilsexc_cf.o
+	corelib_webkit.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 \
@@ -6211,44 +7833,266 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 	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) \
+@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_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_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_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_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_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_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_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_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_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_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_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_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) \
@@ -6326,6 +8170,73 @@ COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 @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)
@@ -6645,925 +8556,45 @@ 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_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_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \
-	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_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
-	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_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
-	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_stdpaths.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_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9 =  \
-	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_stdpaths.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 =  \
-	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_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9)
+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_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)
@@ -7604,9 +8635,9 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 
 ### 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_afm___depname) $(__install_gsafm___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
@@ -7642,6 +8673,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)$(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)
@@ -7680,6 +8712,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)/$(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)
@@ -7905,6 +8941,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_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@	
@@ -8660,8 +9722,8 @@ 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_unzip.o: $(srcdir)/src/common/unzip.c $(MONODLL_ODEP)
-	$(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -8984,6 +10046,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_emptydmy.o: $(srcdir)/src/common/emptydmy.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -9284,6 +10349,9 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_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) $<
 
@@ -9299,15 +10367,12 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_WIN32_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_WIN32_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_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_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_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -9401,21 +10466,45 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @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_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_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_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_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(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) $<
 
@@ -10385,6 +11474,18 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_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) $<
 
@@ -11399,18 +12500,6 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/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/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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) $<
 
@@ -11798,6 +12887,15 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_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) $<
 
@@ -11942,8 +13040,8 @@ 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_unzip.o: $(srcdir)/src/common/unzip.c $(MONOLIB_ODEP)
-	$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -12266,6 +13364,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_emptydmy.o: $(srcdir)/src/common/emptydmy.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -12566,6 +13667,9 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_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) $<
 
@@ -12581,15 +13685,12 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_WIN32_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_WIN32_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_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_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_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -12683,21 +13784,45 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @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_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_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_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_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(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) $<
 
@@ -13667,6 +14792,18 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_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) $<
 
@@ -14681,18 +15818,6 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/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/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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) $<
 
@@ -15080,6 +16205,15 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.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_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) $<
 
@@ -15224,8 +16358,8 @@ 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_unzip.o: $(srcdir)/src/common/unzip.c $(BASEDLL_ODEP)
-	$(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
+basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
@@ -15413,6 +16547,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_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) $<
 
@@ -15428,6 +16565,9 @@ 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_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) $<
 
@@ -15509,12 +16649,42 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @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) $<
 
@@ -15662,8 +16832,8 @@ 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_unzip.o: $(srcdir)/src/common/unzip.c $(BASELIB_ODEP)
-	$(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
+baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
@@ -15851,6 +17021,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_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) $<
 
@@ -15866,6 +17039,9 @@ 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_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) $<
 
@@ -15947,12 +17123,42 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @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) $<
 
@@ -16214,12 +17420,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_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-coredll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -17204,12 +18404,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_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) $<
 
@@ -17240,6 +18434,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_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) $<
 
@@ -18254,18 +19460,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_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/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/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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) $<
 
@@ -18710,12 +19904,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_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-corelib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -19700,12 +20888,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_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) $<
 
@@ -19736,6 +20918,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_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) $<
 
@@ -20750,18 +21944,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_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/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/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.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) $<
 
@@ -21308,6 +22490,30 @@ advlib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+mediadll_emptydmy.o: $(srcdir)/src/common/emptydmy.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_emptydmy.o: $(srcdir)/src/common/emptydmy.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) $<
 
@@ -21997,6 +23203,12 @@ GTK_DIST: ALL_GUI_DIST
 	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)
 
@@ -22917,4 +24129,4 @@ rpm: bzip-dist
 # 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